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

Commit e33a178a authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge "codec2: fix {linear|graphic}Blocks() references" into pi-dev 

am: d793957b

Change-Id: I6738a02ddc38840e3fc7a5d1d8fcde3cfbc1da55
parents 6b26aa47 d793957b

media/libstagefright/codecs/amrnb/enc/C2SoftAmrNbEnc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ void C2SoftAmrNbEnc::process( 
        return;

    }



    const C2ConstLinearBlock &inBuffer = work->input.buffers[0]->data().linearBlocks().front();

    const C2ConstLinearBlock inBuffer = work->input.buffers[0]->data().linearBlocks().front();

    bool eos = ((work->input.flags & C2FrameData::FLAG_END_OF_STREAM) != 0);

    size_t inOffset = inBuffer.offset();

    size_t inSize = inBuffer.size();

media/libstagefright/codecs/avcdec/C2SoftAvcDec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ void C2SoftAvcDec::process( 
    work->result = C2_OK;

    work->workletsProcessed = 0u;



    const C2ConstLinearBlock &buffer =

    const C2ConstLinearBlock buffer =

        work->input.buffers[0]->data().linearBlocks().front();

    if (buffer.size() == 0) {

        ALOGV("empty input: %llu", work->input.ordinal.frameIndex.peekull());

media/libstagefright/codecs/cmds/codec2.cpp

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ void SimplePlayer::play(const sp<IMediaSource> &source) { 
            ALOGV("Render: Frame #%lld", work->worklets.front()->output.ordinal.frameIndex.peekll());

            const std::shared_ptr<C2Buffer> &output = work->worklets.front()->output.buffers[0];

            if (output) {

                const C2ConstGraphicBlock &block = output->data().graphicBlocks().front();

                const C2ConstGraphicBlock block = output->data().graphicBlocks().front();

                native_handle_t *grallocHandle = UnwrapNativeCodec2GrallocHandle(block.handle());

                sp<GraphicBuffer> buffer(new GraphicBuffer(

                        grallocHandle,

media/libstagefright/codecs/flac/dec/C2SoftFlacDecoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void C2SoftFlacDecoder::process( 
        return;

    }



    const C2ConstLinearBlock &inBuffer = work->input.buffers[0]->data().linearBlocks().front();

    const C2ConstLinearBlock inBuffer = work->input.buffers[0]->data().linearBlocks().front();

    size_t inOffset = inBuffer.offset();

    size_t inSize = inBuffer.size();

    C2ReadView rView = work->input.buffers[0]->data().linearBlocks().front().map().get();

media/libstagefright/codecs/flac/enc/C2SoftFlacEnc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void C2SoftFlacEnc::process( 
        return;

    }



    const C2ConstLinearBlock &inBuffer = work->input.buffers[0]->data().linearBlocks().front();

    const C2ConstLinearBlock inBuffer = work->input.buffers[0]->data().linearBlocks().front();

    bool eos = ((work->input.flags & C2FrameData::FLAG_END_OF_STREAM) != 0);

    size_t inOffset = inBuffer.offset();

    size_t inSize = inBuffer.size();