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

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

Merge "codec2: Remove quality from output format for CBR, VBR mode" into qt-dev 

am: 8b04b459

Change-Id: I45fef40e5c64fd3438b272e61779b2b2b63200a7
parents 50a252f4 8b04b459

media/codec2/sfplugin/CCodecConfig.cpp

+3 −3
Original line number Diff line number Diff line
@@ -532,7 +532,6 @@ void CCodecConfig::initializeStandardParams() { 
            }

            return C2Value();

        }));

    add(ConfigMapper(KEY_QUALITY, C2_PARAMKEY_QUALITY, "value"));

    deprecated(ConfigMapper(PARAMETER_KEY_REQUEST_SYNC_FRAME,

                     "coding.request-sync", "value")

        .limitTo(D::PARAM & D::ENCODER)
@@ -798,11 +797,12 @@ void CCodecConfig::initializeStandardParams() { 
            }

        }));



    add(ConfigMapper(KEY_QUALITY, C2_PARAMKEY_QUALITY, "value"));

    add(ConfigMapper(KEY_QUALITY, C2_PARAMKEY_QUALITY, "value")

        .limitTo(D::ENCODER & (D::CONFIG | D::PARAM)));

    add(ConfigMapper(KEY_FLAC_COMPRESSION_LEVEL, C2_PARAMKEY_COMPLEXITY, "value")

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

    add(ConfigMapper("complexity", C2_PARAMKEY_COMPLEXITY, "value")

        .limitTo(D::ENCODER));

        .limitTo(D::ENCODER & (D::CONFIG | D::PARAM)));



    add(ConfigMapper(KEY_GRID_COLUMNS, C2_PARAMKEY_TILE_LAYOUT, "columns")

        .limitTo(D::IMAGE));