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

Unified Diff: webrtc/video/encoder_state_feedback.h

Issue 1936503002: Removed SSRC knowledge from ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@move_payload_router2
Patch Set: Fix unittest. 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.h
diff --git a/webrtc/video/encoder_state_feedback.h b/webrtc/video/encoder_state_feedback.h
index 57595a0a69a1055f04286f39560ab78d9bce26a8..33e3546dd043516d0da975fea7fb0cd08871b2e3 100644
--- a/webrtc/video/encoder_state_feedback.h
+++ b/webrtc/video/encoder_state_feedback.h
@@ -7,10 +7,6 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-
-// TODO(mflodman) ViEEncoder has a time check to not send key frames too often,
-// move the logic to this class.
-
#ifndef WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_
#define WEBRTC_VIDEO_ENCODER_STATE_FEEDBACK_H_
@@ -18,6 +14,7 @@
#include "webrtc/base/criticalsection.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@@ -26,7 +23,7 @@ class ViEEncoder;
class EncoderStateFeedback : public RtcpIntraFrameObserver {
public:
- EncoderStateFeedback();
+ explicit EncoderStateFeedback(Clock* clock);
// Adds an encoder to receive feedback for a set of SSRCs.
void Init(const std::vector<uint32_t>& ssrc, ViEEncoder* encoder);
@@ -38,9 +35,13 @@ class EncoderStateFeedback : public RtcpIntraFrameObserver {
private:
bool HasSsrc(uint32_t ssrc) EXCLUSIVE_LOCKS_REQUIRED(crit_);
+ size_t GetStreamIndex(uint32_t ssrc) EXCLUSIVE_LOCKS_REQUIRED(crit_);
+
+ Clock* const clock_;
rtc::CriticalSection crit_;
std::vector<uint32_t> ssrcs_ GUARDED_BY(crit_);
+ std::vector<int64_t> time_last_intra_request_ms_ GUARDED_BY(crit_);
ViEEncoder* vie_encoder_ GUARDED_BY(crit_);
};

Powered by Google App Engine
This is Rietveld 408576698