文件编码改成UTF-8

source/AudioEncode/src/Mutex/Cond.cpp

@@ -1,4 +1,4 @@
-#include "Cond.h"
+锘�#include "Cond.h"
 
 Cond::Cond()
 {
@@ -23,7 +23,7 @@ Cond::~Cond()
 
 }
 
-//加锁
+//鍔犻攣
 int Cond::Lock()
 {
 #if defined(WIN32) && !defined(MINGW)
@@ -35,7 +35,7 @@ int Cond::Lock()
 
 }
 
-//解锁
+//瑙ｉ攣
 int Cond::Unlock()
 {
 #if defined(WIN32) && !defined(MINGW)
@@ -62,7 +62,7 @@ int Cond::Wait(int timeOut)
 
 }
 
-//固定时间等待
+//鍥哄畾鏃堕棿绛夊緟
 int Cond::TimedWait(int second)
 {
 #if defined(WIN32) && !defined(MINGW)
@@ -70,7 +70,7 @@ int Cond::TimedWait(int second)
     return 0;
 #else
     struct timespec abstime;
-    //获取从当前时间，并加上等待时间， 设置进程的超时睡眠时间
+    //鑾峰彇浠庡綋鍓嶆椂闂达紝骞跺姞涓婄瓑寰呮椂闂达紝 璁剧疆杩涚▼鐨勮秴鏃剁潯鐪犳椂闂�
     clock_gettime(CLOCK_REALTIME, &abstime);
     abstime.tv_sec += second;
     return pthread_cond_timedwait(&m_cond, &m_mutex, &abstime);
@@ -89,7 +89,7 @@ int Cond::Signal()
     return ret;
 }
 
-//唤醒所有睡眠线程
+//鍞ら啋鎵€鏈夌潯鐪犵嚎绋�
 int Cond::Broadcast()
 {
 #if defined(WIN32) && !defined(MINGW)

source/AudioEncode/src/Mutex/Cond.h

@@ -1,8 +1,8 @@
-#ifndef COND_H
+锘�#ifndef COND_H
 #define COND_H
 
-/// 注意Mingw的话使用的是linux下的api pthread
-/// 没有_MSC_VER这个宏 我们就认为他用的是mingw编译器
+/// 娉ㄦ剰Mingw鐨勮瘽浣跨敤鐨勬槸linux涓嬬殑api pthread
+/// 娌℃湁_MSC_VER杩欎釜瀹� 鎴戜滑灏辫�涓轰粬鐢ㄧ殑鏄痬ingw缂栬瘧鍣�
 
 #ifndef _MSC_VER
 #define MINGW
@@ -22,22 +22,22 @@ public:
     Cond();
     ~Cond();
 
-    //上锁
+    //涓婇攣
     int Lock();
 
-    //解锁
+    //瑙ｉ攣
     int Unlock();
 
-    //timeOut-毫秒
+    //timeOut-姣��
     int Wait(int timeOut = -1);
 
-    //固定时间等待
+    //鍥哄畾鏃堕棿绛夊緟
     int TimedWait(int second);
 
     //
     int Signal();
 
-    //唤醒所有睡眠线程
+    //鍞ら啋鎵€鏈夌潯鐪犵嚎绋�
     int Broadcast();
 
 private:

source/AudioEncode/src/Mutex/Mutex.cpp

@@ -1,4 +1,4 @@
-#include "Mutex.h"
+#include "Mutex.h"
 
 Mutex::Mutex()
 {

source/AudioEncode/src/Mutex/Mutex.h

@@ -1,4 +1,4 @@
-#ifndef MUTEX_H
+锘�#ifndef MUTEX_H
 #define MUTEX_H
 
 
@@ -16,10 +16,10 @@ public:
     Mutex();
     ~Mutex();
 
-    //确保拥有互斥对象的线程对被保护资源的独自访问
+    //纭�繚鎷ユ湁浜掓枼瀵硅薄鐨勭嚎绋嬪�琚�繚鎶よ祫婧愮殑鐙�嚜璁块棶
     int Lock() const;
 
-    //释放当前线程拥有的互斥对象，以使其它线程可以拥有互斥对象，对被保护资源进行访问
+    //閲婃斁褰撳墠绾跨▼鎷ユ湁鐨勪簰鏂ュ�璞★紝浠ヤ娇鍏跺畠绾跨▼鍙�互鎷ユ湁浜掓枼瀵硅薄锛屽�琚�繚鎶よ祫婧愯繘琛岃�闂�
     int Unlock() const;
 
 private:

source/OtherDemo/mydemo/FilterDemo/src/overlay.cpp

@@ -0,0 +1,183 @@
+/**
+ * 叶海辉
+ * QQ群121376426
+ * http://blog.yundiantech.com/
+ */
+
+#include "overlay.h"
+
+//#ifdef _WIN32
+//    #ifndef snprintf
+//    #define snprintf _snprintf
+//    #endif
+//#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+    #include <libavcodec/avcodec.h>
+//    #include <libavfilter/avfiltergraph.h>
+    #include <libavfilter/buffersink.h>
+    #include <libavfilter/buffersrc.h>
+    #include <libavutil/avutil.h>
+    #include <libavutil/imgutils.h>
+#ifdef __cplusplus
+};
+#endif
+
+int doOverlay()
+{
+    int ret;
+    AVFrame *frame_in;
+    AVFrame *frame_out;
+    unsigned char *frame_buffer_in;
+    unsigned char *frame_buffer_out;
+
+    AVFilterContext *buffersink_ctx;
+    AVFilterContext *buffersrc_ctx;
+    AVFilterGraph *filter_graph;
+
+    //Input YUV
+    FILE *fp_in=fopen("../data/in.yuv","rb+");
+    if(fp_in==NULL){
+        printf("Error open input file.\n");
+        return -1;
+    }
+    int in_width=176;
+    int in_height=144;
+
+    //Output YUV
+    FILE *fp_out=fopen("../data/output.yuv","wb+");
+    if(fp_out==NULL){
+        printf("Error open output file.\n");
+        return -1;
+    }
+
+    //const char *filter_descr = "lutyuv='u=128:v=128'";
+    //const char *filter_descr = "boxblur";
+    //const char *filter_descr = "hflip";
+    //const char *filter_descr = "hue='h=60:s=-3'";
+//    const char *filter_descr = "crop=2/3*in_w:2/3*in_h";
+//    const char *filter_descr = "crop=out_w=100:out_h=100:x=10:y=10";
+//    const char *filter_descr = "drawbox=x=100:y=100:w=100:h=100:color=pink@0.5";
+    //const char *filter_descr = "drawtext=fontfile=arial.ttf:fontcolor=green:fontsize=30:text='Lei Xiaohua'";
+
+    const char *filter_descr = "overlay=W-w:56";
+
+    avfilter_register_all();
+
+    char args[512] = {0};
+    const AVFilter *buffersrc  = avfilter_get_by_name("buffer");
+//    const AVFilter *buffersink = avfilter_get_by_name("ffbuffersink");新版的ffmpeg这里要改成buffersink
+    const AVFilter *buffersink = avfilter_get_by_name("buffersink");
+    AVFilterInOut *outputs = avfilter_inout_alloc();
+    AVFilterInOut *inputs  = avfilter_inout_alloc();
+    AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE };
+    AVBufferSinkParams *buffersink_params;
+
+    filter_graph = avfilter_graph_alloc();
+
+    /* buffer video source: the decoded frames from the decoder will be inserted here. */
+    sprintf(args,
+        "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
+        in_width,in_height,AV_PIX_FMT_YUV420P,
+        1, 25,1,1);
+
+    ret = avfilter_graph_create_filter(&buffersrc_ctx, buffersrc, "in",
+        args, NULL, filter_graph);
+    if (ret < 0) {
+        printf("Cannot create buffer source\n");
+        return ret;
+    }
+
+    /* buffer video sink: to terminate the filter chain. */
+    buffersink_params = av_buffersink_params_alloc();
+    buffersink_params->pixel_fmts = pix_fmts;
+    ret = avfilter_graph_create_filter(&buffersink_ctx, buffersink, "out",
+        NULL, buffersink_params, filter_graph);
+    av_free(buffersink_params);
+    if (ret < 0) {
+        char str[AV_ERROR_MAX_STRING_SIZE] = {0};
+        av_make_error_string(str, AV_ERROR_MAX_STRING_SIZE, ret);
+        printf("Cannot create buffer sink %d %s\n", ret, str);
+        return ret;
+    }
+
+    /* Endpoints for the filter graph. */
+    outputs->name       = av_strdup("in");
+    outputs->filter_ctx = buffersrc_ctx;
+    outputs->pad_idx    = 0;
+    outputs->next       = NULL;
+
+    inputs->name       = av_strdup("out");
+    inputs->filter_ctx = buffersink_ctx;
+    inputs->pad_idx    = 0;
+    inputs->next       = NULL;
+
+    if ((ret = avfilter_graph_parse_ptr(filter_graph, filter_descr,
+        &inputs, &outputs, NULL)) < 0)
+        return ret;
+
+    if ((ret = avfilter_graph_config(filter_graph, NULL)) < 0)
+        return ret;
+
+    frame_in=av_frame_alloc();
+    frame_buffer_in=(unsigned char *)av_malloc(av_image_get_buffer_size(AV_PIX_FMT_YUV420P, in_width,in_height,1));
+    av_image_fill_arrays(frame_in->data, frame_in->linesize,frame_buffer_in,
+        AV_PIX_FMT_YUV420P,in_width, in_height,1);
+
+    frame_out=av_frame_alloc();
+    frame_buffer_out=(unsigned char *)av_malloc(av_image_get_buffer_size(AV_PIX_FMT_YUV420P, in_width,in_height,1));
+    av_image_fill_arrays(frame_out->data, frame_out->linesize,frame_buffer_out,
+        AV_PIX_FMT_YUV420P,in_width, in_height,1);
+
+    frame_in->width=in_width;
+    frame_in->height=in_height;
+    frame_in->format=AV_PIX_FMT_YUV420P;
+
+    while (1) {
+
+        if(fread(frame_buffer_in, 1, in_width*in_height*3/2, fp_in)!= in_width*in_height*3/2){
+            break;
+        }
+        //input Y,U,V
+        frame_in->data[0]=frame_buffer_in;
+        frame_in->data[1]=frame_buffer_in+in_width*in_height;
+        frame_in->data[2]=frame_buffer_in+in_width*in_height*5/4;
+
+        if (av_buffersrc_add_frame(buffersrc_ctx, frame_in) < 0) {
+            printf( "Error while add frame.\n");
+            break;
+        }
+
+        /* pull filtered pictures from the filtergraph */
+        ret = av_buffersink_get_frame(buffersink_ctx, frame_out);
+        if (ret < 0)
+            break;
+
+        //output Y,U,V
+        if(frame_out->format==AV_PIX_FMT_YUV420P){
+            for(int i=0;i<frame_out->height;i++){
+                fwrite(frame_out->data[0]+frame_out->linesize[0]*i,1,frame_out->width,fp_out);
+            }
+            for(int i=0;i<frame_out->height/2;i++){
+                fwrite(frame_out->data[1]+frame_out->linesize[1]*i,1,frame_out->width/2,fp_out);
+            }
+            for(int i=0;i<frame_out->height/2;i++){
+                fwrite(frame_out->data[2]+frame_out->linesize[2]*i,1,frame_out->width/2,fp_out);
+            }
+        }
+        printf("Process 1 frame!\n");
+        av_frame_unref(frame_out);
+    }
+
+    fclose(fp_in);
+    fclose(fp_out);
+
+    av_frame_free(&frame_in);
+    av_frame_free(&frame_out);
+    avfilter_graph_free(&filter_graph);
+
+    return 0;
+}

source/OtherDemo/mydemo/FilterDemo/src/overlay.h

@@ -0,0 +1,18 @@
+/**
+ * 叶海辉
+ * QQ群121376426
+ * http://blog.yundiantech.com/
+ */
+
+#ifndef OVERLAY_H
+#define OVERLAY_H
+
+/***
+ * 图片叠加例子
+ *
+ * @brief doOverlay
+ * @return
+ */
+int doOverlay();
+
+#endif // OVERLAY_H