Index: media/gpu/android_copying_backing_strategy.cc |
diff --git a/media/gpu/android_copying_backing_strategy.cc b/media/gpu/android_copying_backing_strategy.cc |
index 9fd7034eb1cf6780ffbb1946c5919127702c4c47..3435fb77a5bb9b28de41e81485fa06933698514f 100644 |
--- a/media/gpu/android_copying_backing_strategy.cc |
+++ b/media/gpu/android_copying_backing_strategy.cc |
@@ -28,7 +28,7 @@ AndroidCopyingBackingStrategy::~AndroidCopyingBackingStrategy() {} |
gl::ScopedJavaSurface AndroidCopyingBackingStrategy::Initialize( |
int surface_view_id) { |
- if (surface_view_id != media::VideoDecodeAccelerator::Config::kNoSurfaceID) { |
+ if (surface_view_id != VideoDecodeAccelerator::Config::kNoSurfaceID) { |
LOG(ERROR) << "The copying strategy should not be initialized with a " |
"surface id."; |
return gl::ScopedJavaSurface(); |
@@ -66,7 +66,7 @@ gfx::Size AndroidCopyingBackingStrategy::GetPictureBufferSize() const { |
void AndroidCopyingBackingStrategy::UseCodecBufferForPictureBuffer( |
int32_t codec_buf_index, |
- const media::PictureBuffer& picture_buffer) { |
+ const PictureBuffer& picture_buffer) { |
// Make sure that the decoder is available. |
RETURN_ON_FAILURE(state_provider_, state_provider_->GetGlDecoder().get(), |
"Failed to get gles2 decoder instance.", ILLEGAL_STATE); |
@@ -130,8 +130,7 @@ void AndroidCopyingBackingStrategy::UseCodecBufferForPictureBuffer( |
true, false, false, transform_matrix); |
} |
-void AndroidCopyingBackingStrategy::CodecChanged( |
- media::VideoCodecBridge* codec) { |
+void AndroidCopyingBackingStrategy::CodecChanged(VideoCodecBridge* codec) { |
media_codec_ = codec; |
} |
@@ -147,7 +146,7 @@ bool AndroidCopyingBackingStrategy::ArePicturesOverlayable() { |
} |
void AndroidCopyingBackingStrategy::UpdatePictureBufferSize( |
- media::PictureBuffer* picture_buffer, |
+ PictureBuffer* picture_buffer, |
const gfx::Size& new_size) { |
// This strategy uses 2D textures who's allocated memory is dependent on the |
// size. To update size in all places, we must: |