Refactor and add tests

# Conflicts:
#	libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java

Author: rohitjoins

demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java

@@ -34,16 +34,12 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.media3.common.AudioAttributes;
 import androidx.media3.common.C;
-import androidx.media3.common.CodecParameter;
-import androidx.media3.common.CodecParameters;
-import androidx.media3.common.CodecParametersChangeListener;
 import androidx.media3.common.ErrorMessageProvider;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.PlaybackException;
 import androidx.media3.common.Player;
 import androidx.media3.common.TrackSelectionParameters;
 import androidx.media3.common.Tracks;
-import androidx.media3.common.util.Log;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 import androidx.media3.datasource.DataSchemeDataSource;
@@ -65,7 +61,6 @@
 import androidx.media3.ui.PlayerView;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
@@ -266,7 +261,6 @@ protected void setContentView() {
   /**
    * @return Whether initialization was successful.
    */
-  @OptIn(markerClass = UnstableApi.class)
   protected boolean initializePlayer() {
     Intent intent = getIntent();
     if (player == null) {
@@ -283,56 +277,6 @@ protected boolean initializePlayer() {
       setRenderersFactory(
           playerBuilder, intent.getBooleanExtra(IntentUtil.PREFER_EXTENSION_DECODERS_EXTRA, false));
       player = playerBuilder.build();
-
-      // --------------------------- TESTING CODE ONLY -- REMOVE AGAIN ----------------------------
-      player.setCodecParametersChangeListener(new CodecParametersChangeListener() {
-        @Override
-        public void onCodecParametersChanged(CodecParameters codecParameters) {
-          HashMap<String, CodecParameter> parameters = codecParameters.get();
-          for (String key : parameters.keySet()) {
-            Log.e("PlayerActivity", "key = " + key + "  value = " + parameters.get(key).value);
-          }
-        }
-
-        @Override
-        public ArrayList<String> getFilterKeys() {
-          ArrayList<String> filterKeys = new ArrayList<>();
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            filterKeys.add(CodecParameter.KEY_AAC_DRC_OUTPUT_LOUDNESS);
-          }
-          return filterKeys;
-        }
-      });
-
-      CodecParameter codecParameter;
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-        // For testing set initial targetLoudness to -16 LUFS
-        codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_TARGET_REFERENCE_LEVEL, 64,
-            CodecParameter.VALUETYPE_INT);
-        player.setCodecParameter(codecParameter);
-        // For testing set initial BoostFactor to 32
-        codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_BOOST_FACTOR, 32,
-            CodecParameter.VALUETYPE_INT);
-        player.setCodecParameter(codecParameter);
-        // For testing set initial AttenuationFactor to 16
-        codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_ATTENUATION_FACTOR, 16,
-            CodecParameter.VALUETYPE_INT);
-        player.setCodecParameter(codecParameter);
-      }
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-        // For testing set initial EffectType to NOISY_ENVIRONMENT
-        codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_EFFECT_TYPE, 2,
-            CodecParameter.VALUETYPE_INT);
-        player.setCodecParameter(codecParameter);
-      }
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-        // For testing set initial AlbumMode to ENABLED
-        codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_ALBUM_MODE, 1,
-            CodecParameter.VALUETYPE_INT);
-        player.setCodecParameter(codecParameter);
-      }
-      // --------------------------- TESTING CODE ONLY -- REMOVE AGAIN ----------------------------
-
       player.setTrackSelectionParameters(trackSelectionParameters);
       player.addListener(new PlayerEventListener());
       player.addAnalyticsListener(new EventLogger());
@@ -354,44 +298,6 @@ public ArrayList<String> getFilterKeys() {
       player.setRepeatMode(IntentUtil.parseRepeatModeExtra(repeatModeExtra));
     }
     updateButtonVisibility();
-
-    // --------------------------- TESTING CODE ONLY -- REMOVE AGAIN ----------------------------
-    // Simulate sleep so the MPEG-D DRC can change during runtime
-    try {
-      Thread.sleep(2000);
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    }
-
-    CodecParameter codecParameter;
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      // Testing a change to the targetLoudness during codec runtime (set to -24 LUFS)
-      codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_TARGET_REFERENCE_LEVEL, 96,
-          CodecParameter.VALUETYPE_INT);
-      player.setCodecParameter(codecParameter);
-      // Testing a change to the boost factor during codec runtime (set to 96)
-      codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_BOOST_FACTOR, 96,
-          CodecParameter.VALUETYPE_INT);
-      player.setCodecParameter(codecParameter);
-      // Testing a change to the attenuation factor during codec runtime (set to 64)
-      codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_ATTENUATION_FACTOR, 64,
-          CodecParameter.VALUETYPE_INT);
-      player.setCodecParameter(codecParameter);
-    }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-      // Testing a change to the EffectType during codec runtime (set to OFF)
-      codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_EFFECT_TYPE, -1,
-          CodecParameter.VALUETYPE_INT);
-      player.setCodecParameter(codecParameter);
-    }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      // Testing a change to the album mode during codec runtime (set to DISABLED)
-      codecParameter = new CodecParameter(CodecParameter.KEY_AAC_DRC_ALBUM_MODE, 0,
-          CodecParameter.VALUETYPE_INT);
-      player.setCodecParameter(codecParameter);
-    }
-    // --------------------------- TESTING CODE ONLY -- REMOVE AGAIN ----------------------------
-
     return true;
   }
 

libraries/common/src/main/java/androidx/media3/common/CodecParameter.java

@@ -1,161 +1,175 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package androidx.media3.common;
 
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import android.media.MediaFormat;
 import android.os.Build;
-
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
-
+import androidx.media3.common.util.UnstableApi;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * A {@link CodecParameter} holds the key, value and the value type for signalling a parameter change to a
- * decoder. The key can be an arbitrary string which must be known by the decoder instance.
+ * A parameter for configuring an underlying {@link android.media.MediaCodec}.
+ *
+ * <p>The key must be a key that is understood by the underlying decoder instance.
  */
-public class CodecParameter {
-
-  private static final String TAG = "CodecParameter";
+@UnstableApi
+public final class CodecParameter {
 
   /**
-   * @see MediaFormat#KEY_AAC_DRC_ALBUM_MODE
+   * Value types for a {@link CodecParameter}. One of {@link #TYPE_NULL}, {@link #TYPE_INT}, {@link
+   * #TYPE_LONG}, {@link #TYPE_FLOAT}, {@link #TYPE_STRING} or {@link #TYPE_BYTE_BUFFER}.
    */
-  @RequiresApi(api = Build.VERSION_CODES.R)
-  public final static String KEY_AAC_DRC_ALBUM_MODE = MediaFormat.KEY_AAC_DRC_ALBUM_MODE;
+  @Documented
+  @Retention(RetentionPolicy.SOURCE)
+  @Target(TYPE_USE)
+  @IntDef({TYPE_NULL, TYPE_INT, TYPE_LONG, TYPE_FLOAT, TYPE_STRING, TYPE_BYTE_BUFFER})
+  public @interface ValueType {}
 
   /**
-   * @see MediaFormat#KEY_AAC_DRC_ATTENUATION_FACTOR
+   * @see MediaFormat#TYPE_NULL
    */
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public final static String KEY_AAC_DRC_ATTENUATION_FACTOR = MediaFormat.KEY_AAC_DRC_ATTENUATION_FACTOR;
+  public static final int TYPE_NULL = 0;
 
   /**
-   * @see MediaFormat#KEY_AAC_DRC_BOOST_FACTOR
+   * @see MediaFormat#TYPE_INTEGER
    */
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public final static String KEY_AAC_DRC_BOOST_FACTOR = MediaFormat.KEY_AAC_DRC_BOOST_FACTOR;
+  public static final int TYPE_INT = 1;
 
   /**
-   * @see MediaFormat#KEY_AAC_DRC_EFFECT_TYPE
+   * @see MediaFormat#TYPE_LONG
    */
-  @RequiresApi(api = Build.VERSION_CODES.P)
-  public final static String KEY_AAC_DRC_EFFECT_TYPE = MediaFormat.KEY_AAC_DRC_EFFECT_TYPE;
+  public static final int TYPE_LONG = 2;
 
   /**
-   * @see MediaFormat#KEY_AAC_DRC_TARGET_REFERENCE_LEVEL
+   * @see MediaFormat#TYPE_FLOAT
    */
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public final static String KEY_AAC_DRC_TARGET_REFERENCE_LEVEL = MediaFormat.KEY_AAC_DRC_TARGET_REFERENCE_LEVEL;
+  public static final int TYPE_FLOAT = 3;
 
   /**
-   * @see MediaFormat#KEY_AAC_DRC_OUTPUT_LOUDNESS
+   * @see MediaFormat#TYPE_STRING
    */
-  @RequiresApi(api = Build.VERSION_CODES.R)
-  public final static String KEY_AAC_DRC_OUTPUT_LOUDNESS = MediaFormat.KEY_AAC_DRC_OUTPUT_LOUDNESS;
-
+  public static final int TYPE_STRING = 4;
 
   /**
-   * Key to set the MPEG-H output mode.
-   * The corresponding value must be of value type {@link ValueType#VALUETYPE_INT}.
-   * Possible values are:
-   * 0 for PCM output (decoding the MPEG-H bitstream with a certain MPEG-H target layout CICP index)
-   * 1 for MPEG-H bitstream bypass (using IEC61937-13 with a sample rate factor of 4)
-   * 2 for MPEG-H bitstream bypass (using IEC61937-13 with a sample rate factor of 16)
+   * @see MediaFormat#TYPE_BYTE_BUFFER
    */
-  public final static String KEY_MPEGH_OUTPUT_MODE = "mpegh-output-mode";
+  public static final int TYPE_BYTE_BUFFER = 5;
 
   /**
-   * Key to set the MPEG-H target layout CICP index.
-   * The corresponding value must be of value type {@link ValueType#VALUETYPE_INT}.
-   * It must be set before decoder initialization. A change during runtime does not have any effect.
-   * Supported values are: 0, 1, 2, 6, 8, 10, 12
-   * A value of 0 tells the decoder to create binauralized output.
+   * @see MediaFormat#KEY_AAC_DRC_ALBUM_MODE
    */
-  public final static String KEY_MPEGH_TARGET_LAYOUT = "mpegh-target-layout";
+  @RequiresApi(api = Build.VERSION_CODES.R)
+  public static final String KEY_AAC_DRC_ALBUM_MODE = MediaFormat.KEY_AAC_DRC_ALBUM_MODE;
 
   /**
-   * Key to set the MPEG-H UI configuration.
-   * The corresponding value must be of value type {@link ValueType#VALUETYPE_STRING}.
-   * This key is returned from the MPEG-H UI manager.
+   * @see MediaFormat#KEY_AAC_DRC_ATTENUATION_FACTOR
    */
-  public final static String KEY_MPEGH_UI_CONFIG = "mpegh-ui-config";
+  public static final String KEY_AAC_DRC_ATTENUATION_FACTOR =
+      MediaFormat.KEY_AAC_DRC_ATTENUATION_FACTOR;
 
   /**
-   * Key to set the MPEG-H UI command.
-   * The corresponding value must be of value type {@link ValueType#VALUETYPE_STRING}.
-   * This key is passed to the MPEG-H UI manager.
+   * @see MediaFormat#KEY_AAC_DRC_BOOST_FACTOR
    */
-  public final static String KEY_MPEGH_UI_COMMAND = "mpegh-ui-command";
+  public static final String KEY_AAC_DRC_BOOST_FACTOR = MediaFormat.KEY_AAC_DRC_BOOST_FACTOR;
 
   /**
-   * Key to set the MPEG-H UI persistence storage path.
-   * The corresponding value must be of value type {@link ValueType#VALUETYPE_STRING}.
-   * This key is passed to the MPEG-H UI manager.
+   * @see MediaFormat#KEY_AAC_DRC_EFFECT_TYPE
    */
-  public final static String KEY_MPEGH_UI_PERSISTENCESTORAGE_PATH = "mpegh-ui-persistencestorage-path";
+  @RequiresApi(api = Build.VERSION_CODES.P)
+  public static final String KEY_AAC_DRC_EFFECT_TYPE = MediaFormat.KEY_AAC_DRC_EFFECT_TYPE;
 
   /**
-   * @see MediaFormat#TYPE_NULL
+   * @see MediaFormat#KEY_AAC_DRC_TARGET_REFERENCE_LEVEL
    */
-  public static final int VALUETYPE_NULL = 0; // MediaFormat.TYPE_NULL;
+  public static final String KEY_AAC_DRC_TARGET_REFERENCE_LEVEL =
+      MediaFormat.KEY_AAC_DRC_TARGET_REFERENCE_LEVEL;
+
   /**
-   * @see MediaFormat#TYPE_INTEGER
+   * @see MediaFormat#KEY_AAC_DRC_OUTPUT_LOUDNESS
    */
-  public static final int VALUETYPE_INT = 1; // MediaFormat.TYPE_INTEGER;
+  @RequiresApi(api = Build.VERSION_CODES.R)
+  public static final String KEY_AAC_DRC_OUTPUT_LOUDNESS = MediaFormat.KEY_AAC_DRC_OUTPUT_LOUDNESS;
+
   /**
-   * @see MediaFormat#TYPE_LONG
+   * Key to set the MPEG-H output mode. The corresponding value must be of value type {@link
+   * ValueType#TYPE_INT}.
+   *
+   * <p>Possible values are:
+   *
+   * <ul>
+   *   <li>0 for PCM output (decoding the MPEG-H bitstream with a certain MPEG-H target layout CICP
+   *       index)
+   *   <li>1 for MPEG-H bitstream bypass (using IEC61937-13 with a sample rate factor of 4)
+   *   <li>2 for MPEG-H bitstream bypass (using IEC61937-13 with a sample rate factor of 16)
+   * </ul>
    */
-  public static final int VALUETYPE_LONG = 2; // MediaFormat.TYPE_LONG;
+  public static final String KEY_MPEGH_OUTPUT_MODE = "mpegh-output-mode";
+
   /**
-   * @see MediaFormat#TYPE_FLOAT
+   * Key to set the MPEG-H target layout CICP index. The corresponding value must be of value type
+   * {@link ValueType#TYPE_INT}. It must be set before decoder initialization. A change during
+   * runtime does not have any effect.
+   *
+   * <p>Supported values are: 0, 1, 2, 6, 8, 10, 12. A value of 0 tells the decoder to create
+   * binauralized output.
    */
-  public static final int VALUETYPE_FLOAT = 3; // MediaFormat.TYPE_FLOAT;
+  public static final String KEY_MPEGH_TARGET_LAYOUT = "mpegh-target-layout";
+
   /**
-   * @see MediaFormat#TYPE_STRING
+   * Key to set the MPEG-H UI configuration. The corresponding value must be of value type {@link
+   * ValueType#TYPE_STRING}. This key is returned from the MPEG-H UI manager.
    */
-  public static final int VALUETYPE_STRING = 4; // MediaFormat.TYPE_STRING;
+  public static final String KEY_MPEGH_UI_CONFIG = "mpegh-ui-config";
+
   /**
-   * @see MediaFormat#TYPE_BYTE_BUFFER
+   * Key to set the MPEG-H UI command. The corresponding value must be of value type {@link
+   * ValueType#TYPE_STRING}. This key is passed to the MPEG-H UI manager.
    */
-  public static final int VALUETYPE_BYTE_BUFFER = 5; // MediaFormat.TYPE_BYTE_BUFFER;
+  public static final String KEY_MPEGH_UI_COMMAND = "mpegh-ui-command";
 
   /**
-   * Value types for a {@link CodecParameter}.
-   * One of {@link #VALUETYPE_NULL}, {@link #VALUETYPE_INT}, {@link #VALUETYPE_LONG},
-   * {@link #VALUETYPE_FLOAT}, {@link #VALUETYPE_STRING} or {@link #VALUETYPE_BYTE_BUFFER}.
+   * Key to set the MPEG-H UI persistence storage path. The corresponding value must be of value
+   * type {@link ValueType#TYPE_STRING}. This key is passed to the MPEG-H UI manager.
    */
-  @Documented
-  @Retention(RetentionPolicy.SOURCE)
-  @Target(TYPE_USE)
-  @IntDef({
-      VALUETYPE_NULL,
-      VALUETYPE_INT,
-      VALUETYPE_LONG,
-      VALUETYPE_FLOAT,
-      VALUETYPE_STRING,
-      VALUETYPE_BYTE_BUFFER
-  })
-  public @interface ValueType {
-
-  }
+  public static final String KEY_MPEGH_UI_PERSISTENCESTORAGE_PATH =
+      "mpegh-ui-persistencestorage-path";
 
+  /** The key of the codec parameter. */
+  public final String key;
 
-  public String key;
-  public @Nullable Object value;
-  public @ValueType int valueType;
+  /** The value of the codec parameter. */
+  public final @Nullable Object value;
 
+  /** The {@link ValueType} of the value object. */
+  public final @ValueType int valueType;
 
   /**
-   * Creates a new codec parameter.
+   * Creates an instance.
    *
-   * @param key       A string holding the key of the codec parameter.
-   * @param value     An object representing the value of the codec parameter.
-   * @param valueType The value type of the value object.
+   * @param key The key of the codec parameter.
+   * @param value The value of the codec parameter.
+   * @param valueType The {@link ValueType} of the value object.
    */
   public CodecParameter(String key, @Nullable Object value, @ValueType int valueType) {
     this.key = key;