diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-07 02:26:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 02:26:01 +0000 |
| commit | a753e4ead38e1cc14484ad5e3bf523bbaf2298b0 (patch) | |
| tree | 69e89477fd53f0be4f4639718f545c5a2f0e940d /media/libstagefright | |
| parent | f7e6f7c096167f99f643371eb6a7cb7455c4f0fc (diff) | |
| parent | 88e99f9a5e098ee50019ce85f2b1273b48883f37 (diff) | |
| download | frameworks_av-a753e4ead38e1cc14484ad5e3bf523bbaf2298b0.zip frameworks_av-a753e4ead38e1cc14484ad5e3bf523bbaf2298b0.tar.gz frameworks_av-a753e4ead38e1cc14484ad5e3bf523bbaf2298b0.tar.bz2 | |
am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"
* commit '88e99f9a5e098ee50019ce85f2b1273b48883f37':
SoftVPXEncoder: Set the frame size on the output port as well
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp b/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp index 8375cac..5efe022 100644 --- a/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp +++ b/media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp @@ -677,6 +677,9 @@ OMX_ERRORTYPE SoftVPXEncoder::internalSetPortParams( def->format.video.nFrameHeight = mHeight; def->format.video.xFramerate = port->format.video.xFramerate; def->format.video.eColorFormat = mColorFormat; + def = &editPortInfo(kOutputPortIndex)->mDef; + def->format.video.nFrameWidth = mWidth; + def->format.video.nFrameHeight = mHeight; return OMX_ErrorNone; } else if (port->nPortIndex == kOutputPortIndex) { |