Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

韩亚云
2 parents cd0d79d4 73f4bf09
Showing 25 changed files with 360 additions and 151 deletions
app/strike/src/main/java/com/cnlive/strike/demo/activity/tiktok/TikTokRecycleActivity.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/tiktok/TikTokVerticalViewPagerActivity.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/tiktok/TikTokViewPager2Activity.java
cloud/video/build.gradle
cloud/video/src/main/java/com/libs/video/video/exoplayer/component/DefaultCompleteView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/component/DefaultTitleView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/component/MarqueeTextView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/controller/BaseVideoController.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/controller/ControlWrapper.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/controller/GestureVideoController.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/controller/MediaPlayerControl.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/controller/StandardVideoController.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/AbstractPlayer.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/CNVideoView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/PlayerFactory.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/ProgressManager.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/VideoViewConfig.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/playerCore/exoplayer/ExoMediaPlayer.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/playerCore/mediaplayer/AndroidMediaPlayer.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/playerCore/mediaplayer/AndroidMediaPlayerFactory.java
@@ -13,6 +13,7 @@ import com.cnlive.strike.demo.util.DataUtil;
 import com.libs.video.util.cache.PreloadManager;
 import com.libs.video.video.exoplayer.controller.TikTokController;
 import com.libs.video.video.exoplayer.play.CNVideoView;
+import com.libs.video.video.exoplayer.render.TikTokRenderViewFactory;
 import com.libs.video.video.exoplayer.util.L;
 import com.libs.video.video.exoplayer.util.PlayerUtils;
  
@@ -53,6 +54,8 @@ public class TikTokRecycleActivity extends BaseActivity {
     @Override
     protected void initView() {
         mVideoView = new CNVideoView(this);
+        //以下只能二选一，看你的需求
+//        mVideoView.setRenderViewFactory(TikTokRenderViewFactory.create());
         mVideoView.setScreenScaleType(CNVideoView.SCREEN_SCALE_CENTER_CROP);
         mVideoView.setLooping(true);
         mController = new TikTokController(this);
@@ -14,6 +14,7 @@ import com.libs.video.util.cache.PreloadManager;
 import com.libs.video.util.cache.ProxyVideoCacheManager;
 import com.libs.video.video.exoplayer.controller.TikTokController;
 import com.libs.video.video.exoplayer.play.CNVideoView;
+import com.libs.video.video.exoplayer.render.TikTokRenderViewFactory;
 import com.libs.video.video.exoplayer.util.L;
 import com.libs.video.video.exoplayer.util.PlayerUtils;
 import com.libs.video.video.exoplayer.widget.VerticalViewPager;
@@ -84,6 +85,8 @@ public class TikTokVerticalViewPagerActivity extends BaseActivity {
     private void initVideoView() {
         mVideoView = new CNVideoView(this);
         mVideoView.setLooping(true);
+        //以下只能二选一，看你的需求
+//        mVideoView.setRenderViewFactory(TikTokRenderViewFactory.create());
         mVideoView.setScreenScaleType(CNVideoView.SCREEN_SCALE_CENTER_CROP);
         mController = new TikTokController(this);
         mVideoView.setVideoController(mController);
@@ -13,6 +13,7 @@ import com.libs.video.util.cache.PreloadManager;
 import com.libs.video.util.cache.ProxyVideoCacheManager;
 import com.libs.video.video.exoplayer.controller.TikTokController;
 import com.libs.video.video.exoplayer.play.CNVideoView;
+import com.libs.video.video.exoplayer.render.TikTokRenderViewFactory;
 import com.libs.video.video.exoplayer.util.L;
 import com.libs.video.video.exoplayer.util.PlayerUtils;
 import com.libs.video.video.exoplayer.widget.VerticalViewPager;
@@ -84,6 +85,8 @@ public class TikTokViewPager2Activity extends BaseActivity {
     private void initVideoView() {
         mVideoView = new CNVideoView(this);
         mVideoView.setLooping(true);
+        //以下只能二选一，看你的需求
+//        mVideoView.setRenderViewFactory(TikTokRenderViewFactory.create());
         mVideoView.setScreenScaleType(CNVideoView.SCREEN_SCALE_CENTER_CROP);
  
         mController = new TikTokController(this);
@@ -9,6 +9,7 @@ dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
 //    api project(':lib_cnutil')
 //    api project(':lib_cnchat_tc')
+    //3.2.5
     //友盟
     implementation "com.umeng.umsdk:analytics:8.0.0"
     implementation "com.umeng.umsdk:common:2.0.0"
@@ -104,14 +104,12 @@ public class DefaultCompleteView extends FrameLayout implements IControlComponen
         if (activity != null && mControlWrapper.hasCutout()) {
             int orientation = activity.getRequestedOrientation();
             int cutoutHeight = mControlWrapper.getCutoutHeight();
+            LayoutParams sflp = (LayoutParams) mStopFullscreen.getLayoutParams();
             if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
-                LayoutParams sflp = (LayoutParams) mStopFullscreen.getLayoutParams();
                 sflp.setMargins(0, 0, 0, 0);
             } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
-                LayoutParams sflp = (LayoutParams) mStopFullscreen.getLayoutParams();
                 sflp.setMargins(cutoutHeight, 0, 0, 0);
             } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE) {
-                LayoutParams sflp = (LayoutParams) mStopFullscreen.getLayoutParams();
                 sflp.setMargins(0, 0, 0, 0);
             }
         }
@@ -35,7 +35,7 @@ public class DefaultTitleView extends FrameLayout implements IControlComponent {
     private ControlWrapper mControlWrapper;
  
     private LinearLayout mTitleContainer;
-    private MarqueeTextView mTitle;
+    private TextView mTitle;
     private TextView mSysTime;//系统当前时间
  
     private BatteryReceiver mBatteryReceiver;
@@ -121,8 +121,8 @@ public class DefaultTitleView extends FrameLayout implements IControlComponent {
             }
         } else {
             if (getVisibility() == VISIBLE) {
+                setVisibility(GONE);
                 if (anim != null) {
-                    setVisibility(GONE);
                     startAnimation(anim);
                 }
             }
@@ -150,10 +150,10 @@ public class DefaultTitleView extends FrameLayout implements IControlComponent {
                 setVisibility(VISIBLE);
                 mSysTime.setText(PlayerUtils.getCurrentSystemTime());
             }
-            mTitle.setNeedFocus(true);
+            mTitle.setSelected(true);
         } else {
             setVisibility(GONE);
-            mTitle.setNeedFocus(false);
+            mTitle.setSelected(false);
         }
  
         Activity activity = PlayerUtils.scanForActivity(getContext());
-package com.libs.video.video.exoplayer.component;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-/**
- * 实现跑马灯效果的TextView
- */
-public class MarqueeTextView extends TextView {
-    private boolean mNeedFocus;
-    public MarqueeTextView(Context context) {
-        super(context);
-    }
-    public MarqueeTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-    public MarqueeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-    //返回textview是否处在选中的状态
-    //而只有选中的textview才能够实现跑马灯效果
-    @Override
-    public boolean isFocused() {
-        if (mNeedFocus) {
-            return false;
-        }
-        return super.isFocused();
-    }
-
-    public void setNeedFocus(boolean needFocus) {
-        mNeedFocus = needFocus;
-    }
-}
 \ No newline at end of file
@@ -30,6 +30,14 @@ import androidx.annotation.Nullable;
  
 /**
  * 控制器基类
+ * 此类集成各种事件的处理逻辑，包括
+ * 1.播放器状态改变: {@link #handlePlayerStateChanged(int)}
+ * 2.播放状态改变: {@link #handlePlayStateChanged(int)}
+ * 3.控制视图的显示和隐藏: {@link #handleVisibilityChanged(boolean, Animation)}
+ * 4.播放进度改变: {@link #handleSetProgress(int, int)}
+ * 5.锁定状态改变: {@link #handleLockStateChanged(boolean)}
+ * 6.设备方向监听: {@link #onOrientationChanged(int)}
+ * Created by dueeeke on 2017/4/12.
  */
 public abstract class BaseVideoController extends FrameLayout
         implements IVideoController,
@@ -253,7 +261,7 @@ public abstract class BaseVideoController extends FrameLayout
     /**
      * 隐藏播放视图Runnable
      */
-    public final Runnable mFadeOut = new Runnable() {
+    protected final Runnable mFadeOut = new Runnable() {
         @Override
         public void run() {
             hide();
@@ -294,7 +302,7 @@ public abstract class BaseVideoController extends FrameLayout
     /**
      * 刷新进度Runnable
      */
-    private Runnable mShowProgress = new Runnable() {
+    protected Runnable mShowProgress = new Runnable() {
         @Override
         public void run() {
             int pos = setProgress();
@@ -112,6 +112,10 @@ public class ControlWrapper implements MediaPlayerControl, IVideoController {
     }
  
     @Override
+    public float getSpeed() {
+        return mPlayerControl.getSpeed();
+    }
+    @Override
     public long getTcpSpeed() {
         return mPlayerControl.getTcpSpeed();
     }
@@ -33,8 +33,7 @@ public abstract class GestureVideoController extends BaseVideoController impleme
     private boolean mIsGestureEnabled = true;
     private int mStreamVolume;
     private float mBrightness;
-    private int mPosition;
-    private boolean mNeedSeek;
+    private int mSeekPosition;
     private boolean mFirstTouch;
     private boolean mChangePosition;
     private boolean mChangeBrightness;
@@ -228,8 +227,7 @@ public abstract class GestureVideoController extends BaseVideoController impleme
                 ((IGestureComponent) component).onPositionChange(position, currentPosition, duration);
             }
         }
-        mPosition = position;
-        mNeedSeek = true;
+        mSeekPosition = position;
     }
  
     protected void slideToChangeBrightness(float deltaY) {
@@ -274,22 +272,35 @@ public abstract class GestureVideoController extends BaseVideoController impleme
  
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        boolean detectedUp = event.getAction() == MotionEvent.ACTION_UP;
-        if (!mGestureDetector.onTouchEvent(event) && detectedUp) {
-            for (Map.Entry<IControlComponent, Boolean> next : mControlComponents.entrySet()) {
-                IControlComponent component = next.getKey();
-                if (component instanceof IGestureComponent) {
-                    ((IGestureComponent) component).onStopSlide();
-                }
-            }
-            if (mNeedSeek) {
-                mControlWrapper.seekTo(mPosition);
-                mNeedSeek = false;
+        //滑动结束时事件处理
+        if (!mGestureDetector.onTouchEvent(event)) {
+            int action = event.getAction();
+            switch (action) {
+                case MotionEvent.ACTION_UP:
+                    stopSlide();
+                    if (mSeekPosition > 0) {
+                        mControlWrapper.seekTo(mSeekPosition);
+                        mSeekPosition = 0;
+                    }
+                    break;
+                case MotionEvent.ACTION_CANCEL:
+                    stopSlide();
+                    mSeekPosition = 0;
+                    break;
             }
         }
         return super.onTouchEvent(event);
     }
  
+    private void stopSlide() {
+        for (Map.Entry<IControlComponent, Boolean> next : mControlComponents.entrySet()) {
+            IControlComponent component = next.getKey();
+            if (component instanceof IGestureComponent) {
+                ((IGestureComponent) component).onStopSlide();
+            }
+        }
+    }
+
     @Override
     public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
         return false;
@@ -38,6 +38,8 @@ public interface MediaPlayerControl {
  
     void setSpeed(float speed);
  
+    float getSpeed();
+
     long getTcpSpeed();
  
     void replay(boolean resetPosition);
@@ -32,6 +32,8 @@ import androidx.annotation.Nullable;
  
 /**
  * 直播/点播控制器
+ * 注意：此控制器仅做一个参考，如果想定制ui，你可以直接继承GestureVideoController或者BaseVideoController实现
+ * 你自己的控制器
  */
  
 public class StandardVideoController extends GestureVideoController implements View.OnClickListener, AbstractPlayer.PlayerEventListener {
@@ -207,7 +209,7 @@ public class StandardVideoController extends GestureVideoController implements V
  
     @Override
     public void onError(PlayErrorException playErrorException) {
-        Log.e("测试", "onError: " );
+        Log.e("测试", "onError: ");
     }
  
     @Override
@@ -163,6 +163,11 @@ public abstract class AbstractPlayer {
     public abstract void setSpeed(float speed);
  
     /**
+     * 获取播放速度
+     */
+    public abstract float getSpeed();
+
+    /**
      * 获取当前缓冲的网速
      */
     public abstract long getTcpSpeed();
@@ -656,6 +656,14 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
         }
     }
  
+    @Override
+    public float getSpeed() {
+        if (isInPlaybackState()) {
+            return mMediaPlayer.getSpeed();
+        }
+        return 1f;
+    }
+
     /**
      * 设置视频地址
      */
@@ -3,9 +3,10 @@ package com.libs.video.video.exoplayer.play;
 import android.content.Context;
  
 /**
- * 创建播放器核心
- *
- * @param <P>
+ * 此接口使用方法：
+ * 1.继承{@link AbstractPlayer}扩展自己的播放器。
+ * 2.继承此接口并实现${@link #createPlayer(Context)}，返回步骤1中的播放器。
+ * 可参照{@link com.libs.video.video.exoplayer.playerCore.mediaplayer.AndroidMediaPlayer}和{@link com.libs.video.video.exoplayer.playerCore.mediaplayer.AndroidMediaPlayerFactory}的实现。
  */
 public abstract class PlayerFactory<P extends AbstractPlayer> {
  
 package com.libs.video.video.exoplayer.play;
  
 /**
- * 进度管理
+ * 播放进度管理器，继承此接口实现自己的进度管理器。
  */
 public abstract class ProgressManager {
  
+    /**
+     * 此方法用于实现保存进度的逻辑
+     * @param url 播放地址
+     * @param progress 播放进度
+     */
     public abstract void saveProgress(String url, long progress);
  
+    /**
+     * 此方法用于实现获取保存的进度的逻辑
+     * @param url 播放地址
+     * @return 保存的播放进度
+     */
     public abstract long getSavedProgress(String url);
  
 }
@@ -23,8 +23,6 @@ public class VideoViewConfig {
  
     public final boolean mEnableAudioFocus;
  
-    public final boolean mEnableParallelPlay;
-
     public final boolean mIsEnableLog;
  
     public final ProgressManager mProgressManager;
@@ -43,7 +41,6 @@ public class VideoViewConfig {
         mPlayOnMobileNetwork = builder.mPlayOnMobileNetwork;
         mEnableAudioFocus = builder.mEnableAudioFocus;
         mProgressManager = builder.mProgressManager;
-        mEnableParallelPlay = builder.mEnableParallelPlay;
         mScreenScaleType = builder.mScreenScaleType;
         if (builder.mPlayerFactory == null) {
             //默认为AndroidMediaPlayer
@@ -67,7 +64,6 @@ public class VideoViewConfig {
         private boolean mPlayOnMobileNetwork;
         private boolean mEnableOrientation;
         private boolean mEnableAudioFocus = true;
-        private boolean mEnableParallelPlay;
         private ProgressManager mProgressManager;
         private PlayerFactory mPlayerFactory;
         private int mScreenScaleType;
@@ -107,16 +103,6 @@ public class VideoViewConfig {
         }
  
         /**
-         * 支持多开
-         * @deprecated 此api已经无效，你需要自己去控制同时只有一个VideoView在播放的效果
-         */
-        @Deprecated
-        public Builder setEnableParallelPlay(boolean enableParallelPlay) {
-            mEnableParallelPlay = enableParallelPlay;
-            return this;
-        }
-
-        /**
          * 是否打印日志
          */
         public Builder setLogEnabled(boolean enableLog) {
@@ -332,6 +332,13 @@ public class ExoMediaPlayer extends AbstractPlayer implements VideoListener, Pla
         }
     }
  
+    @Override
+    public float getSpeed() {
+        if (mSpeedPlaybackParameters != null) {
+            return mSpeedPlaybackParameters.speed;
+        }
+        return 1f;
+    }
     /**
      * 不支持
      *
@@ -20,6 +20,11 @@ import com.libs.video.video.exoplayer.util.PlayCacheUtils;
 import java.io.IOException;
 import java.util.Map;
  
+import static com.libs.video.video.exoplayer.PlayErrorException.TYPE_UNEXPECTED_ERROR;
+
+/**
+ * 封装系统的MediaPlayer，不推荐，系统的MediaPlayer兼容性较差，建议使用ExoPlayer
+ */
 public class AndroidMediaPlayer extends AbstractPlayer {
  
     protected MediaPlayer mMediaPlayer;
@@ -57,7 +62,7 @@ public class AndroidMediaPlayer extends AbstractPlayer {
     public void setDataSource(String path, Map<String, String> headers, boolean isCache) {
         try {
             if (isCache) {
-                mMediaPlayer.setDataSource(mAppContext, Uri.parse(PlayCacheUtils.getCachePath(mAppContext,path)), headers);
+                mMediaPlayer.setDataSource(mAppContext, Uri.parse(PlayCacheUtils.getCachePath(mAppContext, path)), headers);
             } else {
                 //不缓存
                 mMediaPlayer.setDataSource(mAppContext, Uri.parse(path), headers);
@@ -94,7 +99,7 @@ public class AndroidMediaPlayer extends AbstractPlayer {
         } else if (e instanceof IllegalStateException) {
             errorException = new PlayErrorException(PlayErrorException.TYPE_IllegalStateException, e.getMessage());
         } else {
-            errorException = new PlayErrorException(PlayErrorException.TYPE_UNEXPECTED_ERROR, e.getMessage());
+            errorException = new PlayErrorException(TYPE_UNEXPECTED_ERROR, e.getMessage());
         }
         mPlayerEventListener.onError(errorException);
     }
@@ -239,6 +244,19 @@ public class AndroidMediaPlayer extends AbstractPlayer {
     }
  
     @Override
+    public float getSpeed() {
+        // only support above Android M
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            try {
+                return mMediaPlayer.getPlaybackParams().getSpeed();
+            } catch (Exception e) {
+                mPlayerEventListener.onError(new PlayErrorException(TYPE_UNEXPECTED_ERROR,e.getMessage()));
+            }
+        }
+        return 1f;
+    }
+
+    @Override
     public long getTcpSpeed() {
         // no support
         return 0;
@@ -3,7 +3,9 @@ package com.libs.video.video.exoplayer.playerCore.mediaplayer;
 import android.content.Context;
  
 import com.libs.video.video.exoplayer.play.PlayerFactory;
-
+/**
+ * 创建{@link AndroidMediaPlayer}的工厂类，不推荐，系统的MediaPlayer兼容性较差，建议使用ExoPlayer
+ */
 public class AndroidMediaPlayerFactory extends PlayerFactory<AndroidMediaPlayer> {
  
     public static AndroidMediaPlayerFactory create() {
@@ -9,7 +9,6 @@ import com.libs.video.video.exoplayer.play.CNVideoView;
  * 测量工具
  */
 public class MeasureHelper {
-
     private int mVideoWidth;
  
     private int mVideoHeight;
@@ -22,7 +21,6 @@ public class MeasureHelper {
         mVideoRotationDegree = videoRotationDegree;
     }
  
-
     public void setVideoSize(int width, int height) {
         mVideoWidth = width;
         mVideoHeight = height;
@@ -32,6 +30,9 @@ public class MeasureHelper {
         mCurrentScreenScale = screenScale;
     }
  
+    /**
+     * 注意：VideoView的宽高一定要定死，否者以下算法不成立
+     */
     public int[] doMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         if (mVideoRotationDegree == 90 || mVideoRotationDegree == 270) { // 软解码时处理旋转信息，交换宽高
             widthMeasureSpec = widthMeasureSpec + heightMeasureSpec;
@@ -39,11 +40,23 @@ public class MeasureHelper {
             widthMeasureSpec = widthMeasureSpec - heightMeasureSpec;
         }
  
-        int width = View.getDefaultSize(mVideoWidth, widthMeasureSpec);
-        int height = View.getDefaultSize(mVideoHeight, heightMeasureSpec);
+        int width = View.MeasureSpec.getSize(widthMeasureSpec);
+        int height = View.MeasureSpec.getSize(heightMeasureSpec);
+
+        if (mVideoHeight == 0 || mVideoWidth == 0) {
+            return new int[]{width, height};
+        }
  
         //如果设置了比例
         switch (mCurrentScreenScale) {
+            case CNVideoView.SCREEN_SCALE_DEFAULT:
+            default:
+                if (mVideoWidth * height < width * mVideoHeight) {
+                    width = height * mVideoWidth / mVideoHeight;
+                } else if (mVideoWidth * height > width * mVideoHeight) {
+                    height = width * mVideoHeight / mVideoWidth;
+                }
+                break;
             case CNVideoView.SCREEN_SCALE_ORIGINAL:
                 width = mVideoWidth;
                 height = mVideoHeight;
@@ -61,80 +74,146 @@ public class MeasureHelper {
                 } else {
                     width = height / 3 * 4;
                 }
-//                Log.d("@@@@", "onMeasure 4:3 : width" + width + "    height:" + height);
                 break;
             case CNVideoView.SCREEN_SCALE_MATCH_PARENT:
                 width = widthMeasureSpec;
                 height = heightMeasureSpec;
                 break;
             case CNVideoView.SCREEN_SCALE_CENTER_CROP:
-                if (mVideoWidth > 0 && mVideoHeight > 0) {
-                    if (mVideoWidth * height > width * mVideoHeight) {
-                        width = height * mVideoWidth / mVideoHeight;
-                    } else {
-                        height = width * mVideoHeight / mVideoWidth;
-                    }
-                }
-                break;
-            case CNVideoView.SCREEN_SCALE_DEFAULT:
-            default:
-                if (mVideoWidth > 0 && mVideoHeight > 0) {
-
-                    int widthSpecMode = View.MeasureSpec.getMode(widthMeasureSpec);
-                    int widthSpecSize = View.MeasureSpec.getSize(widthMeasureSpec);
-                    int heightSpecMode = View.MeasureSpec.getMode(heightMeasureSpec);
-                    int heightSpecSize = View.MeasureSpec.getSize(heightMeasureSpec);
-
-                    if (widthSpecMode == View.MeasureSpec.EXACTLY && heightSpecMode == View.MeasureSpec.EXACTLY) {
-                        // the size is fixed
-                        width = widthSpecSize;
-                        height = heightSpecSize;
-
-                        // for compatibility, we adjust size based on aspect ratio
-                        if (mVideoWidth * height < width * mVideoHeight) {
-                            //Log.i("@@@", "image too wide, correcting");
-                            width = height * mVideoWidth / mVideoHeight;
-                        } else if (mVideoWidth * height > width * mVideoHeight) {
-                            //Log.i("@@@", "image too tall, correcting");
-                            height = width * mVideoHeight / mVideoWidth;
-                        }
-                    } else if (widthSpecMode == View.MeasureSpec.EXACTLY) {
-                        // only the width is fixed, adjust the height to match aspect ratio if possible
-                        width = widthSpecSize;
-                        height = width * mVideoHeight / mVideoWidth;
-                        if (heightSpecMode == View.MeasureSpec.AT_MOST && height > heightSpecSize) {
-                            // couldn't match aspect ratio within the constraints
-                            height = heightSpecSize;
-                        }
-                    } else if (heightSpecMode == View.MeasureSpec.EXACTLY) {
-                        // only the height is fixed, adjust the width to match aspect ratio if possible
-                        height = heightSpecSize;
-                        width = height * mVideoWidth / mVideoHeight;
-                        if (widthSpecMode == View.MeasureSpec.AT_MOST && width > widthSpecSize) {
-                            // couldn't match aspect ratio within the constraints
-                            width = widthSpecSize;
-                        }
-                    } else {
-                        // neither the width nor the height are fixed, try to use actual video size
-                        width = mVideoWidth;
-                        height = mVideoHeight;
-                        if (heightSpecMode == View.MeasureSpec.AT_MOST && height > heightSpecSize) {
-                            // too tall, decrease both width and height
-                            height = heightSpecSize;
-                            width = height * mVideoWidth / mVideoHeight;
-                        }
-                        if (widthSpecMode == View.MeasureSpec.AT_MOST && width > widthSpecSize) {
-                            // too wide, decrease both width and height
-                            width = widthSpecSize;
-                            height = width * mVideoHeight / mVideoWidth;
-                        }
-                    }
+                if (mVideoWidth * height > width * mVideoHeight) {
+                    width = height * mVideoWidth / mVideoHeight;
                 } else {
-                    // no size yet, just adopt the given spec sizes
+                    height = width * mVideoHeight / mVideoWidth;
                 }
                 break;
         }
-
         return new int[]{width, height};
     }
+//    private int mVideoWidth;
+//
+//    private int mVideoHeight;
+//
+//    private int mCurrentScreenScale;
+//
+//    private int mVideoRotationDegree;
+//
+//    public void setVideoRotation(int videoRotationDegree) {
+//        mVideoRotationDegree = videoRotationDegree;
+//    }
+//
+//
+//    public void setVideoSize(int width, int height) {
+//        mVideoWidth = width;
+//        mVideoHeight = height;
+//    }
+//
+//    public void setScreenScale(int screenScale) {
+//        mCurrentScreenScale = screenScale;
+//    }
+//
+//    public int[] doMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+//        if (mVideoRotationDegree == 90 || mVideoRotationDegree == 270) { // 软解码时处理旋转信息，交换宽高
+//            widthMeasureSpec = widthMeasureSpec + heightMeasureSpec;
+//            heightMeasureSpec = widthMeasureSpec - heightMeasureSpec;
+//            widthMeasureSpec = widthMeasureSpec - heightMeasureSpec;
+//        }
+//
+//        int width = View.getDefaultSize(mVideoWidth, widthMeasureSpec);
+//        int height = View.getDefaultSize(mVideoHeight, heightMeasureSpec);
+//
+//        //如果设置了比例
+//        switch (mCurrentScreenScale) {
+//            case CNVideoView.SCREEN_SCALE_ORIGINAL:
+//                width = mVideoWidth;
+//                height = mVideoHeight;
+//                break;
+//            case CNVideoView.SCREEN_SCALE_16_9:
+//                if (height > width / 16 * 9) {
+//                    height = width / 16 * 9;
+//                } else {
+//                    width = height / 9 * 16;
+//                }
+//                break;
+//            case CNVideoView.SCREEN_SCALE_4_3:
+//                if (height > width / 4 * 3) {
+//                    height = width / 4 * 3;
+//                } else {
+//                    width = height / 3 * 4;
+//                }
+////                Log.d("@@@@", "onMeasure 4:3 : width" + width + "    height:" + height);
+//                break;
+//            case CNVideoView.SCREEN_SCALE_MATCH_PARENT:
+//                width = widthMeasureSpec;
+//                height = heightMeasureSpec;
+//                break;
+//            case CNVideoView.SCREEN_SCALE_CENTER_CROP:
+//                if (mVideoWidth > 0 && mVideoHeight > 0) {
+//                    if (mVideoWidth * height > width * mVideoHeight) {
+//                        width = height * mVideoWidth / mVideoHeight;
+//                    } else {
+//                        height = width * mVideoHeight / mVideoWidth;
+//                    }
+//                }
+//                break;
+//            case CNVideoView.SCREEN_SCALE_DEFAULT:
+//            default:
+//                if (mVideoWidth > 0 && mVideoHeight > 0) {
+//
+//                    int widthSpecMode = View.MeasureSpec.getMode(widthMeasureSpec);
+//                    int widthSpecSize = View.MeasureSpec.getSize(widthMeasureSpec);
+//                    int heightSpecMode = View.MeasureSpec.getMode(heightMeasureSpec);
+//                    int heightSpecSize = View.MeasureSpec.getSize(heightMeasureSpec);
+//
+//                    if (widthSpecMode == View.MeasureSpec.EXACTLY && heightSpecMode == View.MeasureSpec.EXACTLY) {
+//                        // the size is fixed
+//                        width = widthSpecSize;
+//                        height = heightSpecSize;
+//
+//                        // for compatibility, we adjust size based on aspect ratio
+//                        if (mVideoWidth * height < width * mVideoHeight) {
+//                            //Log.i("@@@", "image too wide, correcting");
+//                            width = height * mVideoWidth / mVideoHeight;
+//                        } else if (mVideoWidth * height > width * mVideoHeight) {
+//                            //Log.i("@@@", "image too tall, correcting");
+//                            height = width * mVideoHeight / mVideoWidth;
+//                        }
+//                    } else if (widthSpecMode == View.MeasureSpec.EXACTLY) {
+//                        // only the width is fixed, adjust the height to match aspect ratio if possible
+//                        width = widthSpecSize;
+//                        height = width * mVideoHeight / mVideoWidth;
+//                        if (heightSpecMode == View.MeasureSpec.AT_MOST && height > heightSpecSize) {
+//                            // couldn't match aspect ratio within the constraints
+//                            height = heightSpecSize;
+//                        }
+//                    } else if (heightSpecMode == View.MeasureSpec.EXACTLY) {
+//                        // only the height is fixed, adjust the width to match aspect ratio if possible
+//                        height = heightSpecSize;
+//                        width = height * mVideoWidth / mVideoHeight;
+//                        if (widthSpecMode == View.MeasureSpec.AT_MOST && width > widthSpecSize) {
+//                            // couldn't match aspect ratio within the constraints
+//                            width = widthSpecSize;
+//                        }
+//                    } else {
+//                        // neither the width nor the height are fixed, try to use actual video size
+//                        width = mVideoWidth;
+//                        height = mVideoHeight;
+//                        if (heightSpecMode == View.MeasureSpec.AT_MOST && height > heightSpecSize) {
+//                            // too tall, decrease both width and height
+//                            height = heightSpecSize;
+//                            width = height * mVideoWidth / mVideoHeight;
+//                        }
+//                        if (widthSpecMode == View.MeasureSpec.AT_MOST && width > widthSpecSize) {
+//                            // too wide, decrease both width and height
+//                            width = widthSpecSize;
+//                            height = width * mVideoHeight / mVideoWidth;
+//                        }
+//                    }
+//                } else {
+//                    // no size yet, just adopt the given spec sizes
+//                }
+//                break;
+//        }
+//
+//        return new int[]{width, height};
+//    }
 }
@@ -2,8 +2,16 @@ package com.libs.video.video.exoplayer.render;
  
 import android.content.Context;
  
+/**
+ * 此接口用于扩展自己的渲染View。使用方法如下：
+ * 1.继承IRenderView实现自己的渲染View。
+ * 2.重写createRenderView返回步骤1的渲染View。
+ * 可参考{@link com.libs.video.video.exoplayer.render.texture.TextureRenderView}
+ * 和
+ * {@link com.libs.video.video.exoplayer.render.texture.TextureRenderViewFactory}的实现。
+ */
 public abstract class RenderViewFactory {
  
     public abstract IRenderView createRenderView(Context context);
  
 -}
+}
 \ No newline at end of file
+package com.libs.video.video.exoplayer.render;
+
+import android.graphics.Bitmap;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import com.libs.video.video.exoplayer.play.AbstractPlayer;
+import com.libs.video.video.exoplayer.play.CNVideoView;
+
+
+/**
+ * TikTok专用RenderView，横屏视频默认显示，竖屏视频居中裁剪
+ * 使用代理模式实现
+ */
+public class TikTokRenderView implements IRenderView {
+
+    private IRenderView mProxyRenderView;
+
+    TikTokRenderView(@NonNull IRenderView renderView) {
+        this.mProxyRenderView = renderView;
+    }
+
+    @Override
+    public void attachToPlayer(@NonNull AbstractPlayer player) {
+        mProxyRenderView.attachToPlayer(player);
+    }
+
+    @Override
+    public void setVideoSize(int videoWidth, int videoHeight) {
+        if (videoWidth > 0 && videoHeight > 0) {
+            mProxyRenderView.setVideoSize(videoWidth, videoHeight);
+            if (videoHeight > videoWidth) {
+                //竖屏视频，使用居中裁剪
+                mProxyRenderView.setScaleType(CNVideoView.SCREEN_SCALE_CENTER_CROP);
+            } else {
+                //横屏视频，使用默认模式
+                mProxyRenderView.setScaleType(CNVideoView.SCREEN_SCALE_DEFAULT);
+            }
+        }
+    }
+
+    @Override
+    public void setVideoRotation(int degree) {
+        mProxyRenderView.setVideoRotation(degree);
+    }
+
+    @Override
+    public void setScaleType(int scaleType) {
+        // 置空，不要让外部去设置ScaleType
+    }
+
+    @Override
+    public View getView() {
+        return mProxyRenderView.getView();
+    }
+
+    @Override
+    public Bitmap doScreenShot() {
+        return mProxyRenderView.doScreenShot();
+    }
+
+    @Override
+    public void release() {
+        mProxyRenderView.release();
+    }
+}
 \ No newline at end of file
+package com.libs.video.video.exoplayer.render;
+
+import android.content.Context;
+
+import com.libs.video.video.exoplayer.render.texture.TextureRenderView;
+
+
+public class TikTokRenderViewFactory extends RenderViewFactory {
+
+    public static TikTokRenderViewFactory create() {
+        return new TikTokRenderViewFactory();
+    }
+
+    @Override
+    public IRenderView createRenderView(Context context) {
+        return new TikTokRenderView(new TextureRenderView(context));
+    }
+}
@@ -21,14 +21,12 @@
             android:padding="@dimen/cnvideo_controller_icon_padding"
             android:src="@drawable/cnvideo_ic_action_arrow_back" />
  
-        <com.libs.video.video.exoplayer.component.MarqueeTextView
+        <TextView
             android:id="@+id/title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
             android:marqueeRepeatLimit="marquee_forever"
             android:paddingLeft="6dp"
             android:paddingRight="6dp"