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

Commit 061ee8fd authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Restrict access to MetaData parceling functions"

parents ae73ce1d eba88ebd

media/libstagefright/include/media/stagefright/MetaData.h

+9 −5
Original line number Original line Diff line number Diff line
@@ -228,7 +228,7 @@ enum { 
    kTypeD263        = 'd263',

    kTypeD263        = 'd263',

};

};





class MetaData : public RefBase {

class MetaData final : public RefBase {

public:

public:

    MetaData();

    MetaData();

    MetaData(const MetaData &from);

    MetaData(const MetaData &from);
@@ -278,14 +278,18 @@ public: 
    String8 toString() const;

    String8 toString() const;

    void dumpToLog() const;

    void dumpToLog() const;





    status_t writeToParcel(Parcel &parcel);

    status_t updateFromParcel(const Parcel &parcel);

    static sp<MetaData> createFromParcel(const Parcel &parcel);



protected:

protected:

    virtual ~MetaData();

    virtual ~MetaData();





private:

private:

    friend class BpMediaSource;

    friend class BnMediaSource;

    friend class BpMediaExtractor;

    friend class BnMediaExtractor;



    status_t writeToParcel(Parcel &parcel);

    status_t updateFromParcel(const Parcel &parcel);

    static sp<MetaData> createFromParcel(const Parcel &parcel);

    struct typed_data;

    struct typed_data;

    struct Rect;

    struct Rect;

    struct MetaDataInternal;

    struct MetaDataInternal;