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: content/common/gpu/media/video_decode_accelerator_unittest.cc

Issue 170843004: Pass Client pointer in Initialize() for VDA/VEA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 50e826de Rebase. Created 6 years, 10 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: content/common/gpu/media/video_decode_accelerator_unittest.cc
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc
index 28832c7c0a0f0efa4bceefb46ef572d439423b48..8397020c954cd664d234f64303cafb8fdd5d41e7 100644
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
@@ -555,7 +555,7 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
}
#if defined(OS_WIN)
decoder_.reset(
- new DXVAVideoDecodeAccelerator(client, base::Bind(&DoNothingReturnTrue)));
+ new DXVAVideoDecodeAccelerator(base::Bind(&DoNothingReturnTrue)));
#elif defined(OS_CHROMEOS)
#if defined(ARCH_CPU_ARMEL)
@@ -566,7 +566,6 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
}
decoder_.reset(new V4L2VideoDecodeAccelerator(
static_cast<EGLDisplay>(rendering_helper_->GetGLDisplay()),
- client,
weak_client,
base::Bind(&DoNothingReturnTrue),
device.Pass(),
@@ -576,7 +575,6 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
<< "Hardware video decode does not work with OSMesa";
decoder_.reset(new VaapiVideoDecodeAccelerator(
static_cast<Display*>(rendering_helper_->GetGLDisplay()),
- client,
base::Bind(&DoNothingReturnTrue)));
#endif // ARCH_CPU_ARMEL
#endif // OS_WIN
@@ -585,7 +583,7 @@ void GLRenderingVDAClient::CreateAndStartDecoder() {
if (decoder_deleted())
return;
- CHECK(decoder_->Initialize(profile_));
+ CHECK(decoder_->Initialize(profile_, client));
}
void GLRenderingVDAClient::ProvidePictureBuffers(

Powered by Google App Engine
This is Rietveld 408576698