Interface with webrtc through encoded frames

remoting/codec/video_encoder_vpx.cc

 // Copyright 2013 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 "remoting/codec/video_encoder_vpx.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 168 matching lines @@
   image->w = size.width();
   image->d_h = size.height();
   image->h = size.height();
 
   // libvpx should derive chroma shifts from|fmt| but currently has a bug:
   // https://code.google.com/p/webm/issues/detail?id=627
   if (use_i444) {
     image->fmt = VPX_IMG_FMT_I444;
     image->x_chroma_shift = 0;
     image->y_chroma_shift = 0;
-  } else { // I420
+  } else {  // I420
     image->fmt = VPX_IMG_FMT_YV12;
     image->x_chroma_shift = 1;
     image->y_chroma_shift = 1;
   }
 
   // libyuv's fast-path requires 16-byte aligned pointers and strides, so pad
   // the Y, U and V planes' strides to multiples of 16 bytes.
   const int y_stride = ((image->w - 1) & ~15) + 16;
   const int uv_unaligned_stride = y_stride >> image->x_chroma_shift;
   const int uv_stride = ((uv_unaligned_stride - 1) & ~15) + 16;
@@ skipping 21 matching lines @@
   image->planes[1] = image->planes[0] + y_stride * y_rows;
   image->planes[2] = image->planes[1] + uv_stride * uv_rows;
   image->stride[0] = y_stride;
   image->stride[1] = uv_stride;
   image->stride[2] = uv_stride;
 
   *out_image = std::move(image);
   *out_image_buffer = std::move(image_buffer);
 }
 
-} // namespace
+}  // namespace
 
 // static
 scoped_ptr<VideoEncoderVpx> VideoEncoderVpx::CreateForVP8() {
   return make_scoped_ptr(new VideoEncoderVpx(false));
 }
 
 // static
 scoped_ptr<VideoEncoderVpx> VideoEncoderVpx::CreateForVP9() {
   return make_scoped_ptr(new VideoEncoderVpx(true));
 }
@@ skipping 11 matching lines @@
       Configure(webrtc::DesktopSize(codec_->config.enc->g_w,
                                     codec_->config.enc->g_h));
   }
 }
 
 void VideoEncoderVpx::SetLosslessColor(bool want_lossless) {
   if (use_vp9_ && (want_lossless != lossless_color_)) {
     lossless_color_ = want_lossless;
     // TODO(wez): Switch to ConfigureCodec() path once libvpx supports it.
     // See https://code.google.com/p/webm/issues/detail?id=913.
-    //if (codec_)
+    // if (codec_)
     //  Configure(webrtc::DesktopSize(codec_->config.enc->g_w,
     //                                codec_->config.enc->g_h));
     codec_.reset();
   }
 }
 
 scoped_ptr<VideoPacket> VideoEncoderVpx::Encode(
-    const webrtc::DesktopFrame& frame) {
+    const webrtc::DesktopFrame& frame,
+    uint32_t flags) {
   DCHECK_LE(32, frame.size().width());
   DCHECK_LE(32, frame.size().height());
 
   // If there is nothing to encode, and nothing to top-off, then return nothing.
   if (frame.updated_region().is_empty() && !encode_unchanged_frame_)
     return nullptr;
 
   // Create or reconfigure the codec to match the size of |frame|.
   if (!codec_ ||
       (image_ &&
@@ skipping 10 matching lines @@
 
   // Apply active map to the encoder.
   vpx_active_map_t act_map;
   act_map.rows = active_map_size_.height();
   act_map.cols = active_map_size_.width();
   act_map.active_map = active_map_.get();
   if (vpx_codec_control(codec_.get(), VP8E_SET_ACTIVEMAP, &act_map)) {
     LOG(ERROR) << "Unable to apply active map";
   }
 
+  if (flags & kRequestKeyFrame)
+    vpx_codec_control(codec_.get(), VP8E_SET_FRAME_FLAGS, VPX_EFLAG_FORCE_KF);
+
   // Do the actual encoding.
   int timestamp = (clock_->NowTicks() - timestamp_base_).InMilliseconds();
   vpx_codec_err_t ret = vpx_codec_encode(
       codec_.get(), image_.get(), timestamp, 1, 0, VPX_DL_REALTIME);
   DCHECK_EQ(ret, VPX_CODEC_OK)
       << "Encoding error: " << vpx_codec_err_to_string(ret) << "\n"
       << "Details: " << vpx_codec_error(codec_.get()) << "\n"
       << vpx_codec_error_detail(codec_.get());
 
   if (use_vp9_ && !lossless_encode_) {
@@ skipping 20 matching lines @@
   while (!got_data) {
     const vpx_codec_cx_pkt_t* vpx_packet =
         vpx_codec_get_cx_data(codec_.get(), &iter);
     if (!vpx_packet)
       continue;
 
     switch (vpx_packet->kind) {
       case VPX_CODEC_CX_FRAME_PKT:
         got_data = true;
         packet->set_data(vpx_packet->data.frame.buf, vpx_packet->data.frame.sz);
+        packet->set_key_frame(vpx_packet->data.frame.flags & VPX_FRAME_IS_KEY);
         break;
       default:
         break;
     }
   }
 
   return packet;
 }
 
 VideoEncoderVpx::VideoEncoderVpx(bool use_vp9)
@@ skipping 189 matching lines @@
             kMacroBlockSize * (y + 1)));
       }
       x0 = x1 + 1;
     }
   }
   updated_region->IntersectWith(
       webrtc::DesktopRect::MakeWH(image_->w, image_->h));
 }
 
 }  // namespace remoting