Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Side by Side Diff: cc/layers/video_layer_impl.h

Issue 388643002: Rotation into Video Layer + Content Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed to file:// Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 CC_LAYERS_VIDEO_LAYER_IMPL_H_ 5 #ifndef CC_LAYERS_VIDEO_LAYER_IMPL_H_
6 #define CC_LAYERS_VIDEO_LAYER_IMPL_H_ 6 #define CC_LAYERS_VIDEO_LAYER_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "cc/base/cc_export.h" 10 #include "cc/base/cc_export.h"
11 #include "cc/layers/layer_impl.h" 11 #include "cc/layers/layer_impl.h"
12 #include "cc/resources/release_callback.h" 12 #include "cc/resources/release_callback.h"
13 #include "cc/resources/video_resource_updater.h" 13 #include "cc/resources/video_resource_updater.h"
14 #include "media/base/video_rotation.h"
14 15
15 namespace media { 16 namespace media {
16 class VideoFrame; 17 class VideoFrame;
17 } 18 }
18 19
19 namespace cc { 20 namespace cc {
20 class VideoFrameProvider; 21 class VideoFrameProvider;
21 class VideoFrameProviderClientImpl; 22 class VideoFrameProviderClientImpl;
22 23
23 class CC_EXPORT VideoLayerImpl : public LayerImpl { 24 class CC_EXPORT VideoLayerImpl : public LayerImpl {
24 public: 25 public:
25 static scoped_ptr<VideoLayerImpl> Create(LayerTreeImpl* tree_impl, 26 static scoped_ptr<VideoLayerImpl> Create(LayerTreeImpl* tree_impl,
26 int id, 27 int id,
27 VideoFrameProvider* provider); 28 VideoFrameProvider* provider,
29 media::VideoRotation video_rotation);
28 virtual ~VideoLayerImpl(); 30 virtual ~VideoLayerImpl();
29 31
30 // LayerImpl implementation. 32 // LayerImpl implementation.
31 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 33 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
32 OVERRIDE; 34 OVERRIDE;
33 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 35 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
34 virtual bool WillDraw(DrawMode draw_mode, 36 virtual bool WillDraw(DrawMode draw_mode,
35 ResourceProvider* resource_provider) OVERRIDE; 37 ResourceProvider* resource_provider) OVERRIDE;
36 virtual void AppendQuads(RenderPass* render_pass, 38 virtual void AppendQuads(RenderPass* render_pass,
37 const OcclusionTracker<LayerImpl>& occlusion_tracker, 39 const OcclusionTracker<LayerImpl>& occlusion_tracker,
38 AppendQuadsData* append_quads_data) OVERRIDE; 40 AppendQuadsData* append_quads_data) OVERRIDE;
39 virtual void DidDraw(ResourceProvider* resource_provider) OVERRIDE; 41 virtual void DidDraw(ResourceProvider* resource_provider) OVERRIDE;
40 virtual void DidBecomeActive() OVERRIDE; 42 virtual void DidBecomeActive() OVERRIDE;
41 virtual void ReleaseResources() OVERRIDE; 43 virtual void ReleaseResources() OVERRIDE;
42 44
43 void SetNeedsRedraw(); 45 void SetNeedsRedraw();
44 46
45 void SetProviderClientImpl( 47 void SetProviderClientImpl(
46 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl); 48 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl);
47 49
50 media::VideoRotation video_rotation() const { return video_rotation_; }
51
48 private: 52 private:
49 VideoLayerImpl(LayerTreeImpl* tree_impl, int id); 53 VideoLayerImpl(LayerTreeImpl* tree_impl,
54 int id,
55 media::VideoRotation video_rotation);
50 56
51 virtual const char* LayerTypeAsString() const OVERRIDE; 57 virtual const char* LayerTypeAsString() const OVERRIDE;
52 58
53 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_; 59 scoped_refptr<VideoFrameProviderClientImpl> provider_client_impl_;
54 60
55 scoped_refptr<media::VideoFrame> frame_; 61 scoped_refptr<media::VideoFrame> frame_;
56 62
63 media::VideoRotation video_rotation_;
64
57 scoped_ptr<VideoResourceUpdater> updater_; 65 scoped_ptr<VideoResourceUpdater> updater_;
58 VideoFrameExternalResources::ResourceType frame_resource_type_; 66 VideoFrameExternalResources::ResourceType frame_resource_type_;
59 std::vector<ResourceProvider::ResourceId> frame_resources_; 67 std::vector<ResourceProvider::ResourceId> frame_resources_;
60 68
61 // TODO(danakj): Remove these, hide software path inside ResourceProvider and 69 // TODO(danakj): Remove these, hide software path inside ResourceProvider and
62 // ExternalResource (aka TextureMailbox) classes. 70 // ExternalResource (aka TextureMailbox) classes.
63 std::vector<unsigned> software_resources_; 71 std::vector<unsigned> software_resources_;
64 // Called once for each software resource. 72 // Called once for each software resource.
65 ReleaseCallback software_release_callback_; 73 ReleaseCallback software_release_callback_;
66 74
67 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl); 75 DISALLOW_COPY_AND_ASSIGN(VideoLayerImpl);
68 }; 76 };
69 77
70 } // namespace cc 78 } // namespace cc
71 79
72 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_ 80 #endif // CC_LAYERS_VIDEO_LAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698