Merge "Move DataSourceUnwrapper and MemorySource to ID3 class" am: 381d0e4d68 am: dc2bdf1560 am: 4817c71fb1

Change-Id: I6f24d5ad6a5a92b23a0a9ef24ee2f6f56616b8fb

media/libstagefright/id3/ID3.cpp

@@ -32,7 +32,7 @@ namespace android {
 
 static const size_t kMaxMetadataSize = 3 * 1024 * 1024;
 
-struct MemorySource : public DataSourceBase {
+struct ID3::MemorySource : public DataSourceBase {
     MemorySource(const uint8_t *data, size_t size)
         : mData(data),
           mSize(size) {
@@ -58,7 +58,7 @@ private:
     DISALLOW_EVIL_CONSTRUCTORS(MemorySource);
 };
 
-class DataSourceUnwrapper : public DataSourceBase {
+class ID3::DataSourceUnwrapper : public DataSourceBase {
 
 public:
     explicit DataSourceUnwrapper(DataSourceHelper *sourcehelper) {

media/libstagefright/include/ID3.h

@@ -77,6 +77,8 @@ struct ID3 {
     size_t rawSize() const { return mRawSize; }
 
 private:
+    class DataSourceUnwrapper;
+    struct MemorySource;
     bool mIsValid;
     uint8_t *mData;
     size_t mSize;