admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes crash caused by race derefing pixelbufferpool ivar while being destroyed and replaced by format change

Browse Source 
removes cached pixelbufferpool and instead retrieves current pool from the compressionSession each time (as recommended by apple docs)

Bug: webrtc:14688
Change-Id: I2244e69e7f32b912021db0905b9d5867d0bf6357
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/284240
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38920}
This commit is contained in:
Mike Woodworth 2022-11-19 22:46:00 -08:00 committed by WebRTC LUCI CQ
parent a2f5d45b81
commit cca2c0e6bb
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -86,6 +86,7 @@ Miguel Paris <mparisdiaz@gmail.com>
Mike Gilbert <floppymaster@gmail.com> Mike Gilbert <floppymaster@gmail.com>
Mike Wei <Mike.WeiB@gmail.com> Mike Wei <Mike.WeiB@gmail.com>
Min Wang <mingewang@gmail.com> Min Wang <mingewang@gmail.com>
Mike Woodworth <mike@divergentmedia.com>
Mo Zanaty <mzanaty@cisco.com> Mo Zanaty <mzanaty@cisco.com>
Nico Schlumprecht <me@github.nico.onl> Nico Schlumprecht <me@github.nico.onl>
Niek van der Maas <mail@niekvandermaas.nl> Niek van der Maas <mail@niekvandermaas.nl>

29
sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
View File

@ -129,7 +129,14 @@ bool CopyVideoFrameToNV12PixelBuffer(id<RTC_OBJC_TYPE(RTCI420Buffer)> frameBuffe
return true; return true;
} }
CVPixelBufferRef CreatePixelBuffer(CVPixelBufferPoolRef pixel_buffer_pool) { CVPixelBufferRef CreatePixelBuffer(VTCompressionSessionRef compression_session) {
if (!compression_session) {
RTC_LOG(LS_ERROR) << "Failed to get compression session.";
return nullptr;
}
CVPixelBufferPoolRef pixel_buffer_pool =
VTCompressionSessionGetPixelBufferPool(compression_session);
if (!pixel_buffer_pool) { if (!pixel_buffer_pool) {
RTC_LOG(LS_ERROR) << "Failed to get pixel buffer pool."; RTC_LOG(LS_ERROR) << "Failed to get pixel buffer pool.";
return nullptr; return nullptr;
@ -323,7 +330,6 @@ NSUInteger GetMaxSampleRate(const webrtc::H264ProfileLevelId &profile_level_id)
int32_t _width; int32_t _width;
int32_t _height; int32_t _height;
VTCompressionSessionRef _compressionSession; VTCompressionSessionRef _compressionSession;
CVPixelBufferPoolRef _pixelBufferPool;
RTCVideoCodecMode _mode; RTCVideoCodecMode _mode;
webrtc::H264BitstreamParser _h264BitstreamParser; webrtc::H264BitstreamParser _h264BitstreamParser;
@ -412,7 +418,7 @@ NSUInteger GetMaxSampleRate(const webrtc::H264ProfileLevelId &profile_level_id)
CVBufferRetain(pixelBuffer); CVBufferRetain(pixelBuffer);
} else { } else {
// Cropping required, we need to crop and scale to a new pixel buffer. // Cropping required, we need to crop and scale to a new pixel buffer.
pixelBuffer = CreatePixelBuffer(_pixelBufferPool); pixelBuffer = CreatePixelBuffer(_compressionSession);
if (!pixelBuffer) { if (!pixelBuffer) {
return WEBRTC_VIDEO_CODEC_ERROR; return WEBRTC_VIDEO_CODEC_ERROR;
} }
@ -437,7 +443,8 @@ NSUInteger GetMaxSampleRate(const webrtc::H264ProfileLevelId &profile_level_id)
// We did not have a native frame buffer // We did not have a native frame buffer
RTC_DCHECK_EQ(frame.width, _width); RTC_DCHECK_EQ(frame.width, _width);
RTC_DCHECK_EQ(frame.height, _height); RTC_DCHECK_EQ(frame.height, _height);
pixelBuffer = CreatePixelBuffer(_pixelBufferPool);
pixelBuffer = CreatePixelBuffer(_compressionSession);
if (!pixelBuffer) { if (!pixelBuffer) {
return WEBRTC_VIDEO_CODEC_ERROR; return WEBRTC_VIDEO_CODEC_ERROR;
} }
@ -574,8 +581,15 @@ NSUInteger GetMaxSampleRate(const webrtc::H264ProfileLevelId &profile_level_id)
if (_compressionSession) { if (_compressionSession) {
// The pool attribute `kCVPixelBufferPixelFormatTypeKey` can contain either an array of pixel // The pool attribute `kCVPixelBufferPixelFormatTypeKey` can contain either an array of pixel
// formats or a single pixel format. // formats or a single pixel format.
CVPixelBufferPoolRef pixelBufferPool =
VTCompressionSessionGetPixelBufferPool(_compressionSession);
if (!pixelBufferPool) {
return NO;
}
NSDictionary *poolAttributes = NSDictionary *poolAttributes =
(__bridge NSDictionary *)CVPixelBufferPoolGetPixelBufferAttributes(_pixelBufferPool); (__bridge NSDictionary *)CVPixelBufferPoolGetPixelBufferAttributes(pixelBufferPool);
id pixelFormats = id pixelFormats =
[poolAttributes objectForKey:(__bridge NSString *)kCVPixelBufferPixelFormatTypeKey]; [poolAttributes objectForKey:(__bridge NSString *)kCVPixelBufferPixelFormatTypeKey];
NSArray<NSNumber *> *compressionSessionPixelFormats = nil; NSArray<NSNumber *> *compressionSessionPixelFormats = nil;
@ -655,10 +669,6 @@ NSUInteger GetMaxSampleRate(const webrtc::H264ProfileLevelId &profile_level_id)
#endif #endif
[self configureCompressionSession]; [self configureCompressionSession];
// The pixel buffer pool is dependent on the compression session so if the session is reset, the
// pool should be reset as well.
_pixelBufferPool = VTCompressionSessionGetPixelBufferPool(_compressionSession);
return WEBRTC_VIDEO_CODEC_OK; return WEBRTC_VIDEO_CODEC_OK;
} }
@ -689,7 +699,6 @@ NSUInteger GetMaxSampleRate(const webrtc::H264ProfileLevelId &profile_level_id)
VTCompressionSessionInvalidate(_compressionSession); VTCompressionSessionInvalidate(_compressionSession);
CFRelease(_compressionSession); CFRelease(_compressionSession);
_compressionSession = nullptr; _compressionSession = nullptr;
_pixelBufferPool = nullptr;
} }
} }