Skip to content

Commit 6ea63d7

Browse files
committed
支持切换滤镜播放,水平滑动控件改为RecyclerView
支持切换滤镜播放,水平滑动控件改为RecyclerView
1 parent 8548be1 commit 6ea63d7

10 files changed

Lines changed: 215 additions & 139 deletions

File tree

‎app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ dependencies {
4646
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
4747
exclude group: 'com.android.support', module: 'support-annotations'
4848
})
49-
compile 'com.android.support:appcompat-v7:25.0.0'
49+
compile 'com.android.support:appcompat-v7:25.4.0'
50+
compile 'com.android.support:recyclerview-v7:25.4.0'
5051
testCompile 'junit:junit:4.12'
5152
compile project(':Live')
5253
}

‎app/src/main/cpp/video_filter.c‎

Lines changed: 46 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,22 @@ ANativeWindow_Buffer windowBuffer;
3535

3636
ANativeWindow* nativeWindow;
3737

38-
AVFrame * pFrame;
38+
AVFrame *pFrame;
3939

40-
AVFrame * pFrameRGBA;
40+
AVFrame *pFrameRGBA;
4141

42-
uint8_t * buffer;
42+
AVFrame *filter_frame;
43+
44+
uint8_t *buffer;
4345

4446
struct SwsContext *sws_ctx;
4547

48+
int is_playing;
49+
50+
int again;
51+
52+
int release;
53+
4654
/**
4755
* colorbalance:
4856
rs/gs/bs
@@ -71,10 +79,8 @@ struct SwsContext *sws_ctx;
7179
//const char *filter_descr = "drawbox=x=100:y=100:w=100:h=100:color=pink@0.5'";//绘制矩形
7280
//const char *filter_descr = "drawgrid=w=iw/3:h=ih/3:t=2:c=white@0.5";//九宫格分割
7381
//const char *filter_descr = "edgedetect=low=0.1:high=0.4";//边缘检测
74-
//const char *filter_descr = "fftfilt=dc_Y=0:weight_Y='exp(-4 * ((Y+X)/(W+H)))'";//fft模糊
7582
//const char *filter_descr = "lutrgb='r=0:g=0'";//去掉红色、绿色分量,只保留蓝色
7683
//const char *filter_descr = "noise=alls=20:allf=t+u";//添加噪声
77-
//const char *filter_descr = "pad=640:480:40:0:violet";//pad填充颜色
7884
//const char *filter_descr = "vignette='PI/4+random(1)*PI/50':eval=frame";//闪烁装饰-->Make a flickering vignetting
7985

8086
//const char *filter_descr = "gblur=sigma=0.5:steps=1:planes=1:sigmaV=1";//高斯模糊
@@ -167,8 +173,6 @@ int open_input(JNIEnv * env, const char* file_name, jobject surface){
167173
LOGI("open file:%s\n", file_name);
168174
//注册所有组件
169175
av_register_all();
170-
//注册滤波器
171-
avfilter_register_all();
172176
//分配上下文
173177
pFormatCtx = avformat_alloc_context();
174178
//打开视频文件
@@ -246,18 +250,20 @@ JNIEXPORT jint JNICALL Java_com_frank_ffmpeg_VideoPlayer_filter
246250
const char * file_name = (*env)->GetStringUTFChars(env, filePath, JNI_FALSE);
247251
const char *filter_descr = (*env)->GetStringUTFChars(env, filterDescr, JNI_FALSE);
248252
//打开输入文件
249-
if((ret = open_input(env, file_name, surface) < 0)){
250-
LOGE("Couldn't allocate video frame.");
251-
goto end;
252-
}
253-
//注册滤波器
254-
avfilter_register_all();
255-
256-
AVFrame * filter_frame = av_frame_alloc();
257-
if(filter_frame == NULL) {
258-
LOGE("Couldn't allocate video frame.");
259-
ret = -1;
260-
goto end;
253+
if(!is_playing){
254+
LOGI("open_input...");
255+
if((ret = open_input(env, file_name, surface) < 0)){
256+
LOGE("Couldn't allocate video frame.");
257+
goto end;
258+
}
259+
//注册滤波器
260+
avfilter_register_all();
261+
filter_frame = av_frame_alloc();
262+
if(filter_frame == NULL) {
263+
LOGE("Couldn't allocate filter frame.");
264+
ret = -1;
265+
goto end;
266+
}
261267
}
262268

263269
//初始化滤波器
@@ -266,10 +272,15 @@ JNIEXPORT jint JNICALL Java_com_frank_ffmpeg_VideoPlayer_filter
266272
goto end;
267273
}
268274

275+
is_playing = 1;
269276
int frameFinished;
270277
AVPacket packet;
271278

272-
while(av_read_frame(pFormatCtx, &packet)>=0) {
279+
while(av_read_frame(pFormatCtx, &packet)>=0 && !release) {
280+
//切换滤波器,退出当初播放
281+
if(again){
282+
goto again;
283+
}
273284
//判断是否为视频流
274285
if(packet.stream_index == video_stream_index) {
275286
//对该帧进行解码
@@ -311,15 +322,30 @@ JNIEXPORT jint JNICALL Java_com_frank_ffmpeg_VideoPlayer_filter
311322
av_packet_unref(&packet);
312323
}
313324
end:
325+
is_playing = 0;
314326
//释放内存以及关闭文件
315327
av_free(buffer);
316328
av_free(pFrameRGBA);
317329
av_free(filter_frame);
318330
av_free(pFrame);
319331
avcodec_close(pCodecCtx);
320332
avformat_close_input(&pFormatCtx);
333+
avfilter_free(buffersrc_ctx);
334+
avfilter_free(buffersink_ctx);
321335
avfilter_graph_free(&filter_graph);
322336
(*env)->ReleaseStringUTFChars(env, filePath, file_name);
323337
(*env)->ReleaseStringUTFChars(env, filterDescr, filter_descr);
338+
LOGE("do release...");
339+
again:
340+
again = 0;
341+
LOGE("play again...");
324342
return ret;
343+
}
344+
345+
JNIEXPORT void JNICALL Java_com_frank_ffmpeg_VideoPlayer_again(JNIEnv * env, jclass clazz) {
346+
again = 1;
347+
}
348+
349+
JNIEXPORT void JNICALL Java_com_frank_ffmpeg_VideoPlayer_release(JNIEnv * env, jclass clazz) {
350+
release = 1;
325351
}

‎app/src/main/java/com/frank/ffmpeg/VideoPlayer.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ public class VideoPlayer {
1414
public native int setPlayRate(float playRate);
1515

1616
public native int filter(String filePath, Object surface, String filterType);
17-
17+
public native void again();
18+
public native void release();
1819
}

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

Lines changed: 66 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,20 @@
33
import android.os.Environment;
44
import android.support.v7.app.AppCompatActivity;
55
import android.os.Bundle;
6+
import android.support.v7.widget.LinearLayoutManager;
7+
import android.support.v7.widget.RecyclerView;
68
import android.view.SurfaceHolder;
79
import android.view.SurfaceView;
8-
import android.view.View;
910
import com.frank.ffmpeg.R;
1011
import com.frank.ffmpeg.VideoPlayer;
12+
import com.frank.ffmpeg.adapter.HorizontalAdapter;
13+
import com.frank.ffmpeg.listener.OnItemClickListener;
1114
import java.io.File;
15+
import java.util.ArrayList;
16+
import java.util.Arrays;
17+
import java.util.List;
1218

13-
public class FilterActivity extends AppCompatActivity implements View.OnClickListener, SurfaceHolder.Callback{
19+
public class FilterActivity extends AppCompatActivity implements SurfaceHolder.Callback{
1420

1521
//SD卡根目录
1622
private final static String PATH = Environment.getExternalStorageDirectory().getPath();
@@ -19,30 +25,46 @@ public class FilterActivity extends AppCompatActivity implements View.OnClickLis
1925

2026
private VideoPlayer videoPlayer;
2127
private SurfaceHolder surfaceHolder;
28+
//surface是否已经创建
2229
private boolean surfaceCreated;
23-
30+
//是否正在播放
31+
private boolean isPlaying;
32+
//滤镜数组
2433
private String[] filters = new String[]{
2534
"lutyuv='u=128:v=128'",
2635
"hue='h=60:s=-3'",
2736
"lutrgb='r=0:g=0'",
2837
"edgedetect=low=0.1:high=0.4",
29-
"fftfilt=dc_Y=0:weight_Y='exp(-4 * ((Y+X)/(W+H)))'",
38+
"boxblur=2:1",
3039
"drawgrid=w=iw/3:h=ih/3:t=2:c=white@0.5",
3140
"colorbalance=bs=0.3",
32-
"drawbox=x=100:y=100:w=100:h=100:color=pink@0.5'",
33-
"rotate=90",
41+
"drawbox=x=100:y=100:w=100:h=100:color=red@0.5'",
42+
"vignette='PI/4+random(1)*PI/50':eval=frame",
3443
"vflip",
3544
"noise=alls=20:allf=t+u",
36-
"vignette='PI/4+random(1)*PI/50':eval=frame"
3745
};
38-
private int filterType;
46+
private String[] txtArray = new String[]{
47+
"素描",
48+
"鲜明",//hue
49+
"暖蓝",
50+
"边缘",
51+
"模糊",
52+
"九宫格",
53+
"均衡",
54+
"矩形",
55+
"闪烁",//左上角闪烁
56+
"翻转"//vflip上下翻转,hflip是左右翻转
57+
};
58+
private HorizontalAdapter horizontalAdapter;
3959

4060
@Override
4161
protected void onCreate(Bundle savedInstanceState) {
62+
4263
super.onCreate(savedInstanceState);
4364
setContentView(R.layout.activity_filter);
4465

4566
initView();
67+
registerLister();
4668
}
4769

4870
private void initView(){
@@ -51,63 +73,37 @@ private void initView(){
5173
surfaceHolder.addCallback(this);
5274
videoPlayer = new VideoPlayer();
5375

54-
findViewById(R.id.btn_sketch).setOnClickListener(this);
55-
findViewById(R.id.btn_hue).setOnClickListener(this);
56-
findViewById(R.id.btn_lut).setOnClickListener(this);
57-
findViewById(R.id.btn_edge).setOnClickListener(this);
58-
findViewById(R.id.btn_blur).setOnClickListener(this);
59-
findViewById(R.id.btn_grid).setOnClickListener(this);
60-
findViewById(R.id.btn_balance).setOnClickListener(this);
61-
findViewById(R.id.btn_box).setOnClickListener(this);
62-
findViewById(R.id.btn_rotate).setOnClickListener(this);
63-
findViewById(R.id.btn_flip).setOnClickListener(this);
76+
RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
77+
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
78+
linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
79+
recyclerView.setLayoutManager(linearLayoutManager);
80+
List<String> itemList = new ArrayList<>();
81+
itemList.addAll(Arrays.asList(txtArray));
82+
horizontalAdapter = new HorizontalAdapter(itemList);
83+
recyclerView.setAdapter(horizontalAdapter);
6484
}
6585

66-
@Override
67-
public void onClick(View v) {
68-
if(!surfaceCreated)
69-
return;
70-
switch (v.getId()){
71-
case R.id.btn_sketch://素描
72-
filterType = 0;
73-
break;
74-
case R.id.btn_hue://hue
75-
filterType = 1;
76-
break;
77-
case R.id.btn_lut://lut
78-
filterType = 2;
79-
break;
80-
case R.id.btn_edge://边缘
81-
filterType = 3;
82-
break;
83-
case R.id.btn_blur://模糊
84-
filterType = 4;
85-
break;
86-
case R.id.btn_grid://九宫格
87-
filterType = 5;
88-
break;
89-
case R.id.btn_balance://色彩平衡
90-
filterType = 6;
91-
break;
92-
case R.id.btn_box://box绘制矩形区域
93-
filterType = 7;
94-
break;
95-
case R.id.btn_rotate://旋转
96-
filterType = 8;
97-
break;
98-
case R.id.btn_flip://翻转
99-
filterType = 9;
100-
break;
101-
default:
102-
filterType = 0;
103-
break;
104-
}
105-
new Thread(new Runnable() {
86+
//注册监听器
87+
private void registerLister(){
88+
horizontalAdapter.setOnItemClickListener(new OnItemClickListener() {
10689
@Override
107-
public void run() {
108-
videoPlayer.filter(VIDEO_PATH, surfaceHolder.getSurface(), filters[filterType]);
90+
public void onItemClick(int position) {
91+
if(!surfaceCreated)
92+
return;
93+
final int mPosition = position;
94+
new Thread(new Runnable() {
95+
@Override
96+
public void run() {
97+
//切换播放
98+
if(isPlaying){
99+
videoPlayer.again();
100+
}
101+
isPlaying = true;
102+
videoPlayer.filter(VIDEO_PATH, surfaceHolder.getSurface(), filters[mPosition]);
103+
}
104+
}).start();
109105
}
110-
}).start();
106+
});
111107
}
112108

113109
@Override
@@ -125,4 +121,13 @@ public void surfaceDestroyed(SurfaceHolder holder) {
125121
surfaceCreated = false;
126122
}
127123

124+
@Override
125+
protected void onDestroy() {
126+
super.onDestroy();
127+
isPlaying = false;
128+
videoPlayer.release();
129+
videoPlayer = null;
130+
horizontalAdapter = null;
131+
}
132+
128133
}

0 commit comments

Comments
 (0)