From b46ccde3610d3f1713f7ebf0e9ffe943e44b54d2 Mon Sep 17 00:00:00 2001 From: Edwin Wong Date: Tue, 17 Jul 2012 15:03:25 -0700 Subject: Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36 Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d related-to-bug: 6732061 --- media/libmediaplayerservice/Crypto.cpp | 2 +- media/libmediaplayerservice/Crypto.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'media/libmediaplayerservice') diff --git a/media/libmediaplayerservice/Crypto.cpp b/media/libmediaplayerservice/Crypto.cpp index d35d5b1e..0e8f913d 100644 --- a/media/libmediaplayerservice/Crypto.cpp +++ b/media/libmediaplayerservice/Crypto.cpp @@ -141,7 +141,7 @@ bool Crypto::requiresSecureDecoderComponent(const char *mime) const { return mPlugin->requiresSecureDecoderComponent(mime); } -status_t Crypto::decrypt( +ssize_t Crypto::decrypt( bool secure, const uint8_t key[16], const uint8_t iv[16], diff --git a/media/libmediaplayerservice/Crypto.h b/media/libmediaplayerservice/Crypto.h index c5aa3c6c..d066774f 100644 --- a/media/libmediaplayerservice/Crypto.h +++ b/media/libmediaplayerservice/Crypto.h @@ -42,7 +42,7 @@ struct Crypto : public BnCrypto { virtual bool requiresSecureDecoderComponent( const char *mime) const; - virtual status_t decrypt( + virtual ssize_t decrypt( bool secure, const uint8_t key[16], const uint8_t iv[16], -- cgit v1.2.3 From 5d246efa220a7c7b22e490576c488b3853c664dd Mon Sep 17 00:00:00 2001 From: Haynes Mathew George Date: Mon, 9 Jul 2012 10:36:57 -0700 Subject: NuPlayer: Prevents creation of Video Decoder when we use Music Player - Prevents instantion of Video Decoder when we use applications like Music Player which do not support Video Playback - Adds a check to prevent scanning for sources when it is either an Audio only clip or a video only clip or an AV clip played with a Music Player. Change-Id: I74dd9bc53e54fd4f3682536c987289ac252690b0 Signed-off-by: Arvind Thatikonda --- media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'media/libmediaplayerservice') diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 86e122fc..bda81239 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -258,7 +258,9 @@ void NuPlayer::onMessageReceived(const sp &msg) { ALOGV("scanning sources haveAudio=%d, haveVideo=%d", mAudioDecoder != NULL, mVideoDecoder != NULL); - instantiateDecoder(false, &mVideoDecoder); + if (mNativeWindow != NULL) { + instantiateDecoder(false, &mVideoDecoder); + } if (mAudioSink != NULL) { instantiateDecoder(true, &mAudioDecoder); @@ -279,7 +281,8 @@ void NuPlayer::onMessageReceived(const sp &msg) { break; } - if (mAudioDecoder == NULL || mVideoDecoder == NULL) { + if (mAudioDecoder == NULL && mAudioSink != NULL || + mVideoDecoder == NULL && mNativeWindow != NULL) { msg->post(100000ll); mScanSourcesPending = true; } -- cgit v1.2.3