Changeset 270884 in webkit

Timestamp:

Dec 16, 2020, 12:30:05 AM (5 years ago)

Author:

youenn@apple.com

Message:

Make sure to correctly initialize the vpcC configuration in RTCVideoDecoderVTBVP9
​https://bugs.webkit.org/show_bug.cgi?id=219782

Reviewed by Eric Carlson.

We need to initialize the configuration record based on the frame header.
We do so for every key frame.

• Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm:

(convertSubsamplingXYToChromaSubsampling):
(-[RTCVideoDecoderVTBVP9 startDecodeWithNumberOfCores:]):
(-[RTCVideoDecoderVTBVP9 decode:missingFrames:codecSpecificInfo:renderTimeMs:]):
(-[RTCVideoDecoderVTBVP9 decodeData:size:timeStamp:]):

Location:

trunk/Source/ThirdParty/libwebrtc

Files:

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

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2020-12-16  Youenn Fablet  <youenn@apple.com>
+
+        Make sure to correctly initialize the vpcC configuration in RTCVideoDecoderVTBVP9
+        https://bugs.webkit.org/show_bug.cgi?id=219782
+
+        Reviewed by Eric Carlson.
+
+        We need to initialize the configuration record based on the frame header.
+        We do so for every key frame.
+
+        * Source/webrtc/sdk/objc/components/video_codec/RTCVideoDecoderVTBVP9.mm:
+        (convertSubsamplingXYToChromaSubsampling):
+        (-[RTCVideoDecoderVTBVP9 startDecodeWithNumberOfCores:]):
+        (-[RTCVideoDecoderVTBVP9 decode:missingFrames:codecSpecificInfo:renderTimeMs:]):
+        (-[RTCVideoDecoderVTBVP9 decodeData:size:timeStamp:]):
+
 2020-12-13  Andy Estes  <aestes@apple.com>
 

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

@@ -42 +42 @@
 
 #include "modules/video_coding/include/video_error_codes.h"
+#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
@@ -47 +48 @@
 
 extern const CFStringRef kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms;
-#define VPCodecConfigurationContentsSize 12
+
+static uint8_t convertSubsampling(webrtc::vp9::YuvSubsampling value)
+{
+    switch (value) {
+    case webrtc::vp9::YuvSubsampling::k444:
+        return 3;
+    case webrtc::vp9::YuvSubsampling::k440:
+        return 1;
+    case webrtc::vp9::YuvSubsampling::k422:
+        return 2;
+    case webrtc::vp9::YuvSubsampling::k420:
+        return 1;
+    }
+}
+
+rtc::ScopedCFTypeRef<CMVideoFormatDescriptionRef> computeInputFormat(const uint8_t* data, size_t size, int32_t width, int32_t height)
+{
+  constexpr size_t VPCodecConfigurationContentsSize = 12;
+
+  auto result = webrtc::vp9::ParseIntraFrameInfo(data, size);
+
+  if (!result)
+      return { };
+  auto chromaSubsampling = convertSubsampling(result->sub_sampling);
+  uint8_t bitDepthChromaAndRange = (0xF & (uint8_t)result->bit_detph) << 4 | (0x7 & chromaSubsampling) << 1 | (0x1 & (uint8_t)result->color_range);
+
+  uint8_t record[VPCodecConfigurationContentsSize];
+  memset((void*)record, 0, VPCodecConfigurationContentsSize);
+  // Version and flags (4 bytes)
+  record[0] = 1;
+  // profile
+  record[4] = result->profile;
+  // level
+  record[5] = 10;
+  // bitDepthChromaAndRange
+  record[6] = bitDepthChromaAndRange;
+  // colourPrimaries
+  record[7] = 2; // Unspecified.
+  // transferCharacteristics
+  record[8] = 2; // Unspecified.
+  // matrixCoefficients
+  record[9] = 2; // Unspecified.
+
+  auto cfData = rtc::ScopedCF(CFDataCreate(kCFAllocatorDefault, record, VPCodecConfigurationContentsSize));
+  auto configurationDict = @{ @"vpcC": (__bridge NSData *)cfData.get() };
+  auto extensions = @{ (__bridge NSString *)kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms: configurationDict };
+
+  CMVideoFormatDescriptionRef formatDescription = nullptr;
+  // Use kCMVideoCodecType_VP9 once added to CMFormatDescription.h
+  if (noErr != CMVideoFormatDescriptionCreate(kCFAllocatorDefault, 'vp09', width, height, (__bridge CFDictionaryRef)extensions, &formatDescription))
+      return { };
+
+  return rtc::ScopedCF(formatDescription);
+}
 
 // Struct that we pass to the decoder per frame to decode. We receive it again
@@ -118 +172 @@
   int32_t _width;
   int32_t _height;
+  bool _shouldCheckFormat;
+}
+
+- (instancetype)init {
+  self = [super init];
+  if (self) {
+    _shouldCheckFormat = true;
+  }
+  return self;
 }
 
@@ -143 +206 @@
   _width = width;
   _height = height;
+  _shouldCheckFormat = true;
 }
 
@@ -155 +219 @@
   }
 
-  uint8_t record[VPCodecConfigurationContentsSize];
-  // FIXME: Initialize properly the vpcC decoding configuration.
-  memset((void*)record, 0, VPCodecConfigurationContentsSize);
-  auto configurationDict = @{
-    @"vpcC": (__bridge NSData *)CFDataCreate(kCFAllocatorDefault, record, VPCodecConfigurationContentsSize)
-  };
-  auto extensions = @{
-    (__bridge NSString *)kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms: configurationDict
-  };
-
-  CMVideoFormatDescriptionRef formatDescription = nullptr;
-  // Use kCMVideoCodecType_VP9 once added to CMFormatDescription.h
-  if (noErr != CMVideoFormatDescriptionCreate(kCFAllocatorDefault, 'vp09', _width, _height, (__bridge CFDictionaryRef)extensions, &formatDescription))
-    return WEBRTC_VIDEO_CODEC_ERROR;
-
-  rtc::ScopedCFTypeRef<CMVideoFormatDescriptionRef> inputFormat = rtc::ScopedCF(formatDescription);
-  if (inputFormat) {
-    // Check if the video format has changed, and reinitialize decoder if
-    // needed.
-    if (!CMFormatDescriptionEqual(inputFormat.get(), _videoFormat)) {
-      [self setVideoFormat:inputFormat.get()];
-      int resetDecompressionSessionError = [self resetDecompressionSession];
-      if (resetDecompressionSessionError != WEBRTC_VIDEO_CODEC_OK) {
-        return resetDecompressionSessionError;
+  if (_shouldCheckFormat || !_videoFormat) {
+    auto inputFormat = computeInputFormat(data, size, _width, _height);
+    if (inputFormat) {
+      _shouldCheckFormat = false;
+      // Check if the video format has changed, and reinitialize decoder if
+      // needed.
+      if (!CMFormatDescriptionEqual(inputFormat.get(), _videoFormat)) {
+        [self setVideoFormat:inputFormat.get()];
+        int resetDecompressionSessionError = [self resetDecompressionSession];
+        if (resetDecompressionSessionError != WEBRTC_VIDEO_CODEC_OK) {
+          [self setVideoFormat:nullptr];
+          return resetDecompressionSessionError;
+        }
       }
     }