Snap for 5386257 from 60c73a445b632cc2e233b1a275efeee7414a41a4 to qt-release (f5b019c7) · Commits · e / os / android_frameworks_av

apex/ld.config.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,7 @@ namespace.platform.isolated = true
		namespace.platform.search.paths = /system/${LIB}
		namespace.platform.asan.search.paths = /data/asan/system/${LIB}

		# /system/lib/libc.so, etc are symlinks to
		/apex/com.android.lib/lib/bionic/libc.so, etc.
		# /system/lib/libc.so, etc are symlinks to /apex/com.android.lib/lib/bionic/libc.so, etc.
		# Add /apex/... pat to the permitted paths because linker uses realpath(3)
		# to check the accessibility of the lib. We could add this to search.paths
		# instead but that makes the resolution of bionic libs be dependent on

camera/ndk/include/camera/NdkCameraMetadataTags.h

+23 −9

Original line number	Diff line number	Diff line
		@@ -7762,7 +7762,9 @@ typedef enum acamera_metadata_enum_acamera_scaler_cropping_type {
		typedef enum acamera_metadata_enum_acamera_scaler_available_recommended_stream_configurations {
		/**
		* <p>Preview must only include non-stalling processed stream configurations with
		* output formats like YUV_420_888, IMPLEMENTATION_DEFINED, etc.</p>
		* output formats like
		* {@link AIMAGE_FORMAT_YUV_420_888 },
		* {@link AIMAGE_FORMAT_PRIVATE }, etc.</p>
		*/
		ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_PREVIEW
		= 0x0,
		@@ -7777,19 +7779,20 @@ typedef enum acamera_metadata_enum_acamera_scaler_available_recommended_stream_c

		/**
		* <p>Video snapshot must include stream configurations at least as big as
		* the maximum RECORD resolutions and only with format BLOB + DATASPACE_JFIF
		* format/dataspace combination (JPEG). Additionally the configurations shouldn't cause
		* preview glitches and also be able to run at 30 fps.</p>
		* the maximum RECORD resolutions and only with
		* {@link AIMAGE_FORMAT_JPEG JPEG output format}.
		* Additionally the configurations shouldn't cause preview glitches and also be able to
		* run at 30 fps.</p>
		*/
		ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_VIDEO_SNAPSHOT
		= 0x2,

		/**
		* <p>Recommended snapshot stream configurations must include at least one with
		* size close to ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE with BLOB + DATASPACE_JFIF
		* format/dataspace combination (JPEG). Taking into account restrictions on aspect
		* ratio, alignment etc. the area of the maximum suggested size shouldn’t be less than
		* 97% of the sensor array size area.</p>
		* size close to ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE and
		* {@link AIMAGE_FORMAT_JPEG JPEG output format}.
		* Taking into account restrictions on aspect ratio, alignment etc. the area of the
		* maximum suggested size shouldn’t be less than 97% of the sensor array size area.</p>
		*
		* @see ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE
		*/
		@@ -7808,9 +7811,20 @@ typedef enum acamera_metadata_enum_acamera_scaler_available_recommended_stream_c
		*/
		ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_RAW = 0x5,

		ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_PUBLIC_END
		/**
		* <p>If supported, the recommended low latency stream configurations must have
		* end-to-end latency that does not exceed 200 ms. under standard operating conditions
		* (reasonable light levels, not loaded system) and using template
		* TEMPLATE_STILL_CAPTURE. This is primarily for listing configurations for the
		* {@link AIMAGE_FORMAT_JPEG JPEG output format}
		* however other supported output formats can be added as well.</p>
		*/
		ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_LOW_LATENCY_SNAPSHOT
		= 0x6,

		ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_PUBLIC_END
		= 0x7,

		/**
		* <p>Vendor defined use cases. These depend on the vendor implementation.</p>
		*/

media/extractors/mp4/MPEG4Extractor.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -6124,6 +6124,7 @@ static bool isCompatibleBrand(uint32_t fourcc) {
		FOURCC("mp41"),
		FOURCC("mp42"),
		FOURCC("dash"),
		FOURCC("nvr1"),

		// Won't promise that the following file types can be played.
		// Just give these file types a chance.

media/libstagefright/httplive/M3UParser.cpp

+41 −0

Original line number	Diff line number	Diff line
		@@ -1397,6 +1397,18 @@ bool M3UParser::codecIsType(const AString &codec, const char *type) {
		case 'ulaw':
		case 'vdva':
		case 'ac-4':
		case 'Opus':
		case 'a3ds':
		case 'dts+':
		case 'dts-':
		case 'dtsx':
		case 'dtsy':
		case 'ec+3':
		case 'mha1':
		case 'mha2':
		case 'mhm1':
		case 'mhm2':
		case 'sevs':
		return !strcmp("audio", type);

		case 'avc1':
		@@ -1445,6 +1457,35 @@ bool M3UParser::codecIsType(const AString &codec, const char *type) {
		case 'tga ':
		case 'tiff':
		case 'WRLE':
		case 'a3d1':
		case 'a3d2':
		case 'a3d3':
		case 'a3d4':
		case 'avc3':
		case 'avc4':
		case 'dva1':
		case 'dvav':
		case 'dvh1':
		case 'dvhe':
		case 'hev1':
		case 'hev2':
		case 'hvc1':
		case 'hvc2':
		case 'hvt1':
		case 'lhe1':
		case 'lht1':
		case 'lhv1':
		case 'mjpg':
		case 'mvc3':
		case 'mvc4':
		case 'mvd1':
		case 'mvd2':
		case 'mvd3':
		case 'mvd4':
		case 'rv60':
		case 'svc2':
		case 'vp08':
		case 'vp09':
		return !strcmp("video", type);

		default:

media/mediaserver/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ cc_binary {
		],

		static_libs: [
		"libicuandroid_utils",
		"libregistermsext",
		],