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

Unified Diff: media/gpu/ipc/service/gpu_video_decode_accelerator.cc

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix several more bot-identified build issues 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 side-by-side diff with in-line comments
Download patch
Index: media/gpu/ipc/service/gpu_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
similarity index 98%
rename from content/common/gpu/media/gpu_video_decode_accelerator.cc
rename to media/gpu/ipc/service/gpu_video_decode_accelerator.cc
index 160d0c31c5cbe2f1517d33d4a916c8a506ad1859..7ff5e1e18483705271f308d4310cf73b15292161 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc
+++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
+#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
#include <vector>
@@ -14,7 +14,6 @@
#include "base/stl_util.h"
#include "base/thread_task_runner_handle.h"
#include "build/build_config.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator_factory_impl.h"
#include "gpu/command_buffer/common/command_buffer.h"
#include "gpu/command_buffer/service/gpu_preferences.h"
#include "gpu/ipc/service/gpu_channel.h"
@@ -25,11 +24,12 @@
#include "media/base/limits.h"
#include "media/gpu/ipc/common/gpu_video_accelerator_util.h"
#include "media/gpu/ipc/common/media_messages.h"
+#include "media/gpu/ipc/service/gpu_video_decode_accelerator_factory_impl.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_image.h"
-namespace content {
+namespace media {
namespace {
static gfx::GLContext* GetGLContext(
@@ -250,8 +250,7 @@ void GpuVideoDecodeAccelerator::DismissPictureBuffer(
uncleared_textures_.erase(picture_buffer_id);
}
-void GpuVideoDecodeAccelerator::PictureReady(
- const media::Picture& picture) {
+void GpuVideoDecodeAccelerator::PictureReady(const media::Picture& picture) {
// VDA may call PictureReady on IO thread. SetTextureCleared should run on
// the child thread. VDA is responsible to call PictureReady on the child
// thread when a picture buffer is delivered the first time.
@@ -293,8 +292,8 @@ void GpuVideoDecodeAccelerator::NotifyResetDone() {
void GpuVideoDecodeAccelerator::NotifyError(
media::VideoDecodeAccelerator::Error error) {
- if (!Send(new AcceleratedVideoDecoderHostMsg_ErrorNotification(
- host_route_id_, error))) {
+ if (!Send(new AcceleratedVideoDecoderHostMsg_ErrorNotification(host_route_id_,
+ error))) {
DLOG(ERROR) << "Send(AcceleratedVideoDecoderHostMsg_ErrorNotification) "
<< "failed";
}
@@ -521,4 +520,4 @@ void GpuVideoDecodeAccelerator::SetTextureCleared(
uncleared_textures_.erase(it);
}
-} // namespace content
+} // namespace media

Powered by Google App Engine
This is Rietveld 408576698