Upgrade dackka and fix some generation errors

#minor-release

PiperOrigin-RevId: 484483080

javadoc_combined.gradle

@@ -21,7 +21,7 @@ class CombinedJavadocPlugin implements Plugin<Project> {
 
 
   // Dackka snapshots are listed at https://androidx.dev/dackka/builds.
   // Dackka snapshots are listed at https://androidx.dev/dackka/builds.
   static final String DACKKA_JAR_URL =
   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
   @Override
   void apply(Project project) {
   void apply(Project project) {

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.
   // TrackOutput implementation. Called by the loading thread.
 
 
   @Override
   @Override
-  public final void format(Format unadjustedUpstreamFormat) {
-    Format adjustedUpstreamFormat = getAdjustedUpstreamFormat(unadjustedUpstreamFormat);
+  public final void format(Format format) {
+    Format adjustedUpstreamFormat = getAdjustedUpstreamFormat(format);
     upstreamFormatAdjustmentRequired = false;
     upstreamFormatAdjustmentRequired = false;
-    this.unadjustedUpstreamFormat = unadjustedUpstreamFormat;
+    unadjustedUpstreamFormat = format;
     boolean upstreamFormatChanged = setUpstreamFormat(adjustedUpstreamFormat);
     boolean upstreamFormatChanged = setUpstreamFormat(adjustedUpstreamFormat);
     if (upstreamFormatChangeListener != null && upstreamFormatChanged) {
     if (upstreamFormatChangeListener != null && upstreamFormatChanged) {
       upstreamFormatChangeListener.onUpstreamFormatChanged(adjustedUpstreamFormat);
       upstreamFormatChangeListener.onUpstreamFormatChanged(adjustedUpstreamFormat);

libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java

@@ -171,8 +171,8 @@ public final class AviExtractor implements Extractor {
   }
   }
 
 
   @Override
   @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;
       return RESULT_SEEK;
     }
     }
     switch (state) {
     switch (state) {
@@ -305,14 +305,14 @@ public final class AviExtractor implements Extractor {
    * {@link ExtractorInput#getPosition() current position}, but not further than {@link
    * {@link ExtractorInput#getPosition() current position}, but not further than {@link
    * #RELOAD_MINIMUM_SEEK_DISTANCE}.
    * #RELOAD_MINIMUM_SEEK_DISTANCE}.
    */
    */
-  private boolean resolvePendingReposition(ExtractorInput input, PositionHolder positionHolder)
+  private boolean resolvePendingReposition(ExtractorInput input, PositionHolder seekPosition)
       throws IOException {
       throws IOException {
     boolean needSeek = false;
     boolean needSeek = false;
     if (pendingReposition != C.POSITION_UNSET) {
     if (pendingReposition != C.POSITION_UNSET) {
       long currentPosition = input.getPosition();
       long currentPosition = input.getPosition();
       if (pendingReposition < currentPosition
       if (pendingReposition < currentPosition
           || pendingReposition > currentPosition + RELOAD_MINIMUM_SEEK_DISTANCE) {
           || pendingReposition > currentPosition + RELOAD_MINIMUM_SEEK_DISTANCE) {
-        positionHolder.position = pendingReposition;
+        seekPosition.position = pendingReposition;
         needSeek = true;
         needSeek = true;
       } else {
       } else {
         // The distance to the target position is short enough that it makes sense to just skip the
         // The distance to the target position is short enough that it makes sense to just skip the

libraries/session/src/main/java/androidx/media3/session/MediaNotification.java

@@ -128,7 +128,7 @@ public final class MediaNotification {
     /**
     /**
      * Creates a new {@link 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
      * @param actionFactory The {@link ActionFactory} for creating notification {@link
      *     NotificationCompat.Action actions}.
      *     NotificationCompat.Action actions}.
      * @param customLayout The custom layout {@linkplain MediaSession#setCustomLayout(List) set by
      * @param customLayout The custom layout {@linkplain MediaSession#setCustomLayout(List) set by
@@ -138,7 +138,7 @@ public final class MediaNotification {
      *     been loaded asynchronously.
      *     been loaded asynchronously.
      */
      */
     MediaNotification createNotification(
     MediaNotification createNotification(
-        MediaSession session,
+        MediaSession mediaSession,
         ImmutableList<CommandButton> customLayout,
         ImmutableList<CommandButton> customLayout,
         ActionFactory actionFactory,
         ActionFactory actionFactory,
         Callback onNotificationChangedCallback);
         Callback onNotificationChangedCallback);