From ee4e1b1a63758941460ae79a064249d3a5189443 Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Fri, 17 Apr 2015 13:46:19 -0700 Subject: stagefright: warnings be gone, some are now errors, use clang Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c --- include/media/ICrypto.h | 2 +- include/media/IMediaMetadataRetriever.h | 2 +- include/media/IMediaPlayer.h | 2 +- include/media/IStreamSource.h | 2 +- include/media/MediaMetadataRetrieverInterface.h | 2 +- include/media/MediaPlayerInterface.h | 26 ++++++++++++------------- include/media/mediametadataretriever.h | 2 +- include/media/stagefright/AACWriter.h | 2 +- include/media/stagefright/AMRWriter.h | 2 +- include/media/stagefright/AudioPlayer.h | 2 +- include/media/stagefright/CameraSource.h | 2 +- include/media/stagefright/DataSource.h | 2 +- include/media/stagefright/MediaCodec.h | 2 +- include/media/stagefright/MediaMuxer.h | 4 ++-- include/media/stagefright/MediaWriter.h | 2 +- include/media/stagefright/NuMediaExtractor.h | 6 +++--- include/media/stagefright/Utils.h | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) (limited to 'include') diff --git a/include/media/ICrypto.h b/include/media/ICrypto.h index aa04dbe..ea316de 100644 --- a/include/media/ICrypto.h +++ b/include/media/ICrypto.h @@ -25,7 +25,7 @@ namespace android { struct AString; -struct IMemory; +class IMemory; struct ICrypto : public IInterface { DECLARE_META_INTERFACE(Crypto); diff --git a/include/media/IMediaMetadataRetriever.h b/include/media/IMediaMetadataRetriever.h index 95851fd..c90f254 100644 --- a/include/media/IMediaMetadataRetriever.h +++ b/include/media/IMediaMetadataRetriever.h @@ -27,7 +27,7 @@ namespace android { class IDataSource; -class IMediaHTTPService; +struct IMediaHTTPService; class IMediaMetadataRetriever: public IInterface { diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h index 17ef489..df6130d 100644 --- a/include/media/IMediaPlayer.h +++ b/include/media/IMediaPlayer.h @@ -32,7 +32,7 @@ namespace android { class Parcel; class Surface; class IDataSource; -class IStreamSource; +struct IStreamSource; class IGraphicBufferProducer; struct IMediaHTTPService; diff --git a/include/media/IStreamSource.h b/include/media/IStreamSource.h index 149bd49..4a6aafd 100644 --- a/include/media/IStreamSource.h +++ b/include/media/IStreamSource.h @@ -23,7 +23,7 @@ namespace android { struct AMessage; -struct IMemory; +class IMemory; struct IStreamListener; struct IStreamSource : public IInterface { diff --git a/include/media/MediaMetadataRetrieverInterface.h b/include/media/MediaMetadataRetrieverInterface.h index df6c7d6..bce6ee3 100644 --- a/include/media/MediaMetadataRetrieverInterface.h +++ b/include/media/MediaMetadataRetrieverInterface.h @@ -26,7 +26,7 @@ namespace android { class DataSource; -class IMediaHTTPService; +struct IMediaHTTPService; // Abstract base class class MediaMetadataRetrieverBase : public RefBase diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index 90211b1..824762a 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -132,11 +132,11 @@ public: virtual void pause() = 0; virtual void close() = 0; - virtual status_t setPlaybackRatePermille(int32_t rate) { return INVALID_OPERATION; } + virtual status_t setPlaybackRatePermille(int32_t /* rate */) { return INVALID_OPERATION;} virtual bool needsTrailingPadding() { return true; } - virtual status_t setParameters(const String8& keyValuePairs) { return NO_ERROR; }; - virtual String8 getParameters(const String8& keys) { return String8::empty(); }; + virtual status_t setParameters(const String8& /* keyValuePairs */) { return NO_ERROR; } + virtual String8 getParameters(const String8& /* keys */) { return String8::empty(); } }; MediaPlayerBase() : mCookie(0), mNotify(0) {} @@ -144,7 +144,7 @@ public: virtual status_t initCheck() = 0; virtual bool hardwareOutput() = 0; - virtual status_t setUID(uid_t uid) { + virtual status_t setUID(uid_t /* uid */) { return INVALID_OPERATION; } @@ -155,11 +155,11 @@ public: virtual status_t setDataSource(int fd, int64_t offset, int64_t length) = 0; - virtual status_t setDataSource(const sp &source) { + virtual status_t setDataSource(const sp& /* source */) { return INVALID_OPERATION; } - virtual status_t setDataSource(const sp &source) { + virtual status_t setDataSource(const sp& /* source */) { return INVALID_OPERATION; } @@ -173,7 +173,7 @@ public: virtual status_t stop() = 0; virtual status_t pause() = 0; virtual bool isPlaying() = 0; - virtual status_t setPlaybackRate(float rate) { return INVALID_OPERATION; } + virtual status_t setPlaybackRate(float /* rate */) { return INVALID_OPERATION; } virtual status_t seekTo(int msec) = 0; virtual status_t getCurrentPosition(int *msec) = 0; virtual status_t getDuration(int *msec) = 0; @@ -184,13 +184,13 @@ public: virtual status_t getParameter(int key, Parcel *reply) = 0; // default no-op implementation of optional extensions - virtual status_t setRetransmitEndpoint(const struct sockaddr_in* endpoint) { + virtual status_t setRetransmitEndpoint(const struct sockaddr_in* /* endpoint */) { return INVALID_OPERATION; } - virtual status_t getRetransmitEndpoint(struct sockaddr_in* endpoint) { + virtual status_t getRetransmitEndpoint(struct sockaddr_in* /* endpoint */) { return INVALID_OPERATION; } - virtual status_t setNextPlayer(const sp& next) { + virtual status_t setNextPlayer(const sp& /* next */) { return OK; } @@ -210,8 +210,8 @@ public: // the known metadata should be returned. // @param[inout] records Parcel where the player appends its metadata. // @return OK if the call was successful. - virtual status_t getMetadata(const media::Metadata::Filter& ids, - Parcel *records) { + virtual status_t getMetadata(const media::Metadata::Filter& /* ids */, + Parcel* /* records */) { return INVALID_OPERATION; }; @@ -234,7 +234,7 @@ public: if (notifyCB) notifyCB(cookie, msg, ext1, ext2, obj); } - virtual status_t dump(int fd, const Vector &args) const { + virtual status_t dump(int /* fd */, const Vector& /* args */) const { return INVALID_OPERATION; } diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index 08049c4..f655f35 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -26,7 +26,7 @@ namespace android { class IDataSource; -class IMediaHTTPService; +struct IMediaHTTPService; class IMediaPlayerService; class IMediaMetadataRetriever; diff --git a/include/media/stagefright/AACWriter.h b/include/media/stagefright/AACWriter.h index 86417a5..aa60a19 100644 --- a/include/media/stagefright/AACWriter.h +++ b/include/media/stagefright/AACWriter.h @@ -24,7 +24,7 @@ namespace android { struct MediaSource; -struct MetaData; +class MetaData; struct AACWriter : public MediaWriter { AACWriter(int fd); diff --git a/include/media/stagefright/AMRWriter.h b/include/media/stagefright/AMRWriter.h index bac878b..b38be55 100644 --- a/include/media/stagefright/AMRWriter.h +++ b/include/media/stagefright/AMRWriter.h @@ -26,7 +26,7 @@ namespace android { struct MediaSource; -struct MetaData; +class MetaData; struct AMRWriter : public MediaWriter { AMRWriter(int fd); diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h index 14afb85..98c4fa7 100644 --- a/include/media/stagefright/AudioPlayer.h +++ b/include/media/stagefright/AudioPlayer.h @@ -27,7 +27,7 @@ namespace android { class MediaSource; class AudioTrack; -class AwesomePlayer; +struct AwesomePlayer; class AudioPlayer : public TimeSource { public: diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index dd0a106..96dfd7e 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -188,7 +188,7 @@ protected: void releaseCamera(); private: - friend class CameraSourceListener; + friend struct CameraSourceListener; Mutex mLock; Condition mFrameAvailableCondition; diff --git a/include/media/stagefright/DataSource.h b/include/media/stagefright/DataSource.h index 997fe95..dcde36f 100644 --- a/include/media/stagefright/DataSource.h +++ b/include/media/stagefright/DataSource.h @@ -32,7 +32,7 @@ namespace android { struct AMessage; struct AString; -struct IDataSource; +class IDataSource; struct IMediaHTTPService; class String8; struct HTTPBase; diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index e3e952f..f2b21c9 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -33,7 +33,7 @@ struct AString; struct CodecBase; struct IBatteryStats; struct ICrypto; -struct IMemory; +class IMemory; struct MemoryDealer; class IResourceManagerClient; class IResourceManagerService; diff --git a/include/media/stagefright/MediaMuxer.h b/include/media/stagefright/MediaMuxer.h index e6538d1..fa855a8 100644 --- a/include/media/stagefright/MediaMuxer.h +++ b/include/media/stagefright/MediaMuxer.h @@ -29,9 +29,9 @@ namespace android { struct ABuffer; struct AMessage; struct MediaAdapter; -struct MediaBuffer; +class MediaBuffer; struct MediaSource; -struct MetaData; +class MetaData; struct MediaWriter; // MediaMuxer is used to mux multiple tracks into a video. Currently, we only diff --git a/include/media/stagefright/MediaWriter.h b/include/media/stagefright/MediaWriter.h index e27ea1d..8e02506 100644 --- a/include/media/stagefright/MediaWriter.h +++ b/include/media/stagefright/MediaWriter.h @@ -24,7 +24,7 @@ namespace android { struct MediaSource; -struct MetaData; +class MetaData; struct MediaWriter : public RefBase { MediaWriter() diff --git a/include/media/stagefright/NuMediaExtractor.h b/include/media/stagefright/NuMediaExtractor.h index 402e7f8..fd74452 100644 --- a/include/media/stagefright/NuMediaExtractor.h +++ b/include/media/stagefright/NuMediaExtractor.h @@ -30,12 +30,12 @@ namespace android { struct ABuffer; struct AMessage; -struct DataSource; +class DataSource; struct IMediaHTTPService; -struct MediaBuffer; +class MediaBuffer; struct MediaExtractor; struct MediaSource; -struct MetaData; +class MetaData; struct NuMediaExtractor : public RefBase { enum SampleFlags { diff --git a/include/media/stagefright/Utils.h b/include/media/stagefright/Utils.h index ec3a10e..215ca7c 100644 --- a/include/media/stagefright/Utils.h +++ b/include/media/stagefright/Utils.h @@ -41,7 +41,7 @@ uint64_t U64LE_AT(const uint8_t *ptr); uint64_t ntoh64(uint64_t x); uint64_t hton64(uint64_t x); -struct MetaData; +class MetaData; struct AMessage; status_t convertMetaDataToMessage( const sp &meta, sp *format); -- cgit v1.1