From 3069d8130be1bef156bef2d0b3541648fd5dbf9a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 28 Oct 2022 10:03:56 +0000
Subject: [PATCH] Upgrade dackka and fix some generation errors

#minor-release

PiperOrigin-RevId: 484483080
---
 javadoc_combined.gradle                                   | 2 +-
 .../androidx/media3/exoplayer/source/SampleQueue.java     | 6 +++---
 .../java/androidx/media3/extractor/avi/AviExtractor.java  | 8 ++++----
 .../java/androidx/media3/session/MediaNotification.java   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/javadoc_combined.gradle b/javadoc_combined.gradle
index 0b37687b41..ced0f876f4 100644
--- a/javadoc_combined.gradle
+++ b/javadoc_combined.gradle
@@ -21,7 +21,7 @@ class CombinedJavadocPlugin implements Plugin<Project> {
 
   // Dackka snapshots are listed at https://androidx.dev/dackka/builds.
   static final String DACKKA_JAR_URL =
-      "https://androidx.dev/dackka/builds/8003564/artifacts/dackka-0.0.14.jar"
+      "https://androidx.dev/dackka/builds/9221390/artifacts/dackka-1.0.4-all.jar"
 
   @Override
   void apply(Project project) {
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java
index aad102c1e2..203c5f8b9b 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java
@@ -575,10 +575,10 @@ public class SampleQueue implements TrackOutput {
   // TrackOutput implementation. Called by the loading thread.
 
   @Override
-  public final void format(Format unadjustedUpstreamFormat) {
-    Format adjustedUpstreamFormat = getAdjustedUpstreamFormat(unadjustedUpstreamFormat);
+  public final void format(Format format) {
+    Format adjustedUpstreamFormat = getAdjustedUpstreamFormat(format);
     upstreamFormatAdjustmentRequired = false;
-    this.unadjustedUpstreamFormat = unadjustedUpstreamFormat;
+    unadjustedUpstreamFormat = format;
     boolean upstreamFormatChanged = setUpstreamFormat(adjustedUpstreamFormat);
     if (upstreamFormatChangeListener != null && upstreamFormatChanged) {
       upstreamFormatChangeListener.onUpstreamFormatChanged(adjustedUpstreamFormat);
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
index 21f1175c05..9822b428d0 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
@@ -171,8 +171,8 @@ public final class AviExtractor implements Extractor {
   }
 
   @Override
-  public int read(ExtractorInput input, PositionHolder positionHolder) throws IOException {
-    if (resolvePendingReposition(input, positionHolder)) {
+  public int read(ExtractorInput input, PositionHolder seekPosition) throws IOException {
+    if (resolvePendingReposition(input, seekPosition)) {
       return RESULT_SEEK;
     }
     switch (state) {
@@ -305,14 +305,14 @@ public final class AviExtractor implements Extractor {
    * {@link ExtractorInput#getPosition() current position}, but not further than {@link
    * #RELOAD_MINIMUM_SEEK_DISTANCE}.
    */
-  private boolean resolvePendingReposition(ExtractorInput input, PositionHolder positionHolder)
+  private boolean resolvePendingReposition(ExtractorInput input, PositionHolder seekPosition)
       throws IOException {
     boolean needSeek = false;
     if (pendingReposition != C.POSITION_UNSET) {
       long currentPosition = input.getPosition();
       if (pendingReposition < currentPosition
           || pendingReposition > currentPosition + RELOAD_MINIMUM_SEEK_DISTANCE) {
-        positionHolder.position = pendingReposition;
+        seekPosition.position = pendingReposition;
         needSeek = true;
       } else {
         // The distance to the target position is short enough that it makes sense to just skip the
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaNotification.java b/libraries/session/src/main/java/androidx/media3/session/MediaNotification.java
index 14064cfc55..fae9ae1fee 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaNotification.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaNotification.java
@@ -128,7 +128,7 @@ public final class MediaNotification {
     /**
      * Creates a new {@link MediaNotification}.
      *
-     * @param session The media session.
+     * @param mediaSession The media session.
      * @param actionFactory The {@link ActionFactory} for creating notification {@link
      *     NotificationCompat.Action actions}.
      * @param customLayout The custom layout {@linkplain MediaSession#setCustomLayout(List) set by
@@ -138,7 +138,7 @@ public final class MediaNotification {
      *     been loaded asynchronously.
      */
     MediaNotification createNotification(
-        MediaSession session,
+        MediaSession mediaSession,
         ImmutableList<CommandButton> customLayout,
         ActionFactory actionFactory,
         Callback onNotificationChangedCallback);