Merge "ICameraProvider@2.6: Update mandatory concurrent stream combinations." (94165c35) · Commits · e / os / android_hardware_interfaces

camera/provider/2.6/ICameraProvider.hal

+18 −14

Original line number	Original line	Diff line number	Diff line
	@@ -38,20 +38,24 @@ interface ICameraProvider extends @2.5::ICameraProvider {
	* streaming concurrently with the other camera ids in the combination.		* streaming concurrently with the other camera ids in the combination.
	*		*
	* Target 1 Target 2		* Target 1 Target 2
	* ---------------------------------------------		* -----------------------------------------------------
	* \| Type \| Size \| Type \| Size \|		* \| Type \| Size \| Type \| Size \|
	* ---------------------------------------------		* -----------------------------------------------------
	* \| YUV \| 1280 X 720 \| \|		* \| YUV \| s1440p \| \|
	* ---------------------------------------------		* -----------------------------------------------------
	* \| PRIV \| 1280 X 720 \| \|		* \| JPEG \| s1440p \| \|
	* ---------------------------------------------		* -----------------------------------------------------
	* \| YUV \| 1280 X 720 \| YUV \|1280 X 720\|		* \| PRIV \| s1440p \| \|
	* ---------------------------------------------		* -----------------------------------------------------
	* \| PRIV \| 1280 X 720 \| PRIV \|1280 X 720\|		* \| YUV / PRIV \| s720p \| YUV / PRIV \| s1440p \|
	* ---------------------------------------------		* -----------------------------------------------------
	* \| PRIV \| 1280 X 720 \| YUV \|1280 X 720\|		* \| YUV / PRIV \| s720p \| JPEG \| s1440p \|
	* ---------------------------------------------		* -----------------------------------------------------
			*
			* where:
			* s720p - min (max output resolution for the given format, 1280 X 720)
			* s1440p - min (max output resolution for the given format, 1920 X 1440)
			*
	* @return status Status code for the operation		* @return status Status code for the operation
	* @return cameraIds a list of camera id combinations that support		* @return cameraIds a list of camera id combinations that support
	* concurrent stream configurations with the minimum guarantees		* concurrent stream configurations with the minimum guarantees

current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -638,7 +638,7 @@ ae6315fd42196478ac08441cb489d854118001bca5b9b9fd58af5110952be30e android.hardwar
	07d0a252b2d8fa35887908a996ba395cf392968395fc30afab791f46e0c22a52 android.hardware.boot@1.1::IBootControl		07d0a252b2d8fa35887908a996ba395cf392968395fc30afab791f46e0c22a52 android.hardware.boot@1.1::IBootControl
	74049a402be913963edfdd80828a53736570e9d8124a1bf18166b6ed46a6b0ab android.hardware.boot@1.1::types		74049a402be913963edfdd80828a53736570e9d8124a1bf18166b6ed46a6b0ab android.hardware.boot@1.1::types
	b8c63679e1a3874b356f3e691aecce1191d38f59063cf2ed2dce8a9d4cabf00e android.hardware.camera.device@3.6::ICameraDevice		b8c63679e1a3874b356f3e691aecce1191d38f59063cf2ed2dce8a9d4cabf00e android.hardware.camera.device@3.6::ICameraDevice
	e88840e0558439cb54837514ddccd43877094951758f367e9c638084eb7455a6 android.hardware.camera.provider@2.6::ICameraProvider		5d544a22e5a54568e64f32010eb001fcfbe5547b66cff7f3330da59a23bd4f48 android.hardware.camera.provider@2.6::ICameraProvider
	8f8d9463508ff9cae88eb35c429fd0e2dbca0ca8f5de7fdf836cc0c4370becb6 android.hardware.camera.provider@2.6::ICameraProviderCallback		8f8d9463508ff9cae88eb35c429fd0e2dbca0ca8f5de7fdf836cc0c4370becb6 android.hardware.camera.provider@2.6::ICameraProviderCallback
	c1aa508d00b66ed5feefea398fd5edf28fa651ac89773adad7dfda4e0a73a952 android.hardware.cas@1.2::ICas		c1aa508d00b66ed5feefea398fd5edf28fa651ac89773adad7dfda4e0a73a952 android.hardware.cas@1.2::ICas
	9811f867def49b420d8c707f7e38d3bdd64f835244e1d2a5e9762ab9835672dc android.hardware.cas@1.2::ICasListener		9811f867def49b420d8c707f7e38d3bdd64f835244e1d2a5e9762ab9835672dc android.hardware.cas@1.2::ICasListener