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

Unified Diff: media/gpu/video_encode_accelerator_unittest.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/gpu/video_encode_accelerator_unittest.cc
diff --git a/media/gpu/video_encode_accelerator_unittest.cc b/media/gpu/video_encode_accelerator_unittest.cc
index 6a924df0d274b50cc51d4f50affdad0ad6627e16..375f07fe35e8b6de1567e4c6cea0bab8f7751974 100644
--- a/media/gpu/video_encode_accelerator_unittest.cc
+++ b/media/gpu/video_encode_accelerator_unittest.cc
@@ -19,6 +19,7 @@
#include "base/files/file_util.h"
#include "base/macros.h"
#include "base/memory/aligned_memory.h"
+#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
@@ -38,6 +39,7 @@
#include "media/base/bitstream_buffer.h"
#include "media/base/cdm_context.h"
#include "media/base/decoder_buffer.h"
+#include "media/base/media_log.h"
#include "media/base/media_util.h"
#include "media/base/test_data_util.h"
#include "media/base/video_decoder.h"
@@ -747,7 +749,7 @@ VideoFrameQualityValidator::VideoFrameQualityValidator(
const base::Closure& flush_complete_cb,
const base::Closure& decode_error_cb)
: profile_(profile),
- decoder_(new FFmpegVideoDecoder()),
+ decoder_(new FFmpegVideoDecoder(make_scoped_refptr(new MediaLog()))),
decode_cb_(
base::Bind(&VideoFrameQualityValidator::DecodeDone, AsWeakPtr())),
eos_decode_cb_(

Powered by Google App Engine
This is Rietveld 408576698