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

Commit 381d0e4d authored by Ray Essick's avatar Ray Essick Committed by Gerrit Code Review
Browse files

Merge "Move DataSourceUnwrapper and MemorySource to ID3 class"

parents e512cd3d 37eca13f

media/libstagefright/id3/ID3.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -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;