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

Commit e7e019a5 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "stagefright/codec2: fix KEY_PREPEND_HEADER_TO_SYNC_FRAMES" am: deba9fd1 am: 935b95fb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1463007

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cdfed67f19fd3c19d94d8bd032d6b094a524076
parents acb39366 935b95fb

media/codec2/sfplugin/CCodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1133,10 +1133,10 @@ void CCodec::configure(const sp<AMessage> &msg) { 
        int32_t clientPrepend;

        if ((config->mDomain & Config::IS_VIDEO)

                && (config->mDomain & Config::IS_ENCODER)

                && msg->findInt32(KEY_PREPEND_HEADERS_TO_SYNC_FRAMES, &clientPrepend)

                && msg->findInt32(KEY_PREPEND_HEADER_TO_SYNC_FRAMES, &clientPrepend)

                && clientPrepend

                && (!prepend || prepend.value != PREPEND_HEADER_TO_ALL_SYNC)) {

            ALOGE("Failed to set KEY_PREPEND_HEADERS_TO_SYNC_FRAMES");

            ALOGE("Failed to set KEY_PREPEND_HEADER_TO_SYNC_FRAMES");

            return BAD_VALUE;

        }

media/codec2/sfplugin/CCodecConfig.cpp

+2 −2
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ void CCodecConfig::initializeStandardParams() { 
    add(ConfigMapper(std::string(KEY_FEATURE_) + FEATURE_SecurePlayback,

                     C2_PARAMKEY_SECURE_MODE, "value"));



    add(ConfigMapper(KEY_PREPEND_HEADERS_TO_SYNC_FRAMES,

    add(ConfigMapper(KEY_PREPEND_HEADER_TO_SYNC_FRAMES,

                     C2_PARAMKEY_PREPEND_HEADER_MODE, "value")

        .limitTo(D::ENCODER & D::VIDEO)

        .withMappers([](C2Value v) -> C2Value {
@@ -531,7 +531,7 @@ void CCodecConfig::initializeStandardParams() { 
            return C2Value();

        }));

    // remove when codecs switch to PARAMKEY

    deprecated(ConfigMapper(KEY_PREPEND_HEADERS_TO_SYNC_FRAMES,

    deprecated(ConfigMapper(KEY_PREPEND_HEADER_TO_SYNC_FRAMES,

                            "coding.add-csd-to-sync-frames", "value")

               .limitTo(D::ENCODER & D::VIDEO));

    // convert to timestamp base

media/libstagefright/include/media/stagefright/MediaCodecConstants.h

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ constexpr char KEY_OUTPUT_REORDER_DEPTH[] = "output-reorder-depth"; 
constexpr char KEY_PCM_ENCODING[] = "pcm-encoding";

constexpr char KEY_PIXEL_ASPECT_RATIO_HEIGHT[] = "sar-height";

constexpr char KEY_PIXEL_ASPECT_RATIO_WIDTH[] = "sar-width";

constexpr char KEY_PREPEND_HEADERS_TO_SYNC_FRAMES[] = "prepend-sps-pps-to-idr-frames";

constexpr char KEY_PREPEND_HEADER_TO_SYNC_FRAMES[] = "prepend-sps-pps-to-idr-frames";

constexpr char KEY_PRIORITY[] = "priority";

constexpr char KEY_PROFILE[] = "profile";

constexpr char KEY_PUSH_BLANK_BUFFERS_ON_STOP[] = "push-blank-buffers-on-shutdown";