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

Unified Diff: content/common/gpu/media/video_decode_accelerator_unittest.cc

Issue 10408003: Plumb extra_data() to VideoDecodeAccelerator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rev interface versino Created 8 years, 7 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 77e369849eb43ac82cb1028e96ba29c3e6baa0c7..e9f1219fce541ba6ad8d13ce1eaae670334ee570 100644
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
@@ -327,12 +327,6 @@ void EglRenderingVDAClient::CreateDecoder() {
scoped_refptr<MacVideoDecodeAccelerator> decoder =
new MacVideoDecodeAccelerator(this);
decoder->SetGLContext(rendering_helper_->GetGLContext());
- std::vector<uint8_t> avc_data(MP4_EXTRA_DATA,
- MP4_EXTRA_DATA + arraysize(MP4_EXTRA_DATA));
- if (!decoder->SetConfigInfo(frame_width_, frame_height_, avc_data)) {
- SetState(CS_ERROR);
- return;
- }
#endif // OS_WIN
decoder_ = decoder.release();
SetState(CS_DECODER_SET);
@@ -343,7 +337,10 @@ void EglRenderingVDAClient::CreateDecoder() {
media::VideoCodecProfile profile = media::H264PROFILE_BASELINE;
if (profile_ != -1)
profile = static_cast<media::VideoCodecProfile>(profile_);
- CHECK(decoder_->Initialize(profile));
+ std::vector<uint8_t> avc_data(MP4_EXTRA_DATA,
+ MP4_EXTRA_DATA + arraysize(MP4_EXTRA_DATA));
+ CHECK(decoder_->Initialize(
+ profile, gfx::Size(frame_width_, frame_height_), avc_data));
}
void EglRenderingVDAClient::ProvidePictureBuffers(
« no previous file with comments | « content/common/gpu/media/omx_video_decode_accelerator.cc ('k') | content/renderer/media/pepper_platform_video_decoder_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698