Fix naming/documentation for SmoothStreaming.

library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java

@@ -94,7 +94,7 @@ public class SmoothStreamingChunkSource implements ChunkSource,
    *     completed an initial load.
    *     completed an initial load.
    * @param trackSelector Selects tracks from the manifest to be exposed by this source.
    * @param trackSelector Selects tracks from the manifest to be exposed by this source.
    * @param dataSource A {@link DataSource} suitable for loading the media data.
    * @param dataSource A {@link DataSource} suitable for loading the media data.
-   * @param formatEvaluator Selects from the available formats.
+   * @param adaptiveFormatEvaluator For adaptive tracks, selects from the available formats.
    * @param liveEdgeLatencyMs For live streams, the number of milliseconds that the playback should
    * @param liveEdgeLatencyMs For live streams, the number of milliseconds that the playback should
    *     lag behind the "live edge" (i.e. the end of the most recently defined media in the
    *     lag behind the "live edge" (i.e. the end of the most recently defined media in the
    *     manifest). Choosing a small value will minimize latency introduced by the player, however
    *     manifest). Choosing a small value will minimize latency introduced by the player, however
@@ -103,9 +103,9 @@ public class SmoothStreamingChunkSource implements ChunkSource,
    */
    */
   public SmoothStreamingChunkSource(ManifestFetcher<SmoothStreamingManifest> manifestFetcher,
   public SmoothStreamingChunkSource(ManifestFetcher<SmoothStreamingManifest> manifestFetcher,
       SmoothStreamingTrackSelector trackSelector, DataSource dataSource,
       SmoothStreamingTrackSelector trackSelector, DataSource dataSource,
-      FormatEvaluator formatEvaluator, long liveEdgeLatencyMs) {
-    this(manifestFetcher, manifestFetcher.getManifest(), trackSelector, dataSource, formatEvaluator,
-        liveEdgeLatencyMs);
+      FormatEvaluator adaptiveFormatEvaluator, long liveEdgeLatencyMs) {
+    this(manifestFetcher, manifestFetcher.getManifest(), trackSelector, dataSource,
+        adaptiveFormatEvaluator, liveEdgeLatencyMs);
   }
   }
 
 
   /**
   /**
@@ -114,12 +114,12 @@ public class SmoothStreamingChunkSource implements ChunkSource,
    * @param manifest The manifest parsed from {@code baseUrl + "/Manifest"}.
    * @param manifest The manifest parsed from {@code baseUrl + "/Manifest"}.
    * @param trackSelector Selects tracks from the manifest to be exposed by this source.
    * @param trackSelector Selects tracks from the manifest to be exposed by this source.
    * @param dataSource A {@link DataSource} suitable for loading the media data.
    * @param dataSource A {@link DataSource} suitable for loading the media data.
-   * @param formatEvaluator Selects from the available formats.
+   * @param adaptiveFormatEvaluator For adaptive tracks, selects from the available formats.
    */
    */
   public SmoothStreamingChunkSource(SmoothStreamingManifest manifest,
   public SmoothStreamingChunkSource(SmoothStreamingManifest manifest,
       SmoothStreamingTrackSelector trackSelector, DataSource dataSource,
       SmoothStreamingTrackSelector trackSelector, DataSource dataSource,
-      FormatEvaluator formatEvaluator) {
-    this(null, manifest, trackSelector, dataSource, formatEvaluator, 0);
+      FormatEvaluator adaptiveFormatEvaluator) {
+    this(null, manifest, trackSelector, dataSource, adaptiveFormatEvaluator, 0);
   }
   }
 
 
   private SmoothStreamingChunkSource(ManifestFetcher<SmoothStreamingManifest> manifestFetcher,
   private SmoothStreamingChunkSource(ManifestFetcher<SmoothStreamingManifest> manifestFetcher,

library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingTrackSelector.java

@@ -40,7 +40,7 @@ public interface SmoothStreamingTrackSelector {
      * Outputs a fixed track corresponding to the specified track in the specified element.
      * Outputs a fixed track corresponding to the specified track in the specified element.
      *
      *
      * @param manifest The manifest being processed.
      * @param manifest The manifest being processed.
-     * @param element The index of the element within which the adaptive tracks are located.
+     * @param element The index of the element within which the track is located.
      * @param track The index of the track within the element.
      * @param track The index of the track within the element.
      */
      */
     void fixedTrack(SmoothStreamingManifest manifest, int element, int track);
     void fixedTrack(SmoothStreamingManifest manifest, int element, int track);