Snap for 6132583 from 63745973a63976af4d3e18569c2e98a1b691169c to rvc-release (ce17997f) · Commits · e / os / android_frameworks_av

apex/ld.config.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,12 @@ namespace.default.visible = true
		namespace.default.search.paths = /apex/com.android.media.swcodec/${LIB}
		namespace.default.asan.search.paths = /apex/com.android.media.swcodec/${LIB}

		# Below lines are required to be able to access libs in APEXes which are
		# actually symlinks to the files under /system/lib. The symlinks exist for
		# bundled APEXes to reduce space.
		namespace.default.permitted.paths = /system/${LIB}
		namespace.default.asan.permitted.paths = /system/${LIB}

		namespace.default.links = platform

		# TODO: replace the following when apex has a way to auto-generate this list

camera/ndk/include/camera/NdkCameraMetadataTags.h

+18 −6

Original line number	Diff line number	Diff line
		@@ -8380,12 +8380,16 @@ typedef enum acamera_metadata_enum_acamera_sensor_info_color_filter_arrangement
		// ACAMERA_SENSOR_INFO_TIMESTAMP_SOURCE
		typedef enum acamera_metadata_enum_acamera_sensor_info_timestamp_source {
		/**
		* <p>Timestamps from ACAMERA_SENSOR_TIMESTAMP are in nanoseconds and monotonic,
		* but can not be compared to timestamps from other subsystems
		* (e.g. accelerometer, gyro etc.), or other instances of the same or different
		* camera devices in the same system. Timestamps between streams and results for
		* a single camera instance are comparable, and the timestamps for all buffers
		* and the result metadata generated by a single capture are identical.</p>
		* <p>Timestamps from ACAMERA_SENSOR_TIMESTAMP are in nanoseconds and monotonic, but can
		* not be compared to timestamps from other subsystems (e.g. accelerometer, gyro etc.),
		* or other instances of the same or different camera devices in the same system with
		* accuracy. However, the timestamps are roughly in the same timebase as
		* <a href="https://developer.android.com/reference/android/os/SystemClock.html#uptimeMillis">SystemClock#uptimeMillis</a>. The accuracy is sufficient for tasks
		* like A/V synchronization for video recording, at least, and the timestamps can be
		* directly used together with timestamps from the audio subsystem for that task.</p>
		* <p>Timestamps between streams and results for a single camera instance are comparable,
		* and the timestamps for all buffers and the result metadata generated by a single
		* capture are identical.</p>
		*
		* @see ACAMERA_SENSOR_TIMESTAMP
		*/
		@@ -8395,6 +8399,14 @@ typedef enum acamera_metadata_enum_acamera_sensor_info_timestamp_source {
		* <p>Timestamps from ACAMERA_SENSOR_TIMESTAMP are in the same timebase as
		* <a href="https://developer.android.com/reference/android/os/SystemClock.html#elapsedRealtimeNanos">SystemClock#elapsedRealtimeNanos</a>,
		* and they can be compared to other timestamps using that base.</p>
		* <p>When buffers from a REALTIME device are passed directly to a video encoder from the
		* camera, automatic compensation is done to account for differing timebases of the
		* audio and camera subsystems. If the application is receiving buffers and then later
		* sending them to a video encoder or other application where they are compared with
		* audio subsystem timestamps or similar, this compensation is not present. In those
		* cases, applications need to adjust the timestamps themselves. Since <a href="https://developer.android.com/reference/android/os/SystemClock.html#elapsedRealtimeNanos">SystemClock#elapsedRealtimeNanos</a> and <a href="https://developer.android.com/reference/android/os/SystemClock.html#uptimeMillis">SystemClock#uptimeMillis</a> only diverge while the device is asleep, an
		* offset between the two sources can be measured once per active session and applied
		* to timestamps for sufficient accuracy for A/V sync.</p>
		*
		* @see ACAMERA_SENSOR_TIMESTAMP
		*/

cmds/stagefright/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

		LOCAL_MODULE_TAGS := optional

		LOCAL_SYSTEM_EXT_MODULE:= true
		LOCAL_MODULE:= stagefright

		include $(BUILD_EXECUTABLE)

media/codec2/components/avc/C2SoftAvcDec.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -501,7 +501,7 @@ void C2SoftAvcDec::getVersion() {
		status_t C2SoftAvcDec::initDecoder() {
		if (OK != createDecoder()) return UNKNOWN_ERROR;
		mNumCores = MIN(getCpuCoreCount(), MAX_NUM_CORES);
		mStride = ALIGN64(mWidth);
		mStride = ALIGN128(mWidth);
		mSignalledError = false;
		resetPlugin();
		(void) setNumCores();
		@@ -909,7 +909,7 @@ void C2SoftAvcDec::process(
		if (0 < s_decode_op.u4_pic_wd && 0 < s_decode_op.u4_pic_ht) {
		if (mHeaderDecoded == false) {
		mHeaderDecoded = true;
		setParams(ALIGN64(s_decode_op.u4_pic_wd), IVD_DECODE_FRAME);
		setParams(ALIGN128(s_decode_op.u4_pic_wd), IVD_DECODE_FRAME);
		}
		if (s_decode_op.u4_pic_wd != mWidth \|\| s_decode_op.u4_pic_ht != mHeight) {
		mWidth = s_decode_op.u4_pic_wd;

media/codec2/components/hevc/C2SoftHevcDec.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -497,7 +497,7 @@ status_t C2SoftHevcDec::getVersion() {
		status_t C2SoftHevcDec::initDecoder() {
		if (OK != createDecoder()) return UNKNOWN_ERROR;
		mNumCores = MIN(getCpuCoreCount(), MAX_NUM_CORES);
		mStride = ALIGN64(mWidth);
		mStride = ALIGN128(mWidth);
		mSignalledError = false;
		resetPlugin();
		(void) setNumCores();
		@@ -904,7 +904,7 @@ void C2SoftHevcDec::process(
		if (0 < s_decode_op.u4_pic_wd && 0 < s_decode_op.u4_pic_ht) {
		if (mHeaderDecoded == false) {
		mHeaderDecoded = true;
		setParams(ALIGN64(s_decode_op.u4_pic_wd), IVD_DECODE_FRAME);
		setParams(ALIGN128(s_decode_op.u4_pic_wd), IVD_DECODE_FRAME);
		}
		if (s_decode_op.u4_pic_wd != mWidth \|\| s_decode_op.u4_pic_ht != mHeight) {
		mWidth = s_decode_op.u4_pic_wd;