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

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

Merge "NdkMediaExtractor: remove setDataSourceWithHeaders"

parents d10b735c 82248d1d

media/ndk/NdkMediaExtractor.cpp

+5 −6
Original line number Diff line number Diff line
@@ -70,12 +70,6 @@ media_status_t AMediaExtractor_setDataSourceFd(AMediaExtractor *mData, int fd, o 
    return translate_error(mData->mImpl->setDataSource(fd, offset, length));

}



EXPORT

media_status_t AMediaExtractor_setDataSource(AMediaExtractor *mData, const char *location) {

    return AMediaExtractor_setDataSourceWithHeaders(mData, location, 0, NULL, NULL);

}



EXPORT

media_status_t AMediaExtractor_setDataSourceWithHeaders(AMediaExtractor *mData,

        const char *uri,

        int numheaders,
@@ -102,6 +96,11 @@ media_status_t AMediaExtractor_setDataSourceWithHeaders(AMediaExtractor *mData, 
    return translate_error(err);

}



EXPORT

media_status_t AMediaExtractor_setDataSource(AMediaExtractor *mData, const char *location) {

    return AMediaExtractor_setDataSourceWithHeaders(mData, location, 0, NULL, NULL);

}



EXPORT

media_status_t AMediaExtractor_setDataSourceCustom(AMediaExtractor* mData, AMediaDataSource *src) {

    return translate_error(mData->mImpl->setDataSource(new NdkDataSource(src)));

media/ndk/include/media/NdkMediaExtractor.h

+0 −21
Original line number Diff line number Diff line
@@ -73,27 +73,6 @@ media_status_t AMediaExtractor_setDataSourceFd(AMediaExtractor*, int fd, off64_t 
media_status_t AMediaExtractor_setDataSource(AMediaExtractor*,

        const char *location) __INTRODUCED_IN(21);



#if __ANDROID_API__ >= 29

/**

 * Set the |uri| from which the extractor will read,

 * plus additional http headers when initiating the request.

 *

 * Headers will contain corresponding items from |keys| & |values|

 * from indices 0 (inclusive) to numheaders-1 (inclusive):

 *

 * keys[0]:values[0]

 * ...

 * keys[numheaders - 1]:values[numheaders - 1]

 *

 */

media_status_t AMediaExtractor_setDataSourceWithHeaders(AMediaExtractor*,

        const char *uri,

        int numheaders,

        const char * const *keys,

        const char * const *values) __INTRODUCED_IN(29);



#endif /* __ANDROID_API__ >= 29 */



#if __ANDROID_API__ >= 28



/**

media/ndk/libmediandk.map.txt

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ LIBMEDIANDK { 
    AMediaExtractor_setDataSource;

    AMediaExtractor_setDataSourceCustom; # introduced=28

    AMediaExtractor_setDataSourceFd;

    AMediaExtractor_setDataSourceWithHeaders; # introduced=29

    AMediaExtractor_unselectTrack;

    AMediaFormat_clear; # introduced=29

    AMediaFormat_copy; # introduced=29