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

Commit 71950ea3 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: make more warnings errors"

parents f1063e26 3b0da19c

media/libstagefright/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ LOCAL_SHARED_LIBRARIES += \ 
        libdl \

        libRScpp \



LOCAL_CFLAGS += -Wno-multichar -Werror

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE:= libstagefright

media/libstagefright/MPEG4Writer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -63,9 +63,11 @@ static const uint8_t kNalUnitTypeSeqParamSet = 0x07; 
static const uint8_t kNalUnitTypePicParamSet = 0x08;

static const int64_t kInitialDelayTimeUs     = 700000LL;



static const char kMetaKey_Model[]      = "com.android.model";

static const char kMetaKey_Version[]    = "com.android.version";

#ifdef SHOW_MODEL_BUILD

static const char kMetaKey_Model[]      = "com.android.model";

static const char kMetaKey_Build[]      = "com.android.build";

#endif

static const char kMetaKey_CaptureFps[] = "com.android.capture.fps";



/* uncomment to include model and build in meta */

media/libstagefright/MediaCodecListOverrides.cpp

+8 −8
Original line number Diff line number Diff line
@@ -302,10 +302,10 @@ void exportResultsToXML(const char *fileName, const KeyedVector<AString, CodecSe 
        char *buf = (char *)malloc(size);

        if (fread(buf, size, 1, f) == 1) {

            overrides.setTo(buf, size);

#if LOG_NDEBUG == 0

            if (!LOG_NDEBUG) {

                ALOGV("Existing overrides:");

                printLongString(buf, size);

#endif

            }

        } else {

            ALOGE("Failed to read %s", fileName);

        }
@@ -385,10 +385,10 @@ void exportResultsToXML(const char *fileName, const KeyedVector<AString, CodecSe 
        }

    }



#if LOG_NDEBUG == 0

    if (!LOG_NDEBUG) {

        ALOGV("New overrides:");

        printLongString(overrides.c_str(), overrides.size());

#endif

    }



    f = fopen(fileName, "wb");

    if (f == NULL) {

media/libstagefright/MediaCodecSource.cpp

+0 −1
Original line number Diff line number Diff line
@@ -682,7 +682,6 @@ void MediaCodecSource::onMessageReceived(const sp<AMessage> &msg) { 
            size_t size;

            int64_t timeUs;

            int32_t flags;

            native_handle_t* handle = NULL;



            CHECK(msg->findInt32("index", &index));

            CHECK(msg->findSize("offset", &offset));

media/libstagefright/filters/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LOCAL_C_INCLUDES := \ 
intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,)

LOCAL_C_INCLUDES += $(intermediates)



LOCAL_CFLAGS += -Wno-multichar -Werror

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE:= libstagefright_mediafilter