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

Commit 6094af6a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Benchmark: Add backward compatibility for vorbis" am: 7efed09e am:... 

Merge "Benchmark: Add backward compatibility for vorbis" am: 7efed09e am: c98c7c8b am: 1d2276f4

Change-Id: I309d531f2ed3fdf9ca4e3deffc01424fee1047e1
parents 575b638d 1d2276f4

media/tests/benchmark/MediaBenchmarkTest/src/androidTest/java/com/android/media/benchmark/tests/DecoderTest.java

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class DecoderTest { 
                {"bbb_44100hz_2ch_128kbps_mp3_30sec.mp3", false},

                {"bbb_8000hz_1ch_8kbps_amrnb_30sec.3gp", false},

                {"bbb_16000hz_1ch_9kbps_amrwb_30sec.3gp", false},

                {"bbb_44100hz_2ch_80kbps_vorbis_30sec.mp4", false},

                {"bbb_44100hz_2ch_80kbps_vorbis_30sec.webm", false},

                {"bbb_44100hz_2ch_600kbps_flac_30sec.mp4", false},

                {"bbb_48000hz_2ch_100kbps_opus_30sec.webm", false},

                // Audio Async Test
@@ -86,7 +86,7 @@ public class DecoderTest { 
                {"bbb_44100hz_2ch_128kbps_mp3_30sec.mp3", true},

                {"bbb_8000hz_1ch_8kbps_amrnb_30sec.3gp", true},

                {"bbb_16000hz_1ch_9kbps_amrwb_30sec.3gp", true},

                {"bbb_44100hz_2ch_80kbps_vorbis_30sec.mp4", true},

                {"bbb_44100hz_2ch_80kbps_vorbis_30sec.webm", true},

                {"bbb_44100hz_2ch_600kbps_flac_30sec.mp4", true},

                {"bbb_48000hz_2ch_100kbps_opus_30sec.webm", true},

                // Video Sync Test

media/tests/benchmark/MediaBenchmarkTest/src/androidTest/java/com/android/media/benchmark/tests/ExtractorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class ExtractorTest { 
                {"bbb_44100hz_2ch_600kbps_flac_5mins.flac", 0},

                {"bbb_8000hz_1ch_8kbps_amrnb_5mins.3gp", 0},

                {"bbb_16000hz_1ch_9kbps_amrwb_5mins.3gp", 0},

                {"bbb_44100hz_2ch_80kbps_vorbis_5mins.mp4", 0},

                {"bbb_44100hz_2ch_80kbps_vorbis_5mins.webm", 0},

                {"bbb_48000hz_2ch_100kbps_opus_5mins.webm", 0}});

    }

media/tests/benchmark/MediaBenchmarkTest/src/androidTest/java/com/android/media/benchmark/tests/MuxerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class MuxerTest { 
                {"crowd_1920x1080_25fps_6700kbps_h264.ts", "3gpp"},

                {"crowd_1920x1080_25fps_4000kbps_h265.mkv", "3gpp"},

                {"bbb_48000hz_2ch_100kbps_opus_5mins.webm", "ogg"},

                {"bbb_44100hz_2ch_80kbps_vorbis_5mins.mp4", "webm"},

                {"bbb_44100hz_2ch_80kbps_vorbis_5mins.webm", "webm"},

                {"bbb_48000hz_2ch_100kbps_opus_5mins.webm", "webm"},

                {"bbb_44100hz_2ch_128kbps_aac_5mins.mp4", "mp4"},

                {"bbb_8000hz_1ch_8kbps_amrnb_5mins.3gp", "mp4"},

media/tests/benchmark/tests/C2DecoderTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ INSTANTIATE_TEST_SUITE_P( 
                          make_pair("bbb_44100hz_2ch_128kbps_mp3_30sec.mp3", "mp3"),

                          make_pair("bbb_8000hz_1ch_8kbps_amrnb_30sec.3gp", "amrnb"),

                          make_pair("bbb_16000hz_1ch_9kbps_amrwb_30sec.3gp", "amrnb"),

                          make_pair("bbb_44100hz_2ch_80kbps_vorbis_30sec.mp4", "vorbis"),

                          make_pair("bbb_44100hz_2ch_80kbps_vorbis_30sec.webm", "vorbis"),

                          make_pair("bbb_44100hz_2ch_600kbps_flac_30sec.mp4", "flac"),

                          make_pair("bbb_48000hz_2ch_100kbps_opus_30sec.webm", "opus")));

media/tests/benchmark/tests/DecoderTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ INSTANTIATE_TEST_SUITE_P( 
                          make_tuple("bbb_44100hz_2ch_128kbps_mp3_30sec.mp3", "", false),

                          make_tuple("bbb_8000hz_1ch_8kbps_amrnb_30sec.3gp", "", false),

                          make_tuple("bbb_16000hz_1ch_9kbps_amrwb_30sec.3gp", "", false),

                          make_tuple("bbb_44100hz_2ch_80kbps_vorbis_30sec.mp4", "", false),

                          make_tuple("bbb_44100hz_2ch_80kbps_vorbis_30sec.webm", "", false),

                          make_tuple("bbb_44100hz_2ch_600kbps_flac_30sec.mp4", "", false),

                          make_tuple("bbb_48000hz_2ch_100kbps_opus_30sec.webm", "", false)));
@@ -111,7 +111,7 @@ INSTANTIATE_TEST_SUITE_P( 
                          make_tuple("bbb_44100hz_2ch_128kbps_mp3_30sec.mp3", "", true),

                          make_tuple("bbb_8000hz_1ch_8kbps_amrnb_30sec.3gp", "", true),

                          make_tuple("bbb_16000hz_1ch_9kbps_amrwb_30sec.3gp", "", true),

                          make_tuple("bbb_44100hz_2ch_80kbps_vorbis_30sec.mp4", "", true),

                          make_tuple("bbb_44100hz_2ch_80kbps_vorbis_30sec.webm", "", true),

                          make_tuple("bbb_44100hz_2ch_600kbps_flac_30sec.mp4", "", true),

                          make_tuple("bbb_48000hz_2ch_100kbps_opus_30sec.webm", "", true)));