Index: webrtc/video/video_stream_decoder.cc |
diff --git a/webrtc/video/video_stream_decoder.cc b/webrtc/video/video_stream_decoder.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..9ffacb92e40676c5776f71cfd53992e6df7c3847 |
--- /dev/null |
+++ b/webrtc/video/video_stream_decoder.cc |
@@ -0,0 +1,168 @@ |
+/* |
+ * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
+ * |
+ * Use of this source code is governed by a BSD-style license |
+ * that can be found in the LICENSE file in the root of the source |
+ * tree. An additional intellectual property rights grant can be found |
+ * in the file PATENTS. All contributing project authors may |
+ * be found in the AUTHORS file in the root of the source tree. |
+ */ |
+ |
+#include "webrtc/video/video_stream_decoder.h" |
+ |
+#include <algorithm> |
+#include <map> |
+#include <vector> |
+ |
+#include "webrtc/base/checks.h" |
+#include "webrtc/base/logging.h" |
+#include "webrtc/common_video/include/frame_callback.h" |
+#include "webrtc/common_video/include/incoming_video_stream.h" |
+#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" |
pbos-webrtc
2016/05/02 00:59:02
Don't think this include is used.
mflodman
2016/05/02 19:01:27
Done.
|
+#include "webrtc/modules/video_coding/video_coding_impl.h" |
+#include "webrtc/modules/video_processing/include/video_processing.h" |
+#include "webrtc/system_wrappers/include/metrics.h" |
+#include "webrtc/video/call_stats.h" |
+#include "webrtc/video/payload_router.h" |
+#include "webrtc/video/receive_statistics_proxy.h" |
+ |
+namespace webrtc { |
+ |
+// Helper class receiving statistics callbacks. |
pbos-webrtc
2016/05/02 00:59:02
I don't see how this one is useful, just make Vide
mflodman
2016/05/02 19:01:27
Legacy, but removed.
|
+class ChannelStatsObserver : public CallStatsObserver { |
+ public: |
+ explicit ChannelStatsObserver(VideoStreamDecoder* owner) : owner_(owner) {} |
+ virtual ~ChannelStatsObserver() {} |
+ |
+ // Implements StatsObserver. |
+ virtual void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { |
+ owner_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); |
+ } |
+ |
+ private: |
+ VideoStreamDecoder* const owner_; |
+}; |
+ |
+VideoStreamDecoder::VideoStreamDecoder( |
+ vcm::VideoReceiver* video_receiver, |
+ VCMFrameTypeCallback* vcm_frame_type_callback, |
+ VCMPacketRequestCallback* vcm_packet_request_callback, |
+ bool enable_nack, |
+ ReceiveStatisticsProxy* receive_statistics_proxy) |
+ : video_receiver_(video_receiver), |
+ stats_observer_(new ChannelStatsObserver(this)), |
+ receive_stats_callback_(receive_statistics_proxy), |
+ incoming_video_stream_(nullptr), |
+ pre_render_callback_(nullptr), |
+ last_rtt_ms_(0) { |
+ RTC_DCHECK(video_receiver_); |
+ |
+ static const int kMaxPacketAgeToNack = 450; |
+ static const int kMaxNackListSize = 250; |
+ video_receiver_->SetNackSettings(kMaxNackListSize, |
+ kMaxPacketAgeToNack, 0); |
+ video_receiver_->RegisterReceiveCallback(this); |
+ video_receiver_->RegisterFrameTypeCallback(vcm_frame_type_callback); |
+ video_receiver_->RegisterReceiveStatisticsCallback(this); |
+ video_receiver_->RegisterDecoderTimingCallback(this); |
+ static const int kDefaultRenderDelayMs = 10; |
+ video_receiver_->SetRenderDelay(kDefaultRenderDelayMs); |
+ |
+ VCMVideoProtection video_protection = enable_nack ? kProtectionNack |
+ : kProtectionNone; |
+ VCMDecodeErrorMode decode_error_mode = enable_nack ? kNoErrors : kWithErrors; |
+ video_receiver_->SetVideoProtection(video_protection, true); |
+ video_receiver_->SetDecodeErrorMode(decode_error_mode); |
+ VCMPacketRequestCallback* packet_request_callback = |
+ enable_nack ? vcm_packet_request_callback : nullptr; |
+ video_receiver_->RegisterPacketRequestCallback(packet_request_callback); |
+} |
+ |
+VideoStreamDecoder::~VideoStreamDecoder() {} |
+ |
+CallStatsObserver* VideoStreamDecoder::GetStatsObserver() { |
pbos-webrtc
2016/05/02 00:59:02
Remove this function, just make use of that VideoS
mflodman
2016/05/02 19:01:27
Done.
|
+ return stats_observer_.get(); |
+} |
+ |
+// Do not acquire the lock of |video_receiver_| in this function. Decode |
+// callback won't necessarily be called from the decoding thread. The decoding |
+// thread may have held the lock when calling VideoDecoder::Decode, Reset, or |
+// Release. Acquiring the same lock in the path of decode callback can deadlock. |
+int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame) { // NOLINT |
+ rtc::CritScope lock(&crit_); |
+ |
+ if (pre_render_callback_) |
+ pre_render_callback_->FrameCallback(&video_frame); |
+ |
+ // TODO(pbos): Remove stream id argument. |
+ incoming_video_stream_->RenderFrame(0xFFFFFFFF, video_frame); |
pbos-webrtc
2016/05/02 00:59:02
Provide this one on construction, then you don't n
mflodman
2016/05/02 19:01:27
Done.
|
+ return 0; |
+} |
+ |
+int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame( |
+ const uint64_t picture_id) { |
+ RTC_NOTREACHED(); |
+ return 0; |
+} |
+ |
+void VideoStreamDecoder::OnIncomingPayloadType(int payload_type) { |
+ receive_stats_callback_->OnIncomingPayloadType(payload_type); |
+} |
+ |
+void VideoStreamDecoder::OnDecoderImplementationName( |
+ const char* implementation_name) { |
+ receive_stats_callback_->OnDecoderImplementationName(implementation_name); |
+} |
+ |
+void VideoStreamDecoder::OnReceiveRatesUpdated(uint32_t bit_rate, |
+ uint32_t frame_rate) { |
+ receive_stats_callback_->OnIncomingRate(frame_rate, bit_rate); |
+} |
+ |
+void VideoStreamDecoder::OnDiscardedPacketsUpdated(int discarded_packets) { |
+ receive_stats_callback_->OnDiscardedPacketsUpdated(discarded_packets); |
+} |
+ |
+void VideoStreamDecoder::OnFrameCountsUpdated(const FrameCounts& frame_counts) { |
+ receive_stats_callback_->OnFrameCountsUpdated(frame_counts); |
+ rtc::CritScope lock(&crit_); |
+ receive_frame_counts_ = frame_counts; |
pbos-webrtc
2016/05/02 00:59:02
Never read, remove and drop crit_ from this functi
mflodman
2016/05/02 19:01:27
Done.
|
+} |
+ |
+void VideoStreamDecoder::OnDecoderTiming(int decode_ms, |
+ int max_decode_ms, |
+ int current_delay_ms, |
+ int target_delay_ms, |
+ int jitter_buffer_ms, |
+ int min_playout_delay_ms, |
+ int render_delay_ms) { |
+ int last_rtt = -1; |
+ { |
+ rtc::CritScope lock(&crit_); |
+ last_rtt = last_rtt_ms_; |
+ } |
+ |
+ receive_stats_callback_->OnDecoderTiming( |
+ decode_ms, max_decode_ms, current_delay_ms, target_delay_ms, |
+ jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt); |
+} |
+ |
+void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { |
+ video_receiver_->SetReceiveChannelParameters(max_rtt_ms); |
+ |
+ rtc::CritScope lock(&crit_); |
+ last_rtt_ms_ = avg_rtt_ms; |
+} |
+ |
+void VideoStreamDecoder::RegisterPreRenderCallback( |
+ I420FrameCallback* pre_render_callback) { |
+ rtc::CritScope lock(&crit_); |
+ pre_render_callback_ = pre_render_callback; |
+} |
+ |
+void VideoStreamDecoder::SetIncomingVideoStream( |
pbos-webrtc
2016/05/02 00:59:02
Remove and set through ctor.
mflodman
2016/05/02 19:01:27
Done. And for the pre render callback above.
|
+ IncomingVideoStream* incoming_video_stream) { |
+ rtc::CritScope lock(&crit_); |
+ incoming_video_stream_ = incoming_video_stream; |
+} |
+} // namespace webrtc |