Snap for 5429421 from b94a3d3e5461e6148bcb3be96f51e51c8f57c7e2 to pi-qpr3-b-release (86f616a7) · Commits · e / os / android_frameworks_av

camera/ndk/include/camera/NdkCameraDevice.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -643,6 +643,14 @@ camera_status_t ACaptureSessionOutputContainer_remove(
		* target combinations with sizes outside of these guarantees, but this can only be tested for
		* by attempting to create a session with such targets.</p>
		*
		* <p>Exception on 176x144 (QCIF) resolution:
		* Camera devices usually have a fixed capability for downscaling from larger resolution to
		* smaller, and the QCIF resolution sometimes cannot be fully supported due to this
		* limitation on devices with high-resolution image sensors. Therefore, trying to configure a
		* QCIF resolution stream together with any other stream larger than 1920x1080 resolution
		* (either width or height) might not be supported, and capture session creation will fail if it
		* is not.</p>
		*
		* @param device the camera device of interest.
		* @param outputs the {@link ACaptureSessionOutputContainer} describes all output streams.
		* @param callbacks the {@link ACameraCaptureSession_stateCallbacks capture session state callbacks}.

camera/ndk/include/camera/NdkCameraMetadataTags.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -3157,6 +3157,12 @@ typedef enum acamera_metadata_tag {
		* IMPLEMENTATION_DEFINED \| same as YUV_420_888 \| Any \|</p>
		* <p>Refer to ACAMERA_REQUEST_AVAILABLE_CAPABILITIES for additional
		* mandatory stream configurations on a per-capability basis.</p>
		* <p>Exception on 176x144 (QCIF) resolution: camera devices usually have a fixed capability for
		* downscaling from larger resolution to smaller, and the QCIF resolution sometimes is not
		* fully supported due to this limitation on devices with high-resolution image sensors.
		* Therefore, trying to configure a QCIF resolution stream together with any other
		* stream larger than 1920x1080 resolution (either width or height) might not be supported,
		* and capture session creation will fail if it is not.</p>
		*
		* @see ACAMERA_INFO_SUPPORTED_HARDWARE_LEVEL
		* @see ACAMERA_REQUEST_AVAILABLE_CAPABILITIES
		@@ -5154,7 +5160,7 @@ typedef enum acamera_metadata_tag {
		* <li><code>LEVEL_3</code> devices additionally support YUV reprocessing and RAW image capture, along
		* with additional output stream configurations.</li>
		* <li><code>EXTERNAL</code> devices are similar to <code>LIMITED</code> devices with exceptions like some sensor or
		* lens information not reorted or less stable framerates.</li>
		* lens information not reported or less stable framerates.</li>
		* </ul>
		* <p>See the individual level enums for full descriptions of the supported capabilities. The
		* ACAMERA_REQUEST_AVAILABLE_CAPABILITIES entry describes the device's capabilities at a

media/libstagefright/ACodec.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -783,9 +783,6 @@ status_t ACodec::handleSetSurface(const sp<Surface> &surface) {
		// need to enable allocation when attaching
		surface->getIGraphicBufferProducer()->allowAllocation(true);

		// dequeueBuffer cannot time out
		surface->setDequeueTimeout(-1);

		// for meta data mode, we move dequeud buffers to the new surface.
		// for non-meta mode, we must move all registered buffers
		for (size_t i = 0; i < buffers.size(); ++i) {

media/libstagefright/MediaCodec.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -2198,7 +2198,6 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
		}

		if (mime.startsWithIgnoreCase("video/")) {
		mSurface->setDequeueTimeout(-1);
		mSoftRenderer = new SoftwareRenderer(mSurface, mRotationDegrees);
		}
		}
		@@ -2486,7 +2485,6 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) {
		&& (mFlags & kFlagPushBlankBuffersOnShutdown)) {
		pushBlankBuffersToNativeWindow(mSurface.get());
		}
		surface->setDequeueTimeout(-1);
		mSoftRenderer = new SoftwareRenderer(surface);
		// TODO: check if this was successful
		} else {