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

Side by Side Diff: content/renderer/media/media_stream_video_renderer_sink.h

Issue 1874733002: media: split GpuMemoryBufferVideoFramePool into GpuMemoryBufferVideoFrameCopier/Pool Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add GpuMemoryBufferVideoFramePoolTest Created 4 years, 8 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
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_renderer_sink.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "content/common/media/video_capture.h" 12 #include "content/common/media/video_capture.h"
13 #include "content/public/renderer/media_stream_video_sink.h" 13 #include "content/public/renderer/media_stream_video_sink.h"
14 #include "content/public/renderer/video_frame_provider.h" 14 #include "content/public/renderer/video_frame_provider.h"
15 #include "media/video/gpu_memory_buffer_video_frame_pool.h" 15 #include "media/video/gpu_memory_buffer_video_frame_copier.h"
16 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 16 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
17 #include "ui/gfx/geometry/size.h" 17 #include "ui/gfx/geometry/size.h"
18 18
19 namespace base { 19 namespace base {
20 class SingleThreadTaskRunner; 20 class SingleThreadTaskRunner;
21 class TaskRunner; 21 class TaskRunner;
22 } // namespace base 22 } // namespace base
23 23
24 namespace media { 24 namespace media {
25 class GpuVideoAcceleratorFactories; 25 class GpuVideoAcceleratorFactories;
(...skipping 24 matching lines...) Expand all
50 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, 50 const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
51 const scoped_refptr<base::TaskRunner>& worker_task_runner, 51 const scoped_refptr<base::TaskRunner>& worker_task_runner,
52 media::GpuVideoAcceleratorFactories* gpu_factories); 52 media::GpuVideoAcceleratorFactories* gpu_factories);
53 53
54 // VideoFrameProvider implementation. Called on the main thread. 54 // VideoFrameProvider implementation. Called on the main thread.
55 void Start() override; 55 void Start() override;
56 void Stop() override; 56 void Stop() override;
57 void Play() override; 57 void Play() override;
58 void Pause() override; 58 void Pause() override;
59 void SetGpuMemoryBufferVideoForTesting( 59 void SetGpuMemoryBufferVideoForTesting(
60 media::GpuMemoryBufferVideoFramePool* gpu_memory_buffer_pool); 60 media::GpuMemoryBufferVideoFrameCopier* gpu_memory_buffer_copier);
61 61
62 protected: 62 protected:
63 ~MediaStreamVideoRendererSink() override; 63 ~MediaStreamVideoRendererSink() override;
64 64
65 private: 65 private:
66 friend class MediaStreamVideoRendererSinkTest; 66 friend class MediaStreamVideoRendererSinkTest;
67 enum State { 67 enum State {
68 STARTED, 68 STARTED,
69 PAUSED, 69 PAUSED,
70 STOPPED, 70 STOPPED,
(...skipping 11 matching lines...) Expand all
82 82
83 const base::Closure error_cb_; 83 const base::Closure error_cb_;
84 const RepaintCB repaint_cb_; 84 const RepaintCB repaint_cb_;
85 85
86 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 86 const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
87 State state_; 87 State state_;
88 gfx::Size frame_size_; 88 gfx::Size frame_size_;
89 const blink::WebMediaStreamTrack video_track_; 89 const blink::WebMediaStreamTrack video_track_;
90 90
91 // Pool of GpuMemoryBuffers and resources used to create hardware frames. 91 // Pool of GpuMemoryBuffers and resources used to create hardware frames.
92 std::unique_ptr<media::GpuMemoryBufferVideoFramePool> gpu_memory_buffer_pool_; 92 std::unique_ptr<media::GpuMemoryBufferVideoFrameCopier>
93 gpu_memory_buffer_copier_;
93 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; 94 const scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
94 95
95 base::WeakPtrFactory<MediaStreamVideoRendererSink> weak_factory_; 96 base::WeakPtrFactory<MediaStreamVideoRendererSink> weak_factory_;
96 97
97 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoRendererSink); 98 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoRendererSink);
98 }; 99 };
99 100
100 } // namespace content 101 } // namespace content
101 102
102 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_ 103 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_RENDERER_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_renderer_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698