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

Unified Diff: webrtc/video/encoder_state_feedback.cc

Issue 1936503002: Removed SSRC knowledge from ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@move_payload_router2
Patch Set: Created 4 years, 8 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
Index: webrtc/video/encoder_state_feedback.cc
diff --git a/webrtc/video/encoder_state_feedback.cc b/webrtc/video/encoder_state_feedback.cc
index 52f51114fa8b5710b231908e542e15602fe95556..5c424d20591f217c2e24c6a030bfe6b88ba6f406 100644
--- a/webrtc/video/encoder_state_feedback.cc
+++ b/webrtc/video/encoder_state_feedback.cc
@@ -33,13 +33,22 @@ bool EncoderStateFeedback::HasSsrc(uint32_t ssrc) {
return false;
}
+int EncoderStateFeedback::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 EncoderStateFeedback::OnReceivedIntraFrameRequest(uint32_t ssrc) {
rtc::CritScope lock(&crit_);
if (!HasSsrc(ssrc))
return;
RTC_DCHECK(vie_encoder_);
- vie_encoder_->OnReceivedIntraFrameRequest(ssrc);
+ vie_encoder_->OnReceivedIntraFrameRequest(GetStreamIndex(ssrc));
}
void EncoderStateFeedback::OnReceivedSLI(uint32_t ssrc, uint8_t picture_id) {
@@ -48,7 +57,7 @@ void EncoderStateFeedback::OnReceivedSLI(uint32_t ssrc, uint8_t picture_id) {
return;
RTC_DCHECK(vie_encoder_);
- vie_encoder_->OnReceivedSLI(ssrc, picture_id);
+ vie_encoder_->OnReceivedSLI(picture_id);
}
void EncoderStateFeedback::OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id) {
@@ -57,7 +66,7 @@ void EncoderStateFeedback::OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id) {
return;
RTC_DCHECK(vie_encoder_);
- vie_encoder_->OnReceivedRPSI(ssrc, picture_id);
+ vie_encoder_->OnReceivedRPSI(picture_id);
}
// Sending SSRCs for this encoder should never change since they are configured

Powered by Google App Engine
This is Rietveld 408576698