diff options
| author | Lajos Molnar <lajos@google.com> | 2014-02-10 17:56:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 17:56:56 +0000 |
| commit | a6d4f9374b9921ab4a186608598535f5af81643a (patch) | |
| tree | 42b5ad637e2ac8aa587ccfeabded32a0c5b3f7e4 /media/libstagefright/codecs | |
| parent | ee605387da3138634ab6a541a9ddaeb61d6a7625 (diff) | |
| parent | af8a3e29422ec5de5e7f8befbc5253e68729a654 (diff) | |
| download | frameworks_av-a6d4f9374b9921ab4a186608598535f5af81643a.zip frameworks_av-a6d4f9374b9921ab4a186608598535f5af81643a.tar.gz frameworks_av-a6d4f9374b9921ab4a186608598535f5af81643a.tar.bz2 | |
am af8a3e29: am 7142d10a: Merge "avcenc: Update video port parameters in the base class"
* commit 'af8a3e29422ec5de5e7f8befbc5253e68729a654':
avcenc: Update video port parameters in the base class
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp index 4a21a3e..1d398fb 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp @@ -593,6 +593,17 @@ OMX_ERRORTYPE SoftAVCEncoder::internalSetParameter( mVideoHeight = def->format.video.nFrameHeight; mVideoFrameRate = def->format.video.xFramerate >> 16; mVideoColorFormat = def->format.video.eColorFormat; + + OMX_PARAM_PORTDEFINITIONTYPE *portDef = + &editPortInfo(0)->mDef; + portDef->format.video.nFrameWidth = mVideoWidth; + portDef->format.video.nFrameHeight = mVideoHeight; + portDef->format.video.xFramerate = def->format.video.xFramerate; + portDef->format.video.eColorFormat = + (OMX_COLOR_FORMATTYPE) mVideoColorFormat; + portDef = &editPortInfo(1)->mDef; + portDef->format.video.nFrameWidth = mVideoWidth; + portDef->format.video.nFrameHeight = mVideoHeight; } else { mVideoBitRate = def->format.video.nBitrate; } |