优化推流稳定性

优化拉流稳定性

Author: LxzBUG

ArLiveLite/.DS_Store

@@ -0,0 +1,46 @@
+#ifndef __AR_CODEC_H__
+#define __AR_CODEC_H__
+
+//qsv cuvid d3d11va dxva2
+typedef enum CodecMethod
+{
+	CM_Adjust= 0,
+	CM_Soft = 1,
+	CM_Qsv = 2,
+	CM_Cuvid = 3,
+	CM_D3d11va = 4,
+	CM_Dxva1 = 5,
+}CodecMethod;
+
+typedef enum CodecType
+{
+	CT_None = 0,
+	CT_YUV420 = 1,
+	CT_H264 = 2,
+	CT_H265 = 3,
+	CT_AV1 = 10,
+	CT_MJpg = 20,
+
+	CT_PCM = 100,
+	CT_AAC,
+	CT_MP3,
+	CT_OPUS,
+	CT_G711A,
+	CT_G711U,
+	CT_G719A_32 = 110,
+	CT_G719A_48,
+	CT_G719A_64,
+	CT_G719A = CT_G719A_48,
+
+	CT_G722_48 = 120,//16khz
+	CT_G722_56,//16khz
+	CT_G722_64,//16khz
+
+	CT_G7221_7_24 = 130,	//16khz
+	CT_G7221_7_32,		//16khz
+	CT_G7221_14_24,		//32khz
+	CT_G7221_14_32,		//32khz
+	CT_G7221_14_48,		//32khz
+}CodecType;
+
+#endif	// __AR_CODEC_H__

ArLiveLite/ARCodec.h

@@ -17,6 +17,7 @@ ArLive2Player::ArLive2Player(ArLive2Engine*pEngine, const std::string& strPlayId
 	, b_shutdown_(false)
 	, b_audio_paused_(false)
 	, b_video_paused_(false)
+	, e_play_mode_(AR::ArLivePlayModeLive)
 	, n_sei_payload_type_(0)
 	, n_rgba_width_(0)
 	, n_rgba_height_(0)
@@ -51,9 +52,6 @@ void ArLive2Player::setObserver(AR::ArLivePlayerObserver* observer)
 {
 	observer_ = observer;
 }
-void ArLive2Player::setLiveOem(AR::ArLiveOem oem)
-{
-}
 int32_t ArLive2Player::setRenderView(void* view)
 {
     AR::VideoCanvas vidCanvas;
@@ -73,6 +71,14 @@ int32_t ArLive2Player::setRenderFillMode(AR::ArLiveFillMode mode)
 	ar_engine_->setVideoRenderFillMode(str_local_play_id_.c_str(), mode);
 	return AR::ArLIVE_OK;
 }
+int32_t ArLive2Player::setPlayMode(AR::ArLivePlayMode mode)
+{
+	if (ar_player_ != NULL) {
+		return AR::ArLIVE_ERROR_REFUSED;
+	}
+	e_play_mode_ = mode;
+	return AR::ArLIVE_OK;
+}
 int32_t ArLive2Player::startPlay(const char* strPlayUrl)
 {
 	if (!main_thread_->IsCurrent()) {
@@ -308,7 +314,6 @@ void ArLive2Player::OnTickUnAttach()
 {
 
 }
-
 //* For PlayBuffer
 void ArLive2Player::OnBufferVideoRender(VideoData *videoData, int64_t pts)
 {
@@ -405,6 +410,10 @@ void ArLive2Player::OnFirstAudioDecoded()
 int ArLive2Player::MixAudioData(bool mix, void* audioSamples, uint32_t samplesPerSec, int nChannels)
 {
 	if (b_audio_paused_ && b_video_paused_) {
+		if (e_play_mode_ == AR::ArLivePlayModeLive) {//@Eric - 如果是直播，保持播放进度
+			char pMixData[1920];
+			PlayBuffer::DoAudRender(false, pMixData, samplesPerSec, nChannels, true);
+		}
 		return 0;
 	}
 	return PlayBuffer::DoAudRender(mix, audioSamples, samplesPerSec, nChannels, b_audio_paused_);
@@ -492,6 +501,11 @@ bool ArLive2Player::OnArPlyAppIsBackground(void* player)
 {
 	return PlayBuffer::AppIsBackground();
 }
+
+bool ArLive2Player::OnArPlyIsLiveMode(void* player)
+{
+	return e_play_mode_ == AR::ArLivePlayModeLive;
+}
 void ArLive2Player::OnArPlyAudio(void*player, const char*pData, int nSampleHz, int nChannels, int64_t pts)
 {
 	PcmData *audioData = new PcmData((char*)pData, (nSampleHz / 100)*nChannels * sizeof(short), nSampleHz, nChannels);

ArLiveLite/ArLive2Player.cpp

@@ -29,10 +29,10 @@ class ArLive2Player : public AR::IArLivePlayer, public RtcTick, public PlayBuffe
 
 	//* For AR::IArLivePlayer
 	virtual void setObserver(AR::ArLivePlayerObserver* observer);
-	virtual void setLiveOem(AR::ArLiveOem oem);
 	virtual int32_t setRenderView(void* view);
 	virtual int32_t setRenderRotation(AR::ArLiveRotation rotation);
 	virtual int32_t setRenderFillMode(AR::ArLiveFillMode mode);
+	virtual int32_t setPlayMode(AR::ArLivePlayMode mode);
 	virtual int32_t startPlay(const char* url);
 	virtual int32_t stopPlay();
 	virtual int32_t isPlaying();
@@ -75,6 +75,7 @@ class ArLive2Player : public AR::IArLivePlayer, public RtcTick, public PlayBuffe
 	virtual bool OnArPlyNeedMoreAudioData(void*player);
 	virtual bool OnArPlyNeedMoreVideoData(void*player);
 	virtual bool OnArPlyAppIsBackground(void* player);
+	virtual bool OnArPlyIsLiveMode(void* player);
 	virtual void OnArPlyAudio(void*player, const char*pData, int nSampleHz, int nChannels, int64_t pts);
 	virtual void OnArPlyVideo(void*player, int fmt, int ww, int hh, uint8_t**pData, int*linesize, int64_t pts);
 	virtual void OnArPlySeiData(void* player, const char* pData, int nLen, int64_t pts);
@@ -91,6 +92,7 @@ class ArLive2Player : public AR::IArLivePlayer, public RtcTick, public PlayBuffe
 	bool						b_shutdown_;
 	bool						b_audio_paused_;
 	bool						b_video_paused_;
+	AR::ArLivePlayMode			e_play_mode_;
 	int							n_sei_payload_type_;
 	std::string					str_play_url_;
 

ArLiveLite/ArLive2Player.h

@@ -804,11 +804,13 @@ void ArLive2Pusher::RecordedDataIsAvailable(const void* audioSamples, const size
 		while (nAudUsed + nAud10msLen <= nSamples) {
 			const void* ptr = (char*)audioSamples + nAudUsed*nChannels*sizeof(short);
 			if (b_audio_paused_) {
+#if 0
 				char muteAudData[1920] = { 0 };
 				webrtc::MutexLock l(&cs_aac_encoder_);
 				if (aac_encoder_ != NULL) {
 					aac_encoder_->Encode(muteAudData, nSamples, nBytesPerSample, nChannels, samplesPerSec, totalDelayMS);
 				}
+#endif
 			}
 			else {
 				webrtc::MutexLock l(&cs_aac_encoder_);

ArLiveLite/ArLive2Pusher.cpp

@@ -53,7 +53,7 @@ bool A_AACEncoder::Init(int sample_rate, int num_channels, int bitrate)
 		return false;
 	audio_record_sample_hz_ = sample_rate;
 	audio_record_channels_ = num_channels;
-	encoder_ = aac_encoder_open(num_channels, sample_rate, sizeof(short)*8, bitrate, false);
+	encoder_ = aac_encoder_open(num_channels, sample_rate, sizeof(short)*8, bitrate, true);
 	return true;
 }
 

ArLiveLite/codec/AvCodec.cc

@@ -427,6 +427,19 @@ enum ArLiveFillMode {
 
 };
 
+/**
+ * @brief 视频播放模式。
+ */
+enum ArLivePlayMode {
+
+    /// 直播模式 - 暂停的过程中，数据会丢失，保证实时性
+    ArLivePlayModeLive,
+
+    /// 点播模式 - 暂停的过程中，数据不会丢失，恢复后会继续播放
+    ArLivePlayModeVod
+
+};
+
 /**
  * @brief 视频画面顺时针旋转角度。
  */

ArLiveLite/include/ArLiveDef.hpp

@@ -33,15 +33,6 @@ class IArLivePlayer {
      */
     virtual void setObserver(ArLivePlayerObserver* observer) = 0;
 
-    /**
-    * 设置厂家类型Oem。
-    *
-    * 由于各个厂家的标准不统一，比如webrtc的whip方案，
-    * 需要针对不同厂家用针对性的方案去实现
-    *
-    * @param observer oem的厂家枚举，更多信息请查看 {@link ArLiveOem}
-    */
-    virtual void setLiveOem(ArLiveOem oem) = 0;
 
     /**
      * 设置播放器的视频渲染 View。 该控件负责显示视频内容。
@@ -76,6 +67,17 @@ class IArLivePlayer {
      */
     virtual int32_t setRenderFillMode(ArLiveFillMode mode) = 0;
 
+    /**
+     * 设置播放模式。
+     *
+     * @param mode 播放模式 {@link ArLivePlayMode}。
+     *         - ArLivePlayModeLive 【默认值】: 直播模式 - 暂停的过程中，数据会丢失，保证实时性
+     *         - ArLivePlayModeVod: 点播模式 - 暂停的过程中，数据不会丢失，恢复后会继续播放
+     * @return 返回值 {@link ArLiveCode}
+     *         - ArLIVE_OK: 成功
+     */
+    virtual int32_t setPlayMode(ArLivePlayMode mode) = 0;
+
     /**
      * 开始播放音视频流。
      *

ArLiveLite/include/IArLivePlayer.hpp

@@ -342,62 +342,65 @@ bool ARFFPlayer::ReadThreadProcess()
 				if (ret >= 0) {
 					n_last_recv_data_time_ = rtc::Time32();
 					if (packet->stream_index == n_video_stream_idx_) {
-						int64_t pts = 0;
 						n_net_vid_band_ += packet->size;
-						if (packet->flags & AV_PKT_FLAG_KEY) {
-
+						int64_t pts = 0;
+						int64_t dts = 0;
+						if (packet->dts == AV_NOPTS_VALUE) {
+							dts = 0;
 						}
-						if (packet->dts != 0) {
-							if (packet->dts == AV_NOPTS_VALUE) {
-								pts = 0;
-							}
-							else {
-								pts = av_rescale_q(packet->dts, vstream_timebase_, TIMEBASE_MS);
-							}
+						else {
+							dts = av_rescale_q(packet->dts, astream_timebase_, TIMEBASE_MS);
+						}
+						if (packet->pts == AV_NOPTS_VALUE) {
+							pts = 0;
 						}
 						else {
-							if (packet->pts == AV_NOPTS_VALUE) {
-								pts = 0;
-							}
-							else {
-								pts = av_rescale_q(packet->pts, vstream_timebase_, TIMEBASE_MS);
-							}
+							pts = av_rescale_q(packet->pts, astream_timebase_, TIMEBASE_MS);
+						}
+						if (dts == 0 && pts != 0) {
+							dts = pts;
+						}
+						if (pts == 0 && dts != 0) {
+							pts = dts;
 						}
 						if (b_no_buffer_) {
 							OnBufferDecodeVideoData(packet);
 							av_packet_unref(packet);
 							delete packet;
 						}
 						else {
-							FFBuffer::RecvVideoData(packet, pts, pts, av_rescale_q(packet->duration, vstream_timebase_, TIMEBASE_MS));
+							FFBuffer::RecvVideoData(packet, dts, pts, av_rescale_q(packet->duration, vstream_timebase_, TIMEBASE_MS));
 						}
 					}
 					else if (packet->stream_index == n_audio_stream_idx_) {
-						int64_t pts = 0;
 						n_net_aud_band_ += packet->size;
-						if (packet->dts != 0) {
-							if (packet->dts == AV_NOPTS_VALUE) {
-								pts = 0;
-							}
-							else {
-								pts = av_rescale_q(packet->dts, astream_timebase_, TIMEBASE_MS);
-							}
+						int64_t pts = 0;
+						int64_t dts = 0;
+						if (packet->dts == AV_NOPTS_VALUE) {
+							dts = 0;
 						}
 						else {
-							if (packet->pts == AV_NOPTS_VALUE) {
-								pts = 0;
-							}
-							else {
-								pts = av_rescale_q(packet->pts, astream_timebase_, TIMEBASE_MS);
-							}
+							dts = av_rescale_q(packet->dts, astream_timebase_, TIMEBASE_MS);
+						}
+						if (packet->pts == AV_NOPTS_VALUE) {
+							pts = 0;
+						}
+						else {
+							pts = av_rescale_q(packet->pts, astream_timebase_, TIMEBASE_MS);
+						}
+						if (dts == 0 && pts != 0) {
+							dts = pts;
+						}
+						if (pts == 0 && dts != 0) {
+							pts = dts;
 						}
 						if (b_no_buffer_) {
 							OnBufferDecodeAudioData(packet);
 							av_packet_unref(packet);
 							delete packet;
 						}
 						else {
-							FFBuffer::RecvAudioData(packet, pts, pts, av_rescale_q(packet->duration, astream_timebase_, TIMEBASE_MS));
+							FFBuffer::RecvAudioData(packet, dts, pts, av_rescale_q(packet->duration, astream_timebase_, TIMEBASE_MS));
 						}
 					}
 				}

ArLiveLite/player/ARFFPlayer.cpp

@@ -96,13 +96,28 @@ void FFBuffer::DoTick()
 			if (lst_video_recv_.size() > 0) {
 				vidCacheTime = lst_video_recv_.back()->dts_ - lst_video_recv_.front()->dts_;
 				vidFirstDtsTime = lst_video_recv_.front()->dts_;
+
+				if (rtc::TimeUTCMillis() - lst_video_recv_.front()->recv_time_ >= n_cacheing_time_) {
+					RTC_LOG(LS_NONE) << "RenderVideo cache pts: " << lst_video_recv_.front()->pts_ << " curTime: " << rtc::TimeMillis();
+					vidCacheTime = n_cacheing_time_;
+					rtc::CritScope l(&cs_video_decode_);
+					lst_video_decode_.push_back(lst_video_recv_.front());
+					lst_video_recv_.pop_front();
+				}
 			}
 		}
 		{
 			rtc::CritScope cs(&cs_audio_recv_);
 			if (lst_audio_recv_.size() > 0) {
 				audCacheTime = lst_audio_recv_.back()->dts_ - lst_audio_recv_.front()->dts_;
 				audFirstDtsTime = lst_audio_recv_.front()->dts_;
+
+				if (rtc::TimeUTCMillis() - lst_audio_recv_.front()->recv_time_ >= n_cacheing_time_) {
+					audCacheTime = n_cacheing_time_;
+					rtc::CritScope l(&cs_audio_decode_);
+					lst_audio_decode_.push_back(lst_audio_recv_.front());
+					lst_audio_recv_.pop_front();
+				}
 			}
 		}
 		//RTC_LOG(LS_INFO) << "DoTick audCacheTime: " << audCacheTime << " vidCacheTime: " << vidCacheTime;
@@ -434,6 +449,7 @@ void FFBuffer::RecvVideoData(AVPacket* pkt, int64_t dts, int64_t pts, int64_t du
 	recvPkt->dts_ = dts;
 	recvPkt->pts_ = pts;
 	recvPkt->duration_ = duration;
+	recvPkt->recv_time_ = rtc::TimeUTCMillis();
 
 	rtc::CritScope cs(&cs_video_recv_);
 	lst_video_recv_.push_back(recvPkt);
@@ -454,6 +470,7 @@ void FFBuffer::RecvAudioData(AVPacket* pkt, int64_t dts, int64_t pts, int64_t du
 	recvPkt->dts_ = dts;
 	recvPkt->pts_ = pts;
 	recvPkt->duration_ = duration;
+	recvPkt->recv_time_ = rtc::TimeUTCMillis();
 
 	rtc::CritScope cs(&cs_audio_recv_);
 	lst_audio_recv_.push_back(recvPkt);