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

Commit 31de8856 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: cmds: resolve compiler warnings 

Change-Id: I21af2b463231e864781a70ae7667afe37eba9df8
parent 850206ed

cmds/stagefright/Android.mk

+18 −9
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ LOCAL_C_INCLUDES:= \ 
	$(TOP)/frameworks/native/include/media/openmax \

	external/jpeg \



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -40,7 +41,8 @@ LOCAL_C_INCLUDES:= \ 
	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -63,7 +65,8 @@ LOCAL_C_INCLUDES:= \ 
	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -87,7 +90,8 @@ LOCAL_C_INCLUDES:= \ 
	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -110,7 +114,8 @@ LOCAL_C_INCLUDES:= \ 
	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -133,7 +138,8 @@ LOCAL_C_INCLUDES:= \ 
	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -157,7 +163,8 @@ LOCAL_C_INCLUDES:= \ 
	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -199,7 +206,8 @@ LOCAL_C_INCLUDES += $(intermediates) 
LOCAL_STATIC_LIBRARIES:= \

	libstagefright_mediafilter



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -222,7 +230,8 @@ LOCAL_C_INCLUDES:= \ 
	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional

cmds/stagefright/SimplePlayer.cpp

+12 −11
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "SimplePlayer.h"



#include <gui/Surface.h>



#include <media/AudioTrack.h>

#include <media/ICrypto.h>

#include <media/IMediaHTTPService.h>
@@ -428,12 +429,12 @@ status_t SimplePlayer::onDoMoreStuff() { 
            err = state->mCodec->dequeueInputBuffer(&index);



            if (err == OK) {

                ALOGV("dequeued input buffer on track %d",

                ALOGV("dequeued input buffer on track %zu",

                      mStateByTrackIndex.keyAt(i));



                state->mAvailInputBufferIndices.push_back(index);

            } else {

                ALOGV("dequeueInputBuffer on track %d returned %d",

                ALOGV("dequeueInputBuffer on track %zu returned %d",

                      mStateByTrackIndex.keyAt(i), err);

            }

        } while (err == OK);
@@ -448,7 +449,7 @@ status_t SimplePlayer::onDoMoreStuff() { 
                    &info.mFlags);



            if (err == OK) {

                ALOGV("dequeued output buffer on track %d",

                ALOGV("dequeued output buffer on track %zu",

                      mStateByTrackIndex.keyAt(i));



                state->mAvailOutputBufferInfos.push_back(info);
@@ -459,7 +460,7 @@ status_t SimplePlayer::onDoMoreStuff() { 
                err = state->mCodec->getOutputBuffers(&state->mBuffers[1]);

                CHECK_EQ(err, (status_t)OK);

            } else {

                ALOGV("dequeueOutputBuffer on track %d returned %d",

                ALOGV("dequeueOutputBuffer on track %zu returned %d",

                      mStateByTrackIndex.keyAt(i), err);

            }

        } while (err == OK
@@ -502,7 +503,7 @@ status_t SimplePlayer::onDoMoreStuff() { 
                    0);

            CHECK_EQ(err, (status_t)OK);



            ALOGV("enqueued input data on track %d", trackIndex);

            ALOGV("enqueued input data on track %zu", trackIndex);



            err = mExtractor->advance();

            CHECK_EQ(err, (status_t)OK);
@@ -528,8 +529,8 @@ status_t SimplePlayer::onDoMoreStuff() { 
                bool release = true;



                if (lateByUs > 30000ll) {

                    ALOGI("track %d buffer late by %lld us, dropping.",

                          mStateByTrackIndex.keyAt(i), lateByUs);

                    ALOGI("track %zu buffer late by %lld us, dropping.",

                          mStateByTrackIndex.keyAt(i), (long long)lateByUs);

                    state->mCodec->releaseOutputBuffer(info->mIndex);

                } else {

                    if (state->mAudioTrack != NULL) {
@@ -558,8 +559,8 @@ status_t SimplePlayer::onDoMoreStuff() { 
                    break;

                }

            } else {

                ALOGV("track %d buffer early by %lld us.",

                      mStateByTrackIndex.keyAt(i), -lateByUs);

                ALOGV("track %zu buffer early by %lld us.",

                      mStateByTrackIndex.keyAt(i), (long long)-lateByUs);

                break;

            }

        }
@@ -569,7 +570,7 @@ status_t SimplePlayer::onDoMoreStuff() { 
}



status_t SimplePlayer::onOutputFormatChanged(

        size_t trackIndex, CodecState *state) {

        size_t trackIndex __unused, CodecState *state) {

    sp<AMessage> format;

    status_t err = state->mCodec->getOutputFormat(&format);
@@ -640,7 +641,7 @@ void SimplePlayer::renderAudio( 
    if (delayUs > 2000ll) {

        ALOGW("AudioTrack::write took %lld us, numFramesAvailableToWrite=%u, "

              "numFramesWritten=%u",

              delayUs, numFramesAvailableToWrite, numFramesWritten);

              (long long)delayUs, numFramesAvailableToWrite, numFramesWritten);

    }



    info->mOffset += nbytes;

cmds/stagefright/codec.cpp

+13 −13
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int decode( 
            continue;

        }



        ALOGV("selecting track %d", i);

        ALOGV("selecting track %zu", i);



        err = extractor->selectTrack(i);

        CHECK_EQ(err, (status_t)OK);
@@ -151,7 +151,7 @@ static int decode( 
        CHECK_EQ((status_t)OK, codec->getInputBuffers(&state->mInBuffers));

        CHECK_EQ((status_t)OK, codec->getOutputBuffers(&state->mOutBuffers));



        ALOGV("got %d input and %d output buffers",

        ALOGV("got %zu input and %zu output buffers",

              state->mInBuffers.size(), state->mOutBuffers.size());

    }
@@ -172,7 +172,7 @@ static int decode( 
                err = state->mCodec->dequeueInputBuffer(&index, kTimeout);



                if (err == OK) {

                    ALOGV("filling input buffer %d", index);

                    ALOGV("filling input buffer %zu", index);



                    const sp<ABuffer> &buffer = state->mInBuffers.itemAt(index);
@@ -209,7 +209,7 @@ static int decode( 
                        state->mCodec->dequeueInputBuffer(&index, kTimeout);



                    if (err == OK) {

                        ALOGV("signalling input EOS on track %d", i);

                        ALOGV("signalling input EOS on track %zu", i);



                        err = state->mCodec->queueInputBuffer(

                                index,
@@ -258,8 +258,8 @@ static int decode( 
                    kTimeout);



            if (err == OK) {

                ALOGV("draining output buffer %d, time = %lld us",

                      index, presentationTimeUs);

                ALOGV("draining output buffer %zu, time = %lld us",

                      index, (long long)presentationTimeUs);



                ++state->mNumBuffersDecoded;

                state->mNumBytesDecoded += size;
@@ -293,7 +293,7 @@ static int decode( 
                CHECK_EQ((status_t)OK,

                         state->mCodec->getOutputBuffers(&state->mOutBuffers));



                ALOGV("got %d output buffers", state->mOutBuffers.size());

                ALOGV("got %zu output buffers", state->mOutBuffers.size());

            } else if (err == INFO_FORMAT_CHANGED) {

                sp<AMessage> format;

                CHECK_EQ((status_t)OK, state->mCodec->getOutputFormat(&format));
@@ -313,17 +313,17 @@ static int decode( 
        CHECK_EQ((status_t)OK, state->mCodec->release());



        if (state->mIsAudio) {

            printf("track %zu: %" PRId64 " bytes received. %.2f KB/sec\n",

            printf("track %zu: %lld bytes received. %.2f KB/sec\n",

                   i,

                   state->mNumBytesDecoded,

                   (long long)state->mNumBytesDecoded,

                   state->mNumBytesDecoded * 1E6 / 1024 / elapsedTimeUs);

        } else {

            printf("track %zu: %" PRId64 " frames decoded, %.2f fps. %" PRId64

            printf("track %zu: %lld frames decoded, %.2f fps. %lld"

                    " bytes received. %.2f KB/sec\n",

                   i,

                   state->mNumBuffersDecoded,

                   (long long)state->mNumBuffersDecoded,

                   state->mNumBuffersDecoded * 1E6 / elapsedTimeUs,

                   state->mNumBytesDecoded,

                   (long long)state->mNumBytesDecoded,

                   state->mNumBytesDecoded * 1E6 / 1024 / elapsedTimeUs);

        }

    }
@@ -418,7 +418,7 @@ int main(int argc, char **argv) { 
        ssize_t displayWidth = info.w;

        ssize_t displayHeight = info.h;



        ALOGV("display is %ld x %ld\n", displayWidth, displayHeight);

        ALOGV("display is %zd x %zd\n", displayWidth, displayHeight);



        control = composerClient->createSurface(

                String8("A Surface"),

cmds/stagefright/mediafilter.cpp

+4 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct SaturationRSFilter : RenderScriptWrapper::RSFilterCallback { 
        return OK;

    }



    status_t handleSetParameters(const sp<AMessage> &msg) {

    status_t handleSetParameters(const sp<AMessage> &msg __unused) {

        return OK;

    }
@@ -101,7 +101,7 @@ struct NightVisionRSFilter : RenderScriptWrapper::RSFilterCallback { 
        return OK;

    }



    status_t handleSetParameters(const sp<AMessage> &msg) {

    status_t handleSetParameters(const sp<AMessage> &msg __unused) {

        return OK;

    }
@@ -121,7 +121,7 @@ struct ARGBToRGBARSFilter : RenderScriptWrapper::RSFilterCallback { 
        return OK;

    }



    status_t handleSetParameters(const sp<AMessage> &msg) {

    status_t handleSetParameters(const sp<AMessage> &msg __unused) {

        return OK;

    }
@@ -597,7 +597,7 @@ static int decode( 


            if (err == OK) {

                ALOGV("draining decoded buffer %zu, time = %lld us",

                        frame.index, frame.presentationTimeUs);

                        frame.index, (long long)frame.presentationTimeUs);



                ++(state->mNumBuffersDecoded);

cmds/stagefright/muxer.cpp

+2 −3
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ static void usage(const char *me) { 
using namespace android;



static int muxing(

        const android::sp<android::ALooper> &looper,

        const char *path,

        bool useAudio,

        bool useVideo,
@@ -137,7 +136,7 @@ static int muxing( 
            }

        }



        ALOGV("selecting track %d", i);

        ALOGV("selecting track %zu", i);



        err = extractor->selectTrack(i);

        CHECK_EQ(err, (status_t)OK);
@@ -308,7 +307,7 @@ int main(int argc, char **argv) { 
    sp<ALooper> looper = new ALooper;

    looper->start();



    int result = muxing(looper, argv[0], useAudio, useVideo, outputFileName,

    int result = muxing(argv[0], useAudio, useVideo, outputFileName,

                        enableTrim, trimStartTimeMs, trimEndTimeMs, rotationDegrees);



    looper->stop();