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

Commit 909363aa authored by Venkatarama Avadhani's avatar Venkatarama Avadhani
Browse files

Clean up muxer_mp4_enable_apv flag 

Bug: 370061501
Bug: 423905987

Flag: EXEMPT removing muxer_mp4_enable_apv
Test: atest android.media.muxer.cts.MediaMuxerTest#testAPVVideoOnlyOutputInMP4
Change-Id: Ib9471d01e501fc7a53c4206c70b74a2df5773949
parent f2868539

media/libstagefright/MPEG4Writer.cpp

+5 −8
Original line number Diff line number Diff line
@@ -701,8 +701,7 @@ const char *MPEG4Writer::Track::getFourCCForMime(const char *mime) { 
            return "hvc1";

        } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_AV1, mime)) {

            return "av01";

        } else if (editing_flags::muxer_mp4_enable_apv() &&

                   !strcasecmp(MEDIA_MIMETYPE_VIDEO_APV, mime)) {

        } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_APV, mime)) {

            return "apv1";

        }

    } else if (!strncasecmp(mime, "application/", 12)) {
@@ -2307,7 +2306,7 @@ MPEG4Writer::Track::Track(MPEG4Writer* owner, const sp<MediaSource>& source, uin 
    mIsAvc = !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_AVC);

    mIsHevc = !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_HEVC);

    mIsAv1 = !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_AV1);

    mIsApv = editing_flags::muxer_mp4_enable_apv() && !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_APV);

    mIsApv = !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_APV);

    mIsDovi = !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_DOLBY_VISION);

    mIsAudio = !strncasecmp(mime, "audio/", 6);

    mIsVideo = !strncasecmp(mime, "video/", 6);
@@ -2878,8 +2877,7 @@ void MPEG4Writer::Track::getCodecSpecificDataFromInputFormatIfPossible() { 
    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_AV1) ||

               !strcasecmp(mime, MEDIA_MIMETYPE_IMAGE_AVIF)) {

        mMeta->findData(kKeyAV1C, &type, &data, &size);

    } else if (editing_flags::muxer_mp4_enable_apv() &&

               !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_APV)) {

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_APV)) {

        mMeta->findData(kKeyAPVC, &type, &data, &size);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_DOLBY_VISION)) {

        getDolbyVisionProfile();
@@ -4585,7 +4583,7 @@ status_t MPEG4Writer::Track::checkCodecSpecificData() const { 
        !strcasecmp(MEDIA_MIMETYPE_VIDEO_AVC, mime) ||

        !strcasecmp(MEDIA_MIMETYPE_VIDEO_HEVC, mime) ||

        !strcasecmp(MEDIA_MIMETYPE_VIDEO_AV1, mime) ||

        (editing_flags::muxer_mp4_enable_apv() && !strcasecmp(MEDIA_MIMETYPE_VIDEO_APV, mime)) ||

        !strcasecmp(MEDIA_MIMETYPE_VIDEO_APV, mime) ||

        !strcasecmp(MEDIA_MIMETYPE_VIDEO_DOLBY_VISION, mime) ||

        !strcasecmp(MEDIA_MIMETYPE_IMAGE_ANDROID_HEIC, mime) ||

        !strcasecmp(MEDIA_MIMETYPE_IMAGE_AVIF, mime)) {
@@ -4760,8 +4758,7 @@ void MPEG4Writer::Track::writeVideoFourCCBox() { 
        writeHvccBox();

    } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_AV1, mime)) {

        writeAv1cBox();

    } else if (editing_flags::muxer_mp4_enable_apv() &&

               !strcasecmp(MEDIA_MIMETYPE_VIDEO_APV, mime)) {

    } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_APV, mime)) {

        writeApvcBox();

    } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_DOLBY_VISION, mime)) {

        if (mDoviProfile <= DolbyVisionProfileDvheSt) {