Chromium Code Reviews| Index: media/mojo/services/video_overlay_factory.h |
| diff --git a/chromecast/renderer/media/hole_frame_factory.h b/media/mojo/services/video_overlay_factory.h |
| similarity index 55% |
| copy from chromecast/renderer/media/hole_frame_factory.h |
| copy to media/mojo/services/video_overlay_factory.h |
| index a1eee57da8b30539c0569b244cf816208eabb330..2601648db1814e41b21431c6d9408766c7017af9 100644 |
| --- a/chromecast/renderer/media/hole_frame_factory.h |
| +++ b/media/mojo/services/video_overlay_factory.h |
| @@ -1,9 +1,9 @@ |
| -// Copyright 2015 The Chromium Authors. All rights reserved. |
| +// Copyright 2016 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 CHROMECAST_RENDERER_MEDIA_HOLE_FRAME_FACTORY_H_ |
| -#define CHROMECAST_RENDERER_MEDIA_HOLE_FRAME_FACTORY_H_ |
| +#ifndef MEDIA_MOJO_SERVICES_VIDEO_OVERLAY_FACTORY_H_ |
| +#define MEDIA_MOJO_SERVICES_VIDEO_OVERLAY_FACTORY_H_ |
| #include <GLES2/gl2.h> |
| @@ -21,19 +21,18 @@ class GpuVideoAcceleratorFactories; |
| class VideoFrame; |
| } |
| -namespace chromecast { |
| namespace media { |
| -// Creates VideoFrames for CMA - native textures that get turned into |
| -// transparent holes in the browser compositor using overlay system. |
| +// Creates video overlay frame - native textures that get turned into |
| +// transparent quads in the browser compositor using overlay system. |
| // All calls (including ctor/dtor) must be on media thread. |
|
xhwang
2016/04/12 19:40:37
Can you check this condition using thread checker
alokp
2016/04/19 00:16:08
Done.
|
| -class HoleFrameFactory { |
| +class VideoOverlayFactory { |
|
xhwang
2016/04/12 19:40:37
This has nothing to do with mojo and should probab
alokp
2016/04/19 00:16:08
Done.
|
| public: |
| - explicit HoleFrameFactory( |
| + explicit VideoOverlayFactory( |
| ::media::GpuVideoAcceleratorFactories* gpu_factories); |
| - ~HoleFrameFactory(); |
| + ~VideoOverlayFactory(); |
| - scoped_refptr<::media::VideoFrame> CreateHoleFrame(const gfx::Size& size); |
| + scoped_refptr<::media::VideoFrame> CreateFrame(const gfx::Size& size); |
| private: |
| ::media::GpuVideoAcceleratorFactories* gpu_factories_; |
| @@ -42,10 +41,9 @@ class HoleFrameFactory { |
| GLuint texture_; |
| GLuint image_id_; |
| - DISALLOW_COPY_AND_ASSIGN(HoleFrameFactory); |
| + DISALLOW_COPY_AND_ASSIGN(VideoOverlayFactory); |
| }; |
| } // namespace media |
| -} // namespace chromecast |
| -#endif // CHROMECAST_RENDERER_MEDIA_HOLE_FRAME_FACTORY_H_ |
| +#endif // MEDIA_MOJO_SERVICES_VIDEO_OVERLAY_FACTORY_H_ |