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

Unified Diff: media/filters/ffmpeg_video_decoder.h

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/filters/ffmpeg_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index ef3a5c34ff479757f33e30fd20ccc2940d245ec6..1177f6063b98fcba93701e7310b60d2c813934f6 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -10,6 +10,7 @@
#include "base/callback.h"
#include "base/macros.h"
+#include "base/memory/ref_counted.h"
#include "base/threading/thread_checker.h"
#include "media/base/video_decoder.h"
#include "media/base/video_decoder_config.h"
@@ -22,12 +23,13 @@ struct AVFrame;
namespace media {
class DecoderBuffer;
+class MediaLog;
class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
public:
static bool IsCodecSupported(VideoCodec codec);
- FFmpegVideoDecoder();
+ FFmpegVideoDecoder(scoped_refptr<MediaLog> media_log);
DaleCurtis 2017/03/22 00:43:16 explicit
sandersd (OOO until July 31) 2017/03/23 23:34:36 Done.
~FFmpegVideoDecoder() override;
// Allow decoding of individual NALU. Entire frames are required by default.
@@ -73,6 +75,7 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
void ReleaseFFmpegResources();
base::ThreadChecker thread_checker_;
+ scoped_refptr<MediaLog> media_log_;
DecoderState state_;

Powered by Google App Engine
This is Rietveld 408576698