Changeset 181033 in webkit

Timestamp:

Mar 4, 2015, 2:29:25 PM (10 years ago)

Author:

Lucas Forschler

Message:

Merged r181005. rdar://problem/20044540

Location:

branches/safari-600.5-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h (modified) (2 diffs)
• platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (modified) (2 diffs)
• platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h (modified) (4 diffs)
• platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (modified) (14 diffs)

branches/safari-600.5-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-04  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r181005
+
+    2015-03-04  Jer Noble  <jer.noble@apple.com>
+
+            [MSE][EME][Mac] Calling close on a MediaKeysSession will cause many decoding errors to be emitted
+            https://bugs.webkit.org/show_bug.cgi?id=142285
+
+            Reviewed by Eric Carlson.
+
+            When a MediaKeySession (backed by CDMSessionMediaSourceAVFObjC) is closed and the
+            underlying AVStreamSession is invalidated, the decryption context for in-flight
+            CMSampleBuffers is also invalidated, and the AVSampleBufferDisplayLayer will issue
+            one error for each enqueued and un-displayed sample in its image-queue. -flush-ing
+            the AVSampleBufferDisplayLayer is not enough, as the flush only takes effect
+            asynchronously the next time the layer needs new samples.
+
+            Add a workaround until framework-level support lands to fully flush enqueued and
+            encrypted frames.
+
+            When the CDMSessionMediaSOurceAVFObjC object recieves an error from the layer,
+            check to see if the session has been stopped. If so, and if the error in question is
+            one that indicates that the samples decryption context has been invalidated, suppress
+            the error and instruct the sender to suppress the error as well. This workaround will
+            be removed once real support for synchronous flushing lands in <rdar://problem/20027434.>
+
+            Still, we'll make our best effort to flush undisplayed frames when our CDM session is
+            invalidated. Move away from std::map and instead use HashMap to store the set of 
+            AVSampleBufferAudioRenderers. This allows us to use C++11 style loops against just
+            the HashMap's set of values.
+
+            * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
+            * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+            (WebCore::CDMSessionMediaSourceAVFObjC::releaseKeys): Flush and set m_stopped.
+            (WebCore::CDMSessionMediaSourceAVFObjC::layerDidReceiveError): Check m_stopped and the
+                error code and bail before issuing the error.
+            (WebCore::CDMSessionMediaSourceAVFObjC::rendererDidReceiveError): Ditto.
+            * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h:
+            * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+            (-[WebAVSampleBufferErrorListener layerFailedToDecode:]): Drive-by fix. Check whether
+                the layer is in the set of listened-to layers only back in the main thread; the
+                listnener may have been unregistered by the time the main thread was called.
+            (WebCore::SourceBufferPrivateAVFObjC::destroyRenderers): std::map -> HashMap.
+            (WebCore::SourceBufferPrivateAVFObjC::trackDidChangeEnabled): Ditto.
+            (WebCore::SourceBufferPrivateAVFObjC::flushAndEnqueueNonDisplayingSamples): Ditto.
+            (WebCore::SourceBufferPrivateAVFObjC::enqueueSample): Ditto.
+            (WebCore::SourceBufferPrivateAVFObjC::isReadyForMoreSamples): Ditto.
+            (WebCore::SourceBufferPrivateAVFObjC::didBecomeReadyForMoreSamples): Ditto.
+            (WebCore::SourceBufferPrivateAVFObjC::notifyClientWhenReadyForMoreSamples): Ditto.
+            (WebCore::SourceBufferPrivateAVFObjC::flush): Added; call -flush on all the display
+                layers and audio renderers.
+            (WebCore::SourceBufferPrivateAVFObjC::layerDidReceiveError): Check if any clients
+                asked to ignore the error, and if so, bail.
+            (WebCore::SourceBufferPrivateAVFObjC::rendererDidReceiveError): Ditto.
+
 2015-03-04  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h

@@ -51 +51 @@
     virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) override;
 
-    virtual void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *);
-    virtual void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *);
+    virtual void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *, bool& shouldIgnore);
+    virtual void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *, bool& shouldIgnore);
 
     void setStreamSession(AVStreamSession *);
@@ -75 +75 @@
     String m_sessionId;
     enum { Normal, KeyRelease } m_mode;
+    bool m_stopped = { false };
 };
 

branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm

@@ -141 +141 @@
 {
     if (m_streamSession) {
+        m_stopped = true;
+        for (auto& sourceBuffer : m_sourceBuffers)
+            sourceBuffer->flush();
+
         LOG(Media, "CDMSessionMediaSourceAVFObjC::releaseKeys(%p) - expiring stream session", this);
         [m_streamSession expire];
@@ -282 +286 @@
 }
 
-void CDMSessionMediaSourceAVFObjC::layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *error)
+void CDMSessionMediaSourceAVFObjC::layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *error, bool& shouldIgnore)
 {
     if (!m_client)
         return;
 
-    m_client->sendError(CDMSessionClient::MediaKeyErrorDomain, abs(systemCodeForError(error)));
-}
-
-void CDMSessionMediaSourceAVFObjC::rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *error)
+    unsigned long code = abs(systemCodeForError(error));
+
+    // FIXME(142246): Remove the following once <rdar://problem/20027434> is resolved.
+    shouldIgnore = m_stopped && code == 12785;
+    if (!shouldIgnore)
+        m_client->sendError(CDMSessionClient::MediaKeyErrorDomain, code);
+}
+
+void CDMSessionMediaSourceAVFObjC::rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *error, bool& shouldIgnore)
 {
     if (!m_client)
         return;
 
-    m_client->sendError(CDMSessionClient::MediaKeyErrorDomain, abs(systemCodeForError(error)));
+    unsigned long code = abs(systemCodeForError(error));
+
+    // FIXME(142246): Remove the following once <rdar://problem/20027434> is resolved.
+    shouldIgnore = m_stopped && code == 12785;
+    if (!shouldIgnore)
+        m_client->sendError(CDMSessionClient::MediaKeyErrorDomain, code);
 }
 

branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h

@@ -30 +30 @@
 
 #include "SourceBufferPrivate.h"
-#include <map>
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
@@ -65 +64 @@
 public:
     virtual ~SourceBufferPrivateAVFObjCErrorClient() { }
-    virtual void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *) = 0;
-    virtual void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *) = 0;
+    virtual void layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *, bool& shouldIgnore) = 0;
+    virtual void rendererDidReceiveError(AVSampleBufferAudioRenderer *, NSError *, bool& shouldIgnore) = 0;
 };
 
@@ -98 +97 @@
     int protectedTrackID() const { return m_protectedTrackID; }
     AVStreamDataParser* parser() const { return m_parser.get(); }
+
+    void flush();
 
     void registerForErrorNotifications(SourceBufferPrivateAVFObjCErrorClient*);
@@ -139 +140 @@
     RetainPtr<AVAsset> m_asset;
     RetainPtr<AVSampleBufferDisplayLayer> m_displayLayer;
-    std::map<int, RetainPtr<AVSampleBufferAudioRenderer>> m_audioRenderers;
+    HashMap<int, RetainPtr<AVSampleBufferAudioRenderer>> m_audioRenderers;
     RetainPtr<WebAVStreamDataParserListener> m_delegate;
     RetainPtr<WebAVSampleBufferErrorListener> m_errorListener;

branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm

@@ -30 +30 @@
 
 #import "BlockExceptions.h"
+#import "CDMSessionMediaSourceAVFObjC.h"
 #import "ExceptionCodePlaceholder.h"
 #import "Logging.h"
@@ -148 +149 @@
 - (void)enqueueSampleBuffer:(CMSampleBufferRef)sampleBuffer;
 - (void)flush;
+- (void)flushAndRemoveImage;
 - (BOOL)isReadyForMoreMediaData;
 - (void)requestMediaDataWhenReadyOnQueue:(dispatch_queue_t)queue usingBlock:(void (^)(void))block;
@@ -451 +453 @@
 {
     RetainPtr<AVSampleBufferDisplayLayer> layer = (AVSampleBufferDisplayLayer *)[note object];
-    ASSERT(_layers.contains(layer.get()));
-
     RetainPtr<NSError> error = [[note userInfo] valueForKey:AVSampleBufferDisplayLayerFailedToDecodeNotificationErrorKey];
 
     RetainPtr<WebAVSampleBufferErrorListener> strongSelf = self;
     callOnMainThread([strongSelf, layer, error] {
+        if (!strongSelf->_parent || !strongSelf->_layers.contains(layer.get()))
+            return;
         strongSelf->_parent->layerDidReceiveError(layer.get(), error.get());
     });
@@ -804 +806 @@
     }
 
-    for (auto it = m_audioRenderers.begin(), end = m_audioRenderers.end(); it != end; ++it) {
-        AVSampleBufferAudioRenderer* renderer = it->second.get();
+    for (auto& renderer : m_audioRenderers.values()) {
         if (m_mediaSource)
-            m_mediaSource->player()->removeAudioRenderer(renderer);
+            m_mediaSource->player()->removeAudioRenderer(renderer.get());
         [renderer flush];
         [renderer stopRequestingMediaData];
-        [m_errorListener stopObservingRenderer:renderer];
+        [m_errorListener stopObservingRenderer:renderer.get()];
     }
 
@@ -883 +884 @@
 
     if (!track->enabled()) {
-        AVSampleBufferAudioRenderer* renderer = m_audioRenderers[trackID].get();
+        RetainPtr<AVSampleBufferAudioRenderer> renderer = m_audioRenderers.get(trackID);
         [m_parser setShouldProvideMediaData:NO forTrackID:trackID];
         if (m_mediaSource)
-            m_mediaSource->player()->removeAudioRenderer(renderer);
+            m_mediaSource->player()->removeAudioRenderer(renderer.get());
     } else {
         [m_parser setShouldProvideMediaData:YES forTrackID:trackID];
         RetainPtr<AVSampleBufferAudioRenderer> renderer;
-        if (!m_audioRenderers.count(trackID)) {
+        if (!m_audioRenderers.contains(trackID)) {
             renderer = adoptNS([[getAVSampleBufferAudioRendererClass() alloc] init]);
             [renderer requestMediaDataWhenReadyOnQueue:dispatch_get_main_queue() usingBlock:^{
                 didBecomeReadyForMoreSamples(trackID);
             }];
-            m_audioRenderers[trackID] = renderer;
+            m_audioRenderers.set(trackID, renderer);
             [m_errorListener beginObservingRenderer:renderer.get()];
         } else
-            renderer = m_audioRenderers[trackID].get();
+            renderer = m_audioRenderers.get(trackID);
 
         if (m_mediaSource)
@@ -905 +906 @@
 }
 
+void SourceBufferPrivateAVFObjC::flush()
+{
+    if (m_displayLayer)
+        [m_displayLayer flushAndRemoveImage];
+
+    for (auto& renderer : m_audioRenderers.values())
+        [renderer flush];
+}
+
 void SourceBufferPrivateAVFObjC::registerForErrorNotifications(SourceBufferPrivateAVFObjCErrorClient* client)
 {
@@ -920 +930 @@
 {
     LOG(MediaSource, "SourceBufferPrivateAVFObjC::layerDidReceiveError(%p): layer(%p), error(%@)", this, layer, [error description]);
-    for (auto& client : m_errorClients)
-        client->layerDidReceiveError(layer, error);
+
+    // FIXME(142246): Remove the following once <rdar://problem/20027434> is resolved.
+    bool anyIgnored = false;
+    for (auto& client : m_errorClients) {
+        bool shouldIgnore = false;
+        client->layerDidReceiveError(layer, error, shouldIgnore);
+        anyIgnored |= shouldIgnore;
+    }
+    if (anyIgnored)
+        return;
 
     int errorCode = [[[error userInfo] valueForKey:@"OSStatus"] intValue];
@@ -932 +950 @@
 {
     LOG(MediaSource, "SourceBufferPrivateAVFObjC::rendererDidReceiveError(%p): renderer(%p), error(%@)", this, renderer, [error description]);
-    for (auto& client : m_errorClients)
-        client->rendererDidReceiveError(renderer, error);
+
+    // FIXME(142246): Remove the following once <rdar://problem/20027434> is resolved.
+    bool anyIgnored = false;
+    for (auto& client : m_errorClients) {
+        bool shouldIgnore = false;
+        client->rendererDidReceiveError(renderer, error, shouldIgnore);
+        anyIgnored |= shouldIgnore;
+    }
+    if (anyIgnored)
+        return;
 }
 
@@ -959 +985 @@
     if (trackID == m_enabledVideoTrackID)
         flushAndEnqueueNonDisplayingSamples(mediaSamples, m_displayLayer.get());
-    else if (m_audioRenderers.count(trackID))
-        flushAndEnqueueNonDisplayingSamples(mediaSamples, m_audioRenderers[trackID].get());
+    else if (m_audioRenderers.contains(trackID))
+        flushAndEnqueueNonDisplayingSamples(mediaSamples, m_audioRenderers.get(trackID).get());
 }
 
@@ -1003 +1029 @@
 {
     int trackID = trackIDString.toInt();
-    if (trackID != m_enabledVideoTrackID && !m_audioRenderers.count(trackID))
+    if (trackID != m_enabledVideoTrackID && !m_audioRenderers.contains(trackID))
         return;
 
@@ -1019 +1045 @@
             m_mediaSource->player()->setHasAvailableVideoFrame(true);
     } else
-        [m_audioRenderers[trackID] enqueueSampleBuffer:platformSample.sample.cmSampleBuffer];
+        [m_audioRenderers.get(trackID) enqueueSampleBuffer:platformSample.sample.cmSampleBuffer];
 }
 
@@ -1027 +1053 @@
     if (trackID == m_enabledVideoTrackID)
         return [m_displayLayer isReadyForMoreMediaData];
-    else if (m_audioRenderers.count(trackID))
-        return [m_audioRenderers[trackID] isReadyForMoreMediaData];
+    else if (m_audioRenderers.contains(trackID))
+        return [m_audioRenderers.get(trackID) isReadyForMoreMediaData];
     else
         ASSERT_NOT_REACHED();
@@ -1063 +1089 @@
     if (trackID == m_enabledVideoTrackID)
         [m_displayLayer stopRequestingMediaData];
-    else if (m_audioRenderers.count(trackID))
-        [m_audioRenderers[trackID] stopRequestingMediaData];
+    else if (m_audioRenderers.contains(trackID))
+        [m_audioRenderers.get(trackID) stopRequestingMediaData];
     else {
         ASSERT_NOT_REACHED();
@@ -1081 +1107 @@
             didBecomeReadyForMoreSamples(trackID);
         }];
-    } else if (m_audioRenderers.count(trackID)) {
-        [m_audioRenderers[trackID] requestMediaDataWhenReadyOnQueue:dispatch_get_main_queue() usingBlock:^{
+    } else if (m_audioRenderers.contains(trackID)) {
+        [m_audioRenderers.get(trackID) requestMediaDataWhenReadyOnQueue:dispatch_get_main_queue() usingBlock:^{
             didBecomeReadyForMoreSamples(trackID);
         }];