From 4587f8d5507300782e329f9527f35f905f3bb697 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 29 十月 2019 14:13:25 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/ffmpeg/format/FormatIn.cpp | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 9f743f8..59f3f23 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -38,20 +38,13 @@
FormatIn::~FormatIn()
{
- if(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_){
- if (!ctx_->oformat){
- avformat_free_context(ctx_);
- }else{
+ if (!(ctx_->flags & AVFMT_FLAG_CUSTOM_IO)){
avformat_close_input(&ctx_);
+ }else{
+ avformat_free_context(ctx_);
}
+
ctx_ = NULL;
if(dec_ctx_){
avcodec_close(dec_ctx_);
@@ -59,18 +52,23 @@
}
}
+
if (handle_gb28181){
delete handle_gb28181;
}
+ if(read_io_buff_){
+ av_free(read_io_buff_);
+ read_io_buff_ = NULL;
+ }
+ if(io_ctx_){
+ avio_context_free(&io_ctx_);
+ io_ctx_ = 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\n");
- return -1;
- }
read_io_buff_ = (uint8_t*)av_malloc(read_io_buff_size_);
if(!read_io_buff_){
logIt("open with custom io alloc read io buff error\n");
@@ -82,9 +80,16 @@
logIt("open with custom io create custom avio error\n");
return -1;
}
+
+ ctx_ = avformat_alloc_context();
+ if(!ctx_){
+ logIt("open with custom io create format error\n");
+ return -1;
+ }
+
ctx_->pb = io_ctx_;
- auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, read_io_buff_size_);
+ auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, 0);
if(err != 0){
logIt("open with custom io prob input buffer error:%d err: %s\n", err, getAVErrorDesc(err).c_str());
return -1;
--
Gitblit v1.8.0