valib/goffmpeg.git

			@@ -13,9 +13,8 @@
			#include "ffmpeg/configure/conf.hpp"
			#include "ffmpeg/format/FormatIn.hpp"
			#include "ffmpeg/format/FormatOut.hpp"
			#include "ffmpeg/property/VideoProp.hpp"
			#include "ffmpeg/data/CodedData.hpp"
			#include "ffmpeg/data/FrameData.hpp"
			#include "ffmpeg/property/VideoProp.hpp"
			#include "ffmpeg/log/log.hpp"
			#include "ffmpeg/bridge/cvbridge.hpp"

			@@ -44,6 +43,7 @@
			,scale_w_(0)
			,scale_h_(0)
			,scale_f_(SWS_POINT)
			,audio_(false)
			,gb_(0)
			,cpu_(0)
			,thread_(nullptr)
			@@ -72,20 +72,6 @@
			}
			}

			void Wrapper::ScalePicture(const int w, const int h, const int flags){
			scale_w_ = w;
			scale_f_ = flags;
			scale_h_ = h;
			}

			void Wrapper::GB28181(){
			gb_ = 1;
			}

			void Wrapper::CPUDec(){
			cpu_ = 1;
			}

			std::unique_ptr<ffwrapper::FormatIn> Wrapper::init_reader(const char* input){

			VideoProp prop;
			@@ -106,7 +92,7 @@
			}
			if(flag == 0){
			if(!in->findStreamInfo(NULL)){
			logIt("yolo can't find video stream\n");
			logIt("can't find video stream\n");
			return nullptr;
			}

			@@ -131,18 +117,30 @@
			return 0;
			}

			void Wrapper::AudioSwitch(const bool a){
			audio_ = a;
			if (stream_){
			stream_->AudioSwitch(a);
			}
			}

			void Wrapper::init_worker(ffwrapper::FormatIn *in){
			if (rec_->Loaded() && stream_ && decoder_) return;
			stream_ = new stream(3 * 25);

			stream_ = new stream(in, 3 * 25);
			stream_->AudioSwitch(audio_);

			decoder_ = new decoder(in, scale_w_, scale_h_, scale_f_);

			rec_->Load(in);
			if(fn_rec_lazy_) fn_rec_lazy_(in);
			}

			void Wrapper::run_worker(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
			if (stream_) stream_->SetPacket(data);
			if (decoder_) decoder_->SetFrame(data, id);
			void Wrapper::run_worker(ffwrapper::FormatIn *in, std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){

			if (stream_) stream_->SetPacket(data, id);
			if (rec_->Loaded()) rec_->SetPacket(data, id);
			if (decoder_) decoder_->SetFrame(data, id);
			}

			void Wrapper::deinit_worker(){
			@@ -162,17 +160,23 @@
			continue;
			}

			int wTime = 1000000.0 / in->getFPS() ;
			wTime >>= 1;
			logIt("INPUT FPS: %d", wTime);

			init_worker(in.get());

			int64_t id = 0;
			while(!stop_stream_.load()){
			auto data(std::make_shared<CodedData>());
			if(!in->readPacket(data)){
			logIt("read packet error");
			if (in->readPacket(&data->getAVPacket()) != 0){
			logIt("read packet error, id: %lld", id);
			break;
			}

			run_worker(data, id);
			}

			run_worker(in.get(), data, id);
			usleep(wTime);

			id++;
			}

			@@ -180,14 +184,14 @@
			}
			}

			void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur){
			void Wrapper::BuildRecorder(const char* id, const char *output, const int mindur, const int maxdur, const bool audio){

			if (rec_->Loaded()){
			rec_->NewRec(id, output, mindur, maxdur);
			rec_->NewRec(id, output, mindur, maxdur, audio);
			}else{
			std::string rid(id), dir(output);
			fn_rec_lazy_ =
			[=](ffwrapper::FormatIn *in){rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur);};
			[=](ffwrapper::FormatIn *in){rec_->NewRec(rid.c_str(), dir.c_str(), mindur, maxdur, audio);};
			}
			}

			@@ -239,7 +243,7 @@
			logIt("yolo can't find video stream\n");
			return NULL;
			}
			auto flag = in->openCodec(AVMEDIA_TYPE_VIDEO, NULL);
			auto flag = in->openCodec(NULL);
			if(flag){
			auto dec_ctx = in->getCodecContext();

			@@ -257,22 +261,20 @@
			return NULL;
			}

			auto data(std::make_shared<CodedData>());
			if(!in->readPacket(data)){
			logIt("read packet error");
			return NULL;
			uint8_t *data = NULL;
			AVPacket *pkt = av_packet_alloc();
			if(in->readPacket(pkt) == 0){
			AVFrame *frm = av_frame_alloc();
			if(in->decode(frm, pkt) == 0){
			*w = frm->width;
			*h = frm->height;
			data = (unsigned char)malloc(frm->width frm->height * 3);
			bridge_->copyPicture(data, frm);
			}
			av_frame_free(&frm);
			av_packet_free(&pkt);
			}
			auto frame(std::make_shared<FrameData>());
			auto ret = in->decode(frame, data);
			if(ret == 1){
			AVFrame *frm = frame->getAVFrame();
			*w = frm->width;
			*h = frm->height;
			unsigned char data = (unsigned char)malloc(frm->width * frm->height * 3);
			bridge_->copyPicture(data, frm);
			return data;
			}
			return NULL;
			return data;
			}
			/////// for encoder
			typedef struct _PicEncoder{
			@@ -336,28 +338,28 @@
			}

			AVFrame *frame = e->bridge->getAVFrame(in, w, h);
			auto data(std::make_shared<CodedData>());
			AVPacket *pkt = av_packet_alloc();

			const int flag = e->enc->encode(data, frame);
			if(flag > 0){
			auto pkt = data->getAVPacket();
			auto flag = e->enc->encode(pkt, frame);
			if(flag == 0){
			int extradata_size = ctx->extradata_size;
			uint8_t *extra = ctx->extradata;

			*key = pkt.flags & AV_PKT_FLAG_KEY;
			*key = pkt->flags & AV_PKT_FLAG_KEY;
			if(!(*key)){
			extradata_size = 0;
			}
			*size = pkt.size + extradata_size;
			*size = pkt->size + extradata_size;
			out = (unsigned char )malloc(*size);

			memcpy(*out, extra, extradata_size);
			memcpy(*out + extradata_size, pkt.data, pkt.size);
			memcpy(*out + extradata_size, pkt->data, pkt->size);

			}else{
			logIt("encode error or need more packet\n");
			}

			av_packet_free(&pkt);
			av_frame_free(&frame);

			return flag;