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

Commit 933cbc51 authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge "Updated 'Utils.cpp' and 'HevcUtils.cpp'" am: 1f88b099 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323879

Change-Id: I5f08c0546073dc8ea74a3383ea01143e08e87044
parents c33deac9 1f88b099

media/libstagefright/HevcUtils.cpp

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/Utils.h>



#define UNUSED_PARAM __attribute__((unused))



namespace android {



static const uint8_t kHevcNalUnitTypes[5] = {
@@ -375,7 +377,7 @@ status_t HevcParameterSets::parseSps(const uint8_t* data, size_t size) { 
}



status_t HevcParameterSets::parsePps(

        const uint8_t* data __unused, size_t size __unused) {

        const uint8_t* data UNUSED_PARAM, size_t size UNUSED_PARAM) {

    return OK;

}

media/libstagefright/Utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ status_t convertMetaDataToMessage( 
        // assertion, let's be lenient for now...

        // CHECK((ptr[4] >> 2) == 0x3f);  // reserved



        size_t lengthSize __unused = 1 + (ptr[4] & 3);

        // we can get lengthSize value from 1 + (ptr[4] & 3)



        // commented out check below as H264_QVGA_500_NO_AUDIO.3gp

        // violates it...