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

Commit 4073fc50 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libstagefright_writer_fuzzer : Bug Fix" am: ec578c8b am: d4ddd4b6... 

Merge "libstagefright_writer_fuzzer : Bug Fix" am: ec578c8b am: d4ddd4b6 am: 901145c5 am: b59ebd2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1991758



Change-Id: I4e74e009cbc92cdedf8f88d3b349d37f1aa9ee6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20086c13 b59ebd2a

media/libstagefright/tests/fuzzers/FuzzerMediaUtility.cpp

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ sp<MediaSource> genMediaSource(FuzzedDataProvider *dataProvider, uint16_t maxMed 
    for (size_t i = 0; i < extractor->countTracks(); ++i) {

        sp<MetaData> meta = extractor->getTrackMetaData(i);



        const char *trackMime;

        if (!strcasecmp(mime.c_str(), trackMime)) {

        std::string trackMime = dataProvider->PickValueInArray(kTestedMimeTypes);

        if (!strcasecmp(mime.c_str(), trackMime.c_str())) {

            sp<IMediaSource> track = extractor->getTrack(i);

            if (track == NULL) {

                return NULL;

media/libstagefright/tests/fuzzers/FuzzerMediaUtility.h

+45 −0
Original line number Diff line number Diff line
@@ -42,6 +42,51 @@ enum StandardWriters { 
    kMaxValue = MPEG2TS,

};



static std::string kTestedMimeTypes[] = {"audio/3gpp",

                                         "audio/amr-wb",

                                         "audio/vorbis",

                                         "audio/opus",

                                         "audio/mp4a-latm",

                                         "audio/mpeg",

                                         "audio/mpeg-L1",

                                         "audio/mpeg-L2",

                                         "audio/midi",

                                         "audio/qcelp",

                                         "audio/g711-alaw",

                                         "audio/g711-mlaw",

                                         "audio/flac",

                                         "audio/aac-adts",

                                         "audio/gsm",

                                         "audio/ac3",

                                         "audio/eac3",

                                         "audio/eac3-joc",

                                         "audio/ac4",

                                         "audio/scrambled",

                                         "audio/alac",

                                         "audio/x-ms-wma",

                                         "audio/x-adpcm-ms",

                                         "audio/x-adpcm-dvi-ima",

                                         "video/avc",

                                         "video/hevc",

                                         "video/mp4v-es",

                                         "video/3gpp",

                                         "video/x-vnd.on2.vp8",

                                         "video/x-vnd.on2.vp9",

                                         "video/av01",

                                         "video/mpeg2",

                                         "video/dolby-vision",

                                         "video/scrambled",

                                         "video/divx",

                                         "video/divx3",

                                         "video/xvid",

                                         "video/x-motion-jpeg",

                                         "text/3gpp-tt",

                                         "application/x-subrip",

                                         "text/vtt",

                                         "text/cea-608",

                                         "text/cea-708",

                                         "application/x-id3v4"};



std::string genMimeType(FuzzedDataProvider *dataProvider);

sp<IMediaExtractor> genMediaExtractor(FuzzedDataProvider *dataProvider, uint16_t dataAmount);

sp<MediaSource> genMediaSource(FuzzedDataProvider *dataProvider, uint16_t maxMediaBlobSize);