Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Unified Diff: webrtc/video/encoder_rtcp_feedback.cc

Issue 2390463002: Remove OnLocalSsrcChanged and rename EncoderStateFeedback. (Closed)
Patch Set: Rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/encoder_rtcp_feedback.h ('k') | webrtc/video/encoder_rtcp_feedback_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/encoder_rtcp_feedback.cc
diff --git a/webrtc/video/encoder_rtcp_feedback.cc b/webrtc/video/encoder_rtcp_feedback.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ec0ac1e928eea838c2d17b26cf55a531fc1fb550
--- /dev/null
+++ b/webrtc/video/encoder_rtcp_feedback.cc
@@ -0,0 +1,77 @@
+/*
+ * 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/encoder_rtcp_feedback.h"
+
+#include "webrtc/base/checks.h"
+#include "webrtc/video/vie_encoder.h"
+
+static const int kMinKeyFrameRequestIntervalMs = 300;
+
+namespace webrtc {
+
+EncoderRtcpFeedback::EncoderRtcpFeedback(Clock* clock,
+ const std::vector<uint32_t>& ssrcs,
+ ViEEncoder* encoder)
+ : clock_(clock),
+ ssrcs_(ssrcs),
+ vie_encoder_(encoder),
+ time_last_intra_request_ms_(ssrcs.size(), -1) {
+ RTC_DCHECK(!ssrcs.empty());
+}
+
+bool EncoderRtcpFeedback::HasSsrc(uint32_t ssrc) {
+ for (uint32_t registered_ssrc : ssrcs_) {
+ if (registered_ssrc == ssrc) {
+ return true;
+ }
+ }
+ return false;
+}
+
+size_t EncoderRtcpFeedback::GetStreamIndex(uint32_t ssrc) {
+ for (size_t i = 0; i < ssrcs_.size(); ++i) {
+ if (ssrcs_[i] == ssrc)
+ return i;
+ }
+ RTC_NOTREACHED() << "Unknown ssrc " << ssrc;
+ return 0;
+}
+
+void EncoderRtcpFeedback::OnReceivedIntraFrameRequest(uint32_t ssrc) {
+ RTC_DCHECK(HasSsrc(ssrc));
+ size_t index = GetStreamIndex(ssrc);
+ {
+ // TODO(mflodman): Move to ViEEncoder after some more changes making it
+ // easier to test there.
+ int64_t now_ms = clock_->TimeInMilliseconds();
+ rtc::CritScope lock(&crit_);
+ if (time_last_intra_request_ms_[index] + kMinKeyFrameRequestIntervalMs >
+ now_ms) {
+ return;
+ }
+ time_last_intra_request_ms_[index] = now_ms;
+ }
+
+ vie_encoder_->OnReceivedIntraFrameRequest(index);
+}
+
+void EncoderRtcpFeedback::OnReceivedSLI(uint32_t ssrc, uint8_t picture_id) {
+ RTC_DCHECK(HasSsrc(ssrc));
+
+ vie_encoder_->OnReceivedSLI(picture_id);
+}
+
+void EncoderRtcpFeedback::OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id) {
+ RTC_DCHECK(HasSsrc(ssrc));
+
+ vie_encoder_->OnReceivedRPSI(picture_id);
+}
+} // namespace webrtc
« no previous file with comments | « webrtc/video/encoder_rtcp_feedback.h ('k') | webrtc/video/encoder_rtcp_feedback_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698