MediaStream Recorder: Support VP9 encoder

content/renderer/media/video_track_recorder.cc

 // Copyright 2015 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 "content/renderer/media/video_track_recorder.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/sys_info.h"
 #include "base/threading/thread.h"
@@ skipping 57 matching lines @@
 // which is cached on first frame arrival, and is supposed to be the render IO
 // thread, but this is not enforced;
 // - uses an internal |encoding_thread_| for libvpx interactions, notably for
 // encoding (which might take some time).
 class VideoTrackRecorder::VpxEncoder final
     : public base::RefCountedThreadSafe<VpxEncoder> {
  public:
   static void ShutdownEncoder(scoped_ptr<base::Thread> encoding_thread,
                               ScopedVpxCodecCtxPtr encoder);
 
-  explicit VpxEncoder(const OnEncodedVideoCB& on_encoded_video_callback);
+  VpxEncoder(bool use_vp9, const OnEncodedVideoCB& on_encoded_video_callback);
 
   void StartFrameEncode(const scoped_refptr<VideoFrame>& frame,
                         base::TimeTicks capture_timestamp);
 
  private:
   friend class base::RefCountedThreadSafe<VpxEncoder>;
   ~VpxEncoder();
 
   void EncodeOnEncodingThread(const scoped_refptr<VideoFrame>& frame,
                               base::TimeTicks capture_timestamp);
 
-  void ConfigureVp8Encoding(const gfx::Size& size);
+  void ConfigureEncoding(const gfx::Size& size);
 
   // Returns true if |codec_config_| has been filled in at least once.
   bool IsInitialized() const;
 
   // Estimate the frame duration from |frame| and |last_frame_timestamp_|.
   base::TimeDelta CalculateFrameDuration(
       const scoped_refptr<VideoFrame>& frame);
 
+  // Force usage of VP9 for encoding, instead of VP8 which is the default.
+  const bool use_vp9_;
+
   // Used to shutdown properly on the same thread we were created.
   const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
 
   // Task runner where frames to encode and reply callbacks must happen.
   scoped_refptr<base::SingleThreadTaskRunner> origin_task_runner_;
 
   // This callback should be exercised on IO thread.
   const OnEncodedVideoCB on_encoded_video_callback_;
 
   // Thread for encoding. Active for the lifetime of VpxEncoder. All variables
@@ skipping 15 matching lines @@
 // static
 void VideoTrackRecorder::VpxEncoder::ShutdownEncoder(
     scoped_ptr<base::Thread> encoding_thread,
     ScopedVpxCodecCtxPtr encoder) {
   DCHECK(encoding_thread->IsRunning());
   encoding_thread->Stop();
   // Both |encoding_thread| and |encoder| will be destroyed at end-of-scope.
 }
 
 VideoTrackRecorder::VpxEncoder::VpxEncoder(
+    bool use_vp9,
     const OnEncodedVideoCB& on_encoded_video_callback)
-    : main_task_runner_(base::MessageLoop::current()->task_runner()),
+    : use_vp9_(use_vp9),
+      main_task_runner_(base::MessageLoop::current()->task_runner()),
       on_encoded_video_callback_(on_encoded_video_callback),
       encoding_thread_(new base::Thread("EncodingThread")) {
   DCHECK(!on_encoded_video_callback_.is_null());
 
   codec_config_.g_timebase.den = 0;  // Not initialized.
 
   DCHECK(!encoding_thread_->IsRunning());
   encoding_thread_->Start();
 }
 
@@ skipping 20 matching lines @@
 void VideoTrackRecorder::VpxEncoder::EncodeOnEncodingThread(
     const scoped_refptr<VideoFrame>& frame,
     base::TimeTicks capture_timestamp) {
   TRACE_EVENT0("video",
                "VideoTrackRecorder::VpxEncoder::EncodeOnEncodingThread");
   DCHECK(encoding_thread_->task_runner()->BelongsToCurrentThread());
 
   const gfx::Size frame_size = frame->visible_rect().size();
   if (!IsInitialized() ||
       gfx::Size(codec_config_.g_w, codec_config_.g_h) != frame_size) {
-    ConfigureVp8Encoding(frame_size);
+    ConfigureEncoding(frame_size);
   }
 
   vpx_image_t vpx_image;
   vpx_image_t* const result = vpx_img_wrap(&vpx_image,
                                            VPX_IMG_FMT_I420,
                                            frame_size.width(),
                                            frame_size.height(),
                                            1  /* align */,
                                            frame->data(VideoFrame::kYPlane));
   DCHECK_EQ(result, &vpx_image);
@@ skipping 31 matching lines @@
   }
   origin_task_runner_->PostTask(FROM_HERE,
       base::Bind(OnFrameEncodeCompleted,
                  on_encoded_video_callback_,
                  frame,
                  base::Passed(&data),
                  capture_timestamp,
                  keyframe));
 }
 
-void VideoTrackRecorder::VpxEncoder::ConfigureVp8Encoding(
-    const gfx::Size& size) {
+void VideoTrackRecorder::VpxEncoder::ConfigureEncoding(const gfx::Size& size) {
   if (IsInitialized()) {
     // TODO(mcasas) VP8 quirk/optimisation: If the new |size| is strictly less-
     // than-or-equal than the old size, in terms of area, the existing encoder
     // instance could be reused after changing |codec_config_.{g_w,g_h}|.
     DVLOG(1) << "Destroying/Re-Creating encoder for new frame size: "
              << gfx::Size(codec_config_.g_w, codec_config_.g_h).ToString()
-             << " --> " << size.ToString();
+             << " --> " << size.ToString() << (use_vp9_ ? " vp9" : " vp8");
     encoder_.reset();
   }
 
-  const vpx_codec_iface_t* interface = vpx_codec_vp8_cx();
+  const vpx_codec_iface_t* interface =
+      use_vp9_ ? vpx_codec_vp9_cx() : vpx_codec_vp8_cx();
   const vpx_codec_err_t result = vpx_codec_enc_config_default(interface,
                                                               &codec_config_,
                                                               0 /* reserved */);
   DCHECK_EQ(VPX_CODEC_OK, result);
 
   // Adjust default bit rate to account for the actual size.
   DCHECK_EQ(320u, codec_config_.g_w);
   DCHECK_EQ(240u, codec_config_.g_h);
   DCHECK_EQ(256u, codec_config_.rc_target_bitrate);
   codec_config_.rc_target_bitrate = size.GetArea() *
-     codec_config_.rc_target_bitrate / codec_config_.g_w / codec_config_.g_h;
+                                    codec_config_.rc_target_bitrate /
+                                    codec_config_.g_w / codec_config_.g_h;
+  // Both VP8/VP9 configuration should be Variable BitRate by default.
+  DCHECK_EQ(VPX_VBR, codec_config_.rc_end_usage);
+  if (use_vp9_) {
+    // Number of frames to consume before producing output.
+    codec_config_.g_lag_in_frames = 0;
+
+    // DCHECK that the profile selected by default is I420 (magic number 0).
+    DCHECK_EQ(0u, codec_config_.g_profile);
+  } else {
+    // VP8 usually produces frames instantaneously.

[miu, 2015/10/07 21:56:56]

nit: s/usually/always/

[mcasas, 2015/10/08 18:08:45]

Done.

+    DCHECK_EQ(0u, codec_config_.g_lag_in_frames);
+  }
 
   DCHECK(size.width());
   DCHECK(size.height());
   codec_config_.g_w = size.width();
   codec_config_.g_h = size.height();
   codec_config_.g_pass = VPX_RC_ONE_PASS;
 
   // Timebase is the smallest interval used by the stream, can be set to the
   // frame rate or to e.g. microseconds.
   codec_config_.g_timebase.num = 1;
@@ skipping 49 matching lines @@
   }
   last_frame_timestamp_ = frame->timestamp();
   // Make sure |predicted_frame_duration| is in a safe range of values.
   const TimeDelta kMaxFrameDuration = TimeDelta::FromSecondsD(1.0 / 8);
   const TimeDelta kMinFrameDuration = TimeDelta::FromMilliseconds(1);
   return std::min(kMaxFrameDuration, std::max(predicted_frame_duration,
                                               kMinFrameDuration));
 }
 
 VideoTrackRecorder::VideoTrackRecorder(
+    bool use_vp9,
     const blink::WebMediaStreamTrack& track,
     const OnEncodedVideoCB& on_encoded_video_callback)
     : track_(track),
-      encoder_(new VpxEncoder(on_encoded_video_callback)) {
+      encoder_(new VpxEncoder(use_vp9, on_encoded_video_callback)) {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   DCHECK(!track_.isNull());
   DCHECK(track_.extraData());
 
   // StartFrameEncode() will be called on Render IO thread.
   AddToVideoTrack(this,
                   base::Bind(&VideoTrackRecorder::VpxEncoder::StartFrameEncode,
                              encoder_),
                   track_);
 }
 
 VideoTrackRecorder::~VideoTrackRecorder() {
   DCHECK(main_render_thread_checker_.CalledOnValidThread());
   RemoveFromVideoTrack(this, track_);
   track_.reset();
 }
 
 void VideoTrackRecorder::OnVideoFrameForTesting(
     const scoped_refptr<media::VideoFrame>& frame,
     base::TimeTicks timestamp) {
   encoder_->StartFrameEncode(frame, timestamp);
 }
 
 }  // namespace content