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

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

Merge "Fix errorprone warnings that should be errors" am: 70d8e4ca 

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



Change-Id: I9be8c95bf8ff591836ab7089d68c2f2e76ebbfae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 915e7b49 70d8e4ca

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

+6 −8
Original line number Diff line number Diff line
@@ -60,14 +60,12 @@ public class MuxerTest { 
    private static final String mStatsFile =

            mContext.getExternalFilesDir(null) + "/Muxer." + System.currentTimeMillis() + ".csv";

    private static final String TAG = "MuxerTest";

    private static final Map<String, Integer> mMapFormat = new Hashtable<String, Integer>() {

        {

            put("mp4", MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4);

            put("webm", MediaMuxer.OutputFormat.MUXER_OUTPUT_WEBM);

            put("3gpp", MediaMuxer.OutputFormat.MUXER_OUTPUT_3GPP);

            put("ogg", MediaMuxer.OutputFormat.MUXER_OUTPUT_OGG);

        }

    };

    private static final Map<String, Integer> mMapFormat = Map.of(

            "mp4", MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4,

            "webm", MediaMuxer.OutputFormat.MUXER_OUTPUT_WEBM,

            "3gpp", MediaMuxer.OutputFormat.MUXER_OUTPUT_3GPP,

            "ogg", MediaMuxer.OutputFormat.MUXER_OUTPUT_OGG);



    private String mInputFileName;

    private String mFormat;