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

Commit 914e38f7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-b1bd0f0e-f3c4-414e-8f22-d9235831ae23-for-git_oc-mr1-release-40... 

release-request-b1bd0f0e-f3c4-414e-8f22-d9235831ae23-for-git_oc-mr1-release-4099045 snap-temp-L41300000074003051

Change-Id: I3d412cbf230867f58dc51e547369160805c1fa98
parents 700262cd bc334636

media/libmedia/Android.bp

+6 −3
Original line number Diff line number Diff line
@@ -13,9 +13,12 @@ cc_library { 
        "-Wno-error=deprecated-declarations",

        "-Wall",

    ],

    shared: {

    shared_libs: ["libutils", "liblog", "libgui"],

    },

    header_libs: [

        "libmedia_headers",

        "libaudioclient_headers",

        "libaudio_system_headers",

    ],

    clang: true,

}

media/libstagefright/ACodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4841,9 +4841,9 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) { 
                            rect.nTop < 0 ||

                            rect.nLeft + rect.nWidth > videoDef->nFrameWidth ||

                            rect.nTop + rect.nHeight > videoDef->nFrameHeight) {

                            ALOGE("Wrong cropped rect (%d, %d) - (%u, %u) vs. frame (%u, %u)",

                            ALOGE("Wrong cropped rect (%d, %d, %u, %u) vs. frame (%u, %u)",

                                    rect.nLeft, rect.nTop,

                                    rect.nLeft + rect.nWidth, rect.nTop + rect.nHeight,

                                    rect.nWidth, rect.nHeight,

                                    videoDef->nFrameWidth, videoDef->nFrameHeight);

                            return BAD_VALUE;

                        }

media/libstagefright/codecs/raw/SoftRaw.cpp

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void SoftRaw::initPorts() { 
    def.eDir = OMX_DirInput;

    def.nBufferCountMin = kNumBuffers;

    def.nBufferCountActual = def.nBufferCountMin;

    def.nBufferSize = 32 * 1024;

    def.nBufferSize = 64 * 1024;

    def.bEnabled = OMX_TRUE;

    def.bPopulated = OMX_FALSE;

    def.eDomain = OMX_PortDomainAudio;
@@ -78,7 +78,7 @@ void SoftRaw::initPorts() { 
    def.eDir = OMX_DirOutput;

    def.nBufferCountMin = kNumBuffers;

    def.nBufferCountActual = def.nBufferCountMin;

    def.nBufferSize = 32 * 1024;

    def.nBufferSize = 64 * 1024;

    def.bEnabled = OMX_TRUE;

    def.bPopulated = OMX_FALSE;

    def.eDomain = OMX_PortDomainAudio;