update exoplayer version,exoplayer support user-agent setting

Author: jiajunhui

README.md

@@ -88,7 +88,7 @@ dependencies {
   //---------如果使用ExoPlayer解码，使用以下依赖。---------
   //该依赖包含exoplayer解码和MediaPlayer解码
   //注意exoplayer的最小支持SDK版本为16
-  implementation 'cn.jiajunhui:exoplayer:336_291_010'
+  implementation 'cn.jiajunhui:exoplayer:336_2111_011'
 
   
   //---------如果使用ijkPlayer解码，使用以下依赖。---------

app/src/main/java/com/kk/taurus/avplayer/ui/BaseVideoViewActivity.java

@@ -13,6 +13,7 @@
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
+import com.kk.taurus.avplayer.App;
 import com.kk.taurus.avplayer.R;
 import com.kk.taurus.avplayer.cover.ControllerCover;
 import com.kk.taurus.avplayer.play.DataInter;
@@ -21,6 +22,7 @@
 import com.kk.taurus.avplayer.utils.PUtil;
 import com.kk.taurus.playerbase.assist.InterEvent;
 import com.kk.taurus.playerbase.assist.OnVideoViewEventHandler;
+import com.kk.taurus.playerbase.config.PlayerConfig;
 import com.kk.taurus.playerbase.entity.DataSource;
 import com.kk.taurus.playerbase.event.OnPlayerEventListener;
 import com.kk.taurus.playerbase.player.IPlayer;
@@ -187,22 +189,19 @@ public void onItemClick(SettingAdapter.SettingItemHolder holder, SettingItem ite
                 mVideoView.setAspectRatio(AspectRatio.AspectRatio_ORIGIN);
                 break;
             case SettingItem.CODE_PLAYER_MEDIA_PLAYER:
-                replay();
-//                if(mVideoView.switchDecoder(PlayerConfig.DEFAULT_PLAN_ID)){
-//                    replay();
-//                }
+                if(mVideoView.switchDecoder(PlayerConfig.DEFAULT_PLAN_ID)){
+                    replay();
+                }
                 break;
             case SettingItem.CODE_PLAYER_IJK_PLAYER:
-                replay();
-//                if(mVideoView.switchDecoder(App.PLAN_ID_IJK)){
-//                    replay();
-//                }
+                if(mVideoView.switchDecoder(App.PLAN_ID_IJK)){
+                    replay();
+                }
                 break;
             case SettingItem.CODE_PLAYER_EXO_PLAYER:
-                replay();
-//                if(mVideoView.switchDecoder(App.PLAN_ID_EXO)){
-//                    replay();
-//                }
+                if(mVideoView.switchDecoder(App.PLAN_ID_EXO)){
+                    replay();
+                }
                 break;
             case SettingItem.CODE_SPEED_0_5:
                 mVideoView.setSpeed(0.5f);

exoplayer/bintray.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 // 这个version是区分library版本的，因此当我们需要更新library时记得修改这个version
-version = "336_291_010"
+version = "336_2111_011"
 
 def siteUrl = 'https://github.com/jiajunhui/PlayerBase'      // 项目的主页
 def gitUrl = 'https://github.com/jiajunhui/PlayerBase.git'   // Git仓库的url

exoplayer/build.gradle

@@ -30,10 +30,10 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    api 'com.google.android.exoplayer:exoplayer-core:2.9.1'
-    api 'com.google.android.exoplayer:exoplayer-dash:2.9.1'
-    api 'com.google.android.exoplayer:exoplayer-hls:2.9.1'
-    api 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.9.1'
+    api 'com.google.android.exoplayer:exoplayer-core:2.11.1'
+    api 'com.google.android.exoplayer:exoplayer-dash:2.11.1'
+    api 'com.google.android.exoplayer:exoplayer-hls:2.11.1'
+    api 'com.google.android.exoplayer:exoplayer-smoothstreaming:2.11.1'
     api 'com.kk.taurus.playerbase:playerbase:3.3.6'
 //    api project(':playerbase')
 }

exoplayer/src/main/java/com/kk/taurus/exoplayer/ExoMediaPlayer.java

@@ -26,7 +26,6 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
@@ -99,11 +98,12 @@ public ExoMediaPlayer(){
         mAppContext = AppContextAttach.getApplicationContext();
         RenderersFactory renderersFactory = new DefaultRenderersFactory(mAppContext);
         DefaultTrackSelector trackSelector =
-                new DefaultTrackSelector();
-        mInternalPlayer = ExoPlayerFactory.newSimpleInstance(mAppContext, renderersFactory, trackSelector);
+                new DefaultTrackSelector(mAppContext);
+        mInternalPlayer = new SimpleExoPlayer.Builder(mAppContext, renderersFactory)
+                .setTrackSelector(trackSelector).build();
 
         // Measures bandwidth during playback. Can be null if not required.
-        mBandwidthMeter = new DefaultBandwidthMeter();
+        mBandwidthMeter = new DefaultBandwidthMeter.Builder(mAppContext).build();
 
         mInternalPlayer.addListener(mEventListener);
 
@@ -151,18 +151,21 @@ public void setDataSource(DataSource dataSource) {
             return;
         }
 
-        //create DefaultDataSourceFactory
-        com.google.android.exoplayer2.upstream.DataSource.Factory dataSourceFactory =
-                new DefaultDataSourceFactory(mAppContext,
-                        Util.getUserAgent(mAppContext, mAppContext.getPackageName()), mBandwidthMeter);
-
         //if scheme is http or https and DataSource contain extra data, use DefaultHttpDataSourceFactory.
         String scheme = videoUri.getScheme();
         HashMap<String, String> extra = dataSource.getExtra();
+        //setting user-agent from extra data
+        String settingUserAgent = extra!=null?extra.get("User-Agent"):"";
+        //if not setting, use default user-agent
+        String userAgent = !TextUtils.isEmpty(settingUserAgent)?settingUserAgent:Util.getUserAgent(mAppContext, mAppContext.getPackageName());
+        //create DefaultDataSourceFactory
+        com.google.android.exoplayer2.upstream.DataSource.Factory dataSourceFactory =
+                new DefaultDataSourceFactory(mAppContext,
+                        userAgent, mBandwidthMeter);
         if(extra!=null && extra.size()>0 &&
                 ("http".equalsIgnoreCase(scheme)||"https".equalsIgnoreCase(scheme))){
             dataSourceFactory = new DefaultHttpDataSourceFactory(
-                    Util.getUserAgent(mAppContext, mAppContext.getPackageName()),
+                    userAgent,
                     DefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS,
                     DefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS,
                     true);
@@ -180,7 +183,7 @@ public void setDataSource(DataSource dataSource) {
         if(timedTextSource!=null){
             Format format = Format.createTextSampleFormat(null, timedTextSource.getMimeType(), timedTextSource.getFlag(), null);
             MediaSource timedTextMediaSource = new SingleSampleMediaSource.Factory(new DefaultDataSourceFactory(mAppContext,
-                    Util.getUserAgent(mAppContext, mAppContext.getPackageName())))
+                    userAgent))
                     .createMediaSource(Uri.parse(timedTextSource.getPath()), format, C.TIME_UNSET);
             //merge MediaSource and timedTextMediaSource.
             mediaSource = new MergingMediaSource(mediaSource, timedTextMediaSource);