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

Commit 7e04f11a authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4722539 from 6c23e5b1 to pi-release 

Change-Id: I15aeba28d206e09a774c15264a595b9bce7399a0
parents 1951674e 6c23e5b1

include/media/MmapStreamCallback.h

+2 −1
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@ class MmapStreamCallback : public virtual RefBase { 
     * The mmap stream should be torn down because conditions that permitted its creation with

     * the requested parameters have changed and do not allow it to operate with the requested

     * constraints any more.

     * \param[in] handle handle for the client stream to tear down.

     */

    virtual void onTearDown() = 0;

    virtual void onTearDown(audio_port_handle_t handle) = 0;



    /**

     * The volume to be applied to the use case specified when opening the stream has changed

media/extractors/mp4/ItemTable.cpp

+3 −4
Original line number Diff line number Diff line
@@ -1591,10 +1591,9 @@ status_t ItemTable::findThumbnailItem(const uint32_t imageIndex, uint32_t *itemI 


    ssize_t thumbItemIndex = mItemIdToItemMap.indexOfKey(masterImage.thumbnails[0]);

    if (thumbItemIndex < 0) {

        ALOGW("%s: Thumbnail item id %d not found, use master instead",

                __FUNCTION__, masterImage.thumbnails[0]);

        *itemIndex = masterItemIndex;

        return OK;

        // Do not return the master image in this case, fail it so that the

        // thumbnail extraction code knows we really don't have it.

        return INVALID_OPERATION;

    }



    *itemIndex = thumbItemIndex;

media/libaaudio/src/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cc_library { 


    shared_libs: [

        "libaudioclient",

        "libaudioutils",

        "liblog",

        "libcutils",

        "libutils",

media/libaaudio/src/client/AudioStreamInternal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ aaudio_result_t AudioStreamInternal::open(const AudioStreamBuilder &builder) { 
    setInputPreset(configurationOutput.getInputPreset());



    // Save device format so we can do format conversion and volume scaling together.

    mDeviceFormat = configurationOutput.getFormat();

    setDeviceFormat(configurationOutput.getFormat());



    result = mServiceInterface.getStreamDescription(mServiceStreamHandle, mEndPointParcelable);

    if (result != AAUDIO_OK) {
@@ -501,9 +501,9 @@ aaudio_result_t AudioStreamInternal::onEventFromServer(AAudioServiceMessage *mes 
            ALOGW("%s - AAUDIO_SERVICE_EVENT_DISCONNECTED - FIFO cleared", __func__);

            break;

        case AAUDIO_SERVICE_EVENT_VOLUME:

            ALOGD("%s - AAUDIO_SERVICE_EVENT_VOLUME %lf", __func__, message->event.dataDouble);

            mStreamVolume = (float)message->event.dataDouble;

            doSetVolume();

            ALOGD("%s - AAUDIO_SERVICE_EVENT_VOLUME %lf", __func__, message->event.dataDouble);

            break;

        case AAUDIO_SERVICE_EVENT_XRUN:

            mXRunCount = static_cast<int32_t>(message->event.dataLong);

media/libaaudio/src/client/AudioStreamInternal.h

+0 −5
Original line number Diff line number Diff line
@@ -138,8 +138,6 @@ protected: 
    // Calculate timeout for an operation involving framesPerOperation.

    int64_t calculateReasonableTimeout(int32_t framesPerOperation);



    aaudio_format_t getDeviceFormat() const { return mDeviceFormat; }



    int32_t getDeviceChannelCount() const { return mDeviceChannelCount; }



    /**
@@ -195,9 +193,6 @@ private: 


    int64_t                  mServiceLatencyNanos = 0;



    // Sometimes the hardware is operating with a different format or channel count from the app.

    // Then we require conversion in AAudio.

    aaudio_format_t          mDeviceFormat = AAUDIO_FORMAT_UNSPECIFIED;

    int32_t                  mDeviceChannelCount = 0;

};