Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(795)

Unified Diff: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

Issue 2337453002: H.264 packetization mode 0 (try 2) (Closed)
Patch Set: Bot-detected compiler issues Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
index e32a2caf0c4e61ae2d26b4f616c7609a72da8920..6aaed2fc3c4ba271e5c03abc290ccf6fa5a64136 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
+++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
@@ -152,6 +152,7 @@ static void RtpFragmentize(EncodedImage* encoded_image,
H264EncoderImpl::H264EncoderImpl()
: openh264_encoder_(nullptr),
+ max_payload_size_(0),
number_of_cores_(0),
encoded_image_callback_(nullptr),
has_reported_init_(false),
@@ -163,7 +164,7 @@ H264EncoderImpl::~H264EncoderImpl() {
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) {
@@ -210,6 +211,7 @@ int32_t H264EncoderImpl::InitEncode(const VideoCodec* codec_settings,
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;
@@ -217,8 +219,12 @@ int32_t H264EncoderImpl::InitEncode(const VideoCodec* codec_settings,
target_bps_ = codec_settings->startBitrate * 1000;
else
target_bps_ = codec_settings->targetBitrate * 1000;
+ RTC_DCHECK(codec_settings->codecSpecific.H264.packetization_mode !=
+ kH264PacketizationModeNotSet);
+ packetization_mode_ = codec_settings->codecSpecific.H264.packetization_mode;
SEncParamExt encoder_params = CreateEncoderParams();
+
// Initialize.
if (openh264_encoder_->InitializeExt(&encoder_params) != 0) {
LOG(LS_ERROR) << "Failed to initialize OpenH264 encoder";
@@ -377,6 +383,7 @@ int32_t H264EncoderImpl::Encode(const VideoFrame& input_frame,
// Deliver encoded image.
CodecSpecificInfo codec_specific;
codec_specific.codecType = kVideoCodecH264;
+ codec_specific.codecSpecific.H264.packetization_mode = packetization_mode_;
encoded_image_callback_->Encoded(encoded_image_, &codec_specific,
&frag_header);
@@ -445,6 +452,34 @@ SEncParamExt H264EncoderImpl::CreateEncoderParams() const {
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_);
+#else
+ // When uiSliceMode = SM_FIXEDSLCNUM_SLICE, uiSliceNum = 0 means auto
+ // design
+ // it with cpu core number.
+ encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceNum = 0;
+ encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
+ SM_SIZELIMITED_SLICE;
+ encoder_params.sSpatialLayers[0]
+ .sSliceCfg.sSliceArgument.uiSliceSizeConstraint =
+ static_cast<unsigned int>(max_payload_size_);
+#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;
@@ -457,7 +492,10 @@ SEncParamExt H264EncoderImpl::CreateEncoderParams() const {
encoder_params.sSpatialLayers[0].sSliceArgument.uiSliceMode =
SM_FIXEDSLCNUM_SLICE;
#endif
-
+ break;
+ default:
+ RTC_NOTREACHED() << "Illegal packetization mode specified";
+ }
return encoder_params;
}

Powered by Google App Engine
This is Rietveld 408576698