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

Unified Diff: media/gpu/android_copying_backing_strategy.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/android_copying_backing_strategy.cc
diff --git a/content/common/gpu/media/android_copying_backing_strategy.cc b/media/gpu/android_copying_backing_strategy.cc
similarity index 95%
rename from content/common/gpu/media/android_copying_backing_strategy.cc
rename to media/gpu/android_copying_backing_strategy.cc
index b5216154829559901301d8d3bc9fe32d7c575e8c..bf1f8f0d021bccf6bde2a192fe2c981663cdd5d6 100644
--- a/content/common/gpu/media/android_copying_backing_strategy.cc
+++ b/media/gpu/android_copying_backing_strategy.cc
@@ -2,21 +2,21 @@
// 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/android_copying_backing_strategy.h"
+#include "media/gpu/android_copying_backing_strategy.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/trace_event/trace_event.h"
-#include "content/common/gpu/media/avda_return_on_failure.h"
#include "gpu/command_buffer/service/context_group.h"
#include "gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.h"
#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
#include "media/base/limits.h"
+#include "media/gpu/avda_return_on_failure.h"
#include "media/video/picture.h"
#include "ui/gl/android/surface_texture.h"
#include "ui/gl/gl_bindings.h"
-namespace content {
+namespace media {
AndroidCopyingBackingStrategy::AndroidCopyingBackingStrategy(
AVDAStateProvider* state_provider)
@@ -125,8 +125,10 @@ void AndroidCopyingBackingStrategy::UseCodecBufferForPictureBuffer(
if (!copier_) {
copier_.reset(new gpu::CopyTextureCHROMIUMResourceManager());
copier_->Initialize(state_provider_->GetGlDecoder().get(),
- state_provider_->GetGlDecoder()->GetContextGroup()->
- feature_info()->feature_flags());
+ state_provider_->GetGlDecoder()
+ ->GetContextGroup()
+ ->feature_info()
+ ->feature_flags());
}
// Here, we copy |surface_texture_id_| to the picture buffer instead of
@@ -189,4 +191,4 @@ void AndroidCopyingBackingStrategy::UpdatePictureBufferSize(
GL_RGBA, GL_UNSIGNED_BYTE, gfx::Rect(new_size));
}
-} // namespace content
+} // namespace media

Powered by Google App Engine
This is Rietveld 408576698