| OLD | NEW | 
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_ | 
| 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_ | 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_ | 
| 7 | 7 | 
| 8 #include "base/macros.h" | 8 #include "base/macros.h" | 
| 9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" | 
| 10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" | 
| 11 #include "third_party/libjingle/source/talk/media/webrtc/webrtcvideodecoderfacto
    ry.h" | 11 #include "third_party/webrtc/media/webrtc/webrtcvideodecoderfactory.h" | 
| 12 #include "third_party/webrtc/modules/video_coding/include/video_codec_interface.
    h" | 12 #include "third_party/webrtc/modules/video_coding/include/video_codec_interface.
    h" | 
| 13 | 13 | 
| 14 namespace webrtc { | 14 namespace webrtc { | 
| 15 class VideoDecoder; | 15 class VideoDecoder; | 
| 16 }  // namespace webrtc | 16 }  // namespace webrtc | 
| 17 | 17 | 
| 18 namespace media { | 18 namespace media { | 
| 19 class GpuVideoAcceleratorFactories; | 19 class GpuVideoAcceleratorFactories; | 
| 20 }  // namespace media | 20 }  // namespace media | 
| 21 | 21 | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 40 | 40 | 
| 41  private: | 41  private: | 
| 42   media::GpuVideoAcceleratorFactories* gpu_factories_; | 42   media::GpuVideoAcceleratorFactories* gpu_factories_; | 
| 43 | 43 | 
| 44   DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoderFactory); | 44   DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoderFactory); | 
| 45 }; | 45 }; | 
| 46 | 46 | 
| 47 }  // namespace content | 47 }  // namespace content | 
| 48 | 48 | 
| 49 #endif  // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_ | 49 #endif  // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_FACTORY_H_ | 
| OLD | NEW | 
|---|