Bug 1034444 - Fix libstagefright warnings; r=cpearce
authorAnthony Jones <ajones@mozilla.com>
Mon, 02 Jun 2014 17:38:04 +0200
changeset 215440 7c60cb7a9403d4320b58b14dd200882bb1de80b8
parent 215439 4bd579e7389af3767ada254e5a89bbb074c45e1f
child 215441 c928106052fe2d0bb92ac678e8122a52f6a508a5
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1034444
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1034444 - Fix libstagefright warnings; r=cpearce
media/libstagefright/frameworks/av/include/media/stagefright/MediaExtractor.h
media/libstagefright/frameworks/av/include/media/stagefright/Utils.h
media/libstagefright/frameworks/av/media/libstagefright/include/ID3.h
media/libstagefright/frameworks/av/media/libstagefright/include/SampleIterator.h
--- a/media/libstagefright/frameworks/av/include/media/stagefright/MediaExtractor.h
+++ b/media/libstagefright/frameworks/av/include/media/stagefright/MediaExtractor.h
@@ -18,17 +18,17 @@
 
 #define MEDIA_EXTRACTOR_H_
 
 #include <utils/RefBase.h>
 
 namespace stagefright {
 
 class DataSource;
-class MediaSource;
+struct MediaSource;
 class MetaData;
 
 class MediaExtractor : public RefBase {
 public:
     static sp<MediaExtractor> Create(
             const sp<DataSource> &source, const char *mime = NULL);
 
     virtual size_t countTracks() = 0;
--- a/media/libstagefright/frameworks/av/include/media/stagefright/Utils.h
+++ b/media/libstagefright/frameworks/av/include/media/stagefright/Utils.h
@@ -36,17 +36,17 @@ uint64_t U64_AT(const uint8_t *ptr);
 
 uint16_t U16LE_AT(const uint8_t *ptr);
 uint32_t U32LE_AT(const uint8_t *ptr);
 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<MetaData> &meta, sp<AMessage> *format);
 void convertMessageToMetaData(
         const sp<AMessage> &format, sp<MetaData> &meta);
 
 AString MakeUserAgent();
 
--- a/media/libstagefright/frameworks/av/media/libstagefright/include/ID3.h
+++ b/media/libstagefright/frameworks/av/media/libstagefright/include/ID3.h
@@ -17,18 +17,18 @@
 #ifndef ID3_H_
 
 #define ID3_H_
 
 #include <utils/RefBase.h>
 
 namespace stagefright {
 
-struct DataSource;
-struct String8;
+class DataSource;
+class String8;
 
 struct ID3 {
     enum Version {
         ID3_UNKNOWN,
         ID3_V1,
         ID3_V1_1,
         ID3_V2_2,
         ID3_V2_3,
--- a/media/libstagefright/frameworks/av/media/libstagefright/include/SampleIterator.h
+++ b/media/libstagefright/frameworks/av/media/libstagefright/include/SampleIterator.h
@@ -16,17 +16,17 @@
 
 #ifndef SAMPLE_ITERATOR_H_
 #define SAMPLE_ITERATOR_H_
 
 #include <utils/Vector.h>
 
 namespace stagefright {
 
-struct SampleTable;
+class SampleTable;
 
 struct SampleIterator {
     SampleIterator(SampleTable *table);
 
     status_t seekTo(uint32_t sampleIndex);
 
     uint32_t getChunkIndex() const { return mCurrentChunkIndex; }
     uint32_t getDescIndex() const { return mChunkDesc; }