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

Commit 69271523 authored by Deva Ramasubramanian's avatar Deva Ramasubramanian Committed by Linux Build Service Account
Browse files

libstagefright: Use stride/slice-height instead of w/h for buffer dims 

The stride and slice are better suited as dimension parameters to
ColorConvertor, as it considers the width to be be "line length".

This fixes thumbnail generation issues for clips with strange resolutions,
where the stride != width.

Change-Id: I84143956a113cf1976202bd9c4ddac988278a5c0
parent 6fe60e3f

media/libstagefright/StagefrightMetadataRetriever.cpp

+4 −2
Original line number Diff line number Diff line
@@ -370,9 +370,11 @@ static VideoFrame *extractVideoFrame( 
        }

    }



    int32_t width, height;

    int32_t width, height, stride, slice_height;

    CHECK(outputFormat->findInt32("width", &width));

    CHECK(outputFormat->findInt32("height", &height));

    CHECK(outputFormat->findInt32("stride", &stride));

    CHECK(outputFormat->findInt32("slice-height", &slice_height));



    int32_t crop_left, crop_top, crop_right, crop_bottom;

    if (!outputFormat->findRect("crop", &crop_left, &crop_top, &crop_right, &crop_bottom)) {
@@ -410,7 +412,7 @@ static VideoFrame *extractVideoFrame( 
    if (converter.isValid()) {

        err = converter.convert(

                (const uint8_t *)videoFrameBuffer->data(),

                width, height,

                stride, slice_height,

                crop_left, crop_top, crop_right, crop_bottom,

                frame->mData,

                frame->mWidth,