Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8307c684 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-pie-gsi 

* aosp/pie-gsi:
  Zero-initialize HIDL structs before passing
  AudioFlinger: Prevent multiple effect chains with same sessionId
  audio: ensure effect chain with specific session id is unique
  NuPlayerCCDecoder: fix memory OOB
  AudioFlinger: Prevent multiple effect chains with same sessionId
  audio: ensure effect chain with specific session id is unique
  NuPlayerCCDecoder: fix memory OOB
  NuPlayerCCDecoder: fix memory OOB
  setDequeueTimeout(-1) on the output surface
  setDequeueTimeout(-1) on the output surface
  Camera: add QCIF resolution exception
  av: stop puller before releasing encoder
  setDequeueTimeout(-1) on the output surface
  audio: ensure effect chain with specific session id is unique
  AudioFlinger: Prevent multiple effect chains with same sessionId
  Reserve enough space for RTSP CSD
  AAudio: Change dumpsys denial to Denial

Change-Id: I7967483bd684de2675505001ef1ced8dded6129f
parents 0155defa 377dd121

camera/ndk/include/camera/NdkCameraDevice.h

+8 −0
Original line number Original line 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

 * 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>

 * 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 device the camera device of interest.

 * @param outputs the {@link ACaptureSessionOutputContainer} describes all output streams.

 * @param outputs the {@link ACaptureSessionOutputContainer} describes all output streams.

 * @param callbacks the {@link ACameraCaptureSession_stateCallbacks capture session state callbacks}.

 * @param callbacks the {@link ACameraCaptureSession_stateCallbacks capture session state callbacks}.

camera/ndk/include/camera/NdkCameraMetadataTags.h

+7 −1
Original line number Original line Diff line number Diff line
@@ -3157,6 +3157,12 @@ typedef enum acamera_metadata_tag { 
     * IMPLEMENTATION_DEFINED | same as YUV_420_888                  | Any            |</p>

     * IMPLEMENTATION_DEFINED | same as YUV_420_888                  | Any            |</p>

     * <p>Refer to ACAMERA_REQUEST_AVAILABLE_CAPABILITIES for additional

     * <p>Refer to ACAMERA_REQUEST_AVAILABLE_CAPABILITIES for additional

     * mandatory stream configurations on a per-capability basis.</p>

     * 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_INFO_SUPPORTED_HARDWARE_LEVEL

     * @see ACAMERA_REQUEST_AVAILABLE_CAPABILITIES

     * @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

     * <li><code>LEVEL_3</code> devices additionally support YUV reprocessing and RAW image capture, along

     *   with additional output stream configurations.</li>

     *   with additional output stream configurations.</li>

     * <li><code>EXTERNAL</code> devices are similar to <code>LIMITED</code> devices with exceptions like some sensor or

     * <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>

     * </ul>

     * <p>See the individual level enums for full descriptions of the supported capabilities.  The

     * <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

     * ACAMERA_REQUEST_AVAILABLE_CAPABILITIES entry describes the device's capabilities at a

media/libstagefright/MediaCodecSource.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -643,6 +643,10 @@ void MediaCodecSource::signalEOS(status_t err) { 
            output->mBufferQueue.clear();

            output->mBufferQueue.clear();

            output->mEncoderReachedEOS = true;

            output->mEncoderReachedEOS = true;

            output->mErrorCode = err;

            output->mErrorCode = err;

            if (!(mFlags & FLAG_USE_SURFACE_INPUT)) {

                mStopping = true;

                mPuller->stop();

            }

            output->mCond.signal();

            output->mCond.signal();





            reachedEOS = true;

            reachedEOS = true;

services/oboeservice/AAudioService.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ status_t AAudioService::dump(int fd, const Vector<String16>& args) { 




    if (!dumpAllowed()) {

    if (!dumpAllowed()) {

        std::stringstream ss;

        std::stringstream ss;

        ss << "Permission denial: can't dump AAudioService from pid="

        ss << "Permission Denial: can't dump AAudioService from pid="

                << IPCThreadState::self()->getCallingPid() << ", uid="

                << IPCThreadState::self()->getCallingPid() << ", uid="

                << IPCThreadState::self()->getCallingUid() << "\n";

                << IPCThreadState::self()->getCallingUid() << "\n";

        result = ss.str();

        result = ss.str();