From a4cfd08f442fbf6febf06c98bbbed1723aaf5fd4 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期六, 28 九月 2019 11:03:24 +0800
Subject: [PATCH] change audio pts
---
csrc/ffmpeg/format/FormatIn.cpp | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index bee3ae7..4399822 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -57,6 +57,7 @@
avcodec_close(dec_ctx_);
dec_ctx_ = NULL;
}
+
}
if (handle_gb28181){
delete handle_gb28181;
@@ -174,6 +175,10 @@
return true;
}
+ const bool FormatIn::IsHEVC()const{
+ return ctx_->streams[vs_idx_]->codecpar->codec_id == AV_CODEC_ID_HEVC;
+ }
+
bool FormatIn::openCodec(AVDictionary **options){
if (vs_idx_ == -1) return false;
@@ -274,19 +279,6 @@
return NULL;
}
- std::vector<AVStream*> FormatIn::allStreams(){
- std::vector<AVStream*> vec;
- auto v = getStream(AVMEDIA_TYPE_VIDEO);
- if (v){
- vec.push_back(v);
- }
- auto a = getStream(AVMEDIA_TYPE_AUDIO);
- if (a){
- vec.push_back(a);
- }
- return vec;
- }
-
AVCodecContext *FormatIn::getCodecContext(int type){
return dec_ctx_;
}
@@ -311,7 +303,9 @@
int FormatIn::readPacket(AVPacket *pkt_out){
- return av_read_frame(ctx_, pkt_out);
+ auto flag = av_read_frame(ctx_, pkt_out);
+
+ return flag;
}
int FormatIn::decode(AVFrame* frame, AVPacket *pkt){
--
Gitblit v1.8.0