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

Commit 68bd88ac authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "Transcoder: Fix profile and level entry copier data type"

parents 406b76a7 cf41ffc3

media/libmediatranscoding/transcoder/MediaTranscoder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ static std::shared_ptr<AMediaFormat> createVideoTrackFormat(AMediaFormat* srcFor 
    AMediaFormat_getString(srcFormat, AMEDIAFORMAT_KEY_MIME, &srcMime);

    if (!AMediaFormat_getString(options, AMEDIAFORMAT_KEY_MIME, &dstMime) ||

        strcmp(srcMime, dstMime) == 0) {

        srcParamsToCopy.push_back(ENTRY_COPIER(AMEDIAFORMAT_KEY_PROFILE, String));

        srcParamsToCopy.push_back(ENTRY_COPIER(AMEDIAFORMAT_KEY_LEVEL, String));

        srcParamsToCopy.push_back(ENTRY_COPIER(AMEDIAFORMAT_KEY_PROFILE, Int32));

        srcParamsToCopy.push_back(ENTRY_COPIER(AMEDIAFORMAT_KEY_LEVEL, Int32));

    }



    // ------- Define parameters to copy from the caller's options -------