diff options
| author | Adam Hampson <ahampson@google.com> | 2013-11-13 09:25:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 09:25:33 -0800 |
| commit | 56477eb724972c2fe0441dfa7baaad00b7927add (patch) | |
| tree | a0b05102681021a5774c5b3102e876cb3851e648 /media/libstagefright/OMXCodec.cpp | |
| parent | 22990fe1ee3531e84dbadb7ff9ffd68d5bbe9060 (diff) | |
| parent | 27ae268af29b25d85f83aa34e92ac8b7f6c87c6f (diff) | |
| download | frameworks_av-56477eb724972c2fe0441dfa7baaad00b7927add.zip frameworks_av-56477eb724972c2fe0441dfa7baaad00b7927add.tar.gz frameworks_av-56477eb724972c2fe0441dfa7baaad00b7927add.tar.bz2 | |
am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '27ae268af29b25d85f83aa34e92ac8b7f6c87c6f':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 7f56af8..43736ad 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -359,12 +359,7 @@ sp<MediaSource> OMXCodec::Create( observer->setCodec(codec); err = codec->configureCodec(meta); - if (err == OK) { - if (!strcmp("OMX.Nvidia.mpeg2v.decode", componentName)) { - codec->mFlags |= kOnlySubmitOneInputBufferAtOneTime; - } - return codec; } @@ -1346,8 +1341,7 @@ OMXCodec::OMXCodec( mLeftOverBuffer(NULL), mPaused(false), mNativeWindow( - (!strncmp(componentName, "OMX.google.", 11) - || !strcmp(componentName, "OMX.Nvidia.mpeg2v.decode")) + (!strncmp(componentName, "OMX.google.", 11)) ? NULL : nativeWindow) { mPortStatus[kPortIndexInput] = ENABLED; mPortStatus[kPortIndexOutput] = ENABLED; |