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

Commit 78bc72d8 authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

Merge "codec2: fix CBR_FD framerate mode hook-up" into sc-dev am: 61bece9e 

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

Change-Id: I9d6786d27e09f74caeba07bd9b00c90c7484e94d
parents 1803ac47 61bece9e

media/codec2/sfplugin/utils/Codec2Mapper.cpp

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ ALookup<C2Config::profile_t, int32_t> sAvcProfiles = { 


ALookup<C2Config::bitrate_mode_t, int32_t> sBitrateModes = {

    { C2Config::BITRATE_CONST,      BITRATE_MODE_CBR },

    { C2Config::BITRATE_CONST_SKIP_ALLOWED, BITRATE_MODE_CBR_FD },

    { C2Config::BITRATE_VARIABLE,   BITRATE_MODE_VBR },

    { C2Config::BITRATE_IGNORE,     BITRATE_MODE_CQ },

};

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

+2 −0
Original line number Diff line number Diff line
@@ -557,12 +557,14 @@ inline static const char *asString_DolbyVisionLevel(int32_t i, const char *def = 
}



constexpr int32_t BITRATE_MODE_CBR = 2;

constexpr int32_t BITRATE_MODE_CBR_FD = 3;

constexpr int32_t BITRATE_MODE_CQ = 0;

constexpr int32_t BITRATE_MODE_VBR = 1;



inline static const char *asString_BitrateMode(int32_t i, const char *def = "??") {

    switch (i) {

        case BITRATE_MODE_CBR:  return "CBR";

        case BITRATE_MODE_CBR_FD: return "CBR_FD";

        case BITRATE_MODE_CQ:   return "CQ";

        case BITRATE_MODE_VBR:  return "VBR";

        default:                return def;