Define EncodedVideoSource and RtcCapturedEncodingVideoCapturer.

content/renderer/media/rtc_encoding_video_capturer_factory.h

+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_RENDERER_MEDIA_RTC_ENCODING_VIDEO_CAPTURER_FACTORY_H_
+#define CONTENT_RENDERER_MEDIA_RTC_ENCODING_VIDEO_CAPTURER_FACTORY_H_
+
+#include "base/memory/ref_counted.h"
+#include "media/video/encoded_video_source.h"
+#include "media/video/video_encode_types.h"
+#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoencoderfactory.h"
+#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoframe.h"
+#include "third_party/libjingle/source/talk/media/webrtc/webrtcvie.h"

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

I suspect neither of l.12-13 is necessary in this .h.

[hshi1, 2013/06/10 21:49:35]

Done.

+
+using cricket::WebRtcVideoEncoderFactory;

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

style: "using" is verboten in headers.
(here & elsewhere; please make a pass)

[hshi1, 2013/06/10 21:49:35]

Done.

+
+namespace content {
+
+class RtcEncodingVideoCapturer;
+
+class RtcEncodingVideoCapturerFactory :
+      public WebRtcVideoEncoderFactory,
+      public media::EncodedVideoSource::Observer,
+      public base::RefCountedThreadSafe<RtcEncodingVideoCapturerFactory> {
+ public:
+  RtcEncodingVideoCapturerFactory();
+
+  // WebRtcVideoEncoderFactory interface.
+  virtual webrtc::VideoEncoder* CreateVideoEncoder(
+      webrtc::VideoCodecType type) OVERRIDE;
+  virtual void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) OVERRIDE;
+

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

remove newline

[hshi1, 2013/06/10 21:49:35]

Done.

+  virtual const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& codecs()

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

WebRtcVideoEncoderFactory:: unnecessary

[hshi1, 2013/06/10 21:49:35]

Done.

+      const OVERRIDE;
+
+  // EncodedVideoSource::Observer interface.
+  virtual void OnCapabilitiesAvailable(
+      media::EncodedVideoSource* source) OVERRIDE;
+
+  // Invoked when an EncodedVideoSource is added/removed.
+  void OnEncodedVideoSourceAdded(media::EncodedVideoSource* source) OVERRIDE;
+  void OnEncodedVideoSourceRemoved(media::EncodedVideoSource* source) OVERRIDE;
+

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

remove one of these two newlines

[hshi1, 2013/06/10 21:49:35]

Done.

+
+private:
+  friend class base::RefCountedThreadSafe<RtcEncodingVideoCapturerFactory>;
+
+  // Rebuilds the list of supported video codecs.
+  void RebuildCodecsList();
+
+  // Map of registered encoding capable video capturers, key is stream_id.
+  typedef std::map<int, RtcEncodingVideoCapturer*> EncoderMap;
+
+  virtual ~RtcEncodingVideoCapturerFactory();

[Ami GONE FROM CHROMIUM, 2013/06/08 00:18:01]

dtor goes at the top of the section

[hshi1, 2013/06/10 21:49:35]

Done.

+
+  media::EncodedVideoSource* encoded_video_source_;
+  std::vector<WebRtcVideoEncoderFactory::VideoCodec> codecs_;
+
+  int next_stream_id_;
+  EncoderMap encoder_map_;
+  DISALLOW_COPY_AND_ASSIGN(RtcEncodingVideoCapturerFactory);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_MEDIA_RTC_ENCODING_VIDEO_CAPTURER_FACTORY_H_