Adding a class receiving key frame requests and relying to corresponding ViEEncoder. This CL adds the new class and unittest, but doesn't wire up th efunctionality. That will come in a follow soon after.
Also added include path in file_recorder.h to make video_engine_core_unittest compile.
BUG=769
TEST=New unittest added.
Review URL: https://webrtc-codereview.appspot.com/776004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2708 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/src/video_engine/encoder_state_feedback.h b/src/video_engine/encoder_state_feedback.h
new file mode 100644
index 0000000..7d063d4
--- /dev/null
+++ b/src/video_engine/encoder_state_feedback.h
@@ -0,0 +1,69 @@
+/*
+ * 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.
+ */
+
+// TODO(mflodman) ViEEncoder has a time check to not send key frames too often,
+// move the logic to this class.
+
+#ifndef WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_
+#define WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_
+
+#include <map>
+
+#include "system_wrappers/interface/constructor_magic.h"
+#include "system_wrappers/interface/scoped_ptr.h"
+#include "typedefs.h" // NOLINT
+
+namespace webrtc {
+
+class CriticalSectionWrapper;
+class EncoderStateFeedbackObserver;
+class RtcpIntraFrameObserver;
+class ViEEncoder;
+
+class EncoderStateFeedback {
+ public:
+ friend class EncoderStateFeedbackObserver;
+
+ EncoderStateFeedback();
+ ~EncoderStateFeedback();
+
+ // Adds an encoder to receive feedback for a unique ssrc.
+ bool AddEncoder(uint32_t ssrc, ViEEncoder* encoder);
+
+ // Removes a registered ViEEncoder.
+ void RemoveEncoder(uint32_t ssrc);
+
+ // Returns an observer to register at the requesting class. The observer has
+ // the same lifetime as the EncoderStateFeedback instance.
+ RtcpIntraFrameObserver* GetRtcpIntraFrameObserver();
+
+ protected:
+ // Called by EncoderStateFeedbackObserver when a new key frame is requested.
+ void OnReceivedIntraFrameRequest(uint32_t ssrc);
+ void OnReceivedSLI(uint32_t ssrc, uint8_t picture_id);
+ void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id);
+
+ private:
+ typedef std::map<uint32_t, ViEEncoder*> SsrcEncoderMap;
+
+ scoped_ptr<CriticalSectionWrapper> crit_;
+
+ // Instance registered at the class requesting new key frames.
+ scoped_ptr<EncoderStateFeedbackObserver> observer_;
+
+ // Maps a unique ssrc to the given encoder.
+ SsrcEncoderMap encoders_;
+
+ DISALLOW_COPY_AND_ASSIGN(EncoderStateFeedback);
+};
+
+} // namespace webrtc
+
+#endif // WEBRTC_VIDEO_ENGINE_ENCODER_STATE_FEEDBACK_H_
