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

Commit 2cf9c507 authored by James Dong's avatar James Dong
Browse files

Revert "Add const to the finders method in MetaData.cpp" 

This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e.

Conflicts:

	include/media/stagefright/MPEG4Writer.h

Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
parent 07ec0190

include/media/stagefright/MPEG4Writer.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ private: 
    void writeCompositionMatrix(int32_t degrees);

    void writeMvhdBox(int64_t durationUs);

    void writeMoovBox(int64_t durationUs);

    void writeFtypBox(const MetaData *param);

    void writeFtypBox(MetaData *param);

    void writeUdtaBox();

    void writeGeoDataBox();

    void writeLatitude(int degreex10000);

include/media/stagefright/MetaData.h

+6 −6
Original line number Diff line number Diff line
@@ -154,16 +154,16 @@ public: 
            int32_t left, int32_t top,

            int32_t right, int32_t bottom);



    bool findCString(uint32_t key, const char **value) const;

    bool findInt32(uint32_t key, int32_t *value) const;

    bool findInt64(uint32_t key, int64_t *value) const;

    bool findFloat(uint32_t key, float *value) const;

    bool findPointer(uint32_t key, void **value) const;

    bool findCString(uint32_t key, const char **value);

    bool findInt32(uint32_t key, int32_t *value);

    bool findInt64(uint32_t key, int64_t *value);

    bool findFloat(uint32_t key, float *value);

    bool findPointer(uint32_t key, void **value);



    bool findRect(

            uint32_t key,

            int32_t *left, int32_t *top,

            int32_t *right, int32_t *bottom) const;

            int32_t *right, int32_t *bottom);



    bool setData(uint32_t key, uint32_t type, const void *data, size_t size);

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ void MPEG4Writer::writeMoovBox(int64_t durationUs) { 
    endBox();  // moov

}



void MPEG4Writer::writeFtypBox(const MetaData *param) {

void MPEG4Writer::writeFtypBox(MetaData *param) {

    beginBox("ftyp");



    int32_t fileType;

media/libstagefright/MetaData.cpp

+6 −6
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ bool MetaData::setRect( 
    return setData(key, TYPE_RECT, &r, sizeof(r));

}



bool MetaData::findCString(uint32_t key, const char **value) const {

bool MetaData::findCString(uint32_t key, const char **value) {

    uint32_t type;

    const void *data;

    size_t size;
@@ -96,7 +96,7 @@ bool MetaData::findCString(uint32_t key, const char **value) const { 
    return true;

}



bool MetaData::findInt32(uint32_t key, int32_t *value) const {

bool MetaData::findInt32(uint32_t key, int32_t *value) {

    uint32_t type;

    const void *data;

    size_t size;
@@ -111,7 +111,7 @@ bool MetaData::findInt32(uint32_t key, int32_t *value) const { 
    return true;

}



bool MetaData::findInt64(uint32_t key, int64_t *value) const {

bool MetaData::findInt64(uint32_t key, int64_t *value) {

    uint32_t type;

    const void *data;

    size_t size;
@@ -126,7 +126,7 @@ bool MetaData::findInt64(uint32_t key, int64_t *value) const { 
    return true;

}



bool MetaData::findFloat(uint32_t key, float *value) const {

bool MetaData::findFloat(uint32_t key, float *value) {

    uint32_t type;

    const void *data;

    size_t size;
@@ -141,7 +141,7 @@ bool MetaData::findFloat(uint32_t key, float *value) const { 
    return true;

}



bool MetaData::findPointer(uint32_t key, void **value) const {

bool MetaData::findPointer(uint32_t key, void **value) {

    uint32_t type;

    const void *data;

    size_t size;
@@ -159,7 +159,7 @@ bool MetaData::findPointer(uint32_t key, void **value) const { 
bool MetaData::findRect(

        uint32_t key,

        int32_t *left, int32_t *top,

        int32_t *right, int32_t *bottom) const {

        int32_t *right, int32_t *bottom) {

    uint32_t type;

    const void *data;

    size_t size;