Title: [259594] trunk/Source/WebCore
- Revision
- 259594
- Author
- [email protected]
- Date
- 2020-04-06 13:53:56 -0700 (Mon, 06 Apr 2020)
Log Message
Strengthen the ASSERT in ImageDecoderAVFObjC::storeSampleBuffer().
https://bugs.webkit.org/show_bug.cgi?id=209972
<rdar://problem/60727431>
Reviewed by Brent Fulgham.
* platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:
(WebCore::ImageDecoderAVFObjC::storeSampleBuffer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (259593 => 259594)
--- trunk/Source/WebCore/ChangeLog 2020-04-06 20:48:29 UTC (rev 259593)
+++ trunk/Source/WebCore/ChangeLog 2020-04-06 20:53:56 UTC (rev 259594)
@@ -1,5 +1,16 @@
2020-04-06 Jer Noble <[email protected]>
+ Strengthen the ASSERT in ImageDecoderAVFObjC::storeSampleBuffer().
+ https://bugs.webkit.org/show_bug.cgi?id=209972
+ <rdar://problem/60727431>
+
+ Reviewed by Brent Fulgham.
+
+ * platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:
+ (WebCore::ImageDecoderAVFObjC::storeSampleBuffer):
+
+2020-04-06 Jer Noble <[email protected]>
+
[ Mac wk2 ] http/tests/media/track-in-band-hls-metadata.html is flaky crashing.
https://bugs.webkit.org/show_bug.cgi?id=209490
<rdar://problem/60837555>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm (259593 => 259594)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm 2020-04-06 20:48:29 UTC (rev 259593)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm 2020-04-06 20:53:56 UTC (rev 259594)
@@ -421,7 +421,7 @@
{
auto pixelBuffer = m_decompressionSession->decodeSampleSync(sampleBuffer);
if (!pixelBuffer) {
- LOG(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not decode sampleBuffer", this);
+ RELEASE_LOG_ERROR(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not decode sampleBuffer", this);
return false;
}
@@ -433,11 +433,16 @@
CGImageRef rawImage = nullptr;
if (noErr != VTCreateCGImageFromCVPixelBuffer(pixelBuffer.get(), nullptr, &rawImage)) {
- LOG(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not create CGImage from pixelBuffer", this);
+ RELEASE_LOG_ERROR(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not create CGImage from pixelBuffer", this);
return false;
}
ASSERT(iter != m_sampleData.presentationOrder().end());
+ if (iter == m_sampleData.presentationOrder().end()) {
+ RELEASE_LOG_ERROR(Images, "ImageDecoderAVFObjC::storeSampleBuffer(%p) - could not find sample buffer entry with specified presentation time", this);
+ return false;
+ }
+
toSample(iter)->setImage(adoptCF(rawImage));
return true;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
