diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-25 22:56:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 22:56:03 +0000 |
| commit | fd2711ca8c9108d25f18b48b924afd925f41344a (patch) | |
| tree | 386bea1979a6d030d85e6cfdf275e3bb975fe035 /media | |
| parent | a9b15da8df9f596658102fe2b7dfbe114a499867 (diff) | |
| parent | e464018a7fdacdc3bef3058620eb09ec60d3cccf (diff) | |
| download | frameworks_av-fd2711ca8c9108d25f18b48b924afd925f41344a.zip frameworks_av-fd2711ca8c9108d25f18b48b924afd925f41344a.tar.gz frameworks_av-fd2711ca8c9108d25f18b48b924afd925f41344a.tar.bz2 | |
am e464018a: am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"
* commit 'e464018a7fdacdc3bef3058620eb09ec60d3cccf':
Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp index e399984..246069b 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp @@ -353,8 +353,8 @@ void SoftMPEG4::onReset() { } } -void SoftMPEG4::updatePortDefinitions() { - SoftVideoDecoderOMXComponent::updatePortDefinitions(); +void SoftMPEG4::updatePortDefinitions(bool updateCrop) { + SoftVideoDecoderOMXComponent::updatePortDefinitions(updateCrop); /* We have to align our width and height - this should affect stride! */ OMX_PARAM_PORTDEFINITIONTYPE *def = &editPortInfo(kOutputPortIndex)->mDef; diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h index 8a06a00..31577e2 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h @@ -66,7 +66,7 @@ private: status_t initDecoder(); - virtual void updatePortDefinitions(); + virtual void updatePortDefinitions(bool updateCrop = true); bool handlePortSettingsChange(); DISALLOW_EVIL_CONSTRUCTORS(SoftMPEG4); |