Skip to content

Commit

Permalink
Update to 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
martijn00 committed Dec 27, 2016
1 parent 09e3b8e commit 2ae820d
Show file tree
Hide file tree
Showing 510 changed files with 20,054 additions and 3,592 deletions.
67 changes: 52 additions & 15 deletions ExoPlayer/ExoPlayer.csproj

Large diffs are not rendered by default.

Binary file removed ExoPlayer/Jars/exoplayer-r2.0.4.aar
Binary file not shown.
Binary file added ExoPlayer/Jars/exoplayer-r2.1.1.aar
Binary file not shown.
53 changes: 43 additions & 10 deletions ExoPlayer/JavaDoc/allclasses-frame.html

Large diffs are not rendered by default.

53 changes: 43 additions & 10 deletions ExoPlayer/JavaDoc/allclasses-noframe.html

Large diffs are not rendered by default.

75 changes: 49 additions & 26 deletions ExoPlayer/JavaDoc/com/google/android/exoplayer2/BaseRenderer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
<title>BaseRenderer (library API)</title>
<meta name="date" content="2016-10-20">
<meta name="date" content="2016-12-20">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
Expand All @@ -18,7 +18,7 @@
catch(err) {
}
//-->
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};
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};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
Expand Down Expand Up @@ -244,108 +244,115 @@ <h3>Method Summary</h3>
</td>
</tr>
<tr id="i10" class="altColor">
<td class="colFirst"><code>boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#isCurrentStreamFinal--">isCurrentStreamFinal</a></span>()</code>
<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
renderer is next disabled or reset.</div>
</td>
</tr>
<tr id="i11" class="rowColor">
<td class="colFirst"><code>protected boolean</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#isSourceReady--">isSourceReady</a></span>()</code>
<div class="block">Returns whether the upstream source is ready.</div>
</td>
</tr>
<tr id="i11" class="rowColor">
<tr id="i12" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#maybeThrowStreamError--">maybeThrowStreamError</a></span>()</code>
<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>
</td>
</tr>
<tr id="i12" class="altColor">
<tr id="i13" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onDisabled--">onDisabled</a></span>()</code>
<div class="block">Called when the renderer is disabled.</div>
</td>
</tr>
<tr id="i13" class="rowColor">
<tr id="i14" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onEnabled-boolean-">onEnabled</a></span>(boolean&nbsp;joining)</code>
<div class="block">Called when the renderer is enabled.</div>
</td>
</tr>
<tr id="i14" class="altColor">
<tr id="i15" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onPositionReset-long-boolean-">onPositionReset</a></span>(long&nbsp;positionUs,
boolean&nbsp;joining)</code>
<div class="block">Called when the position is reset.</div>
</td>
</tr>
<tr id="i15" class="rowColor">
<tr id="i16" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onStarted--">onStarted</a></span>()</code>
<div class="block">Called when the renderer is started.</div>
</td>
</tr>
<tr id="i16" class="altColor">
<tr id="i17" class="rowColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#onStopped--">onStopped</a></span>()</code>
<div class="block">Called when the renderer is stopped.</div>
</td>
</tr>
<tr id="i17" class="rowColor">
<tr id="i18" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<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>
<div class="block">Called when the renderer's stream has changed.</div>
</td>
</tr>
<tr id="i18" class="altColor">
<tr id="i19" class="rowColor">
<td class="colFirst"><code>protected int</code></td>
<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,
<a href="../../../../com/google/android/exoplayer2/decoder/DecoderInputBuffer.html" title="class in com.google.android.exoplayer2.decoder">DecoderInputBuffer</a>&nbsp;buffer)</code>
<div class="block">Reads from the enabled upstream source.</div>
</td>
</tr>
<tr id="i19" class="rowColor">
<tr id="i20" class="altColor">
<td class="colFirst"><code>void</code></td>
<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,
<a href="../../../../com/google/android/exoplayer2/source/SampleStream.html" title="interface in com.google.android.exoplayer2.source">SampleStream</a>&nbsp;stream,
long&nbsp;offsetUs)</code>
<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>
</td>
</tr>
<tr id="i20" class="altColor">
<tr id="i21" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#resetPosition-long-">resetPosition</a></span>(long&nbsp;positionUs)</code>
<div class="block">Signals to the renderer that a position discontinuity has occurred.</div>
</td>
</tr>
<tr id="i21" class="rowColor">
<tr id="i22" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#setCurrentStreamIsFinal--">setCurrentStreamIsFinal</a></span>()</code>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#setCurrentStreamFinal--">setCurrentStreamFinal</a></span>()</code>
<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
before it is next disabled or reset.</div>
</td>
</tr>
<tr id="i22" class="altColor">
<tr id="i23" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#setIndex-int-">setIndex</a></span>(int&nbsp;index)</code>
<div class="block">Sets the index of this renderer within the player.</div>
</td>
</tr>
<tr id="i23" class="rowColor">
<tr id="i24" class="altColor">
<td class="colFirst"><code>protected void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#skipToKeyframeBefore-long-">skipToKeyframeBefore</a></span>(long&nbsp;timeUs)</code>
<div class="block">Attempts to skip to the keyframe before the specified time.</div>
</td>
</tr>
<tr id="i24" class="altColor">
<tr id="i25" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#start--">start</a></span>()</code>
<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
rendered.</div>
</td>
</tr>
<tr id="i25" class="rowColor">
<tr id="i26" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#stop--">stop</a></span>()</code>
<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>
</td>
</tr>
<tr id="i26" class="altColor">
<tr id="i27" class="rowColor">
<td class="colFirst"><code>int</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../com/google/android/exoplayer2/BaseRenderer.html#supportsMixedMimeTypeAdaptation--">supportsMixedMimeTypeAdaptation</a></span>()</code>
<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
Expand Down Expand Up @@ -619,22 +626,38 @@ <h4>hasReadStreamToEnd</h4>
</dl>
</li>
</ul>
<a name="setCurrentStreamIsFinal--">
<a name="setCurrentStreamFinal--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>setCurrentStreamIsFinal</h4>
<pre>public final&nbsp;void&nbsp;setCurrentStreamIsFinal()</pre>
<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>
<h4>setCurrentStreamFinal</h4>
<pre>public final&nbsp;void&nbsp;setCurrentStreamFinal()</pre>
<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>
<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
before it is next disabled or reset.
<p>
This method may be called when the renderer is in the following states:
<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>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<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>
<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>
</dl>
</li>
</ul>
<a name="isCurrentStreamFinal--">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>isCurrentStreamFinal</h4>
<pre>public final&nbsp;boolean&nbsp;isCurrentStreamFinal()</pre>
<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>
<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
renderer is next disabled or reset.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<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>
</dl>
</li>
</ul>
Expand Down Expand Up @@ -906,7 +929,7 @@ <h4>readSource</h4>
<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,
<a href="../../../../com/google/android/exoplayer2/decoder/DecoderInputBuffer.html" title="class in com.google.android.exoplayer2.decoder">DecoderInputBuffer</a>&nbsp;buffer)</pre>
<div class="block">Reads from the enabled upstream source. If the upstream source has been read to the end then
<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
<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
called. <a href="../../../../com/google/android/exoplayer2/C.html#RESULT_NOTHING_READ"><code>C.RESULT_NOTHING_READ</code></a> is returned otherwise.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
<title>C.BufferFlags (library API)</title>
<meta name="date" content="2016-10-20">
<meta name="date" content="2016-12-20">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
<title>C.ContentType (library API)</title>
<meta name="date" content="2016-10-20">
<meta name="date" content="2016-12-20">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
<title>C.CryptoMode (library API)</title>
<meta name="date" content="2016-10-20">
<meta name="date" content="2016-12-20">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
<title>C.Encoding (library API)</title>
<meta name="date" content="2016-10-20">
<meta name="date" content="2016-12-20">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
<title>C.PcmEncoding (library API)</title>
<meta name="date" content="2016-10-20">
<meta name="date" content="2016-12-20">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (1.8.0_101) on Thu Oct 20 12:37:32 BST 2016 -->
<!-- Generated by javadoc (1.8.0_45-internal) on Tue Dec 20 12:04:43 GMT 2016 -->
<title>C.SelectionFlags (library API)</title>
<meta name="date" content="2016-10-20">
<meta name="date" content="2016-12-20">
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
<script type="text/javascript" src="../../../../script.js"></script>
</head>
Expand Down
Loading

0 comments on commit 2ae820d

Please sign in to comment.