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

Commit 05421987 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: rework metadata buffer support 

- Add fence to new metadata buffer mode structure, but don't use it
yet, so that we don't have to add another mode soon.
- Change GraphicBuffers to ANativeWindowBuffer in new metadata mode.
This removes internal depencency from vendor codecs.
- Extend new metadata mode from SW encoders to all codecs.
- Fallback from new metadata mode to old mode (so Camera can always
use the new mode even with legacy codecs)

Related-bug: 19614055
Bug: 13222807
Change-Id: I405a21dd6ce8e99808f633bfeab8f14278eb7079
parent cb18ec05

include/media/IOMX.h

+24 −3
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <utils/List.h>

#include <utils/String8.h>



#include <media/hardware/MetadataBufferType.h>



#include <OMX_Core.h>

#include <OMX_Video.h>
@@ -81,8 +83,10 @@ public: 
    virtual status_t getState(

            node_id node, OMX_STATETYPE* state) = 0;



    // This will set *type to previous metadata buffer type on OMX error (not on binder error), and

    // new metadata buffer type on success.

    virtual status_t storeMetaDataInBuffers(

            node_id node, OMX_U32 port_index, OMX_BOOL enable) = 0;

            node_id node, OMX_U32 port_index, OMX_BOOL enable, MetadataBufferType *type = NULL) = 0;



    virtual status_t prepareForAdaptivePlayback(

            node_id node, OMX_U32 portIndex, OMX_BOOL enable,
@@ -111,17 +115,23 @@ public: 
            node_id node, OMX_U32 port_index,

            const sp<GraphicBuffer> &graphicBuffer, buffer_id buffer) = 0;



    // This will set *type to resulting metadata buffer type on OMX error (not on binder error) as

    // well as on success.

    virtual status_t createInputSurface(

            node_id node, OMX_U32 port_index,

            sp<IGraphicBufferProducer> *bufferProducer) = 0;

            sp<IGraphicBufferProducer> *bufferProducer,

            MetadataBufferType *type = NULL) = 0;



    virtual status_t createPersistentInputSurface(

            sp<IGraphicBufferProducer> *bufferProducer,

            sp<IGraphicBufferConsumer> *bufferConsumer) = 0;



    // This will set *type to resulting metadata buffer type on OMX error (not on binder error) as

    // well as on success.

    virtual status_t setInputSurface(

            node_id node, OMX_U32 port_index,

            const sp<IGraphicBufferConsumer> &bufferConsumer) = 0;

            const sp<IGraphicBufferConsumer> &bufferConsumer,

            MetadataBufferType *type) = 0;



    virtual status_t signalEndOfInputStream(node_id node) = 0;
@@ -236,4 +246,15 @@ struct CodecProfileLevel { 


}  // namespace android



inline static const char *asString(android::MetadataBufferType i, const char *def = "??") {

    using namespace android;

    switch (i) {

        case kMetadataBufferTypeCameraSource:   return "CameraSource";

        case kMetadataBufferTypeGrallocSource:  return "GrallocSource";

        case kMetadataBufferTypeANWBuffer:      return "ANWBuffer";

        case kMetadataBufferTypeInvalid:        return "Invalid";

        default:                                return def;

    }

}



#endif  // ANDROID_IOMX_H_

include/media/stagefright/ACodec.h

+16 −7
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <stdint.h>

#include <android/native_window.h>

#include <media/hardware/MetadataBufferType.h>

#include <media/IOMX.h>

#include <media/stagefright/foundation/AHierarchicalStateMachine.h>

#include <media/stagefright/CodecBase.h>
@@ -123,7 +124,7 @@ private: 
        kWhatStart                   = 'star',

        kWhatRequestIDRFrame         = 'ridr',

        kWhatSetParameters           = 'setP',

        kWhatSubmitOutputMetaDataBufferIfEOS = 'subm',

        kWhatSubmitOutputMetadataBufferIfEOS = 'subm',

        kWhatOMXDied                 = 'OMXd',

        kWhatReleaseCodecInstance    = 'relC',

    };
@@ -207,7 +208,6 @@ private: 
    bool mSentFormat;

    bool mIsVideo;

    bool mIsEncoder;

    bool mUseMetadataOnEncoderOutput;

    bool mShutdownInProgress;

    bool mExplicitShutdown;
@@ -222,9 +222,10 @@ private: 
    bool mChannelMaskPresent;

    int32_t mChannelMask;

    unsigned mDequeueCounter;

    bool mStoreMetaDataInOutputBuffers;

    MetadataBufferType mInputMetadataType;

    MetadataBufferType mOutputMetadataType;

    bool mLegacyAdaptiveExperiment;

    int32_t mMetaDataBuffersToSubmit;

    int32_t mMetadataBuffersToSubmit;

    size_t mNumUndequeuedBuffers;



    int64_t mRepeatFrameDelayUs;
@@ -249,14 +250,22 @@ private: 
    status_t configureOutputBuffersFromNativeWindow(

            OMX_U32 *nBufferCount, OMX_U32 *nBufferSize,

            OMX_U32 *nMinUndequeuedBuffers);

    status_t allocateOutputMetaDataBuffers();

    status_t submitOutputMetaDataBuffer();

    void signalSubmitOutputMetaDataBufferIfEOS_workaround();

    status_t allocateOutputMetadataBuffers();

    status_t submitOutputMetadataBuffer();

    void signalSubmitOutputMetadataBufferIfEOS_workaround();

    status_t allocateOutputBuffersFromNativeWindow();

    status_t cancelBufferToNativeWindow(BufferInfo *info);

    status_t freeOutputBuffersNotOwnedByComponent();

    BufferInfo *dequeueBufferFromNativeWindow();



    inline bool storingMetadataInDecodedBuffers() {

        return mOutputMetadataType >= 0 && !mIsEncoder;

    }



    inline bool usingMetadataOnEncoderOutput() {

        return mOutputMetadataType >= 0 && mIsEncoder;

    }



    BufferInfo *findBufferByID(

            uint32_t portIndex, IOMX::buffer_id bufferID,

            ssize_t *index = NULL);

include/media/stagefright/foundation/ADebug.h

+25 −0
Original line number Diff line number Diff line
@@ -24,6 +24,31 @@ 
#include <media/stagefright/foundation/AString.h>

#include <utils/Log.h>



inline static const char *asString(android::status_t i, const char *def = "??") {

    using namespace android;

    switch (i) {

        case NO_ERROR:              return "NO_ERROR";

        case UNKNOWN_ERROR:         return "UNKNOWN_ERROR";

        case NO_MEMORY:             return "NO_MEMORY";

        case INVALID_OPERATION:     return "INVALID_OPERATION";

        case BAD_VALUE:             return "BAD_VALUE";

        case BAD_TYPE:              return "BAD_TYPE";

        case NAME_NOT_FOUND:        return "NAME_NOT_FOUND";

        case PERMISSION_DENIED:     return "PERMISSION_DENIED";

        case NO_INIT:               return "NO_INIT";

        case ALREADY_EXISTS:        return "ALREADY_EXISTS";

        case DEAD_OBJECT:           return "DEAD_OBJECT";

        case FAILED_TRANSACTION:    return "FAILED_TRANSACTION";

        case BAD_INDEX:             return "BAD_INDEX";

        case NOT_ENOUGH_DATA:       return "NOT_ENOUGH_DATA";

        case WOULD_BLOCK:           return "WOULD_BLOCK";

        case TIMED_OUT:             return "TIMED_OUT";

        case UNKNOWN_TRANSACTION:   return "UNKNOWN_TRANSACTION";

        case FDS_NOT_ALLOWED:       return "FDS_NOT_ALLOWED";

        default:                    return def;

    }

}



namespace android {



#define LITERAL_TO_STRING_INTERNAL(x)    #x

media/libmedia/IOMX.cpp

+32 −9
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ public: 


    virtual status_t createInputSurface(

            node_id node, OMX_U32 port_index,

            sp<IGraphicBufferProducer> *bufferProducer) {

            sp<IGraphicBufferProducer> *bufferProducer, MetadataBufferType *type) {

        Parcel data, reply;

        status_t err;

        data.writeInterfaceToken(IOMX::getInterfaceDescriptor());
@@ -318,6 +318,12 @@ public: 
            return err;

        }



        // read type even if createInputSurface failed

        int negotiatedType = reply.readInt32();

        if (type != NULL) {

            *type = (MetadataBufferType)negotiatedType;

        }



        err = reply.readInt32();

        if (err != OK) {

            return err;
@@ -356,7 +362,7 @@ public: 


    virtual status_t setInputSurface(

            node_id node, OMX_U32 port_index,

            const sp<IGraphicBufferConsumer> &bufferConsumer) {

            const sp<IGraphicBufferConsumer> &bufferConsumer, MetadataBufferType *type) {

        Parcel data, reply;

        data.writeInterfaceToken(IOMX::getInterfaceDescriptor());

        status_t err;
@@ -370,6 +376,13 @@ public: 
            ALOGW("binder transaction failed: %d", err);

            return err;

        }



        // read type even if setInputSurface failed

        int negotiatedType = reply.readInt32();

        if (type != NULL) {

            *type = (MetadataBufferType)negotiatedType;

        }



        return reply.readInt32();

    }
@@ -388,7 +401,7 @@ public: 
    }



    virtual status_t storeMetaDataInBuffers(

            node_id node, OMX_U32 port_index, OMX_BOOL enable) {

            node_id node, OMX_U32 port_index, OMX_BOOL enable, MetadataBufferType *type) {

        Parcel data, reply;

        data.writeInterfaceToken(IOMX::getInterfaceDescriptor());

        data.writeInt32((int32_t)node);
@@ -396,8 +409,13 @@ public: 
        data.writeInt32((uint32_t)enable);

        remote()->transact(STORE_META_DATA_IN_BUFFERS, data, &reply);



        status_t err = reply.readInt32();

        return err;

        // read type even storeMetaDataInBuffers failed

        int negotiatedType = reply.readInt32();

        if (type != NULL) {

            *type = (MetadataBufferType)negotiatedType;

        }



        return reply.readInt32();

    }



    virtual status_t prepareForAdaptivePlayback(
@@ -818,9 +836,10 @@ status_t BnOMX::onTransact( 
            OMX_U32 port_index = data.readInt32();



            sp<IGraphicBufferProducer> bufferProducer;

            status_t err = createInputSurface(node, port_index,

                    &bufferProducer);

            MetadataBufferType type;

            status_t err = createInputSurface(node, port_index, &bufferProducer, &type);



            reply->writeInt32(type);

            reply->writeInt32(err);



            if (err == OK) {
@@ -859,8 +878,10 @@ status_t BnOMX::onTransact( 
            sp<IGraphicBufferConsumer> bufferConsumer =

                    interface_cast<IGraphicBufferConsumer>(data.readStrongBinder());



            status_t err = setInputSurface(node, port_index, bufferConsumer);

            MetadataBufferType type;

            status_t err = setInputSurface(node, port_index, bufferConsumer, &type);



            reply->writeInt32(type);

            reply->writeInt32(err);

            return NO_ERROR;

        }
@@ -885,7 +906,9 @@ status_t BnOMX::onTransact( 
            OMX_U32 port_index = data.readInt32();

            OMX_BOOL enable = (OMX_BOOL)data.readInt32();



            status_t err = storeMetaDataInBuffers(node, port_index, enable);

            MetadataBufferType type;

            status_t err = storeMetaDataInBuffers(node, port_index, enable, &type);

            reply->writeInt32(type);

            reply->writeInt32(err);



            return NO_ERROR;

media/libstagefright/ACodec.cpp

+123 −84

File changed.

Preview size limit exceeded, changes collapsed.