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

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

Merge "warnings be gone."

parents faf5c0ea 84333e04

include/media/stagefright/MediaSource.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct MediaSource : public virtual RefBase { 
    // This will be called after a successful start() and before the

    // first read() call.

    // Callee assumes ownership of the buffers if no error is returned.

    virtual status_t setBuffers(const Vector<MediaBuffer *> &buffers) {

    virtual status_t setBuffers(const Vector<MediaBuffer *> & /* buffers */) {

        return ERROR_UNSUPPORTED;

    }

media/libmediaplayerservice/StagefrightPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ status_t StagefrightPlayer::getParameter(int key, Parcel *reply) { 
}



status_t StagefrightPlayer::getMetadata(

        const media::Metadata::Filter& ids, Parcel *records) {

        const media::Metadata::Filter& /* ids */, Parcel *records) {

    using media::Metadata;



    uint32_t flags = mPlayer->flags();

media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ status_t NuPlayer::HTTPLiveSource::selectTrack(size_t trackIndex, bool select) { 
    // LiveSession::selectTrack returns BAD_VALUE when selecting the currently

    // selected track, or unselecting a non-selected track. In this case it's an

    // no-op so we return OK.

    return (err == OK || err == BAD_VALUE) ? OK : err;

    return (err == OK || err == BAD_VALUE) ? (status_t)OK : err;

}



status_t NuPlayer::HTTPLiveSource::seekTo(int64_t seekTimeUs) {

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1528,7 +1528,7 @@ void NuPlayer::Source::notifyPrepared(status_t err) { 
    notify->post();

}



void NuPlayer::Source::onMessageReceived(const sp<AMessage> &msg) {

void NuPlayer::Source::onMessageReceived(const sp<AMessage> & /* msg */) {

    TRESPASS();

}

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+7 −5
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ status_t NuPlayerDriver::reset() { 
    return OK;

}



status_t NuPlayerDriver::setLooping(int loop) {

status_t NuPlayerDriver::setLooping(int /* loop */) {

    return INVALID_OPERATION;

}
@@ -423,16 +423,17 @@ void NuPlayerDriver::setAudioSink(const sp<AudioSink> &audioSink) { 
    mPlayer->setAudioSink(audioSink);

}



status_t NuPlayerDriver::setParameter(int key, const Parcel &request) {

status_t NuPlayerDriver::setParameter(

        int /* key */, const Parcel & /* request */) {

    return INVALID_OPERATION;

}



status_t NuPlayerDriver::getParameter(int key, Parcel *reply) {

status_t NuPlayerDriver::getParameter(int /* key */, Parcel * /* reply */) {

    return INVALID_OPERATION;

}



status_t NuPlayerDriver::getMetadata(

        const media::Metadata::Filter& ids, Parcel *records) {

        const media::Metadata::Filter& /* ids */, Parcel *records) {

    Mutex::Autolock autoLock(mLock);



    using media::Metadata;
@@ -496,7 +497,8 @@ void NuPlayerDriver::notifyFrameStats( 
    mNumFramesDropped = numFramesDropped;

}



status_t NuPlayerDriver::dump(int fd, const Vector<String16> &args) const {

status_t NuPlayerDriver::dump(

        int fd, const Vector<String16> & /* args */) const {

    Mutex::Autolock autoLock(mLock);



    FILE *out = fdopen(dup(fd), "w");