Changeset 176482 in webkit

Timestamp:

Nov 21, 2014, 4:04:58 PM (12 years ago)

Author:

jer.noble@apple.com

Message:

[EME][Mac] Check the underlying error if the one returned by AVFoundation is AVErrorUnknown.
​https://bugs.webkit.org/show_bug.cgi?id=138986

Reviewed by Eric Carlson.

When we recieve an error with the code AVErrorUnknown, look for an underlying error from CoreMedia (or another
lower-level framework) with a (presumably) more informative error code, and return that code instead.

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

(WebCore::systemCodeForError):
(WebCore::CDMSessionMediaSourceAVFObjC::layerDidReceiveError):
(WebCore::CDMSessionMediaSourceAVFObjC::rendererDidReceiveError):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-21  Jer Noble  <jer.noble@apple.com>
+
+        [EME][Mac] Check the underlying error if the one returned by AVFoundation is AVErrorUnknown.
+        https://bugs.webkit.org/show_bug.cgi?id=138986
+
+        Reviewed by Eric Carlson.
+
+        When we recieve an error with the code AVErrorUnknown, look for an underlying error from CoreMedia (or another
+        lower-level framework) with a (presumably) more informative error code, and return that code instead.
+
+        * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+        (WebCore::systemCodeForError):
+        (WebCore::CDMSessionMediaSourceAVFObjC::layerDidReceiveError):
+        (WebCore::CDMSessionMediaSourceAVFObjC::rendererDidReceiveError):
+
 2014-11-21  Chris Fleizach  <cfleizach@apple.com>
 

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

@@ -37 +37 @@
 #import "SoftLinking.h"
 #import "UUID.h"
+#import <AVFoundation/AVError.h>
 #import <CoreMedia/CMBase.h>
 #import <cstdlib>
@@ -263 +264 @@
 }
 
+static NSInteger systemCodeForError(NSError *error)
+{
+    NSInteger code = [error code];
+    if (code != AVErrorUnknown)
+        return code;
+
+    NSError* underlyingError = [error valueForKey:NSUnderlyingErrorKey];
+    if (!underlyingError || ![underlyingError isKindOfClass:[NSError class]])
+        return code;
+
+    return [underlyingError code];
+}
+
 void CDMSessionMediaSourceAVFObjC::layerDidReceiveError(AVSampleBufferDisplayLayer *, NSError *error)
 {
@@ -268 +282 @@
         return;
 
-    m_client->sendError(CDMSessionClient::MediaKeyErrorDomain, std::abs([error code]));
+    m_client->sendError(CDMSessionClient::MediaKeyErrorDomain, std::abs(systemCodeForError(error)));
 }
 
@@ -276 +290 @@
         return;
 
-    m_client->sendError(CDMSessionClient::MediaKeyErrorDomain, std::abs([error code]));
+    m_client->sendError(CDMSessionClient::MediaKeyErrorDomain, std::abs(systemCodeForError(error)));
 }