From 81955306d4d9465b12528da1e56c17eb938e7564 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Tue, 5 Jan 2016 16:20:37 -0800 Subject: stagefright: Only include HFR/HSR on QCOM devices Change-Id: Ib98c9c94cccc902708d25a9b8d81bc54fd6bbf7c --- media/libavextensions/stagefright/AVUtils.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'media/libavextensions') 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 &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 & /*meta*/) {} + +status_t AVUtils::HFR::initializeHFR( + const sp & /*meta*/, sp & /*format*/, + int64_t & /*maxFileDurationUs*/, video_encoder /*videoEncoder*/) { + return OK; +} + +void AVUtils::HFR::setHFRRatio( + sp & /*meta*/, const int32_t /*hfrRatio*/) {} + +int32_t AVUtils::HFR::getHFRRatio( + const sp & /*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 &meta) { -- cgit v1.1