Merge pull request #165 from ArchangelWTF/xamarin

Update ExoPlayer to 2.19.1 (Xamarin branch)

Author: martijn00

Directory.Build.props

@@ -15,13 +15,13 @@
     <RepositoryUrl>https://github.com/Baseflow/ExoPlayerXamarin</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>2.18.10-xamarin1</Version>
+    <Version>2.19.1-xamarin1</Version>
     <Platform>AnyCPU</Platform>
     <!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
 
     <IsBindingProject>true</IsBindingProject>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>MonoAndroid12.0;MonoAndroid13.0</TargetFrameworks>
+    <TargetFrameworks>MonoAndroid13.0</TargetFrameworks>
 
     <Nullable>enable</Nullable>
     <LangVersion>11.0</LangVersion>

ExoPlayer.Common/Jars/exoplayer-common-2.18.3.aar

@@ -232,6 +232,7 @@
     <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player']/method[@name='setMediaItems' and count(parameter)=1 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.MediaItem&gt;']]"/>
     <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player']/method[@name='setMediaItems' and count(parameter)=2 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.MediaItem&gt;'] and parameter[2][@type='boolean']]"/>
     <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player']/method[@name='setMediaItems' and count(parameter)=3 and parameter[1][@type='java.util.List&lt;com.google.android.exoplayer2.MediaItem&gt;'] and parameter[2][@type='int'] and parameter[3][@type='long']]"/>
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player']/method[@name='replaceMediaItems' and count(parameter)=3 and parameter[1][@type='int'] and parameter[2][@type='int'] and parameter[3][@type='java.util.List&lt;com.google.android.exoplayer2.MediaItem&gt;']]"/> 
     <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player']/method[@name='getCurrentStaticMetadata' and count(parameter)=0]"/>
     <remove-node path="/api/package[@name='com.google.android.exoplayer2']/interface[@name='Player']/method[@name='getCurrentCues' and count(parameter)=0]"/>
 

ExoPlayer.Common/Jars/exoplayer-common-2.19.1.aar

@@ -0,0 +1,48 @@
+Additions allow you to add arbitrary C# to the generated classes
+before they are compiled.  This can be helpful for providing convenience
+methods or adding pure C# classes.
+
+== Adding Methods to Generated Classes ==
+
+Let's say the library being bound has a Rectangle class with a constructor
+that takes an x and y position, and a width and length size.  It will look like
+this:
+
+public partial class Rectangle
+{
+    public Rectangle (int x, int y, int width, int height)
+    {
+        // JNI bindings
+    }
+}
+
+Imagine we want to add a constructor to this class that takes a Point and
+Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
+with a partial class containing our new method:
+
+public partial class Rectangle
+{
+    public Rectangle (Point location, Size size) :
+        this (location.X, location.Y, size.Width, size.Height)
+    {
+    }
+}
+
+At compile time, the additions class will be added to the generated class
+and the final assembly will a Rectangle class with both constructors.
+
+
+== Adding C# Classes ==
+
+Another thing that can be done is adding fully C# managed classes to the
+generated library.  In the above example, let's assume that there isn't a
+Point class available in Java or our library.  The one we create doesn't need
+to interact with Java, so we'll create it like a normal class in C#.
+
+By adding a Point.cs file with this class, it will end up in the binding library:
+
+public class Point
+{
+    public int X { get; set; }
+    public int Y { get; set; }
+}

ExoPlayer.Common/JavaDocs/exoplayer-common-2.18.3-sources.jar

@@ -0,0 +1,8 @@
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
+  <PropertyGroup>
+    <AssemblyName>ExoPlayer.Container</AssemblyName>
+    <RootNamespace>ExoPlayer.Container</RootNamespace>
+    <Description>Xamarin bindings for ExoPlayer</Description>
+    <PackageId>Xam.Plugins.Android.ExoPlayer.Container</PackageId>
+  </PropertyGroup>
+</Project>

ExoPlayer.Common/JavaDocs/exoplayer-common-2.19.1-sources.jar

@@ -0,0 +1,14 @@
+<enum-field-mappings>
+  <!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
+    <field jni-name="Fragment_name" clr-name="Name" value="0" />
+    <field jni-name="Fragment_id" clr-name="Id" value="1" />
+    <field jni-name="Fragment_tag" clr-name="Tag" value="2" />
+  </mapping>
+  -->
+</enum-field-mappings>

ExoPlayer.Common/Transforms/Metadata.xml

@@ -0,0 +1,13 @@
+<enum-method-mappings>
+  <!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+  
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+  -->
+</enum-method-mappings>

ExoPlayer.Container/Additions/AboutAdditions.txt

@@ -0,0 +1,9 @@
+<metadata>
+  <!--
+  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
+  
+  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
+  -->
+</metadata>

ExoPlayer.Container/ExoPlayer.Container.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\ExoPlayer.Common\ExoPlayer.Common.csproj" />
+    <ProjectReference Include="..\ExoPlayer.Container\ExoPlayer.Container.csproj" />
     <ProjectReference Include="..\ExoPlayer.Database\ExoPlayer.Database.csproj" />
     <ProjectReference Include="..\ExoPlayer.DataSource\ExoPlayer.DataSource.csproj" />
     <ProjectReference Include="..\ExoPlayer.Decoder\ExoPlayer.Decoder.csproj" />

ExoPlayer.Container/Jars/exoplayer-container-2.19.1.aar

@@ -225,7 +225,15 @@
         </method>
     </add-node>
 
-  <attr name="type" path="/api/package[@name='com.google.android.exoplayer2.source.chunk']/interface[@name='ChunkSource']/method[@name='getNextChunk' and count(parameter)=4 and parameter[1][@type='long'] and parameter[2][@type='long'] and parameter[3][@type='java.util.List&lt;? extends com.google.android.exoplayer2.source.chunk.MediaChunk&gt;'] and parameter[4][@type='com.google.android.exoplayer2.source.chunk.ChunkHolder']]/parameter[3]" >Java.Util.IList</attr>
+    <add-node path="/api/package[@name='com.google.android.exoplayer2.source']/class[@name='FilteringMediaSource']">
+        <method abstract="false" deprecated="not deprecated" final="false" name="OnChildSourceInfoRefreshed" native="false" return="void" static="false" synchronized="false" visibility="protected">
+            <parameter name="mediaSourceHolder" type="Java.Lang.Object" />
+            <parameter name="mediaSource" type="Com.Google.Android.Exoplayer2.Source.IMediaSource" />
+            <parameter name="timeline" type="Com.Google.Android.Exoplayer2.Timeline" />
+        </method>
+    </add-node>
+
+    <attr name="type" path="/api/package[@name='com.google.android.exoplayer2.source.chunk']/interface[@name='ChunkSource']/method[@name='getNextChunk' and count(parameter)=4 and parameter[1][@type='long'] and parameter[2][@type='long'] and parameter[3][@type='java.util.List&lt;? extends com.google.android.exoplayer2.source.chunk.MediaChunk&gt;'] and parameter[4][@type='com.google.android.exoplayer2.source.chunk.ChunkHolder']]/parameter[3]" >Java.Util.IList</attr>
 
   <attr name="visibility" path="/api/package[@name='com.google.android.exoplayer2.source']/class[@name='CompositeMediaSource']/method[@name='prepareSourceInternal' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.upstream.TransferListener']]">protected</attr>
   <!--<attr name="visibility" path="/api/package[@name='com.google.android.exoplayer2.source']/class[@name='ExtractorMediaSource']/method[@name='prepareSourceInternal' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.upstream.TransferListener']]">protected</attr>-->

ExoPlayer.Container/JavaDocs/exoplayer-container-2.19.1-sources.jar

@@ -11,50 +11,10 @@
     <remove-node path="/api/package[@name='com.google.android.exoplayer2.effect']/interface[@name='GlMatrixTransformation']/method[@name='toGlTextureProcessor' and count(parameter)=2 and parameter[1][@type='android.content.Context'] and parameter[2][@type='boolean']]" />
     <remove-node path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='Contrast']/field[@name='contrast']" />
 
-    <add-node path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='RgbAdjustment']">
-        <method abstract="false" deprecated="not deprecated" final="false" name="ToGlTextureProcessor" native="false" return="Com.Google.Android.Exoplayer2.Effect.IGlTextureProcessor" static="false" synchronized="false" visibility="public">
-            <parameter name="context" type="Android.Content.Context" />
-            <parameter name="useHdr" type="bool" />
-        </method>
-    </add-node>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='DefaultVideoFrameProcessor.Factory']/method[@name='create' and count(parameter)=8 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.util.List&lt;com.google.android.exoplayer2.util.Effect&gt;'] and parameter[3][@type='com.google.android.exoplayer2.util.DebugViewProvider'] and parameter[4][@type='com.google.android.exoplayer2.video.ColorInfo'] and parameter[5][@type='com.google.android.exoplayer2.video.ColorInfo'] and parameter[6][@type='boolean'] and parameter[7][@type='java.util.concurrent.Executor'] and parameter[8][@type='com.google.android.exoplayer2.util.VideoFrameProcessor.Listener']]">Com.Google.Android.Exoplayer2.Util.IVideoFrameProcessor</attr>
 
-    <add-node path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='Crop']">
-        <method abstract="false" deprecated="not deprecated" final="false" name="ToGlTextureProcessor" native="false" return="Com.Google.Android.Exoplayer2.Effect.IGlTextureProcessor" static="false" synchronized="false" visibility="public">
-            <parameter name="context" type="Android.Content.Context" />
-            <parameter name="useHdr" type="bool" />
-        </method>
-    </add-node>
-
-    <add-node path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='ScaleToFitTransformation']">
-        <method abstract="false" deprecated="not deprecated" final="false" name="ToGlTextureProcessor" native="false" return="Com.Google.Android.Exoplayer2.Effect.IGlTextureProcessor" static="false" synchronized="false" visibility="public">
-            <parameter name="context" type="Android.Content.Context" />
-            <parameter name="useHdr" type="bool" />
-        </method>
-    </add-node>
-
-    <add-node path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='Presentation']">
-        <method abstract="false" deprecated="not deprecated" final="false" name="ToGlTextureProcessor" native="false" return="Com.Google.Android.Exoplayer2.Effect.IGlTextureProcessor" static="false" synchronized="false" visibility="public">
-            <parameter name="context" type="Android.Content.Context" />
-            <parameter name="useHdr" type="bool" />
-        </method>
-    </add-node>
-
-    <add-node path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='Crop']">
-        <method abstract="false" deprecated="not deprecated" final="false" name="GetGlMatrixArray" native="false" return="float[]" static="false" synchronized="false" visibility="public">
-            <parameter name="presentationTimeUs" type="long" />
-        </method>
-    </add-node>
-
-    <add-node path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='Presentation']">
-        <method abstract="false" deprecated="not deprecated" final="false" name="GetGlMatrixArray" native="false" return="float[]" static="false" synchronized="false" visibility="public">
-            <parameter name="presentationTimeUs" type="long" />
-        </method>
-    </add-node>
-
-    <add-node path="/api/package[@name='com.google.android.exoplayer2.effect']/class[@name='ScaleToFitTransformation']">
-        <method abstract="false" deprecated="not deprecated" final="false" name="GetGlMatrixArray" native="false" return="float[]" static="false" synchronized="false" visibility="public">
-            <parameter name="presentationTimeUs" type="long" />
-        </method>
-    </add-node>
-
+    <!-- Since nullable booleans dont exist on XF and they are kind of needed here, time to get rid of these classes as there's no (known) way to make them work without putting in more effort than it's worth.-->
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.effect']/interface[@name='RgbMatrix']" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.effect']/interface[@name='MatrixTransformation']" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.effect']/interface[@name='GlEffect']" />
 </metadata>

ExoPlayer.Container/Transforms/EnumFields.xml

@@ -0,0 +1,48 @@
+Additions allow you to add arbitrary C# to the generated classes
+before they are compiled.  This can be helpful for providing convenience
+methods or adding pure C# classes.
+
+== Adding Methods to Generated Classes ==
+
+Let's say the library being bound has a Rectangle class with a constructor
+that takes an x and y position, and a width and length size.  It will look like
+this:
+
+public partial class Rectangle
+{
+    public Rectangle (int x, int y, int width, int height)
+    {
+        // JNI bindings
+    }
+}
+
+Imagine we want to add a constructor to this class that takes a Point and
+Size structure instead of 4 ints.  We can add a new file called Rectangle.cs
+with a partial class containing our new method:
+
+public partial class Rectangle
+{
+    public Rectangle (Point location, Size size) :
+        this (location.X, location.Y, size.Width, size.Height)
+    {
+    }
+}
+
+At compile time, the additions class will be added to the generated class
+and the final assembly will a Rectangle class with both constructors.
+
+
+== Adding C# Classes ==
+
+Another thing that can be done is adding fully C# managed classes to the
+generated library.  In the above example, let's assume that there isn't a
+Point class available in Java or our library.  The one we create doesn't need
+to interact with Java, so we'll create it like a normal class in C#.
+
+By adding a Point.cs file with this class, it will end up in the binding library:
+
+public class Point
+{
+    public int X { get; set; }
+    public int Y { get; set; }
+}

ExoPlayer.Container/Transforms/EnumMethods.xml

@@ -0,0 +1,8 @@
+<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
+  <PropertyGroup>
+    <AssemblyName>ExoPlayer.Muxer</AssemblyName>
+    <RootNamespace>ExoPlayer.Muxer</RootNamespace>
+    <Description>Xamarin bindings for ExoPlayer</Description>
+    <PackageId>Xam.Plugins.Android.ExoPlayer.Muxer</PackageId>
+  </PropertyGroup>
+</Project>

ExoPlayer.Container/Transforms/Metadata.xml

@@ -0,0 +1,14 @@
+<enum-field-mappings>
+  <!--
+  This example converts the constants Fragment_id, Fragment_name,
+  and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
+  to an enum called Android.Support.V4.App.FragmentTagType with values
+  Id, Name, and Tag.
+  
+  <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
+    <field jni-name="Fragment_name" clr-name="Name" value="0" />
+    <field jni-name="Fragment_id" clr-name="Id" value="1" />
+    <field jni-name="Fragment_tag" clr-name="Tag" value="2" />
+  </mapping>
+  -->
+</enum-field-mappings>

ExoPlayer.Core/ExoPlayer.Core.csproj

@@ -0,0 +1,13 @@
+<enum-method-mappings>
+  <!--
+  This example changes the Java method:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
+  to be:
+    android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
+  when bound in C#.
+  
+  <mapping jni-class="android/support/v4/app/Fragment.SavedState">
+    <method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
+  </mapping>
+  -->
+</enum-method-mappings>

ExoPlayer.Core/Jars/exoplayer-core-2.18.3.aar

@@ -0,0 +1,9 @@
+<metadata>
+  <!--
+  This sample removes the class: android.support.v4.content.AsyncTaskLoader.LoadTask:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='AsyncTaskLoader.LoadTask']" />
+  
+  This sample removes the method: android.support.v4.content.CursorLoader.loadInBackground:
+  <remove-node path="/api/package[@name='android.support.v4.content']/class[@name='CursorLoader']/method[@name='loadInBackground']" />
+  -->
+</metadata>

ExoPlayer.Core/Jars/exoplayer-core-2.19.1.aar

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
+    <!-- Remove these deprecates as they overlap and cause issues when building-->
     <remove-node path="/api/package[@name='com.google.android.exoplayer2.transformer']/interface[@name='Transformer.Listener']/method[@name='onTransformationCompleted' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.MediaItem']]" />
-    <remove-node path="/api/package[@name='com.google.android.exoplayer2.transformer']/interface[@name='Transformer.Listener']/method[@name='onTransformationError' and count(parameter)=2 and parameter[1][@type='com.google.android.exoplayer2.MediaItem'] and parameter[2][@type='java.lang.Exception']]" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.transformer']/interface[@name='Transformer.Listener']/method[@name='onFallbackApplied' and count(parameter)=3 and parameter[1][@type='com.google.android.exoplayer2.MediaItem'] and parameter[2][@type='com.google.android.exoplayer2.transformer.TransformationRequest'] and parameter[3][@type='com.google.android.exoplayer2.transformer.TransformationRequest']]" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.transformer']/interface[@name='Transformer.Listener']/method[@name='onTransformationError' and count(parameter)=3 and parameter[1][@type='com.google.android.exoplayer2.MediaItem'] and parameter[2][@type='com.google.android.exoplayer2.transformer.TransformationResult'] and parameter[3][@type='com.google.android.exoplayer2.transformer.TransformationException']]" />
+    <remove-node path="/api/package[@name='com.google.android.exoplayer2.transformer']/interface[@name='Transformer.Listener']/method[@name='onTransformationError' and count(parameter)=2 and parameter[1][@type='com.google.android.exoplayer2.MediaItem'] and parameter[2][@type='com.google.android.exoplayer2.transformer.TransformationException']]" />
+
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.transformer']/class[@name='InAppMuxer.Factory']/method[@name='create' and count(parameter)=1 and parameter[1][@type='java.lang.String']]">Com.Google.Android.Exoplayer2.Transformer.IMuxer</attr>
+    
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.transformer']/class[@name='DefaultEncoderFactory']/method[@name='createForAudioEncoding' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.Format']]">Com.Google.Android.Exoplayer2.Transformer.ICodec</attr>
+    <attr name="return" path="/api/package[@name='com.google.android.exoplayer2.transformer']/class[@name='DefaultEncoderFactory']/method[@name='createForVideoEncoding' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer2.Format']]">Com.Google.Android.Exoplayer2.Transformer.ICodec</attr>
 </metadata>