Skip to content

Commit 3e8442c

Browse files
committed
remove VideoPlayer
remove VideoPlayer
1 parent 7c4b591 commit 3e8442c

5 files changed

Lines changed: 0 additions & 174 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
<activity android:name=".activity.MediaHandleActivity" />
3434
<!-- 视频处理 -->
3535
<activity android:name=".activity.VideoHandleActivity" />
36-
<!-- 视频解码播放 -->
37-
<activity
38-
android:name=".activity.VideoPlayerActivity"
39-
android:screenOrientation="landscape" />
4036
<!-- 音视频解码播放 -->
4137
<activity
4238
android:name=".activity.MediaPlayerActivity"

‎app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.frank.ffmpeg.activity;
22

33
import android.annotation.SuppressLint;
4-
import android.content.Intent;
54
import android.os.Bundle;
65
import android.os.Environment;
76
import android.os.Handler;
@@ -74,7 +73,6 @@ private void intView() {
7473
R.id.btn_generate_gif,
7574
R.id.btn_screen_record,
7675
R.id.btn_combine_video,
77-
R.id.btn_play_video,
7876
R.id.btn_multi_video,
7977
R.id.btn_reverse_video,
8078
R.id.btn_denoise_video,
@@ -175,11 +173,6 @@ private void doHandleVideo(String srcFile) {
175173
String combineVideo = PATH + File.separator + "combineVideo.mp4";
176174
commandLine = FFmpegUtil.pictureToVideo(picturePath, combineVideo);
177175
break;
178-
case R.id.btn_play_video://视频解码播放
179-
Intent playIntent = new Intent(VideoHandleActivity.this, VideoPlayerActivity.class);
180-
playIntent.putExtra("videoHandlePath", srcFile);
181-
startActivity(playIntent);
182-
return;
183176
case R.id.btn_multi_video://视频画面拼接:分辨率、时长、封装格式不一致时,先把视频源转为一致
184177
String input1 = PATH + File.separator + "input1.mp4";
185178
String input2 = PATH + File.separator + "input2.mp4";

‎app/src/main/java/com/frank/ffmpeg/activity/VideoPlayerActivity.java‎

Lines changed: 0 additions & 125 deletions
This file was deleted.

‎app/src/main/res/layout/activity_video_handle.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@
7979
android:layout_marginTop="4dp"
8080
android:text="@string/video_from_photo"/>
8181

82-
<Button
83-
android:id="@+id/btn_play_video"
84-
android:layout_width="wrap_content"
85-
android:layout_height="wrap_content"
86-
android:layout_marginTop="4dp"
87-
android:text="@string/video_play"/>
88-
8982
<Button
9083
android:id="@+id/btn_multi_video"
9184
android:layout_width="wrap_content"

‎app/src/main/res/layout/activity_video_player.xml‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)