Snap for 13088830 from 7f25241a2e7a13a5e395ffa64cf493b3d497880d to 25Q2-release (2571cddb) · Commits · e / os / android_frameworks_av

media/codec2/components/apv/C2SoftApvEnc.cpp

+1 −12

Original line number	Diff line number	Diff line
		@@ -944,18 +944,6 @@ void C2SoftApvEnc::setParams(oapve_param_t& param) {
		param.band_idc = mIntf->getBandIdc_l();
		param.profile_idc = mIntf->getProfile_l();
		param.level_idc = mIntf->getLevel_l();
		mColorAspects = mIntf->getColorAspects_l();
		param.color_primaries = mColorAspects->primaries;
		param.transfer_characteristics = mColorAspects->transfer;
		param.matrix_coefficients = mColorAspects->matrix;
		param.full_range_flag = mColorAspects->range;

		if (param.color_primaries != C2Color::PRIMARIES_UNSPECIFIED \|\|
		param.transfer_characteristics != C2Color::TRANSFER_UNSPECIFIED \|\|
		param.matrix_coefficients != C2Color::MATRIX_UNSPECIFIED \|\|
		param.full_range_flag != C2Color::RANGE_UNSPECIFIED) {
		param.color_description_present_flag = 1;
		}
		}

		c2_status_t C2SoftApvEnc::setEncodeArgs(oapv_frms_t* inputFrames, const C2GraphicView* const input,
		@@ -1186,6 +1174,7 @@ void C2SoftApvEnc::createCsdData(const std::unique_ptr<C2Work>& work,
		transfer_characteristics = reader.getBits(8); // transfer_characteristics
		matrix_coefficients = reader.getBits(8); // matrix_coefficients
		full_range_flag = reader.getBits(1); // full_range_flag
		reader.skipBits(7); // reserved_zero_7bits
		}

		number_of_configuration_entry = 1; // The real-time encoding on the device is assumed to be 1.

media/codec2/hal/aidl/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -161,8 +161,10 @@ cc_library {
		"Configurable.cpp",
		"InputBufferManager.cpp",
		"ParamTypes.cpp",
		"inputsurface/FrameDropper.cpp",
		"inputsurface/InputSurface.cpp",
		"inputsurface/InputSurfaceConnection.cpp",
		"inputsurface/InputSurfaceSource.cpp",
		],

		header_libs: [
		@@ -186,6 +188,7 @@ cc_library {
		"libmediandk",
		"libstagefright_aidl_bufferpool2",
		"libstagefright_bufferpool@2.0.1",
		"libstagefright_foundation",
		"libui",
		"libutils",
		],

media/codec2/hal/aidl/include/codec2/aidl/inputsurface/FrameDropper.h

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#pragma once

		#include <utils/Errors.h>

		#include <media/stagefright/foundation/ABase.h>

		#include <C2.h>

		namespace aidl::android::hardware::media::c2::implementation {

		/**
		* The class decides whether to drop a frame or not for InputSurface and
		* InputSurfaceConnection.
		*/
		struct FrameDropper {
		FrameDropper();

		~FrameDropper();

		/**
		* Sets max frame rate, which is based on for deciding frame drop.
		*
		* @param[in] maxFrameRate negative value means there is no drop
		* zero value is ignored
		*/
		void setMaxFrameRate(float maxFrameRate);

		/** Returns false if max frame rate has not been set via setMaxFrameRate. */
		bool shouldDrop(int64_t timeUs);

		/** Returns true if all frame drop logic should be disabled. */
		bool disabled() { return (mMinIntervalUs == -1ll); }

		private:
		int64_t mDesiredMinTimeUs;
		int64_t mMinIntervalUs;

		DISALLOW_EVIL_CONSTRUCTORS(FrameDropper);
		};

		} // namespace aidl::android::hardware::media::c2::implementation

media/codec2/hal/aidl/include/codec2/aidl/inputsurface/InputSurfaceSource.h

0 → 100644

+529 −0

File added.

Preview size limit exceeded, changes collapsed.

media/codec2/hal/aidl/inputsurface/FrameDropper.cpp

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		//#define LOG_NDEBUG 0
		#define LOG_TAG "C2AIDL-FrameDropper"
		#include <utils/Log.h>

		#include <codec2/aidl/inputsurface/FrameDropper.h>

		#include <media/stagefright/foundation/ADebug.h>

		namespace aidl::android::hardware::media::c2::implementation {

		static const int64_t kMaxJitterUs = 2000;

		FrameDropper::FrameDropper()
		: mDesiredMinTimeUs(-1),
		mMinIntervalUs(0) {
		}

		FrameDropper::~FrameDropper() {
		}

		void FrameDropper::setMaxFrameRate(float maxFrameRate) {
		if (maxFrameRate < 0) {
		mMinIntervalUs = -1LL;
		return;
		}

		if (maxFrameRate == 0) {
		ALOGW("framerate should be positive but got %f.", maxFrameRate);
		return;
		}
		mMinIntervalUs = (int64_t) (1000000.0f / maxFrameRate);
		}

		bool FrameDropper::shouldDrop(int64_t timeUs) {
		if (mMinIntervalUs <= 0) {
		return false;
		}

		if (mDesiredMinTimeUs < 0) {
		mDesiredMinTimeUs = timeUs + mMinIntervalUs;
		ALOGV("first frame %lld, next desired frame %lld",
		(long long)timeUs, (long long)mDesiredMinTimeUs);
		return false;
		}

		if (timeUs < (mDesiredMinTimeUs - kMaxJitterUs)) {
		ALOGV("drop frame %lld, desired frame %lld, diff %lld",
		(long long)timeUs, (long long)mDesiredMinTimeUs,
		(long long)(mDesiredMinTimeUs - timeUs));
		return true;
		}

		int64_t n = (timeUs - mDesiredMinTimeUs + kMaxJitterUs) / mMinIntervalUs;
		mDesiredMinTimeUs += (n + 1) * mMinIntervalUs;
		ALOGV("keep frame %lld, next desired frame %lld, diff %lld",
		(long long)timeUs, (long long)mDesiredMinTimeUs,
		(long long)(mDesiredMinTimeUs - timeUs));
		return false;
		}

		} // namespace aidl::android::hardware::media::c2::implementation