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

Commit b36cd60c authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "C2SoftAvcEnc: Allocate output buffer as per clip's dimensions" into qt-dev am: 345960f7 

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

Change-Id: Ie8a8bfe10556b7dd1fa68f77287093bfd9c06a04
parents 8dc98947 345960f7

media/codec2/components/avc/C2SoftAvcEnc.cpp

+5 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ namespace android { 
namespace {



constexpr char COMPONENT_NAME[] = "c2.android.avc.encoder";



constexpr uint32_t kMinOutBufferSize = 524288;

void ParseGop(

        const C2StreamGopTuning::output &gop,

        uint32_t *syncInterval, uint32_t *iInterval, uint32_t *maxBframes) {
@@ -440,8 +440,7 @@ C2SoftAvcEnc::C2SoftAvcEnc( 
      mSignalledError(false),

      mCodecCtx(nullptr),

      mOutBlock(nullptr),

      // TODO: output buffer size

      mOutBufferSize(524288) {

      mOutBufferSize(kMinOutBufferSize) {



    // If dump is enabled, then open create an empty file

    GENERATE_FILE_NAMES();
@@ -951,6 +950,9 @@ c2_status_t C2SoftAvcEnc::initEncoder() { 


    mStride = width;



    // Assume worst case output buffer size to be equal to number of bytes in input

    mOutBufferSize = std::max(width * height * 3 / 2, kMinOutBufferSize);



    // TODO

    mIvVideoColorFormat = IV_YUV_420P;