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

Commit 55654a3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Removed unused variable macro usage" am: 1d7a5551 

Change-Id: I2b6f308be50c5fbd9b2ddaeb1c6053c57dd89c1d
parents b185ea91 1d7a5551

media/libstagefright/foundation/avc_utils.cpp

+4 −6
Original line number Diff line number Diff line
@@ -546,11 +546,9 @@ bool ExtractDimensionsFromVOLHeader( 
    CHECK_NE(video_object_type_indication,

             0x21u /* Fine Granularity Scalable */);



    unsigned video_object_layer_verid __unused;

    unsigned video_object_layer_priority __unused;

    if (br.getBits(1)) {

        video_object_layer_verid = br.getBits(4);

        video_object_layer_priority = br.getBits(3);

        br.skipBits(4); //video_object_layer_verid

        br.skipBits(3); //video_object_layer_priority

    }

    unsigned aspect_ratio_info = br.getBits(4);

    if (aspect_ratio_info == 0x0f /* extended PAR */) {
@@ -609,7 +607,7 @@ bool ExtractDimensionsFromVOLHeader( 
    unsigned video_object_layer_height = br.getBits(13);

    CHECK(br.getBits(1));  // marker_bit



    unsigned interlaced __unused = br.getBits(1);

    br.skipBits(1); // interlaced



    *width = video_object_layer_width;

    *height = video_object_layer_height;
@@ -655,7 +653,7 @@ bool GetMPEGAudioFrameSize( 
        return false;

    }



    unsigned protection __unused = (header >> 16) & 1;

    // we can get protection value from (header >> 16) & 1



    unsigned bitrate_index = (header >> 12) & 0x0f;

media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ struct ADebug { 
    static char *GetDebugName(const char *name);



    inline static bool isExperimentEnabled(

            const char *name __unused /* nonnull */, bool allow __unused = true) {

            const char *name __attribute__((unused)) /* nonnull */,

            bool allow __attribute__((unused)) = true) {

#ifdef ENABLE_STAGEFRIGHT_EXPERIMENTS

        if (!strcmp(name, "legacy-adaptive")) {

            return getExperimentFlag(allow, name, 2, 1); // every other day