Revert of H.264 packetization mode 0 (try 2)

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
@@ skipping 134 matching lines @@
     // Copy the entire layer's data (including start codes).
     memcpy(encoded_image->_buffer + encoded_image->_length,
            layerInfo.pBsBuf,
            layer_len);
     encoded_image->_length += layer_len;
   }
 }
 
 H264EncoderImpl::H264EncoderImpl()
     : openh264_encoder_(nullptr),
-      width_(0),
-      height_(0),
-      max_frame_rate_(0.0f),
-      target_bps_(0),
-      max_bps_(0),
-      mode_(kRealtimeVideo),
-      frame_dropping_on_(false),
-      key_frame_interval_(0),
-      max_payload_size_(0),
       number_of_cores_(0),
       encoded_image_callback_(nullptr),
       has_reported_init_(false),
       has_reported_error_(false) {}
 
 H264EncoderImpl::~H264EncoderImpl() {
   Release();
 }
 
 int32_t H264EncoderImpl::InitEncode(const VideoCodec* codec_settings,
                                     int32_t number_of_cores,
-                                    size_t max_payload_size) {
+                                    size_t /*max_payload_size*/) {
   ReportInit();
   if (!codec_settings ||
       codec_settings->codecType != kVideoCodecH264) {
     ReportError();
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
   if (codec_settings->maxFramerate == 0) {
     ReportError();
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
@@ skipping 26 matching lines @@
   // else WELS_LOG_DEFAULT is used by default.
 
   number_of_cores_ = number_of_cores;
   // Set internal settings from codec_settings
   width_ = codec_settings->width;
   height_ = codec_settings->height;
   max_frame_rate_ = static_cast<float>(codec_settings->maxFramerate);
   mode_ = codec_settings->mode;
   frame_dropping_on_ = codec_settings->H264().frameDroppingOn;
   key_frame_interval_ = codec_settings->H264().keyFrameInterval;
-  max_payload_size_ = max_payload_size;
 
   // Codec_settings uses kbits/second; encoder uses bits/second.
   max_bps_ = codec_settings->maxBitrate * 1000;
   if (codec_settings->targetBitrate == 0)
     target_bps_ = codec_settings->startBitrate * 1000;
   else
     target_bps_ = codec_settings->targetBitrate * 1000;
-  RTC_DCHECK(codec_settings->H264().packetization_mode !=
-             kH264PacketizationModeNotSet);
-  packetization_mode_ = codec_settings->H264().packetization_mode;
 
   SEncParamExt encoder_params = CreateEncoderParams();
-
   // Initialize.
   if (openh264_encoder_->InitializeExt(&encoder_params) != 0) {
     LOG(LS_ERROR) << "Failed to initialize OpenH264 encoder";
     Release();
     ReportError();
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
   // TODO(pbos): Base init params on these values before submitting.
   quality_scaler_.Init(codec_settings->codecType, codec_settings->startBitrate,
                        codec_settings->width, codec_settings->height,
@@ skipping 138 matching lines @@
   RTPFragmentationHeader frag_header;
   RtpFragmentize(&encoded_image_, &encoded_image_buffer_, *frame_buffer, &info,
                  &frag_header);
 
   // Encoder can skip frames to save bandwidth in which case
   // |encoded_image_._length| == 0.
   if (encoded_image_._length > 0) {
     // Deliver encoded image.
     CodecSpecificInfo codec_specific;
     codec_specific.codecType = kVideoCodecH264;
-    codec_specific.codecSpecific.H264.packetization_mode = packetization_mode_;
     encoded_image_callback_->OnEncodedImage(encoded_image_, &codec_specific,
                                             &frag_header);
 
     // Parse and report QP.
     h264_bitstream_parser_.ParseBitstream(encoded_image_._buffer,
                                           encoded_image_._length);
     int qp = -1;
     if (h264_bitstream_parser_.GetLastSliceQp(&qp))
       quality_scaler_.ReportQP(qp);
   } else {
@@ skipping 48 matching lines @@
   encoder_params.iMultipleThreadIdc = NumberOfThreads(
       encoder_params.iPicWidth, encoder_params.iPicHeight, number_of_cores_);
   // The base spatial layer 0 is the only one we use.
   encoder_params.sSpatialLayers[0].iVideoWidth = encoder_params.iPicWidth;
   encoder_params.sSpatialLayers[0].iVideoHeight = encoder_params.iPicHeight;
   encoder_params.sSpatialLayers[0].fFrameRate = encoder_params.fMaxFrameRate;
   encoder_params.sSpatialLayers[0].iSpatialBitrate =
       encoder_params.iTargetBitrate;
   encoder_params.sSpatialLayers[0].iMaxSpatialBitrate =
       encoder_params.iMaxBitrate;
-  LOG(INFO) << "OpenH264 version is " << OPENH264_MAJOR << "."
-            << OPENH264_MINOR;
-  switch (packetization_mode_) {
-    case kH264PacketizationMode0:
 #if (OPENH264_MAJOR == 1) && (OPENH264_MINOR <= 5)
-      // Limit the size of packets produced.
-      encoder_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_DYN_SLICE;
-      // The slice size is max payload size - room for a NAL header.
-      // The constant 50 is NAL_HEADER_ADD_0X30BYTES in openh264 source,
-      // but is not exported.
-      encoder_params.sSpatialLayers[0]
-          .sSliceCfg.sSliceArgument.uiSliceSizeConstraint =
-          static_cast<unsigned int>(max_payload_size_ - 50);
-      encoder_params.uiMaxNalSize =
-          static_cast<unsigned int>(max_payload_size_);
+  // Slice num according to number of threads.
+  encoder_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_AUTO_SLICE;
 #else
-      // When uiSliceMode = SM_FIXEDSLCNUM_SLICE, uiSliceNum = 0 means auto
-      // design
-      // it with cpu core number.
-      encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 1;
-      encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
-          SM_SIZELIMITED_SLICE;
-      encoder_params.sSpatialLayers[0]
-          .sSliceArgument.uiSliceSizeConstraint =
-          static_cast<unsigned int>(max_payload_size_);
+  // When uiSliceMode = SM_FIXEDSLCNUM_SLICE, uiSliceNum = 0 means auto design
+  // it with cpu core number.
+  // TODO(sprang): Set to 0 when we understand why the rate controller borks
+  //               when uiSliceNum > 1.
+  encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 1;
+  encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
+      SM_FIXEDSLCNUM_SLICE;
 #endif
-      break;
-    case kH264PacketizationMode1:
-#if (OPENH264_MAJOR == 1) && (OPENH264_MINOR <= 5)
-      // Slice num according to number of threads.
-      encoder_params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_AUTO_SLICE;
-#else
-      // When uiSliceMode = SM_FIXEDSLCNUM_SLICE, uiSliceNum = 0 means auto
-      // design it with cpu core number.
-      // TODO(sprang): Set to 0 when we understand why the rate controller borks
-      //               when uiSliceNum > 1.
-      encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 1;
-      encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
-          SM_FIXEDSLCNUM_SLICE;
-#endif
-      break;
-    default:
-      RTC_NOTREACHED() << "Illegal packetization mode specified";
-  }
+
   return encoder_params;
 }
 
 void H264EncoderImpl::ReportInit() {
   if (has_reported_init_)
     return;
   RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264EncoderImpl.Event",
                             kH264EncoderEventInit,
                             kH264EncoderEventMax);
   has_reported_init_ = true;
@@ skipping 15 matching lines @@
 
 int32_t H264EncoderImpl::SetPeriodicKeyFrames(bool enable) {
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 void H264EncoderImpl::OnDroppedFrame() {
   quality_scaler_.ReportDroppedFrame();
 }
 
 }  // namespace webrtc