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

Commit acdc3e67 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make MetaData::findXXX methods const"

parents fb679e38 22e668af

media/libmediaextractor/MetaData.cpp

+6 −6
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ bool MetaData::setRect( 
/**

 * Note that the returned pointer becomes invalid when additional metadata is set.

 */

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

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

    uint32_t type;

    const void *data;

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

}



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

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

    uint32_t type = 0;

    const void *data;

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

}



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

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

    uint32_t type = 0;

    const void *data;

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

}



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

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

    uint32_t type = 0;

    const void *data;

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

}



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

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

    uint32_t type = 0;

    const void *data;

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

        uint32_t key,

        int32_t *left, int32_t *top,

        int32_t *right, int32_t *bottom) {

        int32_t *right, int32_t *bottom) const {

    uint32_t type = 0;

    const void *data;

    size_t size;

media/libmediaextractor/include/media/stagefright/MetaData.h

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

            int32_t right, int32_t bottom);



    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 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 findRect(

            uint32_t key,

            int32_t *left, int32_t *top,

            int32_t *right, int32_t *bottom);

            int32_t *right, int32_t *bottom) const;



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