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

Commit 63d20b77 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2SoftVpxEnc: Add support for encoding from a larger graphic block"... 

Merge "C2SoftVpxEnc: Add support for encoding from a larger graphic block" into rvc-dev am: 9bc5afbd

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

Change-Id: I7ee09b4d255093ce7fb7162c04e684dc92ecc1e6
parents 94dd1573 9bc5afbd

media/codec2/components/vpx/C2SoftVpxEnc.cpp

+4 −4
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ void C2SoftVpxEnc::process( 


    const C2ConstGraphicBlock inBuffer =

        inputBuffer->data().graphicBlocks().front();

    if (inBuffer.width() != mSize->width ||

        inBuffer.height() != mSize->height) {

    if (inBuffer.width() < mSize->width ||

        inBuffer.height() < mSize->height) {

        ALOGE("unexpected Input buffer attributes %d(%d) x %d(%d)",

              inBuffer.width(), mSize->width, inBuffer.height(),

              mSize->height);
@@ -472,8 +472,8 @@ void C2SoftVpxEnc::process( 
    bool eos = ((work->input.flags & C2FrameData::FLAG_END_OF_STREAM) != 0);

    vpx_image_t raw_frame;

    const C2PlanarLayout &layout = rView->layout();

    uint32_t width = rView->width();

    uint32_t height = rView->height();

    uint32_t width = mSize->width;

    uint32_t height = mSize->height;

    if (width > 0x8000 || height > 0x8000) {

        ALOGE("Image too big: %u x %u", width, height);

        work->result = C2_BAD_VALUE;