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

Unified Diff: media/test/pipeline_integration_test_base.cc

Issue 2768713002: Pass a |media_log| to FFmpegVideoDecoder and roll ffmpeg (Closed)
Patch Set: Created 3 years, 9 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/test/pipeline_integration_test_base.cc
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
index a7638159307cd2d733d6f0827fcb3148bd8c7734..6a8b8f7283a9fb085a7b4e0f3c34950ac44720fb 100644
--- a/media/test/pipeline_integration_test_base.cc
+++ b/media/test/pipeline_integration_test_base.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
+#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
@@ -333,7 +334,8 @@ std::unique_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer(
// Android does not have an ffmpeg video decoder.
#if !defined(MEDIA_DISABLE_FFMPEG) && !defined(OS_ANDROID)
- video_decoders.push_back(new FFmpegVideoDecoder());
+ video_decoders.push_back(
+ new FFmpegVideoDecoder(make_scoped_refptr(new MediaLog())));
#endif
// Simulate a 60Hz rendering sink.
« media/filters/ffmpeg_video_decoder.cc ('K') | « media/renderers/default_renderer_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698