From be9c1d1f659b0ff31f656424c478e83a4f7c53b5 Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期五, 20 九月 2019 11:44:19 +0800 Subject: [PATCH] update ffmpeg --- csrc/worker/stream.cpp | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/csrc/worker/stream.cpp b/csrc/worker/stream.cpp index 0f8dadc..1828304 100644 --- a/csrc/worker/stream.cpp +++ b/csrc/worker/stream.cpp @@ -1,10 +1,13 @@ #include "stream.hpp" #include "../ffmpeg/data/CodedData.hpp" +#include "../ffmpeg/format/FormatIn.hpp" namespace cffmpeg_wrap{ - stream::stream(const int maxSize) - :max_size_(maxSize) + stream::stream(ffwrapper::FormatIn *in, const int maxSize) + :streamRef_(in) + ,max_size_(maxSize) + ,audio_(false) {} stream::~stream(){ @@ -14,6 +17,13 @@ int stream::SetPacket(std::shared_ptr<ffwrapper::CodedData> data){ if (data){ + + auto audio = streamRef_->isAudioPkt(data->getAVPacket()); + // 濡傛灉鍖呮槸闊抽鍖�,浣嗘槸涓嶄娇鐢ㄩ煶棰�,鐩存帴杩斿洖 + if (!audio_ && audio){ + return 0; + } + std::lock_guard<std::mutex> locker(mutex_avpkt_); list_avpkt_.push_back(data); -- Gitblit v1.8.0