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

Commit 784e24e3 authored by Andy Hung's avatar Andy Hung
Browse files

Remove legacy omx_message variables 



Remove platform_private and data_ptr from omx_message.
These were used for legacy deferred buffer creation.
See OMXCodec quirks: kDefersOutputBufferAllocation and
kRequiresAllocateBufferOnOutputPorts.

Change-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf
Signed-off-by: default avatarAndy Hung <hunga@google.com>
parent 7ebe2c64

include/media/IOMX.h

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ struct omx_message { 
            OMX_U32 range_length;

            OMX_U32 flags;

            OMX_TICKS timestamp;

            OMX_PTR platform_private;

            OMX_PTR data_ptr;

        } extended_buffer_data;



    } u;

media/libstagefright/ACodec.cpp

+3 −19
Original line number Diff line number Diff line
@@ -100,12 +100,6 @@ struct CodecObserver : public BnOMXObserver { 
                msg->setInt64(

                        "timestamp",

                        omx_msg.u.extended_buffer_data.timestamp);

                msg->setPointer(

                        "platform_private",

                        omx_msg.u.extended_buffer_data.platform_private);

                msg->setPointer(

                        "data_ptr",

                        omx_msg.u.extended_buffer_data.data_ptr);

                break;

            }
@@ -160,9 +154,7 @@ private: 
            IOMX::buffer_id bufferID,

            size_t rangeOffset, size_t rangeLength,

            OMX_U32 flags,

            int64_t timeUs,

            void *platformPrivate,

            void *dataPtr);

            int64_t timeUs);



    void getMoreInputDataIfPossible();
@@ -3228,23 +3220,17 @@ bool ACodec::BaseState::onOMXMessage(const sp<AMessage> &msg) { 


            int32_t rangeOffset, rangeLength, flags;

            int64_t timeUs;

            void *platformPrivate;

            void *dataPtr;



            CHECK(msg->findInt32("range_offset", &rangeOffset));

            CHECK(msg->findInt32("range_length", &rangeLength));

            CHECK(msg->findInt32("flags", &flags));

            CHECK(msg->findInt64("timestamp", &timeUs));

            CHECK(msg->findPointer("platform_private", &platformPrivate));

            CHECK(msg->findPointer("data_ptr", &dataPtr));



            return onOMXFillBufferDone(

                    bufferID,

                    (size_t)rangeOffset, (size_t)rangeLength,

                    (OMX_U32)flags,

                    timeUs,

                    platformPrivate,

                    dataPtr);

                    timeUs);

        }



        default:
@@ -3543,9 +3529,7 @@ bool ACodec::BaseState::onOMXFillBufferDone( 
        IOMX::buffer_id bufferID,

        size_t rangeOffset, size_t rangeLength,

        OMX_U32 flags,

        int64_t timeUs,

        void * /* platformPrivate */,

        void * /* dataPtr */) {

        int64_t timeUs) {

    ALOGV("[%s] onOMXFillBufferDone %p time %lld us, flags = 0x%08lx",

         mCodec->mComponentName.c_str(), bufferID, timeUs, flags);

media/libstagefright/OMXCodec.cpp

+9 −29
Original line number Diff line number Diff line
@@ -1627,16 +1627,16 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) { 
        info.mMediaBuffer = NULL;



        if (portIndex == kPortIndexOutput) {

            if (!(mOMXLivesLocally

            // Fail deferred MediaBuffer creation until FILL_BUFFER_DONE;

            // this legacy mode is no longer supported.

            LOG_ALWAYS_FATAL_IF((mOMXLivesLocally

                    && (mQuirks & kRequiresAllocateBufferOnOutputPorts)

                        && (mQuirks & kDefersOutputBufferAllocation))) {

                // If the node does not fill in the buffer ptr at this time,

                // we will defer creating the MediaBuffer until receiving

                // the first FILL_BUFFER_DONE notification instead.

                    && (mQuirks & kDefersOutputBufferAllocation)),

                    "allocateBuffersOnPort cannot defer buffer allocation");



            info.mMediaBuffer = new MediaBuffer(info.mData, info.mSize);

            info.mMediaBuffer->setObserver(this);

        }

        }



        mPortBuffers[portIndex].push(info);
@@ -2234,22 +2234,6 @@ void OMXCodec::on_message(const omx_message &msg) { 
            } else if (mPortStatus[kPortIndexOutput] != SHUTTING_DOWN) {

                CHECK_EQ((int)mPortStatus[kPortIndexOutput], (int)ENABLED);



                if (info->mMediaBuffer == NULL) {

                    CHECK(mOMXLivesLocally);

                    CHECK(mQuirks & kRequiresAllocateBufferOnOutputPorts);

                    CHECK(mQuirks & kDefersOutputBufferAllocation);



                    // The qcom video decoders on Nexus don't actually allocate

                    // output buffer memory on a call to OMX_AllocateBuffer

                    // the "pBuffer" member of the OMX_BUFFERHEADERTYPE

                    // structure is only filled in later.



                    info->mMediaBuffer = new MediaBuffer(

                            msg.u.extended_buffer_data.data_ptr,

                            info->mSize);

                    info->mMediaBuffer->setObserver(this);

                }



                MediaBuffer *buffer = info->mMediaBuffer;

                bool isGraphicBuffer = buffer->graphicBuffer() != NULL;
@@ -2284,10 +2268,6 @@ void OMXCodec::on_message(const omx_message &msg) { 
                    buffer->meta_data()->setInt32(kKeyIsUnreadable, true);

                }



                buffer->meta_data()->setPointer(

                        kKeyPlatformPrivate,

                        msg.u.extended_buffer_data.platform_private);



                buffer->meta_data()->setPointer(

                        kKeyBufferID,

                        msg.u.extended_buffer_data.buffer);

media/libstagefright/omx/OMX.cpp

+0 −2
Original line number Diff line number Diff line
@@ -470,8 +470,6 @@ OMX_ERRORTYPE OMX::OnFillBufferDone( 
    msg.u.extended_buffer_data.range_length = pBuffer->nFilledLen;

    msg.u.extended_buffer_data.flags = pBuffer->nFlags;

    msg.u.extended_buffer_data.timestamp = pBuffer->nTimeStamp;

    msg.u.extended_buffer_data.platform_private = pBuffer->pPlatformPrivate;

    msg.u.extended_buffer_data.data_ptr = pBuffer->pBuffer;



    findDispatcher(node)->post(msg);