Pass a |media_log| to FFmpegVideoDecoder and roll ffmpeg

media/filters/ffmpeg_video_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_video_decoder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/limits.h"
+#include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 
 namespace media {
 
+namespace {
+
+std::string AVErrorString(int errnum) {

[wolenetz, 2017/03/22 19:31:50]

If the plan is to put similar into other ffmpeg use cases like FFmpegDemuxer,
please consider moving this to ffmpeg_common.cc

[sandersd (OOO until July 31), 2017/03/23 23:34:36]

Done.

+  char errbuf[AV_ERROR_MAX_STRING_SIZE];
+  av_make_error_string(errbuf, AV_ERROR_MAX_STRING_SIZE, errnum);

[DaleCurtis, 2017/03/22 00:43:16]

Will need an ffmpeg roll to use this in component windows builds; need to update
sigs file.

[sandersd (OOO until July 31), 2017/03/23 23:34:36]

Done.

+  return std::string(errbuf);
+}
+
+}  // namespace
+
 // Always use 2 or more threads for video decoding. Most machines today will
 // have 2-8 execution contexts. Using more cores generally doesn't seem to
 // increase power usage and allows us to decode video faster.
 //
 // Handling decoding on separate threads also frees up the pipeline thread to
 // continue processing. Although it'd be nice to have the option of a single
 // decoding thread, FFmpeg treats having one thread the same as having zero
 // threads (i.e., avcodec_decode_video() will execute on the calling thread).
 // Yet another reason for having two threads :)
 static const int kDecodeThreads = 2;
@@ skipping 62 matching lines @@
   if (opaque)
     static_cast<VideoFrame*>(opaque)->Release();
 }
 
 // static
 bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
   FFmpegGlue::InitializeFFmpeg();
   return avcodec_find_decoder(VideoCodecToCodecID(codec)) != nullptr;
 }
 
-FFmpegVideoDecoder::FFmpegVideoDecoder()
-    : state_(kUninitialized), decode_nalus_(false) {
+FFmpegVideoDecoder::FFmpegVideoDecoder(scoped_refptr<MediaLog> media_log)
+    : media_log_(std::move(media_log)),
+      state_(kUninitialized),
+      decode_nalus_(false) {
   thread_checker_.DetachFromThread();
 }
 
 int FFmpegVideoDecoder::GetVideoBuffer(struct AVCodecContext* codec_context,
                                        AVFrame* frame,
                                        int flags) {
   // Don't use |codec_context_| here! With threaded decoding,
   // it will contain unsynchronized width/height/pix_fmt values,
   // whereas |codec_context| contains the current threads's
   // updated width/height/pix_fmt, which can change for adaptive
@@ skipping 224 matching lines @@
     codec_context_->reordered_opaque = buffer->timestamp().InMicroseconds();
   }
 
   int frame_decoded = 0;
   int result = avcodec_decode_video2(codec_context_.get(),
                                      av_frame_.get(),
                                      &frame_decoded,
                                      &packet);
   // Log the problem if we can't decode a video frame and exit early.
   if (result < 0) {
-    LOG(ERROR) << "Error decoding video: " << buffer->AsHumanReadableString();
+    MEDIA_LOG(DEBUG, media_log_)
+        << "avcodec_decode_video2(): " << AVErrorString(result) << ", at "
+        << buffer->AsHumanReadableString();
     return false;
   }
 
   // FFmpeg says some codecs might have multiple frames per packet.  Previous
   // discussions with rbultje@ indicate this shouldn't be true for the codecs
   // we use.
   DCHECK_EQ(result, packet.size);
 
   // If no frame was produced then signal that more data is required to
   // produce more frames. This can happen under two circumstances:
@@ skipping 56 matching lines @@
   if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
     ReleaseFFmpegResources();
     return false;
   }
 
   av_frame_.reset(av_frame_alloc());
   return true;
 }
 
 }  // namespace media