Snap for 5652499 from f57ace7a6b729211ad0180cfbddb1f5b5be7a48c to qt-release (16bd8890) · Commits · e / os / android_frameworks_av

apex/manifest.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.media",
		"version": 220000000
		"version": 290000000
		}

apex/manifest_codec.json

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.media.swcodec",
		"version": 220000000
		"version": 290000000
		}

media/codec2/sfplugin/CCodecConfig.cpp

+13 −7

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ void CCodecConfig::initializeStandardParams() {
		.limitTo(D::ENCODER & D::VIDEO));
		// convert to timestamp base
		add(ConfigMapper(KEY_I_FRAME_INTERVAL, C2_PARAMKEY_SYNC_FRAME_INTERVAL, "value")
		.withMapper([](C2Value v) -> C2Value {
		.withMappers([](C2Value v) -> C2Value {
		// convert from i32 to float
		int32_t i32Value;
		float fpValue;
		@@ -518,6 +518,12 @@ void CCodecConfig::initializeStandardParams() {
		return int64_t(c2_min(1000000 * fpValue + 0.5, (double)INT64_MAX));
		}
		return C2Value();
		}, [](C2Value v) -> C2Value {
		int64_t i64;
		if (v.get(&i64)) {
		return float(i64) / 1000000;
		}
		return C2Value();
		}));
		// remove when codecs switch to proper coding.gop (add support for calculating gop)
		deprecated(ConfigMapper("i-frame-period", "coding.gop", "intra-period")
		@@ -711,7 +717,7 @@ void CCodecConfig::initializeStandardParams() {

		// convert to dBFS and add default
		add(ConfigMapper(KEY_AAC_DRC_TARGET_REFERENCE_LEVEL, C2_PARAMKEY_DRC_TARGET_REFERENCE_LEVEL, "value")
		.limitTo(D::AUDIO & D::DECODER)
		.limitTo(D::AUDIO & D::DECODER & D::CONFIG)
		.withMapper([](C2Value v) -> C2Value {
		int32_t value;
		if (!v.get(&value) \|\| value < 0) {
		@@ -722,7 +728,7 @@ void CCodecConfig::initializeStandardParams() {

		// convert to 0-1 (%) and add default
		add(ConfigMapper(KEY_AAC_DRC_ATTENUATION_FACTOR, C2_PARAMKEY_DRC_ATTENUATION_FACTOR, "value")
		.limitTo(D::AUDIO & D::DECODER)
		.limitTo(D::AUDIO & D::DECODER & D::CONFIG)
		.withMapper([](C2Value v) -> C2Value {
		int32_t value;
		if (!v.get(&value) \|\| value < 0) {
		@@ -733,7 +739,7 @@ void CCodecConfig::initializeStandardParams() {

		// convert to 0-1 (%) and add default
		add(ConfigMapper(KEY_AAC_DRC_BOOST_FACTOR, C2_PARAMKEY_DRC_BOOST_FACTOR, "value")
		.limitTo(D::AUDIO & D::DECODER)
		.limitTo(D::AUDIO & D::DECODER & D::CONFIG)
		.withMapper([](C2Value v) -> C2Value {
		int32_t value;
		if (!v.get(&value) \|\| value < 0) {
		@@ -744,7 +750,7 @@ void CCodecConfig::initializeStandardParams() {

		// convert to compression type and add default
		add(ConfigMapper(KEY_AAC_DRC_HEAVY_COMPRESSION, C2_PARAMKEY_DRC_COMPRESSION_MODE, "value")
		.limitTo(D::AUDIO & D::DECODER)
		.limitTo(D::AUDIO & D::DECODER & D::CONFIG)
		.withMapper([](C2Value v) -> C2Value {
		int32_t value;
		if (!v.get(&value) \|\| value < 0) {
		@@ -755,7 +761,7 @@ void CCodecConfig::initializeStandardParams() {

		// convert to dBFS and add default
		add(ConfigMapper(KEY_AAC_ENCODED_TARGET_LEVEL, C2_PARAMKEY_DRC_ENCODED_TARGET_LEVEL, "value")
		.limitTo(D::AUDIO & D::DECODER)
		.limitTo(D::AUDIO & D::DECODER & D::CONFIG)
		.withMapper([](C2Value v) -> C2Value {
		int32_t value;
		if (!v.get(&value) \|\| value < 0) {
		@@ -766,7 +772,7 @@ void CCodecConfig::initializeStandardParams() {

		// convert to effect type (these map to SDK values) and add default
		add(ConfigMapper(KEY_AAC_DRC_EFFECT_TYPE, C2_PARAMKEY_DRC_EFFECT_TYPE, "value")
		.limitTo(D::AUDIO & D::DECODER)
		.limitTo(D::AUDIO & D::DECODER & D::CONFIG)
		.withMapper([](C2Value v) -> C2Value {
		int32_t value;
		if (!v.get(&value) \|\| value < -1 \|\| value > 8) {

services/camera/libcameraservice/device3/Camera3Stream.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@ Camera3Stream::Camera3Stream(int id,
		mUsage(0),
		mOldUsage(0),
		mOldMaxBuffers(0),
		mOldFormat(-1),
		mOldDataSpace(HAL_DATASPACE_UNKNOWN),
		mPrepared(false),
		mPrepareBlockRequest(true),
		mPreparedBufferIdx(0),
		@@ -256,6 +258,8 @@ camera3_stream* Camera3Stream::startConfiguration() {

		mOldUsage = mUsage;
		mOldMaxBuffers = camera3_stream::max_buffers;
		mOldFormat = camera3_stream::format;
		mOldDataSpace = camera3_stream::data_space;

		res = getEndpointUsage(&mUsage);
		if (res != OK) {
		@@ -330,7 +334,9 @@ status_t Camera3Stream::finishConfiguration(/out/bool* streamReconfigured) {
		// so. As documented in hardware/camera3.h:configure_streams().
		if (mState == STATE_IN_RECONFIG &&
		mOldUsage == mUsage &&
		mOldMaxBuffers == camera3_stream::max_buffers && !mDataSpaceOverridden) {
		mOldMaxBuffers == camera3_stream::max_buffers &&
		mOldDataSpace == camera3_stream::data_space &&
		mOldFormat == camera3_stream::format) {
		mState = STATE_CONFIGURED;
		return OK;
		}

services/camera/libcameraservice/device3/Camera3Stream.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -540,8 +540,12 @@ class Camera3Stream :
		uint64_t mUsage;

		private:
		// Previously configured stream properties (post HAL override)
		uint64_t mOldUsage;
		uint32_t mOldMaxBuffers;
		int mOldFormat;
		android_dataspace mOldDataSpace;

		Condition mOutputBufferReturnedSignal;
		Condition mInputBufferReturnedSignal;
		static const nsecs_t kWaitForBufferDuration = 3000000000LL; // 3000 ms