Changeset 223564 in webkit

Timestamp:

Oct 17, 2017 11:53:52 AM (7 years ago)

Author:

jer.noble@apple.com

Message:

Corrupted image after looping movie-backed <img>.
​https://bugs.webkit.org/show_bug.cgi?id=178398

Reviewed by Eric Carlson.

Use the decode-order sample cursor rather than the destination sample cursor when generating
the CMSampleBuffer to decode.

• platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:

(WebCore::ImageDecoderAVFObjC::createFrameImageAtIndex):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-17  Jer Noble  <jer.noble@apple.com>
+
+        Corrupted image after looping movie-backed <img>.
+        https://bugs.webkit.org/show_bug.cgi?id=178398
+
+        Reviewed by Eric Carlson.
+
+        Use the decode-order sample cursor rather than the destination sample cursor when generating
+        the CMSampleBuffer to decode.
+
+        * platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm:
+        (WebCore::ImageDecoderAVFObjC::createFrameImageAtIndex):
+
 2017-10-17  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm

@@ -590 +590 @@
         auto presentationTime = PAL::toMediaTime(m_cursor.get().presentationTimeStamp);
         auto indexIter = m_presentationTimeToIndex.find(presentationTime);
-        advanceCursor();
 
         if (indexIter == m_presentationTimeToIndex.end())
-            return nullptr;
+            break;
 
         auto& cursorSampleData = m_sampleData[indexIter->second];
 
         if (!cursorSampleData.sample) {
-            auto request = adoptNS([allocAVSampleBufferRequestInstance() initWithStartCursor:frameCursor]);
+            auto request = adoptNS([allocAVSampleBufferRequestInstance() initWithStartCursor:m_cursor.get()]);
             cursorSampleData.sample = adoptCF([m_generator createSampleBufferForRequest:request.get()]);
         }
 
         if (!cursorSampleData.sample)
-            return nullptr;
+            break;
 
         if (!storeSampleBuffer(cursorSampleData.sample.get()))
-            return nullptr;
-
+            break;
+
+        advanceCursor();
         if (sampleData.image)
             return sampleData.image;
     }
 
-    ASSERT_NOT_REACHED();
+    advanceCursor();
     return nullptr;
 }