Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (255563 => 255564)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-02-03 16:26:50 UTC (rev 255563)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-02-03 16:38:29 UTC (rev 255564)
@@ -1,3 +1,19 @@
+2020-02-03 youenn fablet <[email protected]>
+
+ Make sure RTCVideoEncoderH264 generate a keyframe even if the frame that was supposed to be a key frame was dropped
+ https://bugs.webkit.org/show_bug.cgi?id=207108
+
+ Reviewed by Eric Carlson.
+
+ Add a parameter telling whether a frame to be encoded should be a key frame.
+ In encoder callback, if the frame is expected to be a key frame, set a flag to force the next frame to be a key frame.
+ This ensures that keyframe sending is not delayed in case encoding is dropping or failing to encode frames.
+
+ * Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm:
+ (-[RTCVideoEncoderH264 initWithCodecInfo:]):
+ (-[RTCVideoEncoderH264 encode:codecSpecificInfo:frameTypes:]):
+ (-[RTCVideoEncoderH264 frameWasEncoded:flags:sampleBuffer:codecSpecificInfo:width:height:renderTimeMs:timestamp:rotation:isKeyFrameRequired:]):
+
2020-01-20 youenn fablet <[email protected]>
Setting kVTCompressionPropertyKey_DataRateLimits on RTCVideoEncoderH264 fails
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm (255563 => 255564)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm 2020-02-03 16:26:50 UTC (rev 255563)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm 2020-02-03 16:38:29 UTC (rev 255564)
@@ -86,7 +86,8 @@
height:(int32_t)height
renderTimeMs:(int64_t)renderTimeMs
timestamp:(uint32_t)timestamp
- rotation:(RTCVideoRotation)rotation;
+ rotation:(RTCVideoRotation)rotation
+ isKeyFrameRequired:(bool)isKeyFrameRequired;
@end
@@ -112,8 +113,9 @@
int32_t h,
int64_t rtms,
uint32_t ts,
- RTCVideoRotation r)
- : encoder(e), width(w), height(h), render_time_ms(rtms), timestamp(ts), rotation(r) {
+ RTCVideoRotation r,
+ bool isKeyFrameRequired)
+ : encoder(e), width(w), height(h), render_time_ms(rtms), timestamp(ts), rotation(r), isKeyFrameRequired(isKeyFrameRequired) {
if (csi) {
codecSpecificInfo = csi;
} else {
@@ -128,6 +130,7 @@
int64_t render_time_ms;
uint32_t timestamp;
RTCVideoRotation rotation;
+ bool isKeyFrameRequired;
};
// We receive I420Frames as input, but we need to feed CVPixelBuffers into the
@@ -206,7 +209,8 @@
height:encodeParams->height
renderTimeMs:encodeParams->render_time_ms
timestamp:encodeParams->timestamp
- rotation:encodeParams->rotation];
+ rotation:encodeParams->rotation
+ isKeyFrameRequired:encodeParams->isKeyFrameRequired];
}
// Extract VideoToolbox profile out of the webrtc::SdpVideoFormat. If there is
@@ -370,6 +374,7 @@
webrtc::H264BitstreamParser _h264BitstreamParser;
std::vector<uint8_t> _frameScaleBuffer;
bool _disableEncoding;
+ bool _isKeyFrameRequired;
}
// .5 is set as a mininum to prevent overcompensating for large temporary
@@ -400,6 +405,8 @@
RTC_LOG(LS_INFO) << "Using profile " << CFStringToString(ExtractProfile(*_profile_level_id));
RTC_CHECK([codecInfo.name isEqualToString:kRTCVideoCodecH264Name]);
}
+ _isKeyFrameRequired = false;
+
return self;
}
@@ -450,7 +457,8 @@
if (!_callback || ![self hasCompressionSession]) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
- BOOL isKeyframeRequired = NO;
+ BOOL isKeyframeRequired = _isKeyFrameRequired;
+ _isKeyFrameRequired = false;
// Get a pixel buffer from the pool and copy frame data over.
if ([self resetCompressionSessionIfNeededWithFrame:frame]) {
@@ -513,6 +521,7 @@
if (!isKeyframeRequired && frameTypes) {
for (NSNumber *frameType in frameTypes) {
if ((RTCFrameType)frameType.intValue == RTCFrameTypeVideoFrameKey) {
+ RTC_LOG(LS_INFO) << "keyframe requested";
isKeyframeRequired = YES;
break;
}
@@ -534,7 +543,8 @@
_height,
frame.timeStampNs / rtc::kNumNanosecsPerMillisec,
frame.timeStamp,
- frame.rotation));
+ frame.rotation,
+ isKeyframeRequired));
encodeParams->codecSpecificInfo.packetizationMode = _packetizationMode;
// Update the bitrate if needed.
@@ -947,15 +957,21 @@
height:(int32_t)height
renderTimeMs:(int64_t)renderTimeMs
timestamp:(uint32_t)timestamp
- rotation:(RTCVideoRotation)rotation {
+ rotation:(RTCVideoRotation)rotation
+ isKeyFrameRequired:(bool)isKeyFrameRequired {
if (status != noErr) {
RTC_LOG(LS_ERROR) << "H264 encode failed with code: " << status;
+ if (isKeyFrameRequired)
+ _isKeyFrameRequired = true;
return;
}
if (infoFlags & kVTEncodeInfo_FrameDropped) {
+ if (isKeyFrameRequired)
+ _isKeyFrameRequired = true;
RTC_LOG(LS_INFO) << "H264 encode dropped frame.";
return;
}
+ _isKeyFrameRequired = false;
BOOL isKeyframe = NO;
CFArrayRef attachments = CMSampleBufferGetSampleAttachmentsArray(sampleBuffer, 0);
@@ -1004,6 +1020,8 @@
BOOL res = _callback(frame, codecSpecificInfo, header);
if (!res) {
RTC_LOG(LS_ERROR) << "Encode callback failed";
+ if (isKeyFrameRequired)
+ _isKeyFrameRequired = true;
return;
}
_bitrateAdjuster->Update(frame.buffer.length);
