From bb9e34f512ad3f82d441efd5b0dc4f0b1c307a0a Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@olly-macbookpro2.roam.corp.google.com>
Date: Wed, 21 Jan 2015 15:47:17 -0800
Subject: [PATCH] Minor style tweaks.

---
 .../exoplayer/FrameworkSampleSource.java      | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java b/library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java
index 6fe88cad27..47183b35f8 100644
--- a/library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java
@@ -40,13 +40,15 @@ public final class FrameworkSampleSource implements SampleSource {
   private static final int TRACK_STATE_ENABLED = 1;
   private static final int TRACK_STATE_FORMAT_SENT = 2;
 
+  // Parameters for a Uri data source.
   private final Context context;
   private final Uri uri;
   private final Map<String, String> headers;
-  
+
+  // Parameters for a FileDescriptor data source.
   private final FileDescriptor fileDescriptor;
-  private final long fdOffset;
-  private final long fdLength;
+  private final long fileDescriptorOffset;
+  private final long fileDescriptorLength;
 
   private MediaExtractor extractor;
   private TrackInfo[] trackInfos;
@@ -60,25 +62,26 @@ public final class FrameworkSampleSource implements SampleSource {
   public FrameworkSampleSource(Context context, Uri uri, Map<String, String> headers,
       int downstreamRendererCount) {
     Assertions.checkState(Util.SDK_INT >= 16);
+    this.remainingReleaseCount = downstreamRendererCount;
+
     this.context = context;
     this.uri = uri;
     this.headers = headers;
-    this.remainingReleaseCount = downstreamRendererCount;
-    
+
     this.fileDescriptor = null;
-    this.fdOffset = 0;
-    this.fdLength = 0;
+    this.fileDescriptorOffset = 0;
+    this.fileDescriptorLength = 0;
   }
-  
+
   public FrameworkSampleSource(FileDescriptor fileDescriptor, long offset, long length,
 	  int downstreamRendererCount) {
     Assertions.checkState(Util.SDK_INT >= 16);
-    
-    this.fileDescriptor = fileDescriptor;
-    this.fdOffset = offset;
-    this.fdLength = length;
     this.remainingReleaseCount = downstreamRendererCount;
-    
+
+    this.fileDescriptor = fileDescriptor;
+    this.fileDescriptorOffset = offset;
+    this.fileDescriptorLength = length;
+
     this.context = null;
     this.uri = null;
     this.headers = null;
@@ -88,12 +91,12 @@ public final class FrameworkSampleSource implements SampleSource {
   public boolean prepare() throws IOException {
     if (!prepared) {
       extractor = new MediaExtractor();
-      
+
       if (context != null)
         extractor.setDataSource(context, uri, headers);
       else
-    	extractor.setDataSource(fileDescriptor, fdOffset, fdLength);
-      
+    	extractor.setDataSource(fileDescriptor, fileDescriptorOffset, fileDescriptorLength);
+
       trackStates = new int[extractor.getTrackCount()];
       pendingDiscontinuities = new boolean[trackStates.length];
       trackInfos = new TrackInfo[trackStates.length];