k
/
FFmpegAndroid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change video item to list

Browse Source
pull/209/head
xufuji456 3 years ago
parent 74f5e8522d
commit f1b7ea80b1
2 changed files with 72 additions and 215 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 119
      app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.kt
  2. 166
      app/src/main/res/layout/activity_video_handle.xml

119
app/src/main/java/com/frank/ffmpeg/activity/VideoHandleActivity.kt
Unescape View File

@ -11,9 +11,12 @@ import android.util.Log
import android.view.View
import android.widget.LinearLayout
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.StaggeredGridLayoutManager
import com.frank.ffmpeg.FFmpegCmd
import com.frank.ffmpeg.R
import com.frank.ffmpeg.adapter.WaterfallAdapter
import com.frank.ffmpeg.format.VideoLayout
import com.frank.ffmpeg.gif.HighQualityGif
import com.frank.ffmpeg.handler.FFmpegHandler
@ -28,6 +31,7 @@ import java.util.ArrayList
import com.frank.ffmpeg.handler.FFmpegHandler.MSG_BEGIN
import com.frank.ffmpeg.handler.FFmpegHandler.MSG_FINISH
import com.frank.ffmpeg.handler.FFmpegHandler.MSG_PROGRESS
import com.frank.ffmpeg.listener.OnItemClickListener
/**
* video process by FFmpeg command
@ -35,10 +39,10 @@ import com.frank.ffmpeg.handler.FFmpegHandler.MSG_PROGRESS
*/
class VideoHandleActivity : BaseActivity() {
private var layoutVideoHandle: LinearLayout? = null
private var layoutVideoHandle: RecyclerView? = null
private var layoutProgress: LinearLayout? = null
private var txtProgress: TextView? = null
private var viewId: Int = 0
private var currentPosition: Int = 0
private var ffmpegHandler: FFmpegHandler? = null
private val appendPath = PATH + File.separator + "snow.mp4"
@ -91,7 +95,7 @@ class VideoHandleActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
hideActionBar()
// hideActionBar()
intView()
ffmpegHandler = FFmpegHandler(mHandler)
}
@ -99,40 +103,49 @@ class VideoHandleActivity : BaseActivity() {
private fun intView() {
layoutProgress = getView(R.id.layout_progress)
txtProgress = getView(R.id.txt_progress)
layoutVideoHandle = getView(R.id.layout_video_handle)
initViewsWithClick(
R.id.btn_video_transform,
R.id.btn_video_cut,
R.id.btn_video_concat,
R.id.btn_screen_shot,
R.id.btn_water_mark,
R.id.btn_generate_gif,
R.id.btn_screen_record,
R.id.btn_combine_video,
R.id.btn_multi_video,
R.id.btn_reverse_video,
R.id.btn_denoise_video,
R.id.btn_to_image,
R.id.btn_pip,
R.id.btn_moov,
R.id.btn_speed,
R.id.btn_flv,
R.id.btn_thumbnail,
R.id.btn_add_subtitle,
R.id.btn_rotate,
R.id.btn_gop,
R.id.btn_remove_logo
)
}
val list = listOf(
getString(R.string.video_transform),
getString(R.string.video_cut),
getString(R.string.video_concat),
getString(R.string.video_screen_shot),
getString(R.string.video_water_mark),
getString(R.string.video_remove_logo),
getString(R.string.video_from_photo),
getString(R.string.video_to_gif),
getString(R.string.video_multi),
getString(R.string.video_reverse),
getString(R.string.video_denoise),
getString(R.string.video_image),
getString(R.string.video_pip),
getString(R.string.video_moov),
getString(R.string.video_speed),
getString(R.string.video_flv),
getString(R.string.video_thumbnail),
getString(R.string.video_subtitle),
getString(R.string.video_rotate),
getString(R.string.video_gop))
override fun onViewClick(view: View) {
viewId = view.id
if (viewId == R.id.btn_combine_video) {
layoutVideoHandle = findViewById(R.id.list_video_item)
val layoutManager = StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL)
layoutVideoHandle?.layoutManager = layoutManager
val adapter = WaterfallAdapter(list)
adapter.setOnItemClickListener(object : OnItemClickListener {
override fun onItemClick(position: Int) {
currentPosition = position
if (getString(R.string.video_from_photo) == list[position]) {
handlePhoto()
return
}
} else {
selectFile()
}
}
})
layoutVideoHandle?.adapter = adapter
}
override fun onViewClick(view: View) {
}
override fun onSelectedFile(filePath: String) {
doHandleVideo(filePath)
@ -156,28 +169,28 @@ class VideoHandleActivity : BaseActivity() {
if (suffix == null || suffix.isEmpty()) {
return
}
when (viewId) {
R.id.btn_video_transform//transform format
when (currentPosition) {
0 //transform format
-> {
val transformVideo = PATH + File.separator + "transformVideo.mp4"
commandLine = FFmpegUtil.transformVideo(srcFile, transformVideo)
}
R.id.btn_video_cut//cut video
1 //cut video
-> {
val cutVideo = PATH + File.separator + "cutVideo" + suffix
val startTime = 5.5f
val duration = 20.0f
commandLine = FFmpegUtil.cutVideo(srcFile, startTime, duration, cutVideo)
}
R.id.btn_video_concat//concat video together
2 //concat video together
-> concatVideo(srcFile)
R.id.btn_screen_shot//video snapshot
3 //video snapshot
-> {
val screenShot = PATH + File.separator + "screenShot.jpg"
val time = 10.5f
commandLine = FFmpegUtil.screenShot(srcFile, time, screenShot)
}
R.id.btn_water_mark//add watermark to video
4 //add watermark to video
-> {
// the unit of bitRate is kb
var bitRate = 500
@ -217,14 +230,14 @@ class VideoHandleActivity : BaseActivity() {
}
}
}
R.id.btn_remove_logo//Remove logo from video: suppress logo by a simple interpolation
5 //Remove logo from video: suppress logo by a simple interpolation
-> {
val removeLogoPath = PATH + File.separator + "removeLogo" + suffix
val widthL = 64
val heightL = 40
commandLine = FFmpegUtil.removeLogo(srcFile, 10, 10, widthL, heightL, removeLogoPath)
}
R.id.btn_generate_gif//convert video into gif
7 //convert video into gif
-> {
val video2Gif = PATH + File.separator + "video2Gif.gif"
val gifStart = 10
@ -247,7 +260,7 @@ class VideoHandleActivity : BaseActivity() {
convertGifInHighQuality(video2Gif, srcFile, gifStart, gifDuration, frameRate)
}
}
R.id.btn_multi_video//combine video which layout could be horizontal of vertical
8 //combine video which layout could be horizontal of vertical
-> {
val input1 = PATH + File.separator + "input1.mp4"
val input2 = PATH + File.separator + "input2.mp4"
@ -257,17 +270,17 @@ class VideoHandleActivity : BaseActivity() {
}
commandLine = FFmpegUtil.multiVideo(input1, input2, outputFile, VideoLayout.LAYOUT_HORIZONTAL)
}
R.id.btn_reverse_video//video reverse
9 //video reverse
-> {
val output = PATH + File.separator + "reverse.mp4"
commandLine = FFmpegUtil.reverseVideo(srcFile, output)
}
R.id.btn_denoise_video//noise reduction of video
10 //noise reduction of video
-> {
val denoise = PATH + File.separator + "denoise.mp4"
commandLine = FFmpegUtil.denoiseVideo(srcFile, denoise)
}
R.id.btn_to_image//convert video to picture
11 //convert video to picture
-> {
val imagePath = PATH + File.separator + "Video2Image/"
val imageFile = File(imagePath)
@ -281,7 +294,7 @@ class VideoHandleActivity : BaseActivity() {
val mFrameRate = 10//frameRate
commandLine = FFmpegUtil.videoToImage(srcFile, mStartTime, mDuration, mFrameRate, imagePath)
}
R.id.btn_pip//combine into picture-in-picture video
12 //combine into picture-in-picture video
-> {
val inputFile1 = PATH + File.separator + "beyond.mp4"
val inputFile2 = PATH + File.separator + "small_girl.mp4"
@ -295,7 +308,7 @@ class VideoHandleActivity : BaseActivity() {
val picInPic = PATH + File.separator + "PicInPic.mp4"
commandLine = FFmpegUtil.picInPicVideo(inputFile1, inputFile2, x, y, picInPic)
}
R.id.btn_moov//moov box moves ahead, which is behind mdat box of mp4 video
13 //moov box moves ahead, which is behind mdat box of mp4 video
-> {
if (!srcFile.endsWith(FileUtil.TYPE_MP4)) {
showToast(getString(R.string.tip_not_mp4_video))
@ -316,12 +329,12 @@ class VideoHandleActivity : BaseActivity() {
Log.e(TAG, "move moov use time=" + (System.currentTimeMillis() - start))
}
}
R.id.btn_speed//playing speed of video
14 //playing speed of video
-> {
val speed = PATH + File.separator + "speed.mp4"
commandLine = FFmpegUtil.changeSpeed(srcFile, speed, 2f, false)
}
R.id.btn_flv//rebuild the keyframe index of flv
15 //rebuild the keyframe index of flv
-> {
if (!".flv".equals(FileUtil.getFileSuffix(srcFile)!!, ignoreCase = true)) {
Log.e(TAG, "It's not flv file, suffix=" + FileUtil.getFileSuffix(srcFile)!!)
@ -330,25 +343,25 @@ class VideoHandleActivity : BaseActivity() {
val outputPath = PATH + File.separator + "frame_index.flv"
commandLine = FFmpegUtil.buildFlvIndex(srcFile, outputPath)
}
R.id.btn_thumbnail// insert thumbnail into video
16 // insert thumbnail into video
-> {
val thumbnailPath = PATH + File.separator + "thumb.jpg"
val thumbVideoPath = PATH + File.separator + "thumbnailVideo" + suffix
commandLine = FFmpegUtil.insertPicIntoVideo(srcFile, thumbnailPath, thumbVideoPath)
}
R.id.btn_add_subtitle//add subtitle into video
17 //add subtitle into video
-> {
val subtitlePath = PATH + File.separator + "test.ass"
val addSubtitlePath = PATH + File.separator + "subtitle.mkv"
commandLine = FFmpegUtil.addSubtitleIntoVideo(srcFile, subtitlePath, addSubtitlePath)
}
R.id.btn_rotate// set the rotate degree of video
18 // set the rotate degree of video
-> {
val rotateDegree = 90
val addSubtitlePath = PATH + File.separator + "rotate" + rotateDegree + suffix
commandLine = FFmpegUtil.rotateVideo(srcFile, rotateDegree, addSubtitlePath)
}
R.id.btn_gop// change the gop(key frame interval) of video
19 // change the gop(key frame interval) of video
-> {
val gop = 30
val gopPath = PATH + File.separator + "gop" + gop + suffix

166
app/src/main/res/layout/activity_video_handle.xml
Unescape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.frank.ffmpeg.activity.VideoHandleActivity">
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<include
layout="@layout/item_progress"
@ -11,166 +11,10 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp">
<LinearLayout
android:id="@+id/layout_video_handle"
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_video_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<Button
android:id="@+id/btn_video_transform"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_transform"/>
<Button
android:id="@+id/btn_video_cut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_cut"/>
<Button
android:id="@+id/btn_video_concat"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_concat" />
<Button
android:id="@+id/btn_screen_shot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_screen_shot"/>
<Button
android:id="@+id/btn_water_mark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_water_mark"/>
<Button
android:id="@+id/btn_remove_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_remove_logo"/>
<Button
android:id="@+id/btn_generate_gif"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_to_gif"/>
<Button
android:id="@+id/btn_screen_record"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_screen_record"
android:visibility="gone"/>
<Button
android:id="@+id/btn_combine_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_from_photo"/>
<Button
android:id="@+id/btn_multi_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_multi"/>
<Button
android:id="@+id/btn_add_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_subtitle"/>
<Button
android:id="@+id/btn_reverse_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_reverse"
android:visibility="visible"/>
<Button
android:id="@+id/btn_denoise_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_denoise"/>
<Button
android:id="@+id/btn_to_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_image"/>
<Button
android:id="@+id/btn_pip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_pip"/>
<Button
android:id="@+id/btn_moov"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_moov"/>
<Button
android:id="@+id/btn_speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_speed"/>
<Button
android:id="@+id/btn_flv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_flv"/>
<Button
android:id="@+id/btn_thumbnail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_thumbnail"/>
<Button
android:id="@+id/btn_rotate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_rotate"/>
<Button
android:id="@+id/btn_gop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/video_gop"/>
</LinearLayout>
</ScrollView>
android:layout_centerInParent="true" />
</RelativeLayout>

Write Preview
Loading…
Cancel
Save