Fix miscellaneous consistency/formatting things.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=126631393

extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java

@@ -35,13 +35,14 @@ import java.util.Arrays;
  * Facilitates the extraction of data from the FLAC container format.
  * Facilitates the extraction of data from the FLAC container format.
  */
  */
 public final class FlacExtractor implements Extractor {
 public final class FlacExtractor implements Extractor {
+
   /**
   /**
    * FLAC signature: first 4 is the signature word, second 4 is the sizeof STREAMINFO. 0x22 is the
    * FLAC signature: first 4 is the signature word, second 4 is the sizeof STREAMINFO. 0x22 is the
    * mandatory STREAMINFO.
    * mandatory STREAMINFO.
    */
    */
   private static final byte[] FLAC_SIGNATURE = {'f', 'L', 'a', 'C', 0, 0, 0, 0x22};
   private static final byte[] FLAC_SIGNATURE = {'f', 'L', 'a', 'C', 0, 0, 0, 0x22};
 
 
-  private ExtractorOutput output;
+  private ExtractorOutput extractorOutput;
   private TrackOutput trackOutput;
   private TrackOutput trackOutput;
 
 
   private FlacJni decoder;
   private FlacJni decoder;
@@ -53,9 +54,9 @@ public final class FlacExtractor implements Extractor {
 
 
   @Override
   @Override
   public void init(ExtractorOutput output) {
   public void init(ExtractorOutput output) {
-    this.output = output;
-    this.trackOutput = output.track(0);
-    output.endTracks();
+    extractorOutput = output;
+    trackOutput = extractorOutput.track(0);
+    extractorOutput.endTracks();
 
 
     try {
     try {
       decoder = new FlacJni();
       decoder = new FlacJni();
@@ -90,7 +91,7 @@ public final class FlacExtractor implements Extractor {
       }
       }
       metadataParsed = true;
       metadataParsed = true;
 
 
-      output.seekMap(new SeekMap() {
+      extractorOutput.seekMap(new SeekMap() {
         final boolean isSeekable = decoder.getSeekPosition(0) != -1;
         final boolean isSeekable = decoder.getSeekPosition(0) != -1;
         final long durationUs = streamInfo.durationUs();
         final long durationUs = streamInfo.durationUs();
 
 

library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java

@@ -43,13 +43,6 @@ public interface Extractor {
   int RESULT_END_OF_INPUT = C.RESULT_END_OF_INPUT;
   int RESULT_END_OF_INPUT = C.RESULT_END_OF_INPUT;
 
 
   /**
   /**
-   * Initializes the extractor with an {@link ExtractorOutput}.
-   *
-   * @param output An {@link ExtractorOutput} to receive extracted data.
-   */
-  void init(ExtractorOutput output);
-
-  /**
    * Returns whether this extractor can extract samples from the {@link ExtractorInput}, which must
    * Returns whether this extractor can extract samples from the {@link ExtractorInput}, which must
    * provide data from the start of the stream.
    * provide data from the start of the stream.
    * <p>
    * <p>
@@ -64,6 +57,13 @@ public interface Extractor {
   boolean sniff(ExtractorInput input) throws IOException, InterruptedException;
   boolean sniff(ExtractorInput input) throws IOException, InterruptedException;
 
 
   /**
   /**
+   * Initializes the extractor with an {@link ExtractorOutput}.
+   *
+   * @param output An {@link ExtractorOutput} to receive extracted data.
+   */
+  void init(ExtractorOutput output);
+
+  /**
    * Extracts data read from a provided {@link ExtractorInput}.
    * Extracts data read from a provided {@link ExtractorInput}.
    * <p>
    * <p>
    * A single call to this method will block until some progress has been made, but will not block
    * A single call to this method will block until some progress has been made, but will not block

library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java

@@ -788,6 +788,7 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
      * later calls.
      * later calls.
      *
      *
      * @param input The {@link ExtractorInput} from which data should be read.
      * @param input The {@link ExtractorInput} from which data should be read.
+     * @return An initialized extractor for reading {@code input}.
      * @throws UnrecognizedInputFormatException Thrown if the input format could not be detected.
      * @throws UnrecognizedInputFormatException Thrown if the input format could not be detected.
      * @throws IOException Thrown if the input could not be read.
      * @throws IOException Thrown if the input could not be read.
      * @throws InterruptedException Thrown if the thread was interrupted.
      * @throws InterruptedException Thrown if the thread was interrupted.

library/src/main/java/com/google/android/exoplayer/extractor/GaplessInfoHolder.java

@@ -21,7 +21,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 
 
 /**
 /**
- * Holder for gapless playback information
+ * Holder for gapless playback information.
  */
  */
 public final class GaplessInfoHolder {
 public final class GaplessInfoHolder {
 
 

library/src/main/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractor.java

@@ -773,7 +773,7 @@ public final class MatroskaExtractor implements Extractor {
                     }
                     }
                     // The first read value is the first size. Later values are signed offsets.
                     // The first read value is the first size. Later values are signed offsets.
                     if (sampleIndex > 0) {
                     if (sampleIndex > 0) {
-                      readValue -= (1L << 6 + i * 7) - 1;
+                      readValue -= (1L << (6 + i * 7)) - 1;
                     }
                     }
                     break;
                     break;
                   }
                   }

library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java

@@ -97,8 +97,8 @@ public final class Mp3Extractor implements Extractor {
   }
   }
 
 
   @Override
   @Override
-  public void init(ExtractorOutput extractorOutput) {
-    this.extractorOutput = extractorOutput;
+  public void init(ExtractorOutput output) {
+    extractorOutput = output;
     trackOutput = extractorOutput.track(0);
     trackOutput = extractorOutput.track(0);
     extractorOutput.endTracks();
     extractorOutput.endTracks();
   }
   }
@@ -106,8 +106,8 @@ public final class Mp3Extractor implements Extractor {
   @Override
   @Override
   public void seek(long position) {
   public void seek(long position) {
     synchronizedHeaderData = 0;
     synchronizedHeaderData = 0;
-    samplesRead = 0;
     basisTimeUs = -1;
     basisTimeUs = -1;
+    samplesRead = 0;
     sampleBytesRemaining = 0;
     sampleBytesRemaining = 0;
   }
   }
 
 

library/src/main/java/com/google/android/exoplayer/extractor/ogg/StreamReader.java

@@ -51,6 +51,7 @@ import java.io.IOException;
 
 
   /**
   /**
    * Resets the state of the {@link StreamReader}.
    * Resets the state of the {@link StreamReader}.
+   *
    * @param headerData Resets parsed header data too.
    * @param headerData Resets parsed header data too.
    */
    */
   protected void reset(boolean headerData) {
   protected void reset(boolean headerData) {
@@ -174,9 +175,8 @@ import java.io.IOException;
   /**
   /**
    * Converts granule value to time.
    * Converts granule value to time.
    *
    *
-   * @param granule
-   *     granule value.
-   * @return Returns time in milliseconds.
+   * @param granule The granule value.
+   * @return Time in milliseconds.
    */
    */
   protected long convertGranuleToTime(long granule) {
   protected long convertGranuleToTime(long granule) {
     return (granule * C.MICROS_PER_SECOND) / sampleRate;
     return (granule * C.MICROS_PER_SECOND) / sampleRate;
@@ -185,9 +185,8 @@ import java.io.IOException;
   /**
   /**
    * Converts time value to granule.
    * Converts time value to granule.
    *
    *
-   * @param timeUs
-   *     Time in milliseconds.
-   * @return Granule value.
+   * @param timeUs Time in milliseconds.
+   * @return The granule value.
    */
    */
   protected long convertTimeToGranule(long timeUs) {
   protected long convertTimeToGranule(long timeUs) {
     return (sampleRate * timeUs) / C.MICROS_PER_SECOND;
     return (sampleRate * timeUs) / C.MICROS_PER_SECOND;
@@ -197,8 +196,7 @@ import java.io.IOException;
    * Prepares payload data in the packet for submitting to TrackOutput and returns number of
    * Prepares payload data in the packet for submitting to TrackOutput and returns number of
    * granules in the packet.
    * granules in the packet.
    *
    *
-   * @param packet
-   *     Ogg payload data packet
+   * @param packet Ogg payload data packet.
    * @return Number of granules in the packet or -1 if the packet doesn't contain payload data.
    * @return Number of granules in the packet or -1 if the packet doesn't contain payload data.
    */
    */
   protected abstract long preparePayload(ParsableByteArray packet);
   protected abstract long preparePayload(ParsableByteArray packet);
@@ -209,7 +207,7 @@ import java.io.IOException;
    * @param packet An ogg packet.
    * @param packet An ogg packet.
    * @param position Position of the given header packet.
    * @param position Position of the given header packet.
    * @param setupData Setup data to be filled.
    * @param setupData Setup data to be filled.
-   * @return Return true if the packet contains header data.
+   * @return True if the packet contains header data. False otherwise.
    */
    */
   protected abstract boolean readHeaders(ParsableByteArray packet, long position,
   protected abstract boolean readHeaders(ParsableByteArray packet, long position,
       SetupData setupData) throws IOException, InterruptedException;
       SetupData setupData) throws IOException, InterruptedException;
@@ -223,7 +221,7 @@ import java.io.IOException;
     this.currentGranule = currentGranule;
     this.currentGranule = currentGranule;
   }
   }
 
 
-  private class UnseekableOggSeeker implements OggSeeker {
+  private static final class UnseekableOggSeeker implements OggSeeker {
     @Override
     @Override
     public long read(ExtractorInput input) throws IOException, InterruptedException {
     public long read(ExtractorInput input) throws IOException, InterruptedException {
       return -1;
       return -1;