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

Commit 654af6c5 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Reduce the number of output buffers and force output buffers in display... 

Merge "Reduce the number of output buffers and force output buffers in display order for SoftAVC decoder"
parents a084c841 2db9a95b

media/libstagefright/codecs/on2/h264dec/SoftAVC.cpp

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ void SoftAVC::initPorts() { 
}



status_t SoftAVC::initDecoder() {

    if (H264SwDecInit(&mHandle, 1) == H264SWDEC_OK) {

    // Force decoder to output buffers in display order.

    if (H264SwDecInit(&mHandle, 0) == H264SWDEC_OK) {

        return OK;

    }

    return UNKNOWN_ERROR;

media/libstagefright/codecs/on2/h264dec/SoftAVC.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ private: 
        kInputPortIndex   = 0,

        kOutputPortIndex  = 1,

        kNumInputBuffers  = 8,

        kNumOutputBuffers = 16,

        kNumOutputBuffers = 2,

    };



    enum EOSStatus {