修改视频选帧页面视频比例问题

musicMerge/src/main/java/com/cooleshow/musicmerge/adapter/SelectCoverAdapter.java

@@ -8,6 +8,7 @@ import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
 import com.cooleshow.musicmerge.R;
+import com.cooleshow.musicmerge.constants.MusicMergeConfig;
 
 import java.util.ArrayList;
 
@@ -27,7 +28,7 @@ public class SelectCoverAdapter extends RecyclerView.Adapter<SelectCoverAdapter.
     @Override
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         int height = mContext.getResources().getDimensionPixelOffset(R.dimen.item_thumb_height);
-        int width = mContext.getResources().getDimensionPixelOffset(R.dimen.item_thumb_width);
+        int width = MusicMergeConfig.getMaxWidthForThumbWidth();
         ImageView view = new ImageView(parent.getContext());
         view.setLayoutParams(new ViewGroup.LayoutParams(width, height));
         view.setScaleType(ImageView.ScaleType.FIT_XY);

musicMerge/src/main/java/com/cooleshow/musicmerge/bean/VideoInfo.java

@@ -5,4 +5,22 @@ public class VideoInfo {
     public long duration;
     public String videoPath;
     public String coverPath;
+    private int videoWidth;
+    private int videoHeight;
+
+    public int getVideoWidth() {
+        return videoWidth;
+    }
+
+    public void setVideoWidth(int videoWidth) {
+        this.videoWidth = videoWidth;
+    }
+
+    public int getVideoHeight() {
+        return videoHeight;
+    }
+
+    public void setVideoHeight(int videoHeight) {
+        this.videoHeight = videoHeight;
+    }
 }

musicMerge/src/main/java/com/cooleshow/musicmerge/constants/MusicMergeConfig.java

@@ -1,5 +1,8 @@
 package com.cooleshow.musicmerge.constants;
 
+import com.cooleshow.base.utils.LOG;
+import com.cooleshow.base.utils.ScreenUtils;
+
 /**
  * Author by pq, Date on 2023/11/1.
  */
@@ -7,4 +10,17 @@ public class MusicMergeConfig {
     public static final String OFFSET_KEY="offset";
     public static final String ORIGINALVOLUME_KEY="originalVolume";
     public static final String ACCOMPANYVOLUME_KEY="accompanyVolume";
+
+    public static final int MAX_THUMBNAIL_COUNT = 10;
+
+    public static int getMaxWidthForThumbWidth() {
+        int result = ScreenUtils.getScreenWidth() / MAX_THUMBNAIL_COUNT;
+        LOG.i("getMaxWidthForThumbWidth:" + result);
+        return result;
+    }
+
+    public static int getHeightAtRatio16_9(float width) {
+        float ratio = 16 / 9f;
+        return (int) (width / ratio);
+    }
 }

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/SelectVideoFrameActivity.java

@@ -172,6 +172,9 @@ public class SelectVideoFrameActivity extends BaseMVPActivity<AcSelectVideoFrame
     }
 
     private void toPreView() {
+        if(!checkActivityExist()){
+            return;
+        }
         viewBinding.videoCutterLayout.prePlayVideo(mVideoPath);
     }
 

musicMerge/src/main/java/com/cooleshow/musicmerge/widget/cover/CoverSliderView.java

@@ -1,16 +1,15 @@
 package com.cooleshow.musicmerge.widget.cover;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
-import android.util.DisplayMetrics;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
 import com.cooleshow.musicmerge.R;
 import com.cooleshow.musicmerge.adapter.SelectCoverAdapter;
 import com.cooleshow.musicmerge.bean.VideoInfo;
+import com.cooleshow.musicmerge.constants.MusicMergeConfig;
 import com.cooleshow.musicmerge.manager.ICoverSelector;
 
 import androidx.annotation.NonNull;
@@ -77,7 +76,7 @@ public class CoverSliderView extends RelativeLayout implements RangeSlider.OnRan
         mAdapter = new SelectCoverAdapter(mContext);
         mRecyclerView.setAdapter(mAdapter);
 
-        mSingleWidth = mContext.getResources().getDimensionPixelOffset(R.dimen.item_thumb_width);
+        mSingleWidth = MusicMergeConfig.getMaxWidthForThumbWidth();
     }
 
     /**
@@ -89,14 +88,14 @@ public class CoverSliderView extends RelativeLayout implements RangeSlider.OnRan
         ViewGroup.LayoutParams layoutParams = getLayoutParams();
         int width = count * mSingleWidth;
         mAllWidth = width;
-        Resources resources = getResources();
-        DisplayMetrics dm = resources.getDisplayMetrics();
-        int screenWidth = dm.widthPixels;
-        if (width > screenWidth) {
-            width = screenWidth;
-        }
-        layoutParams.width = width;
-        setLayoutParams(layoutParams);
+//        Resources resources = getResources();
+//        DisplayMetrics dm = resources.getDisplayMetrics();
+//        int screenWidth = dm.widthPixels;
+//        if (width > screenWidth) {
+//            width = screenWidth;
+//        }
+//        layoutParams.width = screenWidth;
+//        setLayoutParams(layoutParams);
     }
 
     public void setSliderMoveListener(ICoverSelector.OnSliderMoveListener listener) {

musicMerge/src/main/java/com/cooleshow/musicmerge/widget/cover/RangeSlider.java

@@ -8,6 +8,7 @@ import android.graphics.Paint;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
+import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.TextureView;
 import android.view.View;
@@ -15,8 +16,8 @@ import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.musicmerge.R;
+import com.cooleshow.musicmerge.constants.MusicMergeConfig;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -55,6 +56,8 @@ public class RangeSlider extends ViewGroup {
     private boolean mComplete;
     private long mStartTime;
 
+    float percent = 0.95f;//滑块内视频缩小比例
+
     public RangeSlider(@NonNull Context context) {
         this(context, null);
     }
@@ -81,15 +84,18 @@ public class RangeSlider extends ViewGroup {
                 array.getInteger(R.styleable.RangeSlider_rightThumbIndex, mTickCount));
         array.recycle();
         videoPlayer = new VideoPlayer();
-        View borderView =new View(getContext());
+        View borderView = new View(getContext());
         borderView.setBackground(mIcon);
         textureView = new TextureView(getContext());
         textureView.setVisibility(VISIBLE);
         videoPlayer.setTextureView(textureView);
-        int i = SizeUtils.dp2px(4);
-        FrameLayout.LayoutParams layoutParams =new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT,FrameLayout.LayoutParams.MATCH_PARENT);
-        layoutParams.setMargins(i,i,i,i);
-        mThumb.addView(textureView,layoutParams);
+
+        int videoWith = (int) (mThumbWidth * percent);
+        int videoHeight = (int) (MusicMergeConfig.getHeightAtRatio16_9(mThumbWidth) * percent);
+
+        FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(videoWith, videoHeight);
+        layoutParams.gravity = Gravity.CENTER;
+        mThumb.addView(textureView, layoutParams);
         mThumb.addView(borderView);
         addView(mThumb);
         setWillNotDraw(false);
@@ -129,7 +135,7 @@ public class RangeSlider extends ViewGroup {
         if (!isEnabled()) {
             return false;
         }
-        if (!mComplete){
+        if (!mComplete) {
             return false;
         }
 
@@ -149,12 +155,12 @@ public class RangeSlider extends ViewGroup {
                     if (mRangeChangeListener != null) {
                         mRangeChangeListener.onKeyDown(TYPE_LEFT);
                     }
-                    int moveX = (int) (x - (mThumb.getX()+ mThumb.getWidth()/2));
+                    int moveX = (int) (x - (mThumb.getX() + mThumb.getWidth() / 2));
                     getParent().requestDisallowInterceptTouchEvent(true);
                     moveLeftThumbByPixel(moveX);
                     invalidate();
                     if (mRangeChangeListener != null) {
-                        mRangeChangeListener.onKeyMove(TYPE_LEFT, mThumb.getRangeIndex(),moveX);
+                        mRangeChangeListener.onKeyMove(TYPE_LEFT, mThumb.getRangeIndex(), moveX);
                     }
                 }
                 mLastX = mOriginalX = x;

musicMerge/src/main/java/com/cooleshow/musicmerge/widget/cover/ShortVideoSelectCover.java

@@ -4,12 +4,14 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.TextureView;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
 import com.cooleshow.base.utils.LOG;
+import com.cooleshow.base.utils.ScreenUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.musicmerge.R;
 import com.cooleshow.musicmerge.bean.VideoInfo;
@@ -66,6 +68,7 @@ public class ShortVideoSelectCover extends RelativeLayout {
     }
 
     private void loadVideoInfo(VideoInfo videoInfo) {
+        resetVideoScale(videoInfo.getVideoWidth(), videoInfo.getVideoHeight());
         mVideoCutLayout.setVideoInfo(videoInfo);
         mVideoCutLayout.clearThumbnail();
         mVideoCutLayout.setSliderMoveListener(new ICoverSelector.OnSliderMoveListener() {
@@ -101,6 +104,51 @@ public class ShortVideoSelectCover extends RelativeLayout {
         mCoverSelectorManager.loadThumbnail2(videoInfo);
     }
 
+    private void resetVideoScale(int videoWidth, int videoHeight) {
+        LOG.i("videoWidth:" + videoWidth);
+        LOG.i("videoHeight:" + videoHeight);
+        if (videoWidth == 0 || videoHeight == 0) {
+            return;
+        }
+        // 计算视频的宽高比例
+        float videoProportion = (float) videoWidth / (float) videoHeight;
+        LOG.i("videoProportion:" + videoProportion);
+        // 获取TextureView的宽和高
+        int viewWidth = textureView.getWidth();
+        int viewHeight = textureView.getHeight();
+        if (viewWidth == 0 || viewHeight == 0) {
+            textureView.measure(0, 0);
+            viewWidth = textureView.getMeasuredWidth();
+            viewHeight = textureView.getMeasuredHeight();
+            LOG.i("触发0:viewWidth:" + viewWidth + "-viewHeight:" + viewHeight);
+        }
+        LOG.i("viewWidth:" + viewWidth);
+        LOG.i("viewHeight:" + viewHeight);
+        float viewProportion = (float) viewWidth / (float) viewHeight;
+        LOG.i("viewProportion:" + viewProportion);
+
+        if (viewHeight == 0) {
+            viewHeight = ScreenUtils.getScreenHeight();
+        }
+        int newWidth = (int) (viewHeight * videoProportion);
+        FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) textureView.getLayoutParams();
+        layoutParams.width = newWidth;
+        layoutParams.gravity = Gravity.CENTER;
+        LOG.i("newWidth:" + newWidth);
+        textureView.requestLayout();
+
+//        // 根据视频和View的宽高比例调整显示
+//        if (videoProportion > viewProportion) {
+//            // 视频宽高比例大于View的宽高比例，需要调整宽度
+//
+//        } else {
+//            // 视频宽高比例小于等于View的宽高比例，需要调整高度
+//            int newHeight = (int) (viewWidth / videoProportion);
+//            textureView.getLayoutParams().height = newHeight;
+//            textureView.requestLayout();
+//        }
+    }
+
     public void getCover() {
         if (onGetSampleImageListener != null) {
             onGetSampleImageListener.start();
@@ -126,6 +174,8 @@ public class ShortVideoSelectCover extends RelativeLayout {
                 int duration = videoPlayer.getDuration();
                 LOG.i("duration :" + duration);
                 mVideoInfo.duration = duration;
+                mVideoInfo.setVideoWidth(videoPlayer.getVideoWidth());
+                mVideoInfo.setVideoHeight(videoPlayer.getVideoHeight());
                 loadVideoInfo(mVideoInfo);
             }
 

musicMerge/src/main/java/com/cooleshow/musicmerge/widget/cover/VideoPlayer.java

@@ -229,6 +229,14 @@ public class VideoPlayer {
         return mediaPlayer.getDuration();
     }
 
+    public int getVideoWidth(){
+        return mediaPlayer.getVideoWidth();
+    }
+
+    public int getVideoHeight(){
+        return mediaPlayer.getVideoHeight();
+    }
+
     public void setVolume(float leftVolume, float rightVolume) {
         mediaPlayer.setVolume(leftVolume, rightVolume);
     }

musicMerge/src/main/res/layout/item_sv_cover_view.xml

@@ -25,7 +25,7 @@
         seekbar:leftThumbIndex="0"
         seekbar:lineColor="#00000000"
         seekbar:maskColor="#00000000"
-        seekbar:thumbWidth="128dp"
+        seekbar:thumbWidth="154.7dp"
         seekbar:tickCount="100" />
 
 </RelativeLayout>

musicMerge/src/main/res/layout/video_selector_layout.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#F5F5F5"
+    android:background="@color/black"
     android:orientation="vertical">
 
     <FrameLayout
@@ -34,9 +34,8 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="87dp"
-        android:layout_marginBottom="22dp"
         android:layout_gravity="center_horizontal" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>