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

Unified Diff: trunk/src/media/filters/pipeline_integration_test_base.cc

Issue 14320005: Revert 194993 "Remove reference counting from media::VideoDecode..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
« no previous file with comments | « trunk/src/media/filters/gpu_video_decoder.cc ('k') | trunk/src/media/filters/video_decoder_selector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/filters/pipeline_integration_test_base.cc
===================================================================
--- trunk/src/media/filters/pipeline_integration_test_base.cc (revision 195011)
+++ trunk/src/media/filters/pipeline_integration_test_base.cc (working copy)
@@ -223,17 +223,16 @@
Decryptor* decryptor) {
scoped_ptr<FilterCollection> collection(new FilterCollection());
collection->SetDemuxer(demuxer);
+ scoped_refptr<VideoDecoder> video_decoder = new FFmpegVideoDecoder(
+ message_loop_.message_loop_proxy());
+ scoped_refptr<VpxVideoDecoder> vpx_decoder = new VpxVideoDecoder(
+ message_loop_.message_loop_proxy());
+ collection->GetVideoDecoders()->push_back(video_decoder);
+ collection->GetVideoDecoders()->push_back(vpx_decoder);
- ScopedVector<VideoDecoder> video_decoders;
- video_decoders.push_back(
- new FFmpegVideoDecoder(message_loop_.message_loop_proxy()));
- video_decoders.push_back(
- new VpxVideoDecoder(message_loop_.message_loop_proxy()));
-
// Disable frame dropping if hashing is enabled.
scoped_ptr<VideoRenderer> renderer(new VideoRendererBase(
message_loop_.message_loop_proxy(),
- video_decoders.Pass(),
base::Bind(&PipelineIntegrationTestBase::SetDecryptor,
base::Unretained(this), decryptor),
base::Bind(&PipelineIntegrationTestBase::OnVideoRendererPaint,
« no previous file with comments | « trunk/src/media/filters/gpu_video_decoder.cc ('k') | trunk/src/media/filters/video_decoder_selector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698