diff --git a/README.md b/README.md index 110e7c2..d0bd82c 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ android端基于FFmpeg库的使用。
- #### 实时直播推流 - #### 音视频解码播放 - #### OpenGL+GPUImage滤镜 +- #### FFmpeg的AVFilter滤镜 本地直播截图: ![静态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/live.png) @@ -30,9 +31,6 @@ android端基于FFmpeg库的使用。
左边是ffplay客户端拉流播放,中间是web网页播放: ![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/gif/live.gif) -视频添加图片水印(左上角Android机器人): -![静态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/Watermark.png) - 视频添加文字水印(文字白色背景可以改为透明): ![静态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/Textmark.png) @@ -40,12 +38,17 @@ android端基于FFmpeg库的使用。
![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/gif/VideoToGif.gif) 滤镜效果: -![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_cool.jpg) +![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_balance.png) + +![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_sketch.png) + +![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_bright.png) -![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_romantic.jpg) +![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_edge.png) -![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_sketch.jpg) +![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_blue.png) +![动态图片](https://github.com/xufuji456/FFmpegAndroid/blob/master/picture/filter_grid.png) *** 后续会完善音视频播放、推流直播。 diff --git a/picture/filter_balance.png b/picture/filter_balance.png new file mode 100644 index 0000000..04db1b5 Binary files /dev/null and b/picture/filter_balance.png differ diff --git a/picture/filter_blue.png b/picture/filter_blue.png new file mode 100644 index 0000000..86da11e Binary files /dev/null and b/picture/filter_blue.png differ diff --git a/picture/filter_bright.png b/picture/filter_bright.png new file mode 100644 index 0000000..929c344 Binary files /dev/null and b/picture/filter_bright.png differ diff --git a/picture/filter_cool.jpg b/picture/filter_cool.jpg deleted file mode 100644 index 92904ff..0000000 Binary files a/picture/filter_cool.jpg and /dev/null differ diff --git a/picture/filter_edge.png b/picture/filter_edge.png new file mode 100644 index 0000000..87064f7 Binary files /dev/null and b/picture/filter_edge.png differ diff --git a/picture/filter_grid.png b/picture/filter_grid.png new file mode 100644 index 0000000..609d05f Binary files /dev/null and b/picture/filter_grid.png differ diff --git a/picture/filter_romantic.jpg b/picture/filter_romantic.jpg deleted file mode 100644 index 4747da4..0000000 Binary files a/picture/filter_romantic.jpg and /dev/null differ diff --git a/picture/filter_sketch.jpg b/picture/filter_sketch.jpg deleted file mode 100644 index 2a3e392..0000000 Binary files a/picture/filter_sketch.jpg and /dev/null differ diff --git a/picture/filter_sketch.png b/picture/filter_sketch.png new file mode 100644 index 0000000..80b01fe Binary files /dev/null and b/picture/filter_sketch.png differ