diff options
author | Steve Kondik <steve@cyngn.com> | 2016-01-05 16:20:37 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-01-05 16:20:37 -0800 |
commit | 81955306d4d9465b12528da1e56c17eb938e7564 (patch) | |
tree | 8d80ada39c81294b64ee34823ef6362153a291fb /media/libavextensions | |
parent | de1e368d8ac5891e03e664a0ea385b896b48db0b (diff) | |
download | frameworks_av-81955306d4d9465b12528da1e56c17eb938e7564.zip frameworks_av-81955306d4d9465b12528da1e56c17eb938e7564.tar.gz frameworks_av-81955306d4d9465b12528da1e56c17eb938e7564.tar.bz2 |
stagefright: Only include HFR/HSR on QCOM devices
Change-Id: Ib98c9c94cccc902708d25a9b8d81bc54fd6bbf7c
Diffstat (limited to 'media/libavextensions')
-rw-r--r-- | media/libavextensions/stagefright/AVUtils.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp index 298434f..bdf5eb6 100644 --- a/media/libavextensions/stagefright/AVUtils.cpp +++ b/media/libavextensions/stagefright/AVUtils.cpp @@ -975,6 +975,7 @@ void AVUtils::setIntraPeriod( return; } +#ifdef QCOM_HARDWARE void AVUtils::HFR::setHFRIfEnabled( const CameraParameters& params, sp<MetaData> &meta) { @@ -1093,6 +1094,32 @@ int32_t AVUtils::HFR::getHFRCapabilities( return (maxHFRWidth > 0) && (maxHFRHeight > 0) && (maxHFRFps > 0) && (maxBitRate > 0) ? 1 : -1; } +#else +void AVUtils::HFR::setHFRIfEnabled( + const CameraParameters& /*params*/, + sp<MetaData> & /*meta*/) {} + +status_t AVUtils::HFR::initializeHFR( + const sp<MetaData> & /*meta*/, sp<AMessage> & /*format*/, + int64_t & /*maxFileDurationUs*/, video_encoder /*videoEncoder*/) { + return OK; +} + +void AVUtils::HFR::setHFRRatio( + sp<MetaData> & /*meta*/, const int32_t /*hfrRatio*/) {} + +int32_t AVUtils::HFR::getHFRRatio( + const sp<MetaData> & /*meta */) { + return 1; +} + +int32_t AVUtils::HFR::getHFRCapabilities( + video_encoder /*codec*/, + int& /*maxHFRWidth*/, int& /*maxHFRHeight*/, int& /*maxHFRFps*/, + int& /*maxBitRate*/) { + return -1; +} +#endif void AVUtils::extractCustomCameraKeys( const CameraParameters& params, sp<MetaData> &meta) { |