diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-28 04:12:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-28 04:12:31 +0000 |
| commit | 294c7f36e6a92419017e7fe2a204fba1284cdc08 (patch) | |
| tree | de03ac586a7439f6dbe0d238cba4b38b7f6a5d74 /media/libstagefright/ACodec.cpp | |
| parent | ff412661240d6ad34800512cb60841f8b0700107 (diff) | |
| parent | 701b96474dc8afd16046e440975e00be57cc4874 (diff) | |
| download | frameworks_av-294c7f36e6a92419017e7fe2a204fba1284cdc08.zip frameworks_av-294c7f36e6a92419017e7fe2a204fba1284cdc08.tar.gz frameworks_av-294c7f36e6a92419017e7fe2a204fba1284cdc08.tar.bz2 | |
Merge "libstagefright: set actual stride info for SW encoder input port" into lmp-mr1-dev
automerge: 701b964
* commit '701b96474dc8afd16046e440975e00be57cc4874':
libstagefright: set actual stride info for SW encoder input port
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 2f2f9cf..0e9d734 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -2221,7 +2221,11 @@ status_t ACodec::setupVideoEncoder(const char *mime, const sp<AMessage> &msg) { video_def->xFramerate = (OMX_U32)(frameRate * 65536.0f); video_def->eCompressionFormat = OMX_VIDEO_CodingUnused; - video_def->eColorFormat = colorFormat; + // this is redundant as it was already set up in setVideoPortFormatType + // FIXME for now skip this only for flexible YUV formats + if (colorFormat != OMX_COLOR_FormatYUV420Flexible) { + video_def->eColorFormat = colorFormat; + } err = mOMX->setParameter( mNode, OMX_IndexParamPortDefinition, &def, sizeof(def)); |