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

Unified Diff: media/blink/video_frame_compositor.cc

Issue 495353003: Move WebMediaPlayerImpl and its dependencies to media/blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/video_frame_compositor.h ('k') | media/blink/video_frame_compositor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/video_frame_compositor.cc
diff --git a/content/renderer/media/video_frame_compositor.cc b/media/blink/video_frame_compositor.cc
similarity index 66%
rename from content/renderer/media/video_frame_compositor.cc
rename to media/blink/video_frame_compositor.cc
index 50dd8c992feed292750851dcfef7b0167482f1bf..7f254d4bc84c6872cedb9326cab5b454536192b3 100644
--- a/content/renderer/media/video_frame_compositor.cc
+++ b/media/blink/video_frame_compositor.cc
@@ -2,28 +2,28 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/renderer/media/video_frame_compositor.h"
+#include "media/blink/video_frame_compositor.h"
#include "media/base/video_frame.h"
-namespace content {
+namespace media {
-static bool IsOpaque(const scoped_refptr<media::VideoFrame>& frame) {
+static bool IsOpaque(const scoped_refptr<VideoFrame>& frame) {
switch (frame->format()) {
- case media::VideoFrame::UNKNOWN:
- case media::VideoFrame::YV12:
- case media::VideoFrame::YV12J:
- case media::VideoFrame::YV16:
- case media::VideoFrame::I420:
- case media::VideoFrame::YV24:
- case media::VideoFrame::NV12:
+ case VideoFrame::UNKNOWN:
+ case VideoFrame::YV12:
+ case VideoFrame::YV12J:
+ case VideoFrame::YV16:
+ case VideoFrame::I420:
+ case VideoFrame::YV24:
+ case VideoFrame::NV12:
return true;
- case media::VideoFrame::YV12A:
+ case VideoFrame::YV12A:
#if defined(VIDEO_HOLE)
- case media::VideoFrame::HOLE:
+ case VideoFrame::HOLE:
#endif // defined(VIDEO_HOLE)
- case media::VideoFrame::NATIVE_TEXTURE:
+ case VideoFrame::NATIVE_TEXTURE:
break;
}
return false;
@@ -49,16 +49,16 @@ void VideoFrameCompositor::SetVideoFrameProviderClient(
client_ = client;
}
-scoped_refptr<media::VideoFrame> VideoFrameCompositor::GetCurrentFrame() {
+scoped_refptr<VideoFrame> VideoFrameCompositor::GetCurrentFrame() {
return current_frame_;
}
void VideoFrameCompositor::PutCurrentFrame(
- const scoped_refptr<media::VideoFrame>& frame) {
+ const scoped_refptr<VideoFrame>& frame) {
}
void VideoFrameCompositor::UpdateCurrentFrame(
- const scoped_refptr<media::VideoFrame>& frame) {
+ const scoped_refptr<VideoFrame>& frame) {
if (current_frame_.get() &&
current_frame_->natural_size() != frame->natural_size()) {
natural_size_changed_cb_.Run(frame->natural_size());
@@ -74,4 +74,4 @@ void VideoFrameCompositor::UpdateCurrentFrame(
client_->DidReceiveFrame();
}
-} // namespace content
+} // namespace media
« no previous file with comments | « media/blink/video_frame_compositor.h ('k') | media/blink/video_frame_compositor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698