summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-02-10 17:45:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-10 17:45:10 +0000
commit7142d10a7a3941b2deb18869a7f7b79462e0aa52 (patch)
tree13877ae350dca91d5786152d87fd41132d3b550e
parent61bdaaa18a1d52666827e31bb7980a5784443835 (diff)
parentc490e80239f090c67b00a88468155e1c406da938 (diff)
downloadframeworks_av-7142d10a7a3941b2deb18869a7f7b79462e0aa52.zip
frameworks_av-7142d10a7a3941b2deb18869a7f7b79462e0aa52.tar.gz
frameworks_av-7142d10a7a3941b2deb18869a7f7b79462e0aa52.tar.bz2
Merge "avcenc: Update video port parameters in the base class"
-rw-r--r--media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp11
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;
}