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

Commit eb0ee0e8 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "libstagefright: handle MediaFormat "priority" key."

parents bd321b6e 8b806ea8

include/media/stagefright/ACodec.h

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ private: 
    status_t setupRawAudioFormat(

            OMX_U32 portIndex, int32_t sampleRate, int32_t numChannels);



    status_t setPriority(int32_t priority);



    status_t setMinBufferSize(OMX_U32 portIndex, size_t size);



    status_t setupMPEG4EncoderParameters(const sp<AMessage> &msg);

media/libstagefright/ACodec.cpp

+21 −0
Original line number Diff line number Diff line
@@ -1676,6 +1676,11 @@ status_t ACodec::configureCodec( 
        err = setMinBufferSize(kPortIndexInput, 8192);  // XXX

    }



    int32_t priority;

    if (msg->findInt32("priority", &priority)) {

        err = setPriority(priority);

    }



    mBaseOutputFormat = outputFormat;



    CHECK_EQ(getPortFormat(kPortIndexInput, inputFormat), (status_t)OK);
@@ -1686,6 +1691,22 @@ status_t ACodec::configureCodec( 
    return err;

}



status_t ACodec::setPriority(int32_t priority) {

    if (priority < 0) {

        return BAD_VALUE;

    }

    OMX_PARAM_U32TYPE config;

    InitOMXParams(&config);

    config.nU32 = (OMX_U32)priority;

    status_t temp = mOMX->setConfig(

            mNode, (OMX_INDEXTYPE)OMX_IndexConfigPriority,

            &config, sizeof(config));

    if (temp != OK) {

        ALOGI("codec does not support config priority (err %d)", temp);

    }

    return OK;

}



status_t ACodec::setMinBufferSize(OMX_U32 portIndex, size_t size) {

    OMX_PARAM_PORTDEFINITIONTYPE def;

    InitOMXParams(&def);