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

Commit 4dfd9ded authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6291259 from 4cfc33a8 to rvc-release 

Change-Id: Ie6e4e7bad77be59ccefbcd079f02ba519395b312
parents c9e306d4 4cfc33a8

camera/ndk/ndk_vendor/impl/ACameraManager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -735,9 +735,8 @@ ACameraManager::openCamera( 


    if (!serviceRet.isOk() || status != Status::NO_ERROR) {

        ALOGE("%s: connect camera device failed", __FUNCTION__);

        // TODO: Convert serviceRet to camera_status_t

        delete device;

        return ACAMERA_ERROR_UNKNOWN;

        return utils::convertFromHidl(status);

    }

    if (deviceRemote == nullptr) {

        ALOGE("%s: connect camera device failed! remote device is null", __FUNCTION__);

media/codec2/core/include/C2Config.h

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ struct C2Config { 
    enum drc_compression_mode_t : int32_t;  ///< DRC compression mode

    enum drc_effect_type_t : int32_t;       ///< DRC effect type

    enum drc_album_mode_t : int32_t;        ///< DRC album mode

    enum drc_output_loudness : int32_t;     ///< DRC output loudness

    enum intra_refresh_mode_t : uint32_t;   ///< intra refresh modes

    enum level_t : uint32_t;                ///< coding level

    enum ordinal_key_t : uint32_t;          ///< work ordering keys

media/codec2/vndk/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ cc_defaults { 
    name: "libcodec2-internal-defaults",

    defaults: ["libcodec2-impl-defaults"],



    header_libs: [

        "libcodec2_internal",

    ],



    shared_libs: [

        "libcutils", // for properties

    ],

media/libstagefright/MPEG4Writer.cpp

+11 −5
Original line number Diff line number Diff line
@@ -3148,11 +3148,17 @@ status_t MPEG4Writer::Track::threadEntry() { 
            if (buffer->meta_data().findInt32(kKeyIsEndOfStream, &isEOS) && isEOS) {

                int64_t eosSampleTimestampUs = -1;

                CHECK(buffer->meta_data().findInt64(kKeyTime, &eosSampleTimestampUs));

                ALOGV("eosSampleTimestampUs:%" PRId64, eosSampleTimestampUs);

                lastSampleDurationUs = eosSampleTimestampUs - previousSampleTimestampWithoutFudgeUs

                                       - previousPausedDurationUs;

                CHECK(lastSampleDurationUs >= 0);

                lastSampleDurationTicks = (lastSampleDurationUs * mTimeScale + 500000LL)/1000000LL;

                if (eosSampleTimestampUs > 0) {

                    lastSampleDurationUs = eosSampleTimestampUs -

                                           previousSampleTimestampWithoutFudgeUs -

                                           previousPausedDurationUs;

                    if (lastSampleDurationUs >= 0) {

                        lastSampleDurationTicks = (lastSampleDurationUs * mTimeScale + 500000LL) /

                                                  1000000LL;

                    } else {

                        ALOGW("lastSampleDurationUs %" PRId64 " is negative", lastSampleDurationUs);

                    }

                }

                buffer->release();

                buffer = nullptr;

                mSource->stop();

services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp

+6 −3
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ 


namespace android {



DeviceTypeSet APM_AUDIO_OUT_DEVICE_REMOTE_ALL = {AUDIO_DEVICE_OUT_REMOTE_SUBMIX};

static const DeviceTypeSet& getAllOutRemoteDevices() {

    static const DeviceTypeSet allOutRemoteDevices = {AUDIO_DEVICE_OUT_REMOTE_SUBMIX};

    return allOutRemoteDevices;

}



AudioOutputDescriptor::AudioOutputDescriptor(const sp<PolicyAudioPort>& policyAudioPort,

                                             AudioPolicyClientInterface *clientInterface)
@@ -681,7 +684,7 @@ bool SwAudioOutputCollection::isActiveLocally(VolumeSource volumeSource, uint32_ 
        const sp<SwAudioOutputDescriptor> outputDesc = this->valueAt(i);

        if (outputDesc->isActive(volumeSource, inPastMs, sysTime)

                && (!(outputDesc->devices()

                        .containsDeviceAmongTypes(APM_AUDIO_OUT_DEVICE_REMOTE_ALL)))) {

                        .containsDeviceAmongTypes(getAllOutRemoteDevices())))) {

            return true;

        }

    }
@@ -693,7 +696,7 @@ bool SwAudioOutputCollection::isActiveRemotely(VolumeSource volumeSource, uint32 
    nsecs_t sysTime = systemTime();

    for (size_t i = 0; i < size(); i++) {

        const sp<SwAudioOutputDescriptor> outputDesc = valueAt(i);

        if (outputDesc->devices().containsDeviceAmongTypes(APM_AUDIO_OUT_DEVICE_REMOTE_ALL) &&

        if (outputDesc->devices().containsDeviceAmongTypes(getAllOutRemoteDevices()) &&

                outputDesc->isActive(volumeSource, inPastMs, sysTime)) {

            // do not consider re routing (when the output is going to a dynamic policy)

            // as "remote playback"