Merge "Revert "transcoding: Use the maximum operating rate from property."" (5998a63a) · Commits · e / os / android_frameworks_av

media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp

+1 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		#define LOG_TAG "VideoTrackTranscoder"

		#include <android-base/logging.h>
		#include <cutils/properties.h>
		#include <media/NdkCommon.h>
		#include <media/VideoTrackTranscoder.h>
		#include <utils/AndroidThreads.h>
		@@ -40,8 +39,7 @@ static constexpr int32_t kColorFormatSurface = 0x7f000789;
		// Default key frame interval in seconds.
		static constexpr float kDefaultKeyFrameIntervalSeconds = 1.0f;
		// Default codec operating rate.
		static int32_t kDefaultCodecOperatingRate =
		property_get_int32("debug.media.transcoding.codec_max_operating_rate", /default/ 240);
		static constexpr int32_t kDefaultCodecOperatingRate = 240;
		// Default codec priority.
		static constexpr int32_t kDefaultCodecPriority = 1;
		// Default bitrate, in case source estimation fails.