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

Commit 20f33e6f authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge "CCodec: fix i-frame-interval and aac configs" into qt-dev 

am: 7a92b009

Change-Id: I0e3d791baca36ca7c2f782fd565e10684e19e24d
parents cdedbb38 7a92b009

media/codec2/sfplugin/CCodecConfig.cpp

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

    // convert to timestamp base

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

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

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

            // convert from i32 to float

            int32_t i32Value;

            float fpValue;
@@ -518,6 +518,12 @@ 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")
@@ -711,7 +717,7 @@ void CCodecConfig::initializeStandardParams() { 


    // convert to dBFS and add default

    add(ConfigMapper(KEY_AAC_DRC_TARGET_REFERENCE_LEVEL, C2_PARAMKEY_DRC_TARGET_REFERENCE_LEVEL, "value")

        .limitTo(D::AUDIO & D::DECODER)

        .limitTo(D::AUDIO & D::DECODER & D::CONFIG)

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

            int32_t value;

            if (!v.get(&value) || value < 0) {
@@ -722,7 +728,7 @@ void CCodecConfig::initializeStandardParams() { 


    // convert to 0-1 (%) and add default

    add(ConfigMapper(KEY_AAC_DRC_ATTENUATION_FACTOR, C2_PARAMKEY_DRC_ATTENUATION_FACTOR, "value")

        .limitTo(D::AUDIO & D::DECODER)

        .limitTo(D::AUDIO & D::DECODER & D::CONFIG)

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

            int32_t value;

            if (!v.get(&value) || value < 0) {
@@ -733,7 +739,7 @@ void CCodecConfig::initializeStandardParams() { 


    // convert to 0-1 (%) and add default

    add(ConfigMapper(KEY_AAC_DRC_BOOST_FACTOR, C2_PARAMKEY_DRC_BOOST_FACTOR, "value")

        .limitTo(D::AUDIO & D::DECODER)

        .limitTo(D::AUDIO & D::DECODER & D::CONFIG)

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

            int32_t value;

            if (!v.get(&value) || value < 0) {
@@ -744,7 +750,7 @@ void CCodecConfig::initializeStandardParams() { 


    // convert to compression type and add default

    add(ConfigMapper(KEY_AAC_DRC_HEAVY_COMPRESSION, C2_PARAMKEY_DRC_COMPRESSION_MODE, "value")

        .limitTo(D::AUDIO & D::DECODER)

        .limitTo(D::AUDIO & D::DECODER & D::CONFIG)

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

            int32_t value;

            if (!v.get(&value) || value < 0) {
@@ -755,7 +761,7 @@ void CCodecConfig::initializeStandardParams() { 


    // convert to dBFS and add default

    add(ConfigMapper(KEY_AAC_ENCODED_TARGET_LEVEL, C2_PARAMKEY_DRC_ENCODED_TARGET_LEVEL, "value")

        .limitTo(D::AUDIO & D::DECODER)

        .limitTo(D::AUDIO & D::DECODER & D::CONFIG)

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

            int32_t value;

            if (!v.get(&value) || value < 0) {
@@ -766,7 +772,7 @@ void CCodecConfig::initializeStandardParams() { 


    // convert to effect type (these map to SDK values) and add default

    add(ConfigMapper(KEY_AAC_DRC_EFFECT_TYPE, C2_PARAMKEY_DRC_EFFECT_TYPE, "value")

        .limitTo(D::AUDIO & D::DECODER)

        .limitTo(D::AUDIO & D::DECODER & D::CONFIG)

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

            int32_t value;

            if (!v.get(&value) || value < -1 || value > 8) {