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

Commit 8c299a34 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5595178 from b4ad5740 to qt-c2f2-release 

Change-Id: Ia2c05359f7f817334ee29da1b77d9a3a59cbac67
parents 32ca6520 b4ad5740

media/extractors/mp4/MPEG4Extractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1772,7 +1772,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 
                int64_t codecDelay = pre_skip * 1000000000ll / kOpusSampleRate;



                AMediaFormat_setBuffer(mLastTrack->meta,

                            AMEDIAFORMAT_KEY_CSD_0, opusInfo, sizeof(opusInfo));

                            AMEDIAFORMAT_KEY_CSD_0, opusInfo, opusInfoSize);

                AMediaFormat_setBuffer(mLastTrack->meta,

                        AMEDIAFORMAT_KEY_CSD_1, &codecDelay, sizeof(codecDelay));

                AMediaFormat_setBuffer(mLastTrack->meta,

media/libstagefright/foundation/OpusHeader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int WriteOpusHeaders(const OpusHeader &header, int inputSampleRate, 
    headerLen += AOPUS_LENGTH_SIZE;



    int headerSize = WriteOpusHeader(header, inputSampleRate, output + headerLen,

        outputSize);

        outputSize - headerLen);

    if (headerSize < 0) {

        ALOGD("%s: WriteOpusHeader failed", __func__);

        return -1;

services/audioflinger/PlaybackTracks.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ public: 
private:

    OpPlayAudioMonitor(uid_t uid, audio_usage_t usage, int id);

    void onFirstRef() override;

    static void getPackagesForUid(uid_t uid, Vector<String16>& packages);



    AppOpsManager mAppOpsManager;

services/audioflinger/Tracks.cpp

+19 −5
Original line number Diff line number Diff line
@@ -389,10 +389,17 @@ sp<AudioFlinger::PlaybackThread::OpPlayAudioMonitor> 
AudioFlinger::PlaybackThread::OpPlayAudioMonitor::createIfNeeded(

            uid_t uid, const audio_attributes_t& attr, int id, audio_stream_type_t streamType)

{

    if (isAudioServerOrRootUid(uid)) {

        ALOGD("OpPlayAudio: not muting track:%d usage:%d root or audioserver", id, attr.usage);

    if (isServiceUid(uid)) {

        Vector <String16> packages;

        getPackagesForUid(uid, packages);

        if (packages.isEmpty()) {

            ALOGD("OpPlayAudio: not muting track:%d usage:%d for service UID %d",

                  id,

                  attr.usage,

                  uid);

            return nullptr;

        }

    }

    // stream type has been filtered by audio policy to indicate whether it can be muted

    if (streamType == AUDIO_STREAM_ENFORCED_AUDIBLE) {

        ALOGD("OpPlayAudio: not muting track:%d usage:%d ENFORCED_AUDIBLE", id, attr.usage);
@@ -423,8 +430,7 @@ AudioFlinger::PlaybackThread::OpPlayAudioMonitor::~OpPlayAudioMonitor() 


void AudioFlinger::PlaybackThread::OpPlayAudioMonitor::onFirstRef()

{

    PermissionController permissionController;

    permissionController.getPackagesForUid(mUid, mPackages);

    getPackagesForUid(mUid, mPackages);

    checkPlayAudioForUsage();

    if (!mPackages.isEmpty()) {

        mOpCallback = new PlayAudioOpCallback(this);
@@ -475,6 +481,14 @@ void AudioFlinger::PlaybackThread::OpPlayAudioMonitor::PlayAudioOpCallback::opCh 
    }

}



// static

void AudioFlinger::PlaybackThread::OpPlayAudioMonitor::getPackagesForUid(

    uid_t uid, Vector<String16>& packages)

{

    PermissionController permissionController;

    permissionController.getPackagesForUid(uid, packages);

}



// ----------------------------------------------------------------------------

#undef LOG_TAG

#define LOG_TAG "AF::Track"

services/camera/libcameraservice/api2/HeicCompositeStream.cpp

+9 −4
Original line number Diff line number Diff line
@@ -330,9 +330,9 @@ status_t HeicCompositeStream::getCompositeStreamInfo(const OutputStreamInfo &str 
}



bool HeicCompositeStream::isSizeSupportedByHeifEncoder(int32_t width, int32_t height,

        bool* useHeic, bool* useGrid, int64_t* stall) {

        bool* useHeic, bool* useGrid, int64_t* stall, AString* hevcName) {

    static HeicEncoderInfoManager& heicManager = HeicEncoderInfoManager::getInstance();

    return heicManager.isSizeSupported(width, height, useHeic, useGrid, stall);

    return heicManager.isSizeSupported(width, height, useHeic, useGrid, stall, hevcName);

}



bool HeicCompositeStream::isInMemoryTempFileSupported() {
@@ -1115,8 +1115,9 @@ status_t HeicCompositeStream::initializeCodec(uint32_t width, uint32_t height, 
    ALOGV("%s", __FUNCTION__);



    bool useGrid = false;

    AString hevcName;

    bool isSizeSupported = isSizeSupportedByHeifEncoder(width, height,

            &mUseHeic, &useGrid, nullptr);

            &mUseHeic, &useGrid, nullptr, &hevcName);

    if (!isSizeSupported) {

        ALOGE("%s: Encoder doesnt' support size %u x %u!",

                __FUNCTION__, width, height);
@@ -1138,7 +1139,11 @@ status_t HeicCompositeStream::initializeCodec(uint32_t width, uint32_t height, 
    }



    // Create HEIC/HEVC codec.

    if (mUseHeic) {

        mCodec = MediaCodec::CreateByType(mCodecLooper, desiredMime, true /*encoder*/);

    } else {

        mCodec = MediaCodec::CreateByComponentName(mCodecLooper, hevcName);

    }

    if (mCodec == nullptr) {

        ALOGE("%s: Failed to create codec for %s", __FUNCTION__, desiredMime);

        return NO_INIT;