[cast] Add optional VideoEncoder method to flush frames.

media/cast/sender/h264_vt_encoder.cc

 // Copyright 2014 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/cast/sender/h264_vt_encoder.h"
 
 #include <string>
 
 #include "base/big_endian.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "media/base/mac/corevideo_glue.h"
 #include "media/base/mac/video_frame_mac.h"
 #include "media/cast/sender/video_frame_factory.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 
 // Container for the associated data of a video frame being processed.
@@ skipping 12 matching lines @@
 
 base::ScopedCFTypeRef<CFDictionaryRef> DictionaryWithKeyValue(CFTypeRef key,
                                                               CFTypeRef value) {
   CFTypeRef keys[1] = {key};
   CFTypeRef values[1] = {value};
   return base::ScopedCFTypeRef<CFDictionaryRef>(CFDictionaryCreate(
       kCFAllocatorDefault, keys, values, 1, &kCFTypeDictionaryKeyCallBacks,
       &kCFTypeDictionaryValueCallBacks));
 }
 
+base::ScopedCFTypeRef<CFArrayRef> ArrayWithIntegers(const std::vector<int>& v) {
+  std::vector<CFNumberRef> numbers;
+  numbers.reserve(v.size());
+  for (const int i : v) {
+    numbers.push_back(CFNumberCreate(nullptr, kCFNumberSInt32Type, &i));
+  }
+  base::ScopedCFTypeRef<CFArrayRef> array(CFArrayCreate(
+      kCFAllocatorDefault, reinterpret_cast<const void**>(&numbers[0]),
+      numbers.size(), &kCFTypeArrayCallBacks));
+  for (CFNumberRef number : numbers) {
+    CFRelease(number);
+  }
+  return array;
+}
+
 template <typename NalSizeType>
 void CopyNalsToAnnexB(char* avcc_buffer,
                       const size_t avcc_size,
                       std::string* annexb_buffer) {
   static_assert(sizeof(NalSizeType) == 1 || sizeof(NalSizeType) == 2 ||
                     sizeof(NalSizeType) == 4,
                 "NAL size type has unsupported size");
   static const char startcode_3[3] = {0, 0, 1};
   DCHECK(avcc_buffer);
   DCHECK(annexb_buffer);
@@ skipping 194 matching lines @@
   // On OS X, allow the hardware encoder. Don't require it, it does not support
   // all configurations (some of which are used for testing).
   base::ScopedCFTypeRef<CFDictionaryRef> encoder_spec;
 #if !defined(OS_IOS)
   encoder_spec = DictionaryWithKeyValue(
       videotoolbox_glue_
           ->kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder(),
       kCFBooleanTrue);
 #endif
 
+  // Certain encoders prefer kCVPixelFormatType_422YpCbCr8, which is not
+  // supported through VideoFrame. We can force 420 formats to be used instead.
+  const int formats[] = {
+      kCVPixelFormatType_420YpCbCr8Planar,
+      CoreVideoGlue::kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange};
+  base::ScopedCFTypeRef<CFArrayRef> formats_array = ArrayWithIntegers(
+      std::vector<int>(formats, formats + arraysize(formats)));
+  base::ScopedCFTypeRef<CFDictionaryRef> buffer_attributes =
+      DictionaryWithKeyValue(kCVPixelBufferPixelFormatTypeKey, formats_array);
+
   VTCompressionSessionRef session;
   OSStatus status = videotoolbox_glue_->VTCompressionSessionCreate(
       kCFAllocatorDefault, video_config.width, video_config.height,
-      CoreMediaGlue::kCMVideoCodecType_H264, encoder_spec,
-      nullptr /* sourceImageBufferAttributes */,
+      CoreMediaGlue::kCMVideoCodecType_H264, encoder_spec, buffer_attributes,
       nullptr /* compressedDataAllocator */,
       &H264VideoToolboxEncoder::CompressionCallback,
       reinterpret_cast<void*>(this), &session);
   if (status != noErr) {
     DLOG(ERROR) << " VTCompressionSessionCreate failed: " << status;
     return false;
   }
   compression_session_.reset(session);
 
   ConfigureSession(video_config);
@@ skipping 27 matching lines @@
       video_config.max_frame_rate);
   SetSessionProperty(
       videotoolbox_glue_->kVTCompressionPropertyKey_ColorPrimaries(),
       kCVImageBufferColorPrimaries_ITU_R_709_2);
   SetSessionProperty(
       videotoolbox_glue_->kVTCompressionPropertyKey_TransferFunction(),
       kCVImageBufferTransferFunction_ITU_R_709_2);
   SetSessionProperty(
       videotoolbox_glue_->kVTCompressionPropertyKey_YCbCrMatrix(),
       kCVImageBufferYCbCrMatrix_ITU_R_709_2);
+  if (video_config.max_number_of_video_buffers_used > 0) {
+    SetSessionProperty(
+        videotoolbox_glue_->kVTCompressionPropertyKey_MaxFrameDelayCount(),
+        video_config.max_number_of_video_buffers_used);

[miu, 2015/01/21 23:24:27]

VideoSenderConfig::max_number_of_video_buffers_used means something completely
different from how you're using it here.

However, it's a codec-specific property.  I think it would be reasonable if you
just document (in cast_config.h) how the H264 codec interprets this value.

+  }
 }
 
 void H264VideoToolboxEncoder::Teardown() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // If the compression session exists, invalidate it. This blocks until all
   // pending output callbacks have returned and any internal threads have
   // joined, ensuring no output callback ever sees a dangling encoder pointer.
   if (compression_session_) {
     videotoolbox_glue_->VTCompressionSessionInvalidate(compression_session_);
@@ skipping 75 matching lines @@
 scoped_ptr<VideoFrameFactory>
 H264VideoToolboxEncoder::CreateVideoFrameFactory() {
   base::ScopedCFTypeRef<CVPixelBufferPoolRef> pool(
       videotoolbox_glue_->VTCompressionSessionGetPixelBufferPool(
           compression_session_),
       base::scoped_policy::RETAIN);
   return scoped_ptr<VideoFrameFactory>(
       new VideoFrameFactoryCVPixelBufferPoolImpl(pool));
 }
 
+void H264VideoToolboxEncoder::EmitFrames() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  if (!compression_session_) {
+    DLOG(ERROR) << " compression session is null";
+    return;
+  }
+
+  OSStatus status = videotoolbox_glue_->VTCompressionSessionCompleteFrames(
+      compression_session_, CoreMediaGlue::CMTime{0, 0, 0, 0});
+  if (status != noErr) {
+    DLOG(ERROR) << " VTCompressionSessionCompleteFrames failed: " << status;
+  }
+}
+
 bool H264VideoToolboxEncoder::SetSessionProperty(CFStringRef key,
                                                  int32_t value) {
   base::ScopedCFTypeRef<CFNumberRef> cfvalue(
       CFNumberCreate(nullptr, kCFNumberSInt32Type, &value));
   return videotoolbox_glue_->VTSessionSetProperty(compression_session_, key,
                                                   cfvalue) == noErr;
 }
 
 bool H264VideoToolboxEncoder::SetSessionProperty(CFStringRef key, bool value) {
   CFBooleanRef cfvalue = (value) ? kCFBooleanTrue : kCFBooleanFalse;
@@ skipping 62 matching lines @@
   CopySampleBufferToAnnexBBuffer(sbuf, &encoded_frame->data, keyframe);
 
   encoder->cast_environment_->PostTask(
       CastEnvironment::MAIN, FROM_HERE,
       base::Bind(request->frame_encoded_callback,
                  base::Passed(&encoded_frame)));
 }
 
 }  // namespace cast
 }  // namespace media