Index: content/renderer/media/rtc_video_encoder_factory.h |
diff --git a/content/renderer/media/rtc_video_encoder_factory.h b/content/renderer/media/rtc_video_encoder_factory.h |
index b07ccda00439b03c18485b0a10cd54e53d6942a7..b9971bfeb0aa1d4e37f4e92dd30d5ff75e2c5462 100644 |
--- a/content/renderer/media/rtc_video_encoder_factory.h |
+++ b/content/renderer/media/rtc_video_encoder_factory.h |
@@ -12,9 +12,13 @@ |
#include "content/common/content_export.h" |
#include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoencoderfactory.h" |
-namespace content { |
+namespace media { |
+ |
Ami GONE FROM CHROMIUM
2013/10/26 19:30:26
Here and elsewhere the newlines seem bad to me, bu
sheu
2013/10/28 18:58:05
I seemed to remember that we newlined curly bracke
|
+class GpuVideoAcceleratorFactories; |
-class RendererGpuVideoAcceleratorFactories; |
+} // namespace media |
+ |
+namespace content { |
// This class creates RTCVideoEncoder instances (each wrapping a |
// media::VideoEncodeAccelerator) on behalf of the WebRTC stack. |
@@ -22,7 +26,7 @@ class CONTENT_EXPORT RTCVideoEncoderFactory |
: NON_EXPORTED_BASE(public cricket::WebRtcVideoEncoderFactory) { |
public: |
explicit RTCVideoEncoderFactory( |
- const scoped_refptr<RendererGpuVideoAcceleratorFactories>& gpu_factories); |
+ const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories); |
virtual ~RTCVideoEncoderFactory(); |
// cricket::WebRtcVideoEncoderFactory implementation. |
@@ -34,7 +38,7 @@ class CONTENT_EXPORT RTCVideoEncoderFactory |
virtual void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) OVERRIDE; |
private: |
- const scoped_refptr<RendererGpuVideoAcceleratorFactories> gpu_factories_; |
+ const scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_; |
// Codec support list of cricket::WebRtcVideoEncoderFactory::VideoCodec |
// instances. |