From be9c1d1f659b0ff31f656424c478e83a4f7c53b5 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 20 九月 2019 11:44:19 +0800
Subject: [PATCH] update ffmpeg
---
csrc/wrapper.hpp | 149 ++++++++++++++++++-------------------------------
1 files changed, 55 insertions(+), 94 deletions(-)
diff --git a/csrc/wrapper.hpp b/csrc/wrapper.hpp
index c1b56e0..3b4aa7b 100644
--- a/csrc/wrapper.hpp
+++ b/csrc/wrapper.hpp
@@ -1,6 +1,10 @@
#ifndef _cffmpeg_wrapper_hpp_
#define _cffmpeg_wrapper_hpp_
+extern "C"{
+#include <libavcodec/avcodec.h>
+}
+
#include <stdint.h>
#include <string>
@@ -8,118 +12,75 @@
#include <thread>
#include <atomic>
#include <mutex>
-#include <unordered_map>
#include <memory>
#include "common/callback.hpp"
namespace ffwrapper{
class FormatIn;
- class FormatOut;
class VideoProp;
class CodedData;
- class FrameData;
-
- class cvbridge;
}
-
-enum WORKER{
- WORKER_RECORDER = 0,
- WORKER_DECODER,
- WORKER_ENCODER,
-};
namespace cffmpeg_wrap{
- typedef std::function<int(ffwrapper::FormatIn*)> FUNC_WORKER;
+ class stream;
+ class decoder;
+ class rec;
- typedef struct _pic_bgr24{
- unsigned char *data;
- int w;
- int h;
- }pic_bgr24;
-
- namespace buz{
- class Recorder;
- struct avpacket;
- }
class Wrapper{
- public:
- Wrapper();
- ~Wrapper ();
+ public:
+ Wrapper();
+ ~Wrapper ();
+ private:
+ std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
- private:
- std::unique_ptr<ffwrapper::FormatIn> init_reader(const char* input);
- ffwrapper::FormatIn* init_reader_gb28181(const char* input);
- void init_worker(ffwrapper::FormatIn *in);
- int init_recorder(ffwrapper::FormatIn *in, std::string dir, const int mind, const int maxd);
- void run_worker(ffwrapper::FormatIn *in, buz::avpacket &pkt);
-
- void cache_rec_info(int &index, std::string &path);
- void cache_pic(std::shared_ptr<ffwrapper::FrameData> &frame);
- public:
- int RunStream(const char* input);
- private:
- void run_stream_thread();
-
- public: //recorder
- void BuildRecorder(const char *dir, const int mind, const int maxd);
- int FireRecorder(const int64_t &id);
- void GetInfoRecorder(int &index, std::string &path);
-
- // active api
- void ActiveRecorder(const char *dir, const int mind, const int maxd,
- FUNC_REC func);
-
- void ScalePicture(const int w, const int h, const int flags);
- void UseGB28181();
- void UseCPU();
- public: //decoder
- void BuildDecoder();
- void GetPicDecoder(unsigned char **data, int *w, int *h);
- //active api
- void ActiveDecoder(FUNC_DEC fn);
-
- public:
- void BuildEncoder(const char *file, const int w, const int h, const int fps, const int br, const int gi);
- int init_encoder(ffwrapper::FormatIn *in, const char *file, const int w, const int h, const int fps, const int br, const int gi);
-
- private:
-
- std::string input_url_;
- buz::Recorder *recorder_;
-
- std::unique_ptr<std::thread> thread_;
- std::atomic_bool stop_stream_;
-
- ffwrapper::cvbridge *bridge_;
- std::unordered_map<int, FUNC_WORKER> map_workers_;
-
- //passive api
- struct record_file_info{
- int file_frame_index;
- std::string file_path;
- };
- std::list<struct record_file_info> list_rec_;
- std::mutex mutex_rec_;
-
- std::list<pic_bgr24> list_pic_;
- std::mutex mutex_pic_;
- // active api
- FUNC_REC func_rec_;
- FUNC_DEC func_dec_;
-
- int scale_w_, scale_h_, scale_f_;
- int gb_, cpu_;
- //////////////////test frame to bgr24
- public:
- uint8_t *decodeJPEG(const char *file, int *w, int *h);
-
- private:
- ffwrapper::FormatOut *encoder_;
+ void init_worker(ffwrapper::FormatIn *in);
+ void run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id);
+ void deinit_worker();
+ public:
+ int RunStream(const char* input);
+ private:
+ void run_stream_thread();
+ public: //recorder
+ void BuildRecorder(const char* id,const char *dir, const int mind, const int maxd, const bool audio);
+ int FireRecorder(const char* sid,const int64_t &id);
+ void GetInfoRecorder(std::string &recID, int &index, std::string &path);
+ void ScalePicture(const int w, const int h, const int flags){
+ scale_w_ = w;
+ scale_h_ = h;
+ scale_f_ = flags;
+ }
+ void GB28181(){gb_ = 1;}
+ void CPUDec(){cpu_ = 1;}
+ void AudioSwitch(const bool a);
+ public: //decoder
+ void BuildDecoder();
+ void GetPicDecoder(unsigned char **data, int *w, int *h, int64_t *id);
+ public: // push stream
+ void GetPacket(unsigned char **pktData, int *size, int *key);
+ private:
+ // stream 鍙傛暟
+ std::string input_url_;
+ int scale_w_, scale_h_, scale_f_;
+ bool audio_;
+ int gb_, cpu_;
+ // decoder 鍙傛暟
+ std::unique_ptr<std::thread> thread_;
+ std::atomic_bool stop_stream_;
+ // 涓氬姟绫�
+ // 鎺ㄦ祦绫�
+ stream* stream_;
+ // 瑙ｇ爜绫�
+ decoder* decoder_;
+ // 褰曞儚绫�,涓�鐩村瓨鍦�
+ rec* rec_;
+ // 褰曞儚璇锋眰缂撳瓨,绛夊緟runstream鍚庢坊鍔�
+ std::function<void(ffwrapper::FormatIn*)> fn_rec_lazy_;
};
+ uint8_t *DecodeJPEG(const char *file, int *w, int *h);
void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi);
void DestroyEncoder(void *h);
int Encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key);
--
Gitblit v1.8.0