diff options
| author | Adam Hampson <ahampson@google.com> | 2013-11-13 09:35:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 09:35:30 -0800 |
| commit | 7000c85348a69e37193230c8ccf493c8cb2708f8 (patch) | |
| tree | 7635debd9c96319621bb457d02f618f285db9491 /media/libstagefright/OMXCodec.cpp | |
| parent | 2c165bad49eb3a04f901d2e6e87a80757fc97485 (diff) | |
| parent | 728549e39be9b8fcc701ef0f4623bc50d8726bd7 (diff) | |
| download | frameworks_av-7000c85348a69e37193230c8ccf493c8cb2708f8.zip frameworks_av-7000c85348a69e37193230c8ccf493c8cb2708f8.tar.gz frameworks_av-7000c85348a69e37193230c8ccf493c8cb2708f8.tar.bz2 | |
am 728549e3: am 56477eb7: am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '728549e39be9b8fcc701ef0f4623bc50d8726bd7':
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 063ab49..625922f 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -361,12 +361,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; } @@ -1359,8 +1354,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; |