Update DefaultAudioSink.java

.github/ISSUE_TEMPLATE/bug.yml

@@ -19,6 +19,8 @@ body:
       options:
         - Media3 main branch
         - Media3 pre-release (alpha, beta or RC not in this list)
+        - Media3 1.10.1
+        - Media3 1.10.0
         - Media3 1.9.2
         - Media3 1.9.1
         - Media3 1.9.0

common_library_config.gradle → common_config.gradle

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 apply from: "$gradle.ext.androidxMediaSettingsDir/constants.gradle"
-apply plugin: 'com.android.library'
 
 group = 'androidx.media3'
 

constants.gradle

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.10.0-alpha01'
-    releaseVersionCode = 1_010_000_0_01
+    releaseVersion = '1.10.1'
+    releaseVersionCode = 1_010_001_3_00
     minSdkVersion = 23
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28

core_settings.gradle

@@ -102,9 +102,6 @@ project(modulePrefix + 'lib-effect').projectDir = new File(rootDir, 'libraries/e
 include modulePrefix + 'lib-effect-lottie'
 project(modulePrefix + 'lib-effect-lottie').projectDir = new File(rootDir, 'libraries/effect_lottie')
 
-include modulePrefix + 'lib-effect-ndk'
-project(modulePrefix + 'lib-effect-ndk').projectDir = new File(rootDir, 'libraries/effect_ndk')
-
 include modulePrefix + 'lib-inspector'
 project(modulePrefix + 'lib-inspector').projectDir = new File(rootDir, 'libraries/inspector')
 include modulePrefix + 'lib-inspector-frame'

demos/compose/src/main/java/androidx/media3/demo/compose/layout/MainScreen.kt

@@ -38,6 +38,7 @@ import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
@@ -51,13 +52,15 @@ import androidx.lifecycle.compose.LifecycleResumeEffect
 import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
+import androidx.media3.common.util.ExperimentalApi
 import androidx.media3.demo.compose.buttons.LabeledProgressSlider
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.compose.material3.Player
 import androidx.media3.ui.compose.material3.buttons.PlaybackSpeedToggleButton
 import androidx.media3.ui.compose.material3.buttons.RepeatButton
 import androidx.media3.ui.compose.material3.buttons.ShuffleButton
 import androidx.media3.ui.compose.material3.indicator.PositionAndDurationText
+import kotlinx.coroutines.delay
 
 @Composable
 fun MainScreen(mediaItems: List<MediaItem>, modifier: Modifier = Modifier) {
@@ -94,22 +97,36 @@ fun MainScreen(mediaItems: List<MediaItem>, modifier: Modifier = Modifier) {
   MainScreen(player, modifier = modifier.fillMaxSize())
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
+@androidx.annotation.OptIn(ExperimentalApi::class)
 @Composable
 internal fun MainScreen(player: Player?, modifier: Modifier = Modifier) {
   var currentContentScaleIndex by remember { mutableIntStateOf(0) }
   var keepContentOnReset by remember { mutableStateOf(false) } // Shutter is on by default
 
+  var showControls by remember { mutableStateOf(true) }
+  var anyPointerDown by remember { mutableStateOf(false) }
+  LaunchedEffect(showControls, anyPointerDown) {
+    if (showControls && !anyPointerDown) {
+      delay(CONTROLS_VISIBILITY_TIMEOUT_MS)
+      showControls = false
+    }
+  }
+
   Box(modifier.background(MaterialTheme.colorScheme.background).statusBarsPadding()) {
     Player(
       player = player,
+      showControls = showControls,
+      modifier =
+        Modifier.noRippleClickable { showControls = !showControls }
+          .reportPointerDown { anyPointerDown = it },
       contentScale = CONTENT_SCALES[currentContentScaleIndex].second,
       keepContentOnReset = keepContentOnReset,
-      controlsTimeoutMs = CONTROLS_VISIBILITY_TIMEOUT_MS,
       bottomControls = { player, showControls ->
         BottomControlsWithLabeledProgress(
           player,
           showControls,
-          Modifier.fillMaxWidth().padding(horizontal = 15.dp),
+          modifier = Modifier.fillMaxWidth().padding(horizontal = 15.dp),
         )
       },
     )

demos/compose/src/main/java/androidx/media3/demo/compose/layout/modifiers.kt

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2026 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.demo.compose.layout
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.pointerInput
+
+@Composable
+internal fun Modifier.noRippleClickable(onClick: () -> Unit): Modifier =
+  clickable(
+    interactionSource = remember { MutableInteractionSource() },
+    indication = null, // to prevent the ripple from the tap
+  ) {
+    onClick()
+  }
+
+@Composable
+internal fun Modifier.reportPointerDown(onPointerDownChange: (Boolean) -> Unit): Modifier =
+  this.pointerInput(onPointerDownChange) {
+    awaitPointerEventScope {
+      var isDown = false
+      while (true) {
+        val event = awaitPointerEvent()
+        val currentlyPressed = event.changes.any { it.pressed }
+        if (isDown != currentlyPressed) {
+          isDown = currentlyPressed
+          onPointerDownChange(isDown)
+        }
+      }
+    }
+  }

demos/composition/build.gradle

@@ -63,7 +63,6 @@ dependencies {
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
     implementation project(modulePrefix + 'lib-effect')
     implementation project(modulePrefix + 'lib-effect-lottie')
-    implementation project(modulePrefix + 'lib-effect-ndk')
     implementation project(modulePrefix + 'lib-exoplayer')
     implementation project(modulePrefix + 'lib-exoplayer-dash')
     implementation project(modulePrefix + 'lib-muxer')

demos/composition/src/main/java/androidx/media3/demo/composition/CompositionPreviewActivity.kt

@@ -336,21 +336,6 @@ class CompositionPreviewActivity : AppCompatActivity() {
           },
           modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
         )
-        Row(
-          verticalAlignment = Alignment.CenterVertically,
-          horizontalArrangement = Arrangement.SpaceBetween,
-          modifier = Modifier.fillMaxWidth(),
-        ) {
-          Text(
-            text = stringResource(R.string.frame_consumer_enabled),
-            modifier = Modifier.textPadding(),
-          )
-          Switch(
-            checked = uiState.outputSettingsState.frameConsumerEnabled,
-            onCheckedChange = { isEnabled -> viewModel.onFrameConsumerEnabledChanged(isEnabled) },
-          )
-        }
-
         Row(
           verticalAlignment = Alignment.CenterVertically,
           horizontalArrangement = Arrangement.SpaceBetween,

demos/composition/src/main/java/androidx/media3/demo/composition/CompositionPreviewViewModel.kt

@@ -63,11 +63,8 @@ import androidx.media3.effect.LanczosResample
 import androidx.media3.effect.MultipleInputVideoGraph
 import androidx.media3.effect.OverlayEffect
 import androidx.media3.effect.Presentation
-import androidx.media3.effect.ProcessAndRenderToSurfaceConsumer
 import androidx.media3.effect.RgbFilter
 import androidx.media3.effect.StaticOverlaySettings
-import androidx.media3.effect.ndk.NdkCompositionPlayerBuilder
-import androidx.media3.effect.ndk.NdkTransformerBuilder
 import androidx.media3.transformer.Composition
 import androidx.media3.transformer.CompositionPlayer
 import androidx.media3.transformer.EditedMediaItem
@@ -107,16 +104,7 @@ class CompositionPreviewViewModel(application: Application) : AndroidViewModel(a
   var compositionPlayer by mutableStateOf(createCompositionPlayer())
   val EXPORT_ERROR_MESSAGE = application.resources.getString(R.string.export_error)
   val EXPORT_STARTED_MESSAGE = application.resources.getString(R.string.export_started)
-  internal var frameConsumerEnabled: Boolean = false
   internal var surfaceView: SurfaceView? = null
-  internal val packetConsumerFactory: ProcessAndRenderToSurfaceConsumer.Factory by lazy {
-    if (SDK_INT < 34) {
-      throw IllegalStateException(
-        "Render with PacketConsumer<HardwareBufferFrame> requires API 34+"
-      )
-    }
-    ProcessAndRenderToSurfaceConsumer.Factory()
-  }
   private val glExecutorService: ExecutorService by lazy {
     Util.newSingleThreadExecutor("CompositionDemo::GlThread")
   }
@@ -220,12 +208,6 @@ class CompositionPreviewViewModel(application: Application) : AndroidViewModel(a
     DebugTraceUtil.enableTracing = enable
   }
 
-  fun onFrameConsumerEnabledChanged(isEnabled: Boolean) {
-    _uiState.update {
-      it.copy(outputSettingsState = it.outputSettingsState.copy(frameConsumerEnabled = isEnabled))
-    }
-  }
-
   fun onIncludeBackgroundAudioChanged(isEnabled: Boolean) {
     _uiState.update {
       it.copy(outputSettingsState = it.outputSettingsState.copy(includeBackgroundAudio = isEnabled))
@@ -494,23 +476,7 @@ class CompositionPreviewViewModel(application: Application) : AndroidViewModel(a
     }
     val filePath = outputFile!!.absolutePath
 
-    val transformerBuilder =
-      if (uiState.value.outputSettingsState.frameConsumerEnabled) {
-        if (SDK_INT < 34) {
-          _uiState.update {
-            it.copy(snackbarMessage = "API 34+ required to export with PacketConsumer")
-          }
-          return
-        }
-        NdkTransformerBuilder.create(getApplication())
-          .setHardwareBufferEffectsPipeline(
-            // TODO: b/449957627 - Implement HardwareBuffer compositing.
-            DefaultHardwareBufferEffectsPipeline()
-          )
-      } else {
-        Transformer.Builder(/* context= */ getApplication())
-      }
-
+    val transformerBuilder = Transformer.Builder(/* context= */ getApplication())
     if (SAME_AS_INPUT_OPTION != settings.audioMimeType) {
       transformerBuilder.setAudioMimeType(settings.audioMimeType)
     }
@@ -780,18 +746,9 @@ class CompositionPreviewViewModel(application: Application) : AndroidViewModel(a
   }
 
   private fun createCompositionPlayer(): CompositionPlayer {
-    val playerBuilder: CompositionPlayer.Builder
-    frameConsumerEnabled = uiState.value.outputSettingsState.frameConsumerEnabled
-    if (uiState.value.outputSettingsState.frameConsumerEnabled && SDK_INT >= 34) {
-      playerBuilder = NdkCompositionPlayerBuilder.create(getApplication())
-      surfaceView?.let { packetConsumerFactory.setOutput(it.holder, it::post) }
-      playerBuilder.setPacketConsumerFactory(packetConsumerFactory)
-      playerBuilder.setGlThreadExecutorService(glExecutorService)
-    } else {
-      playerBuilder = CompositionPlayer.Builder(getApplication())
-      if (uiState.value.compositionLayout != COMPOSITION_LAYOUT[0]) {
-        playerBuilder.setVideoGraphFactory(MultipleInputVideoGraph.Factory())
-      }
+    val playerBuilder = CompositionPlayer.Builder(getApplication())
+    if (uiState.value.compositionLayout != COMPOSITION_LAYOUT[0]) {
+      playerBuilder.setVideoGraphFactory(MultipleInputVideoGraph.Factory())
     }
     playerBuilder.setAudioAttributes(AudioAttributes.DEFAULT, /* handleAudioFocus= */ true)
     val player = playerBuilder.build()

demos/composition/src/main/java/androidx/media3/demo/composition/data/CompositionState.kt

@@ -154,7 +154,6 @@ sealed interface PlacementState {
  */
 @OptIn(UnstableApi::class)
 data class OutputSettingsState(
-  val frameConsumerEnabled: Boolean = false,
   val includeBackgroundAudio: Boolean = false,
   val resolutionHeight: String,
   val hdrMode: Int,

demos/composition/src/main/res/values/strings.xml

@@ -27,7 +27,6 @@
   <string name="export_completed" translatable="false">Export completed in %.3f seconds.\nOutput: %s</string>
   <string name="export_error" translatable="false">Export error</string>
   <string name="export_started" translatable="false">Export started</string>
-  <string name="frame_consumer_enabled" translatable="false">Use FrameConsumer</string>
   <string name="add_background_audio" translatable="false">Add background audio</string>
   <string name="output_video_resolution" translatable="false">Output video resolution</string>
   <string name="hdr_mode" translatable="false">HDR mode</string>

demos/session_service/build.gradle

@@ -11,7 +11,8 @@
 // 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.
-apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
+apply plugin: 'com.android.library'
+apply from: "$gradle.ext.androidxMediaSettingsDir/common_config.gradle"
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.protobuf'
 

demos/transformer/build.gradle

@@ -78,7 +78,6 @@ dependencies {
     implementation 'androidx.window:window:' + androidxWindowVersion
     implementation 'com.google.android.material:material:' + androidxMaterialVersion
     implementation project(modulePrefix + 'lib-effect')
-    implementation project(modulePrefix + 'lib-effect-ndk')
     implementation project(modulePrefix + 'lib-exoplayer')
     implementation project(modulePrefix + 'lib-exoplayer-dash')
     implementation project(modulePrefix + 'lib-transformer')

demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java

@@ -102,7 +102,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
   public static final String TEXT_OVERLAY_TEXT = "text_overlay_text";
   public static final String TEXT_OVERLAY_TEXT_COLOR = "text_overlay_text_color";
   public static final String TEXT_OVERLAY_ALPHA = "text_overlay_alpha";
-  public static final String ENABLE_PACKET_PROCESSOR = "enable_packet_processor";
 
   // Video effect selections.
   public static final int DIZZY_CROP_INDEX = 0;
@@ -184,7 +183,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
   private CheckBox produceFragmentedMp4;
   private Spinner hdrModeSpinner;
   private CheckBox enableTrimOptimization;
-  private CheckBox enablePacketProcessorCheckBox;
   private CheckBox enableMp4EditListTrimming;
   private CheckBox enableCodecDbLite;
   private Button selectAudioEffectsButton;
@@ -319,7 +317,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             enableMp4EditListTrimming.setChecked(false);
           }
         });
-    enablePacketProcessorCheckBox = findViewById(R.id.enable_packet_processor);
     enableMp4EditListTrimming.setOnCheckedChangeListener(
         (buttonView, isChecked) -> {
           if (isChecked) {
@@ -417,7 +414,6 @@ private void startExport() {
     bundle.putBoolean(ABORT_SLOW_EXPORT, abortSlowExportCheckBox.isChecked());
     bundle.putBoolean(PRODUCE_FRAGMENTED_MP4, produceFragmentedMp4.isChecked());
     bundle.putBoolean(ENABLE_TRIM_OPTIMIZATION, enableTrimOptimization.isChecked());
-    bundle.putBoolean(ENABLE_PACKET_PROCESSOR, enablePacketProcessorCheckBox.isChecked());
     bundle.putBoolean(ENABLE_MP4_EDIT_LIST_TRIMMING, enableMp4EditListTrimming.isChecked());
     bundle.putBoolean(ENABLE_CODECDB_LITE, enableCodecDbLite.isChecked());
     String selectedHdrMode = String.valueOf(hdrModeSpinner.getSelectedItem());

demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java

@@ -365,13 +365,6 @@ private Transformer createTransformer(
       @Nullable Bundle bundle, Composition composition, Uri inputUri, String filePath) {
     Transformer.Builder transformerBuilder = new Transformer.Builder(/* context= */ this);
 
-    if (bundle != null && bundle.getBoolean(ConfigurationActivity.ENABLE_PACKET_PROCESSOR)) {
-      if (SDK_INT < 34) {
-        throw new IllegalStateException("API version 34+ required to export with PacketProcessor");
-      }
-      transformerBuilder.setHardwareBufferEffectsPipeline(
-          new DefaultHardwareBufferEffectsPipeline());
-    }
     transformerBuilder.addListener(
         new Transformer.Listener() {
           @Override

demos/transformer/src/main/res/layout/configuration_activity.xml

@@ -256,15 +256,6 @@
             android:id="@+id/enable_trim_optimization"
             android:layout_gravity="end"/>
       </TableRow>
-      <TableRow
-          android:layout_weight="1">
-        <TextView
-            android:layout_gravity="center_vertical"
-            android:text="@string/enable_packet_processor" />
-        <CheckBox
-            android:id="@+id/enable_packet_processor"
-            android:layout_gravity="end"/>
-      </TableRow>
       <TableRow
           android:layout_weight="1">
         <TextView

demos/transformer/src/main/res/values/strings.xml

@@ -36,7 +36,6 @@
   <string name="trim" translatable="false">Trim</string>
   <string name="hdr_mode" translatable="false">HDR mode</string>
   <string name="enable_trim_optimization" translatable="false">Enable trim optimization</string>
-  <string name="enable_packet_processor" translatable="false">Enable Packet Processor</string>
   <string name="enable_mp4_edit_list_trimming" translatable="false">Enable MP4 edit list trimming</string>
   <string name="enable_codecdb_lite" translatable="false">Enable CodecDB Lite</string>
   <string name="select_audio_effects" translatable="false">Add audio effects</string>

docsamples/build.gradle

@@ -11,7 +11,8 @@
 // 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.
-apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
+apply plugin: 'com.android.library'
+apply from: "$gradle.ext.androidxMediaSettingsDir/common_config.gradle"
 
 apply plugin: 'kotlin-android'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'

libraries/cast/build.gradle

@@ -14,7 +14,8 @@
 
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
+apply plugin: 'com.android.library'
+apply from: "$gradle.ext.androidxMediaSettingsDir/common_config.gradle"
 apply plugin: 'kotlin-android'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'