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

Commit dc2bdf15 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Move DataSourceUnwrapper and MemorySource to ID3 class" am: 381d0e4d 

Change-Id: I918ac2b8f381bab86823e81eca28a68998ca25bf
parents 06e19002 381d0e4d

media/libstagefright/id3/ID3.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ namespace android { 




static const size_t kMaxMetadataSize = 3 * 1024 * 1024;

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)

    MemorySource(const uint8_t *data, size_t size)

        : mData(data),

        : mData(data),

          mSize(size) {

          mSize(size) {
@@ -58,7 +58,7 @@ private: 
    DISALLOW_EVIL_CONSTRUCTORS(MemorySource);

    DISALLOW_EVIL_CONSTRUCTORS(MemorySource);

};

};





class DataSourceUnwrapper : public DataSourceBase {

class ID3::DataSourceUnwrapper : public DataSourceBase {





public:

public:

    explicit DataSourceUnwrapper(DataSourceHelper *sourcehelper) {

    explicit DataSourceUnwrapper(DataSourceHelper *sourcehelper) {

media/libstagefright/include/ID3.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,8 @@ struct ID3 { 
    size_t rawSize() const { return mRawSize; }

    size_t rawSize() const { return mRawSize; }





private:

private:

    class DataSourceUnwrapper;

    struct MemorySource;

    bool mIsValid;

    bool mIsValid;

    uint8_t *mData;

    uint8_t *mData;

    size_t mSize;

    size_t mSize;