diff options
| author | Ed Heyl <ed@google.com> | 2012-07-29 16:47:58 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2012-07-29 16:47:58 -0700 |
| commit | 9fbe94294ce2053d102ff5de89846a0c5015fb58 (patch) | |
| tree | 7ba08233afeb658bdd59e1e0b12e96638ee796a4 /media/libmediaplayerservice/nuplayer | |
| parent | 3beb3ff4af08ea02da87e6548e0544d2ba47daf1 (diff) | |
| parent | 5d246efa220a7c7b22e490576c488b3853c664dd (diff) | |
| download | frameworks_av-9fbe94294ce2053d102ff5de89846a0c5015fb58.zip frameworks_av-9fbe94294ce2053d102ff5de89846a0c5015fb58.tar.gz frameworks_av-9fbe94294ce2053d102ff5de89846a0c5015fb58.tar.bz2 | |
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Conflicts:
services/audioflinger/AudioFlinger.cpp
Change-Id: If27e4ff35de1e182394cc149e1557a49f0f7c95b
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 8f45491..daf60f6 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -258,7 +258,9 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &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<AMessage> &msg) { break; } - if (mAudioDecoder == NULL || mVideoDecoder == NULL) { + if (mAudioDecoder == NULL && mAudioSink != NULL || + mVideoDecoder == NULL && mNativeWindow != NULL) { msg->post(100000ll); mScanSourcesPending = true; } |