mxy

Ensteinjun · Jul 21, 2015 · 34fde78 · 34fde78
1 parent 7ed5a35
commit 34fde78
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 12 deletions.
diff --git a/...peg_android_decoder_onelib/src/com/leixiaohua1020/sffmpegandroiddecoder/MainActivity.java b/...peg_android_decoder_onelib/src/com/leixiaohua1020/sffmpegandroiddecoder/MainActivity.java
@@ -8,10 +8,11 @@
  * Communication University of China / Digital TV Technology
  * http://blog.csdn.net/leixiaohua1020
  * 
- * 本程序是安卓平台下最简单的基于FFmpeg的视频解码器。它可以将输入的视频数据解码成YUV像素数据。
+ * 本程序是安卓平台下最简单的基于FFmpeg的视频解码器。
+ * 它可以将输入的视频数据解码成YUV像素数据。
  * 
- * This software is the simplest decoder based on FFmpeg in Android. It can decode video stream
- * to raw YUV data.
+ * This software is the simplest decoder based on FFmpeg in Android. 
+ * It can decode video stream to raw YUV data.
  * 
  */
 package com.leixiaohua1020.sffmpegandroiddecoder;

diff --git a/simplest_ffmpeg_android_streamer/Readme.txt b/simplest_ffmpeg_android_streamer/Readme.txt
@@ -0,0 +1,13 @@
+��򵥵Ļ���FFmpeg����Ƶ������-��׿
+Simplest FFmpeg Android Decoder
+
+������ Lei Xiaohua
+[email protected]
+�й���ý��ѧ/���ֵ��Ӽ���
+Communication University of China / Digital TV Technology
+http://blog.csdn.net/leixiaohua1020
+
+�������ǰ�׿ƽ̨����򵥵Ļ���FFmpeg����Ƶ�������������Խ��������Ƶ���ݽ����YUV�������ݡ�
+
+This software is the simplest decoder based on FFmpeg in Android. It can decode video stream
+to raw YUV data.
diff --git a/simplest_ffmpeg_android_streamer/jni/simplest_ffmpeg_streamer.c b/simplest_ffmpeg_android_streamer/jni/simplest_ffmpeg_streamer.c
@@ -8,10 +8,11 @@
  * Communication University of China / Digital TV Technology
  * http://blog.csdn.net/leixiaohua1020
  *
- * 本程序是安卓平台下最简单的基于FFmpeg的流媒体推送器。它可以将视频数据以流媒体的形式发送出去。
+ * 本程序是安卓平台下最简单的基于FFmpeg的流媒体推送器。
+ * 它可以将视频数据以流媒体的形式发送出去。
  *
- * This software is the simplest streamer based on FFmpeg in Android. It can stream video data
- * to media server.
+ * This software is the simplest streamer based on FFmpeg in Android.
+ * It can stream local media file to streaming media server (in RTMP).
  */
 
 

diff --git a/...t_ffmpeg_android_streamer/src/com/leixiaohua1020/sffmpegandroidstreamer/MainActivity.java b/...t_ffmpeg_android_streamer/src/com/leixiaohua1020/sffmpegandroidstreamer/MainActivity.java
@@ -1,3 +1,20 @@
+/**
+ * 最简单的基于FFmpeg的推流器(RTMP)-安卓
+ * Simplest FFmpeg Android Streamer (RTMP)
+ * 
+ * 雷霄骅 Lei Xiaohua
+ * [email protected]
+ * 中国传媒大学/数字电视技术
+ * Communication University of China / Digital TV Technology
+ * http://blog.csdn.net/leixiaohua1020
+ * 
+ * 本程序是安卓平台下最简单的基于FFmpeg的推流器。
+ * 它可以将视频文件以流媒体的形式推送到服务器。
+ * 
+ * This software is the simplest streamer based on FFmpeg in Android.
+ * It can stream local media file to streaming media server (in RTMP).
+ * 
+ */
 package com.leixiaohua1020.sffmpegandroidstreamer;
 
 import android.os.Bundle;

diff --git a/...oid_transcoder/bin/classes/com/leixiaohua1020/sffmpegandroidtranscoder/MainActivity.class b/...oid_transcoder/bin/classes/com/leixiaohua1020/sffmpegandroidtranscoder/MainActivity.class
diff --git a/simplest_ffmpeg_android_transcoder/jni/ffmpeg_jni.c b/simplest_ffmpeg_android_transcoder/jni/ffmpeg_jni.c
@@ -2,17 +2,22 @@
  * 最简单的基于FFmpeg的转码器-安卓
  * Simplest FFmpeg Android Transcoder
  *
- * 雷霄骅 Lei Xiaohua
+ * 雷霄骅  Lei Xiaohua
  * [email protected]
+ * 马小雨  Ma Xiaoyu
+ * [email protected]
  * 中国传媒大学/数字电视技术
  * Communication University of China / Digital TV Technology
  * http://blog.csdn.net/leixiaohua1020
  *
+ *
  * 本程序是安卓平台下的转码器。它移植于ffmpeg.c命令行工具。
  *
- * This software is a Transcoder in Android. It is transplanted from ffmpeg.c
- * command line tools.
+ * This software is a Transcoder in Android.
+ * It is transplanted from ffmpeg.c command line tools.
+ *
  */
+
 #include <string.h>
 #include <jni.h>
 #include <ffmpeg.h>

diff --git a/...mpeg_android_transcoder/src/com/leixiaohua1020/sffmpegandroidtranscoder/MainActivity.java b/...mpeg_android_transcoder/src/com/leixiaohua1020/sffmpegandroidtranscoder/MainActivity.java
@@ -2,17 +2,19 @@
  * 最简单的基于FFmpeg的转码器-安卓
  * Simplest FFmpeg Android Transcoder
  * 
- * 雷霄骅 Lei Xiaohua
+ * 雷霄骅  Lei Xiaohua
  * [email protected]
+ * 马小雨  Ma Xiaoyu
+ * [email protected]
  * 中国传媒大学/数字电视技术
  * Communication University of China / Digital TV Technology
  * http://blog.csdn.net/leixiaohua1020
  * 
  * 
  * 本程序是安卓平台下的转码器。它移植于ffmpeg.c命令行工具。
  * 
- * This software is a Transcoder in Android. It is transplanted from ffmpeg.c 
- *  command line tools.
+ * This software is a Transcoder in Android.
+ * It is transplanted from ffmpeg.c command line tools.
  * 
  */
 package com.leixiaohua1020.sffmpegandroidtranscoder;