Changeset 255564 in webkit

Timestamp:

Feb 3, 2020 8:38:29 AM (4 years ago)

Author:

youenn@apple.com

Message:

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:]):

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

• ChangeLog (modified) (1 diff)
• Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm (modified) (11 diffs)

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2020-02-03  youenn fablet  <youenn@apple.com>
+
+        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  <youenn@apple.com>
 

trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm

@@ -87 +87 @@
            renderTimeMs:(int64_t)renderTimeMs
               timestamp:(uint32_t)timestamp
-               rotation:(RTCVideoRotation)rotation;
+               rotation:(RTCVideoRotation)rotation
+     isKeyFrameRequired:(bool)isKeyFrameRequired;
 
 @end
@@ -113 +114 @@
                        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;
@@ -129 +131 @@
   uint32_t timestamp;
   RTCVideoRotation rotation;
+  bool isKeyFrameRequired;
 };
 
@@ -207 +210 @@
                             renderTimeMs:encodeParams->render_time_ms
                                timestamp:encodeParams->timestamp
-                                rotation:encodeParams->rotation];
+                                rotation:encodeParams->rotation
+                      isKeyFrameRequired:encodeParams->isKeyFrameRequired];
 }
 
@@ -371 +375 @@
   std::vector<uint8_t> _frameScaleBuffer;
   bool _disableEncoding;
+  bool _isKeyFrameRequired;
 }
 
@@ -401 +406 @@
     RTC_CHECK([codecInfo.name isEqualToString:kRTCVideoCodecH264Name]);
   }
+  _isKeyFrameRequired = false;
+
   return self;
 }
@@ -451 +458 @@
     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.
@@ -514 +522 @@
     for (NSNumber *frameType in frameTypes) {
       if ((RTCFrameType)frameType.intValue == RTCFrameTypeVideoFrameKey) {
+        RTC_LOG(LS_INFO) << "keyframe requested";
         isKeyframeRequired = YES;
         break;
@@ -535 +544 @@
                                               frame.timeStampNs / rtc::kNumNanosecsPerMillisec,
                                               frame.timeStamp,
-                                              frame.rotation));
+                                              frame.rotation,
+                                              isKeyframeRequired));
   encodeParams->codecSpecificInfo.packetizationMode = _packetizationMode;
 
@@ -948 +958 @@
            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;
@@ -1005 +1021 @@
   if (!res) {
     RTC_LOG(LS_ERROR) << "Encode callback failed";
+    if (isKeyFrameRequired)
+      _isKeyFrameRequired = true;
     return;
   }