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

Commit 7294a02b authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge "codec2: make i-frame-interval write-only" into qt-r1-dev am: e5e116d0 

am: 68790eb7

Change-Id: Ic4736e64e05006c45091818b3d7e198f3254cf99
parents 37d80d94 68790eb7

media/codec2/sfplugin/CCodecConfig.cpp

+2 −7
Original line number Diff line number Diff line
@@ -508,7 +508,8 @@ void CCodecConfig::initializeStandardParams() { 
               .limitTo(D::ENCODER & D::VIDEO));

    // convert to timestamp base

    add(ConfigMapper(KEY_I_FRAME_INTERVAL, C2_PARAMKEY_SYNC_FRAME_INTERVAL, "value")

        .withMappers([](C2Value v) -> C2Value {

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

        .withMapper([](C2Value v) -> C2Value {

            // convert from i32 to float

            int32_t i32Value;

            float fpValue;
@@ -518,12 +519,6 @@ void CCodecConfig::initializeStandardParams() { 
                return int64_t(c2_min(1000000 * fpValue + 0.5, (double)INT64_MAX));

            }

            return C2Value();

        }, [](C2Value v) -> C2Value {

            int64_t i64;

            if (v.get(&i64)) {

                return float(i64) / 1000000;

            }

            return C2Value();

        }));

    // remove when codecs switch to proper coding.gop (add support for calculating gop)

    deprecated(ConfigMapper("i-frame-period", "coding.gop", "intra-period")