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

Commit dd01ce9c authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Android Git Automerger
Browse files

am 52a861d2: Merge "warnings be gone." 

* commit '52a861d2':
  warnings be gone.
parents 52a23bd3 52a861d2

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
@@ -187,7 +187,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
@@ -140,7 +140,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/NuPlayerDriver.cpp

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

}



status_t NuPlayerDriver::setLooping(int loop) {

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

    return INVALID_OPERATION;

}
@@ -421,16 +421,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;
@@ -494,7 +495,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");

media/libmediaplayerservice/nuplayer/NuPlayerSource.h

+5 −5
Original line number Diff line number Diff line
@@ -68,19 +68,19 @@ struct NuPlayer::Source : public AHandler { 
    virtual status_t dequeueAccessUnit(

            bool audio, sp<ABuffer> *accessUnit) = 0;



    virtual status_t getDuration(int64_t *durationUs) {

    virtual status_t getDuration(int64_t * /* durationUs */) {

        return INVALID_OPERATION;

    }



    virtual status_t getTrackInfo(Parcel* reply) const {

    virtual status_t getTrackInfo(Parcel* /* reply */) const {

        return INVALID_OPERATION;

    }



    virtual status_t selectTrack(size_t trackIndex, bool select) {

    virtual status_t selectTrack(size_t /* trackIndex */, bool /* select */) {

        return INVALID_OPERATION;

    }



    virtual status_t seekTo(int64_t seekTimeUs) {

    virtual status_t seekTo(int64_t /* seekTimeUs */) {

        return INVALID_OPERATION;

    }
@@ -93,7 +93,7 @@ protected: 


    virtual void onMessageReceived(const sp<AMessage> &msg);



    virtual sp<MetaData> getFormatMeta(bool audio) { return NULL; }

    virtual sp<MetaData> getFormatMeta(bool /* audio */) { return NULL; }



    sp<AMessage> dupNotify() const { return mNotify->dup(); }