Hacking ffvp9 decoder support for profiling.

media/filters/vpx_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/vpx_video_decoder.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 126 matching lines @@
     decode_threads = std::min(decode_threads,
                               base::SysInfo::NumberOfProcessors());
     return decode_threads;
   }
 
   decode_threads = std::max(decode_threads, 0);
   decode_threads = std::min(decode_threads, kMaxDecodeThreads);
   return decode_threads;
 }
 
+static int GetVPXFlags() {
+  int flags = 0;
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+
+  if (cmd_line->HasSwitch(switches::kEnableVpxFrameThreading)) {
+    LOG(ERROR) << "Frame threading enabled for libVPX.";
+    flags |= VPX_CODEC_USE_FRAME_THREADING;
+  }
+
+  return flags;
+}
+
 static vpx_codec_ctx* InitializeVpxContext(vpx_codec_ctx* context,
                                            const VideoDecoderConfig& config) {
   context = new vpx_codec_ctx();
   vpx_codec_dec_cfg_t vpx_config = {0};
   vpx_config.w = config.coded_size().width();
   vpx_config.h = config.coded_size().height();
   vpx_config.threads = GetThreadCount(config);
 
+  LOG(ERROR) << "Configured VPX decoder with thread count:"
+             << vpx_config.threads;
+
   vpx_codec_err_t status = vpx_codec_dec_init(
       context,
       config.codec() == kCodecVP9 ? vpx_codec_vp9_dx() : vpx_codec_vp8_dx(),
-      &vpx_config, 0 /* flags */);
+      &vpx_config, GetVPXFlags());
   if (status == VPX_CODEC_OK)
     return context;
 
   DLOG(ERROR) << "vpx_codec_dec_init() failed: " << vpx_codec_error(context);
   delete context;
   return nullptr;
 }
 
 // MemoryPool is a pool of simple CPU memory, allocated by hand and used by both
 // VP9 and any data consumers. This class needs to be ref-counted to hold on to
@@ skipping 287 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   if (offload_task_runner_)
     g_vpx_offload_thread.Pointer()->WaitForOutstandingTasks();
 
   state_ = kNormal;
   // PostTask() to avoid calling |closure| inmediately.
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, closure);
 }
 
 bool VpxVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config) {
-  if (config.codec() != kCodecVP8 && config.codec() != kCodecVP9)
+  const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+  bool use_ffvp9(cmd_line->HasSwitch(switches::kUseFFVP9));
+  bool skip_loop_filter(cmd_line->HasSwitch(switches::kSkipVpxLoopFilter));
+
+  if (config.codec() != kCodecVP8 && (config.codec() != kCodecVP9 || use_ffvp9))
     return false;
 
   // These are the combinations of codec-pixel format supported in principle.
   // Note that VP9 does not support Alpha in the current implementation.
   DCHECK(
       (config.codec() == kCodecVP8 && config.format() == PIXEL_FORMAT_YV12) ||
       (config.codec() == kCodecVP8 && config.format() == PIXEL_FORMAT_YV12A) ||
       (config.codec() == kCodecVP9 && config.format() == PIXEL_FORMAT_YV12) ||
       (config.codec() == kCodecVP9 && config.format() == PIXEL_FORMAT_YV24));
 
 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS)
   // When FFmpegVideoDecoder is available it handles VP8 that doesn't have
   // alpha, and VpxVideoDecoder will handle VP8 with alpha.
   if (config.codec() == kCodecVP8 && config.format() != PIXEL_FORMAT_YV12A)
     return false;
 #endif
 
   CloseDecoder();
 
   vpx_codec_ = InitializeVpxContext(vpx_codec_, config);
   if (!vpx_codec_)
     return false;
 
+  if (skip_loop_filter) {
+    LOG(ERROR) << "Skipping loop filter (in loop de-blocking) for libVPX.";
+    vpx_codec_control_(vpx_codec_, VP9_SET_SKIP_LOOP_FILTER, skip_loop_filter);
+  }
+
   // Configure VP9 to decode on our buffers to skip a data copy on decoding.
   if (config.codec() == kCodecVP9) {
     DCHECK_NE(PIXEL_FORMAT_YV12A, config.format());
     DCHECK(vpx_codec_get_caps(vpx_codec_->iface) &
            VPX_CODEC_CAP_EXTERNAL_FRAME_BUFFER);
 
     // Move high resolution vp9 decodes off of the main media thread (otherwise
     // decode may block audio decoding, demuxing, and other control activities).
     if (config.coded_size().width() >= 1024) {
       offload_task_runner_ =
           g_vpx_offload_thread.Pointer()->RequestOffloadThread();
     }
 
     memory_pool_ = new MemoryPool();
     if (vpx_codec_set_frame_buffer_functions(vpx_codec_,
                                              &MemoryPool::GetVP9FrameBuffer,
                                              &MemoryPool::ReleaseVP9FrameBuffer,
                                              memory_pool_.get())) {
       DLOG(ERROR) << "Failed to configure external buffers. "
                   << vpx_codec_error(vpx_codec_);
       return false;
     }
   }
 
   if (config.format() != PIXEL_FORMAT_YV12A)
     return true;
 
+  LOG(ERROR) << "Using libvpx!!!!!!!!!!!!!!!!!!!!!!";
   vpx_codec_alpha_ = InitializeVpxContext(vpx_codec_alpha_, config);
   return !!vpx_codec_alpha_;
 }
 
 void VpxVideoDecoder::CloseDecoder() {
   if (offload_task_runner_) {
     g_vpx_offload_thread.Pointer()
         ->WaitForOutstandingTasksAndReleaseOffloadThread();
     offload_task_runner_ = nullptr;
   }
@@ skipping 198 matching lines @@
       (*video_frame)->visible_data(VideoFrame::kUPlane),
       (*video_frame)->stride(VideoFrame::kUPlane),
       (*video_frame)->visible_data(VideoFrame::kVPlane),
       (*video_frame)->stride(VideoFrame::kVPlane), coded_size.width(),
       coded_size.height());
 
   return true;
 }
 
 }  // namespace media