summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaCodecSource.cpp
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-01-05 15:21:14 -0800
committerSteve Kondik <steve@cyngn.com>2016-01-05 15:22:11 -0800
commitde1e368d8ac5891e03e664a0ea385b896b48db0b (patch)
tree12b15ff95a32ca0a55d4fa9f94dbba8c886c09d8 /media/libstagefright/MediaCodecSource.cpp
parent72f2347c4eb4aa50503cd990d1ab5c0f8f5bbb61 (diff)
downloadframeworks_av-de1e368d8ac5891e03e664a0ea385b896b48db0b.zip
frameworks_av-de1e368d8ac5891e03e664a0ea385b896b48db0b.tar.gz
frameworks_av-de1e368d8ac5891e03e664a0ea385b896b48db0b.tar.bz2
stagefright: Forward-port HFR and HSR support
* CAF commit bd42a7ac3a60c0d8a079b4567484c9b006bac8ad upstream Change-Id: I457ccab603647f3139ea2199a544f64ac3d1a214
Diffstat (limited to 'media/libstagefright/MediaCodecSource.cpp')
-rw-r--r--media/libstagefright/MediaCodecSource.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp
index aef6715..adbde54 100644
--- a/media/libstagefright/MediaCodecSource.cpp
+++ b/media/libstagefright/MediaCodecSource.cpp
@@ -429,9 +429,14 @@ status_t MediaCodecSource::initEncoder() {
return err;
}
+ int32_t hfrRatio = 0;
+ mOutputFormat->findInt32("hfr-ratio", &hfrRatio);
+
mEncoder->getOutputFormat(&mOutputFormat);
convertMessageToMetaData(mOutputFormat, mMeta);
+ AVUtils::get()->HFRUtils().setHFRRatio(mMeta, hfrRatio);
+
if (mFlags & FLAG_USE_SURFACE_INPUT) {
CHECK(mIsVideo);