Motion photo poc

.github/ISSUE_TEMPLATE/bug.yml

@@ -19,6 +19,7 @@ body:
       options:
         - Media3 main branch
         - Media3 pre-release (alpha, beta or RC not in this list)
+        - Media3 1.8.0
         - Media3 1.7.1 (same as 1.6.1)
         - Media3 1.7.0 (do not use)
         - Media3 1.6.1

api.txt

@@ -26,7 +26,9 @@ package androidx.media3.common {
   }
 
   public final class AudioAttributes {
-    method public androidx.media3.common.AudioAttributes.AudioAttributesV21 getAudioAttributesV21();
+    method public static androidx.media3.common.AudioAttributes fromPlatformAudioAttributes(android.media.AudioAttributes);
+    method @Deprecated public androidx.media3.common.AudioAttributes.AudioAttributesV21 getAudioAttributesV21();
+    method public android.media.AudioAttributes getPlatformAudioAttributes();
     field public static final androidx.media3.common.AudioAttributes DEFAULT;
     field @androidx.media3.common.C.AudioAllowedCapturePolicy public final int allowedCapturePolicy;
     field @androidx.media3.common.C.AudioContentType public final int contentType;
@@ -35,8 +37,8 @@ package androidx.media3.common {
     field @androidx.media3.common.C.AudioUsage public final int usage;
   }
 
-  public static final class AudioAttributes.AudioAttributesV21 {
-    field public final android.media.AudioAttributes audioAttributes;
+  @Deprecated public static final class AudioAttributes.AudioAttributesV21 {
+    field @Deprecated public final android.media.AudioAttributes audioAttributes;
   }
 
   public static final class AudioAttributes.Builder {

constants.gradle

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.8.0-alpha01'
-    releaseVersionCode = 1_008_000_0_01
-    minSdkVersion = 21
+    releaseVersion = '1.8.0'
+    releaseVersionCode = 1_008_000_3_00
+    minSdkVersion = 23
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28
     appTargetSdkVersion = 34
     // Upgrading this requires [Internal ref: b/193254928] to be fixed, or some
     // additional robolectric config.
     targetSdkVersion = 31
-    compileSdkVersion = 35
+    compileSdkVersion = 36
     dexmakerVersion = '2.28.3'
     // Use the same JUnit version as the Android repo:
     // https://cs.android.com/android/platform/superproject/main/+/main:external/junit/METADATA

core_settings.gradle

@@ -62,8 +62,6 @@ include modulePrefix + 'lib-datasource'
 project(modulePrefix + 'lib-datasource').projectDir = new File(rootDir, 'libraries/datasource')
 include modulePrefix + 'lib-datasource-cronet'
 project(modulePrefix + 'lib-datasource-cronet').projectDir = new File(rootDir, 'libraries/datasource_cronet')
-include modulePrefix + 'lib-datasource-httpengine'
-project(modulePrefix + 'lib-datasource-httpengine').projectDir = new File(rootDir, 'libraries/datasource_httpengine')
 include modulePrefix + 'lib-datasource-rtmp'
 project(modulePrefix + 'lib-datasource-rtmp').projectDir = new File(rootDir, 'libraries/datasource_rtmp')
 include modulePrefix + 'lib-datasource-okhttp'

demos/compose/src/main/java/androidx/media3/demo/compose/MainActivity.kt

@@ -23,9 +23,9 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
@@ -47,6 +47,7 @@ import androidx.media3.common.Player
 import androidx.media3.demo.compose.buttons.ExtraControls
 import androidx.media3.demo.compose.buttons.MinimalControls
 import androidx.media3.demo.compose.data.videos
+import androidx.media3.demo.compose.indicator.HorizontalLinearProgressIndicator
 import androidx.media3.demo.compose.layout.CONTENT_SCALES
 import androidx.media3.demo.compose.layout.noRippleClickable
 import androidx.media3.exoplayer.ExoPlayer
@@ -133,14 +134,11 @@ private fun MediaPlayerScreen(player: Player, modifier: Modifier = Modifier) {
 
     if (showControls) {
       // drawn on top of a potential shutter
-      MinimalControls(player, scaledModifier.fillMaxWidth().align(Alignment.Center))
-      ExtraControls(
-        player,
-        Modifier.fillMaxWidth()
-          .align(Alignment.BottomCenter)
-          .background(Color.Gray.copy(alpha = 0.4f))
-          .navigationBarsPadding(),
-      )
+      MinimalControls(player, Modifier.fillMaxWidth().align(Alignment.Center))
+      Column(Modifier.fillMaxWidth().align(Alignment.BottomCenter)) {
+        HorizontalLinearProgressIndicator(player, Modifier.fillMaxWidth())
+        ExtraControls(player, Modifier.fillMaxWidth().background(Color.Gray.copy(alpha = 0.4f)))
+      }
     }
 
     Button(

demos/compose/src/main/java/androidx/media3/demo/compose/buttons/ExtraControls.kt

@@ -18,10 +18,12 @@ package androidx.media3.demo.compose.buttons
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.media3.common.Player
+import androidx.media3.demo.compose.indicator.TextProgressIndicator
 
 @Composable
 internal fun ExtraControls(player: Player, modifier: Modifier = Modifier) {
@@ -30,8 +32,11 @@ internal fun ExtraControls(player: Player, modifier: Modifier = Modifier) {
     horizontalArrangement = Arrangement.Center,
     verticalAlignment = Alignment.CenterVertically,
   ) {
+    TextProgressIndicator(player, Modifier.align(Alignment.CenterVertically))
+    Spacer(Modifier.weight(1f))
     PlaybackSpeedPopUpButton(player)
     ShuffleButton(player)
     RepeatButton(player)
+    MuteButton(player)
   }
 }

demos/compose/src/main/java/androidx/media3/demo/compose/buttons/MuteButton.kt

@@ -0,0 +1,43 @@
+/*
+ * 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.demo.compose.buttons
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.VolumeOff
+import androidx.compose.material.icons.automirrored.filled.VolumeUp
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.media3.common.Player
+import androidx.media3.demo.compose.R
+import androidx.media3.ui.compose.state.rememberMuteButtonState
+
+@Composable
+internal fun MuteButton(player: Player, modifier: Modifier = Modifier) {
+  val state = rememberMuteButtonState(player)
+  val icon =
+    if (state.showMuted) Icons.AutoMirrored.Default.VolumeOff
+    else Icons.AutoMirrored.Default.VolumeUp
+  val contentDescription =
+    if (state.showMuted) stringResource(R.string.mute_button_shown_muted)
+    else stringResource(R.string.mute_button_shown_unmuted)
+  IconButton(onClick = state::onClick, modifier = modifier, enabled = state.isEnabled) {
+    Icon(icon, contentDescription = contentDescription, modifier = modifier)
+  }
+}

demos/compose/src/main/java/androidx/media3/demo/compose/indicator/HorizontalLinearProgressIndicator.kt

@@ -0,0 +1,129 @@
+/*
+ * 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.demo.compose.indicator
+
+import androidx.annotation.IntRange
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.times
+import androidx.media3.common.Player
+import androidx.media3.ui.compose.state.rememberProgressStateWithTickCount
+
+@Composable
+fun HorizontalLinearProgressIndicator(
+  player: Player,
+  modifier: Modifier = Modifier,
+  @IntRange(from = 0) totalTickCount: Int = 0,
+) {
+  var ticks by remember(totalTickCount) { mutableIntStateOf(totalTickCount) }
+  val progressState = rememberProgressStateWithTickCount(player, ticks)
+  HorizontalLinearProgressIndicator(
+    modifier,
+    currentPositionProgress = { progressState.currentPositionProgress },
+    bufferedPositionProgress = { progressState.bufferedPositionProgress },
+    onLayoutWidthChanged = { widthPx -> if (totalTickCount == 0) ticks = widthPx },
+  )
+}
+
+@Composable
+private fun HorizontalLinearProgressIndicator(
+  modifier: Modifier = Modifier,
+  currentPositionProgress: () -> Float,
+  bufferedPositionProgress: () -> Float = currentPositionProgress,
+  onLayoutWidthChanged: (Int) -> Unit = {},
+  playedColor: Color = Color.Red,
+  bufferedColor: Color = Color.LightGray,
+  unplayedColor: Color = Color.DarkGray,
+  scrubberColor: Color = playedColor,
+  scrubberShape: Shape = CircleShape,
+  rectHeightDp: Dp = 10.dp,
+) {
+  // the following X-coordinates are relative to the size of the Canvas, not the whole HLPI
+  var positionX by remember { mutableFloatStateOf(0f) }
+  var scrubberX by remember { mutableFloatStateOf(0f) }
+  var bufferX by remember { mutableFloatStateOf(0f) }
+  var barSize by remember { mutableStateOf(Size(0f, 0f)) }
+  val rectHeightPx = with(LocalDensity.current) { rectHeightDp.roundToPx() }
+  val scrubberBoxSizeDp = 2 * rectHeightDp
+  val scrubberBoxSizePx = 2 * rectHeightPx
+  val canvasTopDownPaddingDp = 5.dp
+  val canvasTopDownPaddingPx = with(LocalDensity.current) { canvasTopDownPaddingDp.roundToPx() }
+  val canvasLeftRightPaddingDp = scrubberBoxSizeDp / 2 + canvasTopDownPaddingDp
+  val canvasLeftRightPaddingPx = scrubberBoxSizePx / 2 + canvasTopDownPaddingPx
+
+  Box(
+    contentAlignment = Alignment.CenterStart,
+    modifier =
+      modifier
+        .background(Color.Gray.copy(alpha = 0.4f))
+        .height(scrubberBoxSizeDp + 2 * canvasTopDownPaddingDp),
+  ) {
+    Canvas(
+      Modifier.padding(
+          start = canvasLeftRightPaddingDp,
+          top = canvasTopDownPaddingDp,
+          bottom = canvasTopDownPaddingDp,
+          end = canvasLeftRightPaddingDp,
+        )
+        .fillMaxWidth()
+        .height(rectHeightDp)
+        .onSizeChanged { (w, _) -> onLayoutWidthChanged(w) }
+    ) {
+      positionX = (currentPositionProgress() * size.width).coerceAtLeast(0f)
+      scrubberX = positionX
+      bufferX = (bufferedPositionProgress() * size.width).coerceAtLeast(0f)
+      // Canvas.size.height = 0, hence need our own height
+      barSize = Size(size.width, rectHeightDp.toPx())
+
+      drawRect(unplayedColor, size = barSize)
+      drawRect(bufferedColor, size = barSize.copy(width = bufferX))
+      drawRect(playedColor, size = barSize.copy(width = positionX))
+    }
+
+    val absoluteThumbX = canvasLeftRightPaddingPx + scrubberX
+    val scrubberTopLeftX = absoluteThumbX - scrubberBoxSizePx / 2
+    Box(
+      Modifier.offset { IntOffset(x = scrubberTopLeftX.toInt(), y = 0) }
+        .size(scrubberBoxSizeDp)
+        .background(scrubberColor, scrubberShape)
+    )
+  }
+}

demos/compose/src/main/java/androidx/media3/demo/compose/indicator/TextProgressIndicator.kt

@@ -0,0 +1,58 @@
+/*
+ * 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.demo.compose.indicator
+
+import androidx.annotation.IntRange
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.media3.common.Player
+import androidx.media3.common.util.Util.getStringForTime
+import androidx.media3.ui.compose.state.ProgressStateWithTickInterval
+import androidx.media3.ui.compose.state.rememberProgressStateWithTickInterval
+
+/**
+ * An example of a progress indicator that represents the [Player's][Player]
+ * [ProgressStateWithTickInterval] in textual form.
+ *
+ * It displays the up-to-date current position and duration of the media at the granularity of the
+ * provided [timeStepSeconds]. For example, for shorter videos, a 1-second granularity
+ * (`timeSecondsStep = 1`) might be more appropriate, whereas for a multiple-hour long movie, a
+ * 1-minute granularity (`timeSecondsStep = 60`) might be enough. Tuning this parameter can help you
+ * avoid unnecessary recompositions.
+ *
+ * @param timeStepSeconds Delta of the media time that constitutes a progress step, in seconds.
+ */
+@Composable
+fun TextProgressIndicator(
+  player: Player,
+  modifier: Modifier = Modifier,
+  @IntRange(from = 0) timeStepSeconds: Int = 1,
+) {
+  val progressState =
+    rememberProgressStateWithTickInterval(
+      player,
+      tickIntervalMs = timeStepSeconds.toLong().times(1000),
+    )
+  val current = getStringForTime(progressState.currentPositionMs)
+  // duration will not change as often as current position
+  val duration by remember { derivedStateOf { getStringForTime(progressState.durationMs) } }
+  BasicText("$current - $duration", modifier)
+}

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

@@ -49,4 +49,8 @@
   <string name="shuffle_button_shuffle_off">Enable shuffle mode</string>
   <!-- Accessibility description for a playback speed selection button. The button is shown with the current playback speed. If a user clicks it, the list of possible playback speeds will be shown. [CHAR_LIMIT=NONE] -->
   <string name="playback_speed">Speed</string>
+  <!-- Accessibility description for a mute button in the unmuted state. If a user clicks it, the player's volume will be changed to zero. [CHAR_LIMIT=NONE] -->
+  <string name="mute_button_shown_unmuted">Mute</string>
+  <!-- Accessibility description for a mute button in the muted state. If a user clicks it, the player's volume will be changed to whatever it was previously before muting. [CHAR_LIMIT=NONE] -->
+  <string name="mute_button_shown_muted">Unmute</string>
 </resources>

demos/composition/build.gradle

@@ -50,7 +50,7 @@ android {
 
     lintOptions {
         // This demo app isn't indexed and doesn't have translations.
-        disable 'GoogleAppIndexingWarning','MissingTranslation'
+        disable 'GoogleAppIndexingWarning', 'MissingTranslation'
     }
 
     buildFeatures {
@@ -69,7 +69,6 @@ dependencies {
     implementation project(modulePrefix + 'lib-ui')
     implementation project(modulePrefix + 'lib-ui-compose')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
-    implementation 'androidx.lifecycle:lifecycle-livedata:' + androidxLifecycleVersion
     implementation 'androidx.lifecycle:lifecycle-viewmodel:' + androidxLifecycleVersion
     implementation 'androidx.activity:activity-compose:1.9.0'
     implementation platform('androidx.compose:compose-bom:2024.12.01')
@@ -80,6 +79,7 @@ dependencies {
     implementation 'androidx.compose.material3.adaptive:adaptive'
     implementation 'androidx.compose.material3.adaptive:adaptive-layout'
     implementation 'androidx.compose.material3.adaptive:adaptive-navigation'
+    implementation 'com.airbnb.android:lottie:6.6.0'
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'