OLD | NEW |
---|---|
(Empty) | |
1 /* | |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | |
3 * | |
4 * Use of this source code is governed by a BSD-style license | |
5 * that can be found in the LICENSE file in the root of the source | |
6 * tree. An additional intellectual property rights grant can be found | |
7 * in the file PATENTS. All contributing project authors may | |
8 * be found in the AUTHORS file in the root of the source tree. | |
9 */ | |
10 | |
11 #include "webrtc/video/video_stream_decoder.h" | |
12 | |
13 #include <algorithm> | |
14 #include <map> | |
15 #include <vector> | |
16 | |
17 #include "webrtc/base/checks.h" | |
18 #include "webrtc/base/logging.h" | |
19 #include "webrtc/common_video/include/frame_callback.h" | |
20 #include "webrtc/common_video/include/incoming_video_stream.h" | |
21 #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.
| |
22 #include "webrtc/modules/video_coding/video_coding_impl.h" | |
23 #include "webrtc/modules/video_processing/include/video_processing.h" | |
24 #include "webrtc/system_wrappers/include/metrics.h" | |
25 #include "webrtc/video/call_stats.h" | |
26 #include "webrtc/video/payload_router.h" | |
27 #include "webrtc/video/receive_statistics_proxy.h" | |
28 | |
29 namespace webrtc { | |
30 | |
31 // 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.
| |
32 class ChannelStatsObserver : public CallStatsObserver { | |
33 public: | |
34 explicit ChannelStatsObserver(VideoStreamDecoder* owner) : owner_(owner) {} | |
35 virtual ~ChannelStatsObserver() {} | |
36 | |
37 // Implements StatsObserver. | |
38 virtual void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | |
39 owner_->OnRttUpdate(avg_rtt_ms, max_rtt_ms); | |
40 } | |
41 | |
42 private: | |
43 VideoStreamDecoder* const owner_; | |
44 }; | |
45 | |
46 VideoStreamDecoder::VideoStreamDecoder( | |
47 vcm::VideoReceiver* video_receiver, | |
48 VCMFrameTypeCallback* vcm_frame_type_callback, | |
49 VCMPacketRequestCallback* vcm_packet_request_callback, | |
50 bool enable_nack, | |
51 ReceiveStatisticsProxy* receive_statistics_proxy) | |
52 : video_receiver_(video_receiver), | |
53 stats_observer_(new ChannelStatsObserver(this)), | |
54 receive_stats_callback_(receive_statistics_proxy), | |
55 incoming_video_stream_(nullptr), | |
56 pre_render_callback_(nullptr), | |
57 last_rtt_ms_(0) { | |
58 RTC_DCHECK(video_receiver_); | |
59 | |
60 static const int kMaxPacketAgeToNack = 450; | |
61 static const int kMaxNackListSize = 250; | |
62 video_receiver_->SetNackSettings(kMaxNackListSize, | |
63 kMaxPacketAgeToNack, 0); | |
64 video_receiver_->RegisterReceiveCallback(this); | |
65 video_receiver_->RegisterFrameTypeCallback(vcm_frame_type_callback); | |
66 video_receiver_->RegisterReceiveStatisticsCallback(this); | |
67 video_receiver_->RegisterDecoderTimingCallback(this); | |
68 static const int kDefaultRenderDelayMs = 10; | |
69 video_receiver_->SetRenderDelay(kDefaultRenderDelayMs); | |
70 | |
71 VCMVideoProtection video_protection = enable_nack ? kProtectionNack | |
72 : kProtectionNone; | |
73 VCMDecodeErrorMode decode_error_mode = enable_nack ? kNoErrors : kWithErrors; | |
74 video_receiver_->SetVideoProtection(video_protection, true); | |
75 video_receiver_->SetDecodeErrorMode(decode_error_mode); | |
76 VCMPacketRequestCallback* packet_request_callback = | |
77 enable_nack ? vcm_packet_request_callback : nullptr; | |
78 video_receiver_->RegisterPacketRequestCallback(packet_request_callback); | |
79 } | |
80 | |
81 VideoStreamDecoder::~VideoStreamDecoder() {} | |
82 | |
83 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.
| |
84 return stats_observer_.get(); | |
85 } | |
86 | |
87 // Do not acquire the lock of |video_receiver_| in this function. Decode | |
88 // callback won't necessarily be called from the decoding thread. The decoding | |
89 // thread may have held the lock when calling VideoDecoder::Decode, Reset, or | |
90 // Release. Acquiring the same lock in the path of decode callback can deadlock. | |
91 int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame) { // NOLINT | |
92 rtc::CritScope lock(&crit_); | |
93 | |
94 if (pre_render_callback_) | |
95 pre_render_callback_->FrameCallback(&video_frame); | |
96 | |
97 // TODO(pbos): Remove stream id argument. | |
98 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.
| |
99 return 0; | |
100 } | |
101 | |
102 int32_t VideoStreamDecoder::ReceivedDecodedReferenceFrame( | |
103 const uint64_t picture_id) { | |
104 RTC_NOTREACHED(); | |
105 return 0; | |
106 } | |
107 | |
108 void VideoStreamDecoder::OnIncomingPayloadType(int payload_type) { | |
109 receive_stats_callback_->OnIncomingPayloadType(payload_type); | |
110 } | |
111 | |
112 void VideoStreamDecoder::OnDecoderImplementationName( | |
113 const char* implementation_name) { | |
114 receive_stats_callback_->OnDecoderImplementationName(implementation_name); | |
115 } | |
116 | |
117 void VideoStreamDecoder::OnReceiveRatesUpdated(uint32_t bit_rate, | |
118 uint32_t frame_rate) { | |
119 receive_stats_callback_->OnIncomingRate(frame_rate, bit_rate); | |
120 } | |
121 | |
122 void VideoStreamDecoder::OnDiscardedPacketsUpdated(int discarded_packets) { | |
123 receive_stats_callback_->OnDiscardedPacketsUpdated(discarded_packets); | |
124 } | |
125 | |
126 void VideoStreamDecoder::OnFrameCountsUpdated(const FrameCounts& frame_counts) { | |
127 receive_stats_callback_->OnFrameCountsUpdated(frame_counts); | |
128 rtc::CritScope lock(&crit_); | |
129 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.
| |
130 } | |
131 | |
132 void VideoStreamDecoder::OnDecoderTiming(int decode_ms, | |
133 int max_decode_ms, | |
134 int current_delay_ms, | |
135 int target_delay_ms, | |
136 int jitter_buffer_ms, | |
137 int min_playout_delay_ms, | |
138 int render_delay_ms) { | |
139 int last_rtt = -1; | |
140 { | |
141 rtc::CritScope lock(&crit_); | |
142 last_rtt = last_rtt_ms_; | |
143 } | |
144 | |
145 receive_stats_callback_->OnDecoderTiming( | |
146 decode_ms, max_decode_ms, current_delay_ms, target_delay_ms, | |
147 jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt); | |
148 } | |
149 | |
150 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | |
151 video_receiver_->SetReceiveChannelParameters(max_rtt_ms); | |
152 | |
153 rtc::CritScope lock(&crit_); | |
154 last_rtt_ms_ = avg_rtt_ms; | |
155 } | |
156 | |
157 void VideoStreamDecoder::RegisterPreRenderCallback( | |
158 I420FrameCallback* pre_render_callback) { | |
159 rtc::CritScope lock(&crit_); | |
160 pre_render_callback_ = pre_render_callback; | |
161 } | |
162 | |
163 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.
| |
164 IncomingVideoStream* incoming_video_stream) { | |
165 rtc::CritScope lock(&crit_); | |
166 incoming_video_stream_ = incoming_video_stream; | |
167 } | |
168 } // namespace webrtc | |
OLD | NEW |