Fix cleared metadata when repeating the same item

Issue: androidx/media#1007 #minor-release PiperOrigin-RevId: 600477540
google · Jan 22, 2024 · aca38e9 · aca38e9
1 parent e3aba20
commit aca38e9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -2016,7 +2016,8 @@ private void updatePlaybackInfo(
       }
       staticAndDynamicMediaMetadata = MediaMetadata.EMPTY;
     }
-    if (!previousPlaybackInfo.staticMetadata.equals(newPlaybackInfo.staticMetadata)) {
+    if (mediaItemTransitioned
+        || !previousPlaybackInfo.staticMetadata.equals(newPlaybackInfo.staticMetadata)) {
       staticAndDynamicMediaMetadata =
           staticAndDynamicMediaMetadata
               .buildUpon()

diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -14217,6 +14217,33 @@ public void seekToZeroAndTrackSelection_withNonZeroDefaultPosition_startsPlaybac
     assertThat(positionAfterSeek).isEqualTo(0);
   }
 
+  @Test
+  public void repeatingItemWithSameStaticMetadata_keepsMetadata() throws Exception {
+    Format formatWithStaticMetadata =
+        new Format.Builder()
+            .setSampleMimeType(MimeTypes.VIDEO_H264)
+            .setMetadata(
+                new Metadata(
+                    new BinaryFrame(/* id= */ "", /* data= */ new byte[0]),
+                    new TextInformationFrame(
+                        /* id= */ "TT2",
+                        /* description= */ null,
+                        /* values= */ ImmutableList.of("title"))))
+            .build();
+    ExoPlayer player = new TestExoPlayerBuilder(context).build();
+    player.setMediaSource(new FakeMediaSource(new FakeTimeline(), formatWithStaticMetadata));
+    player.prepare();
+    player.setRepeatMode(Player.REPEAT_MODE_ONE);
+    player.play();
+
+    // Wait until item repeats.
+    runUntilPositionDiscontinuity(player, Player.DISCONTINUITY_REASON_AUTO_TRANSITION);
+    MediaMetadata metadataAfterTransition = player.getMediaMetadata();
+    player.release();
+
+    assertThat(metadataAfterTransition.title).isEqualTo("title");
+  }
+
   // Internal methods.
 
   private void addWatchAsSystemFeature() {