Merge branch 'tresvecesseis-dev' into dev

demo/src/main/java/com/google/android/exoplayer/demo/Samples.java

@@ -43,11 +43,8 @@ import java.util.Locale;
   }
   }
 
 
   public static final Sample[] YOUTUBE_DASH_MP4 = new Sample[] {
   public static final Sample[] YOUTUBE_DASH_MP4 = new Sample[] {
-    new Sample("Google Glass",
-        "http://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?"
-        + "as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&"
-        + "ipbits=0&expire=19000000000&signature=51AF5F39AB0CEC3E5497CD9C900EBFEAECCCB5C7."
-        + "8506521BFC350652163895D4C26DEE124209AA9E&key=ik0", PlayerActivity.TYPE_DASH),
+    new Sample("XXXXXXXXX",
+        "http://178.33.229.111/live/mp4:Videolina/playlist.m3u8", PlayerActivity.TYPE_HLS),
     new Sample("Google Play",
     new Sample("Google Play",
         "http://www.youtube.com/api/manifest/dash/id/3aa39fa2cc27967f/source/youtube?"
         "http://www.youtube.com/api/manifest/dash/id/3aa39fa2cc27967f/source/youtube?"
         + "as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&"
         + "as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&"

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

@@ -43,7 +43,7 @@ public final class Mp3Extractor implements Extractor {
   /** Mask that includes the audio header values that must match between frames. */
   /** Mask that includes the audio header values that must match between frames. */
   private static final int HEADER_MASK = 0xFFFE0C00;
   private static final int HEADER_MASK = 0xFFFE0C00;
   private static final int ID3_TAG = Util.getIntegerCodeForString("ID3");
   private static final int ID3_TAG = Util.getIntegerCodeForString("ID3");
-  private static final String[] MIME_TYPE_BY_LAYER =
+  public static final String[] MIME_TYPE_BY_LAYER =
       new String[] {MimeTypes.AUDIO_MPEG_L1, MimeTypes.AUDIO_MPEG_L2, MimeTypes.AUDIO_MPEG};
       new String[] {MimeTypes.AUDIO_MPEG_L1, MimeTypes.AUDIO_MPEG_L2, MimeTypes.AUDIO_MPEG};
   private static final int XING_HEADER = Util.getIntegerCodeForString("Xing");
   private static final int XING_HEADER = Util.getIntegerCodeForString("Xing");
   private static final int INFO_HEADER = Util.getIntegerCodeForString("Info");
   private static final int INFO_HEADER = Util.getIntegerCodeForString("Info");
@@ -55,7 +55,7 @@ public final class Mp3Extractor implements Extractor {
    * 160000 bit/s / (8000 sample/s * 8 bit/byte) + 1 padding byte/frame = 2881 byte/frame.
    * 160000 bit/s / (8000 sample/s * 8 bit/byte) + 1 padding byte/frame = 2881 byte/frame.
    * The next power of two size is 4 KiB.
    * The next power of two size is 4 KiB.
    */
    */
-  private static final int MAX_FRAME_SIZE_BYTES = 4096;
+  public static final int MAX_FRAME_SIZE_BYTES = 4096;
 
 
   private final BufferingInput inputBuffer;
   private final BufferingInput inputBuffer;
   private final ParsableByteArray scratch;
   private final ParsableByteArray scratch;

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

@@ -16,7 +16,7 @@
 package com.google.android.exoplayer.extractor.mp3;
 package com.google.android.exoplayer.extractor.mp3;
 
 
 /** Parsed MPEG audio frame header. */
 /** Parsed MPEG audio frame header. */
-/* package */ final class MpegAudioHeader {
+public final class MpegAudioHeader {
 
 
   private static final int[] SAMPLING_RATE_V1 = {44100, 48000, 32000};
   private static final int[] SAMPLING_RATE_V1 = {44100, 48000, 32000};
   private static final int[] BITRATE_V1_L1 =
   private static final int[] BITRATE_V1_L1 =

library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java

@@ -130,7 +130,7 @@ import java.util.Collections;
    * Locates the next sync word, advancing the position to the byte that immediately follows it.
    * Locates the next sync word, advancing the position to the byte that immediately follows it.
    * If a sync word was not located, the position is advanced to the limit.
    * If a sync word was not located, the position is advanced to the limit.
    *
    *
-   * @param pesBuffer The buffer whose position should be advanced.
+   * @param pesBuffer The buffer in which to search for the sync word.
    * @return True if a sync word position was found. False otherwise.
    * @return True if a sync word position was found. False otherwise.
    */
    */
   private boolean skipToNextSync(ParsableByteArray pesBuffer) {
   private boolean skipToNextSync(ParsableByteArray pesBuffer) {