From d42f702ea93b3d34a300ad2f1f72db4d7bb9cc80 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 22 七月 2019 09:58:55 +0800
Subject: [PATCH] update
---
csrc/ffmpeg/format/FormatIn.cpp | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 9ebdb3d..d61fbc7 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -21,6 +21,7 @@
#include "../data/FrameData.hpp"
#include "../../common/gpu/info.h"
+#include "PsToEs.hpp"
using namespace logif;
@@ -38,8 +39,12 @@
FormatIn::~FormatIn()
{
if(io_ctx_){
- free(read_io_buff_);
- avio_close(io_ctx_);
+ if(read_io_buff_){
+ // av_free(read_io_buff_);
+ read_io_buff_ = NULL;
+ }
+ avio_context_free(&io_ctx_);
+ io_ctx_ = NULL;
}
if(ctx_){
avformat_close_input(&ctx_);
@@ -47,12 +52,13 @@
ctx_ = NULL;
if(dec_ctx_){
avcodec_close(dec_ctx_);
+ dec_ctx_ = NULL;
}
}
}
////////////////////////////////////////////////////////////////////////
- int FormatIn::openWithCustomIO(read_packet fn, AVDictionary **options/*=NULL*/){
+ int FormatIn::openWithCustomIO(void *opaque, read_packet fn, AVDictionary **options/*=NULL*/){
ctx_ = avformat_alloc_context();
if(!ctx_){
logIt("open with custom io create format error");
@@ -64,21 +70,43 @@
return -1;
}
- io_ctx_ = avio_alloc_context(read_io_buff_, read_io_buff_size_, 0, NULL, fn, NULL, NULL);
+ io_ctx_ = avio_alloc_context(read_io_buff_, read_io_buff_size_, 0, opaque, fn, NULL, NULL);//opaque
if(!io_ctx_){
logIt("open with custom io create custom avio error");
return -1;
}
ctx_->pb = io_ctx_;
- auto err = av_probe_input_buffer(io_ctx_, &ctx_->iformat, NULL, NULL, 0, read_io_buff_size_);
+ auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, read_io_buff_size_);
if(err != 0){
- logIt("open with custom io prob input buffer error");
+ logIt("open with custom io prob input buffer error:%d", err);
+ logIt("failed:%s", getAVErrorDesc(err).c_str());
return -1;
}
+
return 0;
}
+ int FormatIn::openGb28181(const char *filename, AVDictionary **options){
+
+ std::string fn = filename;
+ addCamera(fn);
+
+ int ret = openWithCustomIO(NULL, readData, options);
+ if(ret < 0){
+ logIt("do openWithCustomIO failed:%d",ret);
+ }
+
+ ret = avformat_open_input(&ctx_, "", NULL, options);
+ if(ret < 0){
+ logIt("open %s failed:%s",filename,
+ getAVErrorDesc(ret).c_str());
+
+ }
+
+ return ret;
+ }
+
/////////////////////////////////////////////////////////////////////////
int FormatIn::open(const char *filename, AVDictionary **options){
--
Gitblit v1.8.0