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

Commit ac4d4d36 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."

parents 17799467 c32589a7

media/libstagefright/AwesomePlayer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ void AwesomePlayer::setListener(const wp<MediaPlayerBase> &listener) { 
}



void AwesomePlayer::setUID(uid_t uid) {

    LOGI("AwesomePlayer running on behalf of uid %d", uid);

    LOGV("AwesomePlayer running on behalf of uid %d", uid);



    mUID = uid;

    mUIDValid = true;
@@ -362,7 +362,7 @@ status_t AwesomePlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { 
        if (!meta->findInt32(kKeyBitRate, &bitrate)) {

            const char *mime;

            CHECK(meta->findCString(kKeyMIMEType, &mime));

            LOGW("track of type '%s' does not publish bitrate", mime);

            LOGV("track of type '%s' does not publish bitrate", mime);



            totalBitRate = -1;

            break;
@@ -1192,7 +1192,7 @@ void AwesomePlayer::shutdownVideoDecoder_l() { 
        usleep(1000);

    }

    IPCThreadState::self()->flushCommands();

    LOGI("video decoder shutdown completed");

    LOGV("video decoder shutdown completed");

}



status_t AwesomePlayer::setNativeWindow_l(const sp<ANativeWindow> &native) {
@@ -1202,7 +1202,7 @@ status_t AwesomePlayer::setNativeWindow_l(const sp<ANativeWindow> &native) { 
        return OK;

    }



    LOGI("attempting to reconfigure to use new surface");

    LOGV("attempting to reconfigure to use new surface");



    bool wasPlaying = (mFlags & PLAYING) != 0;

media/libstagefright/OMXCodec.cpp

+5 −5
Original line number Diff line number Diff line
@@ -1635,7 +1635,7 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) { 
        return err;

    }



    CODEC_LOGI("allocating %lu buffers of size %lu on %s port",

    CODEC_LOGV("allocating %lu buffers of size %lu on %s port",

            def.nBufferCountActual, def.nBufferSize,

            portIndex == kPortIndexInput ? "input" : "output");
@@ -1876,7 +1876,7 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() { 
        return err;

    }



    CODEC_LOGI("allocating %lu buffers from a native window of size %lu on "

    CODEC_LOGV("allocating %lu buffers from a native window of size %lu on "

            "output port", def.nBufferCountActual, def.nBufferSize);



    // Dequeue buffers and send them to OMX
@@ -3654,7 +3654,7 @@ status_t OMXCodec::stop() { 


    mSource->stop();



    CODEC_LOGI("stopped in state %d", mState);

    CODEC_LOGV("stopped in state %d", mState);



    return OK;

}
@@ -4219,14 +4219,14 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) { 
                inputFormat->findInt32(kKeySampleRate, &sampleRate);



                if ((OMX_U32)numChannels != params.nChannels) {

                    LOGW("Codec outputs a different number of channels than "

                    LOGV("Codec outputs a different number of channels than "

                         "the input stream contains (contains %d channels, "

                         "codec outputs %ld channels).",

                         numChannels, params.nChannels);

                }



                if (sampleRate != (int32_t)params.nSamplingRate) {

                    LOGW("Codec outputs at different sampling rate than "

                    LOGV("Codec outputs at different sampling rate than "

                         "what the input stream contains (contains data at "

                         "%d Hz, codec outputs %lu Hz)",

                         sampleRate, params.nSamplingRate);