Skip to content

Commit 2ae820d

Browse files
martijn00martijn00
committed
Update to 2.1.1
1 parent 09e3b8e commit 2ae820d

File tree

510 files changed

+20054
-3592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

510 files changed

+20054
-3592
lines changed

‎ExoPlayer/ExoPlayer.csproj‎

Lines changed: 52 additions & 15 deletions
Large diffs are not rendered by default.

‎ExoPlayer/Jars/exoplayer-r2.0.4.aar‎

-940 KB
Binary file not shown.

‎ExoPlayer/Jars/exoplayer-r2.1.1.aar‎

1020 KB
Binary file not shown.

‎ExoPlayer/JavaDoc/allclasses-frame.html‎

Lines changed: 43 additions & 10 deletions
Large diffs are not rendered by default.

‎ExoPlayer/JavaDoc/allclasses-noframe.html‎

Lines changed: 43 additions & 10 deletions
Large diffs are not rendered by default.

‎ExoPlayer/JavaDoc/com/google/android/exoplayer2/BaseRenderer.html‎

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
66
<title>BaseRenderer (library API)</title>
7-
<meta name="date" content="2016-10-20">
7+
<meta name="date" content="2016-12-20">
88
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../../script.js"></script>
1010
</head>
@@ -18,7 +18,7 @@
1818
catch(err) {
1919
}
2020
//-->
21-
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10};
21+
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10};
2222
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
2323
var altColor = "altColor";
2424
var rowColor = "rowColor";
@@ -244,108 +244,115 @@ <h3>Method Summary</h3>
244244
</td>
245245
</tr>
246246
<tr id="i10" class="altColor">
247+
<td class="colFirst"><code>boolean</code></td>
248+
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#isCurrentStreamFinal--">isCurrentStreamFinal</a></span>()</code>
249+
<div class="block">Returns whether the current <a href="../../../../com/google/android/exoplayer2/source/SampleStream.html" title="interface in com.google.android.exoplayer2.source"><code>SampleStream</code></a> will be the final one supplied before the
250+
renderer is next disabled or reset.</div>
251+
</td>
252+
</tr>
253+
<tr id="i11" class="rowColor">
247254
<td class="colFirst"><code>protected boolean</code></td>
248255
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#isSourceReady--">isSourceReady</a></span>()</code>
249256
<div class="block">Returns whether the upstream source is ready.</div>
250257
</td>
251258
</tr>
252-
<tr id="i11" class="rowColor">
259+
<tr id="i12" class="altColor">
253260
<td class="colFirst"><code>void</code></td>
254261
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#maybeThrowStreamError--">maybeThrowStreamError</a></span>()</code>
255262
<div class="block">Throws an error that's preventing the renderer from reading from its <a href="../../../../com/google/android/exoplayer2/source/SampleStream.html" title="interface in com.google.android.exoplayer2.source"><code>SampleStream</code></a>.</div>
256263
</td>
257264
</tr>
258-
<tr id="i12" class="altColor">
265+
<tr id="i13" class="rowColor">
259266
<td class="colFirst"><code>protected void</code></td>
260267
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onDisabled--">onDisabled</a></span>()</code>
261268
<div class="block">Called when the renderer is disabled.</div>
262269
</td>
263270
</tr>
264-
<tr id="i13" class="rowColor">
271+
<tr id="i14" class="altColor">
265272
<td class="colFirst"><code>protected void</code></td>
266273
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onEnabled-boolean-">onEnabled</a></span>(boolean&nbsp;joining)</code>
267274
<div class="block">Called when the renderer is enabled.</div>
268275
</td>
269276
</tr>
270-
<tr id="i14" class="altColor">
277+
<tr id="i15" class="rowColor">
271278
<td class="colFirst"><code>protected void</code></td>
272279
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onPositionReset-long-boolean-">onPositionReset</a></span>(long&nbsp;positionUs,
273280
boolean&nbsp;joining)</code>
274281
<div class="block">Called when the position is reset.</div>
275282
</td>
276283
</tr>
277-
<tr id="i15" class="rowColor">
284+
<tr id="i16" class="altColor">
278285
<td class="colFirst"><code>protected void</code></td>
279286
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onStarted--">onStarted</a></span>()</code>
280287
<div class="block">Called when the renderer is started.</div>
281288
</td>
282289
</tr>
283-
<tr id="i16" class="altColor">
290+
<tr id="i17" class="rowColor">
284291
<td class="colFirst"><code>protected void</code></td>
285292
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onStopped--">onStopped</a></span>()</code>
286293
<div class="block">Called when the renderer is stopped.</div>
287294
</td>
288295
</tr>
289-
<tr id="i17" class="rowColor">
296+
<tr id="i18" class="altColor">
290297
<td class="colFirst"><code>protected void</code></td>
291298
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onStreamChanged-com.google.android.exoplayer2.Format:A-">onStreamChanged</a></span>(<a href="../../../../com/google/android/exoplayer2/Format.html" title="class in com.google.android.exoplayer2">Format</a>[]&nbsp;formats)</code>
292299
<div class="block">Called when the renderer's stream has changed.</div>
293300
</td>
294301
</tr>
295-
<tr id="i18" class="altColor">
302+
<tr id="i19" class="rowColor">
296303
<td class="colFirst"><code>protected int</code></td>
297304
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#readSource-com.google.android.exoplayer2.FormatHolder-com.google.android.exoplayer2.decoder.DecoderInputBuffer-">readSource</a></span>(<a href="../../../../com/google/android/exoplayer2/FormatHolder.html" title="class in com.google.android.exoplayer2">FormatHolder</a>&nbsp;formatHolder,
298305
<a href="../../../../com/google/android/exoplayer2/decoder/DecoderInputBuffer.html" title="class in com.google.android.exoplayer2.decoder">DecoderInputBuffer</a>&nbsp;buffer)</code>
299306
<div class="block">Reads from the enabled upstream source.</div>
300307
</td>
301308
</tr>
302-
<tr id="i19" class="rowColor">
309+
<tr id="i20" class="altColor">
303310
<td class="colFirst"><code>void</code></td>
304311
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#replaceStream-com.google.android.exoplayer2.Format:A-com.google.android.exoplayer2.source.SampleStream-long-">replaceStream</a></span>(<a href="../../../../com/google/android/exoplayer2/Format.html" title="class in com.google.android.exoplayer2">Format</a>[]&nbsp;formats,
305312
<a href="../../../../com/google/android/exoplayer2/source/SampleStream.html" title="interface in com.google.android.exoplayer2.source">SampleStream</a>&nbsp;stream,
306313
long&nbsp;offsetUs)</code>
307314
<div class="block">Replaces the <a href="../../../../com/google/android/exoplayer2/source/SampleStream.html" title="interface in com.google.android.exoplayer2.source"><code>SampleStream</code></a> from which samples will be consumed.</div>
308315
</td>
309316
</tr>
310-
<tr id="i20" class="altColor">
317+
<tr id="i21" class="rowColor">
311318
<td class="colFirst"><code>void</code></td>
312319
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#resetPosition-long-">resetPosition</a></span>(long&nbsp;positionUs)</code>
313320
<div class="block">Signals to the renderer that a position discontinuity has occurred.</div>
314321
</td>
315322
</tr>
316-
<tr id="i21" class="rowColor">
323+
<tr id="i22" class="altColor">
317324
<td class="colFirst"><code>void</code></td>
318-
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#setCurrentStreamIsFinal--">setCurrentStreamIsFinal</a></span>()</code>
325+
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#setCurrentStreamFinal--">setCurrentStreamFinal</a></span>()</code>
319326
<div class="block">Signals to the renderer that the current <a href="../../../../com/google/android/exoplayer2/source/SampleStream.html" title="interface in com.google.android.exoplayer2.source"><code>SampleStream</code></a> will be the final one supplied
320327
before it is next disabled or reset.</div>
321328
</td>
322329
</tr>
323-
<tr id="i22" class="altColor">
330+
<tr id="i23" class="rowColor">
324331
<td class="colFirst"><code>void</code></td>
325332
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#setIndex-int-">setIndex</a></span>(int&nbsp;index)</code>
326333
<div class="block">Sets the index of this renderer within the player.</div>
327334
</td>
328335
</tr>
329-
<tr id="i23" class="rowColor">
336+
<tr id="i24" class="altColor">
330337
<td class="colFirst"><code>protected void</code></td>
331338
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#skipToKeyframeBefore-long-">skipToKeyframeBefore</a></span>(long&nbsp;timeUs)</code>
332339
<div class="block">Attempts to skip to the keyframe before the specified time.</div>
333340
</td>
334341
</tr>
335-
<tr id="i24" class="altColor">
342+
<tr id="i25" class="rowColor">
336343
<td class="colFirst"><code>void</code></td>
337344
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#start--">start</a></span>()</code>
338345
<div class="block">Starts the renderer, meaning that calls to <a href="../../../../com/google/android/exoplayer2/Renderer.html#render-long-long-"><code>Renderer.render(long, long)</code></a> will cause media to be
339346
rendered.</div>
340347
</td>
341348
</tr>
342-
<tr id="i25" class="rowColor">
349+
<tr id="i26" class="altColor">
343350
<td class="colFirst"><code>void</code></td>
344351
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#stop--">stop</a></span>()</code>
345352
<div class="block">Stops the renderer, transitioning it to the <a href="../../../../com/google/android/exoplayer2/Renderer.html#STATE_ENABLED"><code>Renderer.STATE_ENABLED</code></a> state.</div>
346353
</td>
347354
</tr>
348-
<tr id="i26" class="altColor">
355+
<tr id="i27" class="rowColor">
349356
<td class="colFirst"><code>int</code></td>
350357
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#supportsMixedMimeTypeAdaptation--">supportsMixedMimeTypeAdaptation</a></span>()</code>
351358
<div class="block">Returns the extent to which the <a href="../../../../com/google/android/exoplayer2/Renderer.html" title="interface in com.google.android.exoplayer2"><code>Renderer</code></a> supports adapting between supported formats
@@ -619,22 +626,38 @@ <h4>hasReadStreamToEnd</h4>
619626
</dl>
620627
</li>
621628
</ul>
622-
<a name="setCurrentStreamIsFinal--">
629+
<a name="setCurrentStreamFinal--">
623630
<!-- -->
624631
</a>
625632
<ul class="blockList">
626633
<li class="blockList">
627-
<h4>setCurrentStreamIsFinal</h4>
628-
<pre>public final&nbsp;void&nbsp;setCurrentStreamIsFinal()</pre>
629-
<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../com/google/android/exoplayer2/Renderer.html#setCurrentStreamIsFinal--">Renderer</a></code></span></div>
634+
<h4>setCurrentStreamFinal</h4>
635+
<pre>public final&nbsp;void&nbsp;setCurrentStreamFinal()</pre>
636+
<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../com/google/android/exoplayer2/Renderer.html#setCurrentStreamFinal--">Renderer</a></code></span></div>
630637
<div class="block">Signals to the renderer that the current <a href="../../../../com/google/android/exoplayer2/source/SampleStream.html" title="interface in com.google.android.exoplayer2.source"><code>SampleStream</code></a> will be the final one supplied
631638
before it is next disabled or reset.
632639
<p>
633640
This method may be called when the renderer is in the following states:
634641
<a href="../../../../com/google/android/exoplayer2/Renderer.html#STATE_ENABLED"><code>Renderer.STATE_ENABLED</code></a>, <a href="../../../../com/google/android/exoplayer2/Renderer.html#STATE_STARTED"><code>Renderer.STATE_STARTED</code></a>.</div>
635642
<dl>
636643
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
637-
<dd><code><a href="../../../../com/google/android/exoplayer2/Renderer.html#setCurrentStreamIsFinal--">setCurrentStreamIsFinal</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../com/google/android/exoplayer2/Renderer.html" title="interface in com.google.android.exoplayer2">Renderer</a></code></dd>
644+
<dd><code><a href="../../../../com/google/android/exoplayer2/Renderer.html#setCurrentStreamFinal--">setCurrentStreamFinal</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../com/google/android/exoplayer2/Renderer.html" title="interface in com.google.android.exoplayer2">Renderer</a></code></dd>
645+
</dl>
646+
</li>
647+
</ul>
648+
<a name="isCurrentStreamFinal--">
649+
<!-- -->
650+
</a>
651+
<ul class="blockList">
652+
<li class="blockList">
653+
<h4>isCurrentStreamFinal</h4>
654+
<pre>public final&nbsp;boolean&nbsp;isCurrentStreamFinal()</pre>
655+
<div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../com/google/android/exoplayer2/Renderer.html#isCurrentStreamFinal--">Renderer</a></code></span></div>
656+
<div class="block">Returns whether the current <a href="../../../../com/google/android/exoplayer2/source/SampleStream.html" title="interface in com.google.android.exoplayer2.source"><code>SampleStream</code></a> will be the final one supplied before the
657+
renderer is next disabled or reset.</div>
658+
<dl>
659+
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
660+
<dd><code><a href="../../../../com/google/android/exoplayer2/Renderer.html#isCurrentStreamFinal--">isCurrentStreamFinal</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../com/google/android/exoplayer2/Renderer.html" title="interface in com.google.android.exoplayer2">Renderer</a></code></dd>
638661
</dl>
639662
</li>
640663
</ul>
@@ -906,7 +929,7 @@ <h4>readSource</h4>
906929
<pre>protected final&nbsp;int&nbsp;readSource(<a href="../../../../com/google/android/exoplayer2/FormatHolder.html" title="class in com.google.android.exoplayer2">FormatHolder</a>&nbsp;formatHolder,
907930
<a href="../../../../com/google/android/exoplayer2/decoder/DecoderInputBuffer.html" title="class in com.google.android.exoplayer2.decoder">DecoderInputBuffer</a>&nbsp;buffer)</pre>
908931
<div class="block">Reads from the enabled upstream source. If the upstream source has been read to the end then
909-
<a href="../../../../com/google/android/exoplayer2/C.html#RESULT_BUFFER_READ"><code>C.RESULT_BUFFER_READ</code></a> is only returned if <a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#setCurrentStreamIsFinal--"><code>setCurrentStreamIsFinal()</code></a> has been
932+
<a href="../../../../com/google/android/exoplayer2/C.html#RESULT_BUFFER_READ"><code>C.RESULT_BUFFER_READ</code></a> is only returned if <a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#setCurrentStreamFinal--"><code>setCurrentStreamFinal()</code></a> has been
910933
called. <a href="../../../../com/google/android/exoplayer2/C.html#RESULT_NOTHING_READ"><code>C.RESULT_NOTHING_READ</code></a> is returned otherwise.</div>
911934
<dl>
912935
<dt><span class="paramLabel">Parameters:</span></dt>

‎ExoPlayer/JavaDoc/com/google/android/exoplayer2/C.BufferFlags.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
66
<title>C.BufferFlags (library API)</title>
7-
<meta name="date" content="2016-10-20">
7+
<meta name="date" content="2016-12-20">
88
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../../script.js"></script>
1010
</head>

‎ExoPlayer/JavaDoc/com/google/android/exoplayer2/C.ContentType.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
66
<title>C.ContentType (library API)</title>
7-
<meta name="date" content="2016-10-20">
7+
<meta name="date" content="2016-12-20">
88
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../../script.js"></script>
1010
</head>

‎ExoPlayer/JavaDoc/com/google/android/exoplayer2/C.CryptoMode.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
66
<title>C.CryptoMode (library API)</title>
7-
<meta name="date" content="2016-10-20">
7+
<meta name="date" content="2016-12-20">
88
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../../script.js"></script>
1010
</head>

‎ExoPlayer/JavaDoc/com/google/android/exoplayer2/C.Encoding.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
5+
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
66
<title>C.Encoding (library API)</title>
7-
<meta name="date" content="2016-10-20">
7+
<meta name="date" content="2016-12-20">
88
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../../script.js"></script>
1010
</head>

0 commit comments

Comments
 (0)