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

Commit caee8747 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "configure bitrate and bitrate mode at encoder initialization for VP8/9" into klp-dev

parents e100b813 89b31a3f

include/media/stagefright/ACodec.h

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ private: 
    status_t setupMPEG4EncoderParameters(const sp<AMessage> &msg);

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

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

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



    status_t verifySupportForProfileAndLevel(int32_t profile, int32_t level);

media/libstagefright/ACodec.cpp

+16 −0
Original line number Diff line number Diff line
@@ -1909,6 +1909,11 @@ status_t ACodec::setupVideoEncoder(const char *mime, const sp<AMessage> &msg) { 
            err = setupAVCEncoderParameters(msg);

            break;



        case OMX_VIDEO_CodingVP8:

        case OMX_VIDEO_CodingVP9:

            err = setupVPXEncoderParameters(msg);

            break;



        default:

            break;

    }
@@ -2240,6 +2245,17 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) { 
    return configureBitrate(bitrate, bitrateMode);

}



status_t ACodec::setupVPXEncoderParameters(const sp<AMessage> &msg) {

    int32_t bitrate;

    if (!msg->findInt32("bitrate", &bitrate)) {

        return INVALID_OPERATION;

    }



    OMX_VIDEO_CONTROLRATETYPE bitrateMode = getBitrateMode(msg);



    return configureBitrate(bitrate, bitrateMode);

}



status_t ACodec::verifySupportForProfileAndLevel(

        int32_t profile, int32_t level) {

    OMX_VIDEO_PARAM_PROFILELEVELTYPE params;