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/buz/recorder.cpp | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/csrc/buz/recorder.cpp b/csrc/buz/recorder.cpp
index 86afe89..c3b4d84 100644
--- a/csrc/buz/recorder.cpp
+++ b/csrc/buz/recorder.cpp
@@ -35,6 +35,7 @@
,thrd_(nullptr)
,error_occured_(false)
,audio_(false)
+ ,cur_frame_a(0)
{
// logIt("RECODER ID: %s", id_.c_str());
}
@@ -71,20 +72,25 @@
}
out_ = new FormatOut(in_->getFPS(), "mp4");
- AVStream *vs = in_->getStream(0);
- AVStream *as = in_->getStream(1);
- if (!vs) return -1;
- if (audio && !as) logIt("there is no audio");
- std::vector<AVStream*> in;
- in.push_back(vs);
- if (audio && as) in.push_back(as);
+ int pid = getpid();
+ file_path_ = dir_ + "/" + sole::uuid4().base62() + "-" + std::to_string(pid) + ".mp4";
- file_path_ = dir_ + "/" + sole::uuid4().base62() + ".mp4";
- auto ret = out_->JustWriter(in, file_path_.c_str());
+ auto v = in_->getStream(AVMEDIA_TYPE_VIDEO);
+ if (!v){
+ return -2;
+ }
+ AVStream *a = in_->getStream(AVMEDIA_TYPE_AUDIO);
+ if (!audio){
+ a = NULL;
+ }
+ auto ret = out_->JustWriter(v, a, file_path_.c_str());
if (ret){
+ logIt("start record file: %s", file_path_.c_str());
return 0;
}
+
+ logIt("failed to start record: %s", file_path_.c_str());
return -1;
}
@@ -99,17 +105,25 @@
return 1;
}
- int64_t cur = cur_frame++;
AVPacket &op = pkt.data->getAVPacket();
AVPacket np(op);
av_copy_packet(&np, &op);
- auto ret = out_->writeFrame(np, cur);
- av_packet_unref(&np);
- if (!ret) return -1;
- if(pkt.id == id_frame_){
- id_frame_in_file_ = cur_frame-1;
+ int64_t cur = cur_frame;
+ if (in_->isVideoPkt(&np)){
+
+ if(pkt.id == id_frame_){
+ id_frame_in_file_ = cur_frame;
+ }
+ cur_frame++;
+ }else if (in_->isAudioPkt(&np)) {
+ cur = cur_frame_a++;
}
+
+ auto ret = out_->writeFrame(&np, cur);
+ av_packet_unref(&np);
+
+ if (!ret) return -1;
// logIt("WRITE FRAME ID: %d, RECORD ID: %d", pkt.id, id_frame_);
return 0;
@@ -232,15 +246,8 @@
if(id_frame_ == -1){
//wait I
- if (!audio_ && in_->isAudioPkt(pkt.data->getAVPacket())){
- return 0;
- }
-
- if (list_pkt_.empty()) {
- AVPacket &avpkt = pkt.data->getAVPacket();
- if (!(avpkt.flags & AV_PKT_FLAG_KEY)){
- return -1;
- }
+ if (!audio_ && in_->isAudioPkt(&pkt.data->getAVPacket())){
+ return 0;
}
maybe_dump_gop();
@@ -263,15 +270,8 @@
std::lock_guard<std::mutex> locker(mutex_pkt_);
bool i = false;
for (auto &p : lst){
- if (!i){
- if (!audio_ && in_->isAudioPkt(p.data->getAVPacket())){
- continue;
- }
- AVPacket &avpkt = p.data->getAVPacket();
- if (!(avpkt.flags & AV_PKT_FLAG_KEY)){
- continue;
- }
- i = true;
+ if (!audio_ && in_->isAudioPkt(&p.data->getAVPacket())){
+ continue;
}
list_pkt_.push_back(p);
@@ -288,9 +288,8 @@
while (list_pkt_.size() > minduration) {
list_pkt_.pop_front();
while(!list_pkt_.empty()){
- auto &cache = list_pkt_.front();
- AVPacket &avpkt = cache.data->getAVPacket();
- if (!(avpkt.flags & AV_PKT_FLAG_KEY)){
+ auto &i = list_pkt_.front();
+ if (!(i.data->getAVPacket().flags & AV_PKT_FLAG_KEY)){
list_pkt_.pop_front();
}else{
break;
--
Gitblit v1.8.0