diff options
| author | Lajos Molnar <lajos@google.com> | 2014-02-10 17:49:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 17:49:06 +0000 |
| commit | 70243771c60f34afe1067c69821b5a79020281bb (patch) | |
| tree | 46691f5109e8311e817b6e22f3d7e83d0e5057ba /media/libstagefright/codecs | |
| parent | aa0b0557c77cce05c4ec8277fa75e1617786ef75 (diff) | |
| parent | 25da2f099f657d8b778ce3c03f5d4519e04150cf (diff) | |
| download | frameworks_av-70243771c60f34afe1067c69821b5a79020281bb.zip frameworks_av-70243771c60f34afe1067c69821b5a79020281bb.tar.gz frameworks_av-70243771c60f34afe1067c69821b5a79020281bb.tar.bz2 | |
am 25da2f09: am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as well"
* commit '25da2f099f657d8b778ce3c03f5d4519e04150cf':
SoftVPXEncoder: Set the frame size on the output port as well
Diffstat (limited to 'media/libstagefright/codecs')
| -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) { |