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

Commit cd6efb00 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CCodec: Fix null check" am: 77a7eeff am: def29061 am: 1cefed77 am: b77b3575 

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

Change-Id: Ifc192a43d197f31872869be95eab5cf0fc3d3772
parents 97b16621 b77b3575

media/codec2/sfplugin/CCodecBuffers.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -236,7 +236,7 @@ bool OutputBuffers::convert( 
    if (!srcBuffer) {

    if (!srcBuffer) {

        return false;

        return false;

    }

    }

    if (!dst) {

    if (!*dst) {

        *dst = new Codec2Buffer(

        *dst = new Codec2Buffer(

                mFormat,

                mFormat,

                new ABuffer(mDataConverter->targetSize(srcBuffer->size())));

                new ABuffer(mDataConverter->targetSize(srcBuffer->size())));

media/codec2/sfplugin/CCodecBuffers.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -385,7 +385,7 @@ protected: 
    void submit(const sp<MediaCodecBuffer> &buffer);

    void submit(const sp<MediaCodecBuffer> &buffer);





    /**

    /**

     * Apply DataConverter from |src| to |*dst| if needed. If |dst| is nullptr,

     * Apply DataConverter from |src| to |*dst| if needed. If |*dst| is nullptr,

     * a new buffer is allocated.

     * a new buffer is allocated.

     *

     *

     * Returns true if conversion was needed and executed; false otherwise.

     * Returns true if conversion was needed and executed; false otherwise.