<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[178457] branches/safari-600.5-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/178457">178457</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-01-14 15:44:22 -0800 (Wed, 14 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174460">r174460</a>. <rdar://problem/19424153></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceWebCoreChangeLog">branches/safari-600.5-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh">branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h</a></li>
<li><a href="#branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCmm">branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/ChangeLog (178456 => 178457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-14 23:39:11 UTC (rev 178456)
+++ branches/safari-600.5-branch/Source/WebCore/ChangeLog 2015-01-14 23:44:22 UTC (rev 178457)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2015-01-14 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merged r174460. <rdar://problem/19424153>
+
+ 2014-10-07 Jer Noble <jer.noble@apple.com>
+
+ [EME][Mac] Update CDMSessionMediaSourceAVFObjC to match new API provided by AVStreamSession
+ https://bugs.webkit.org/show_bug.cgi?id=137469
+
+ Reviewed by Brent Fulgham.
+
+ Update our forward declaration to match the API provided by AVStreamSession.
+ AVStreamSession now takes an error: parameter in its initialiazer. It also provides the
+ sessionIdentifier used by the CDM, which CDMSessionMediaSourceAVFObjC will use as the
+ value of sessionId. Having this identifier allows us to fire a
+ secure-proof-of-key-release message after the client calls MediaKeySession.close().
+ Because this call will now generate messages, which have to be responded to in order
+ to remove those proofs from storage, do not clear the CDMSession from MediaKeySession
+ after calling close().
+
+ * Modules/encryptedmedia/MediaKeySession.cpp:
+ (WebCore::MediaKeySession::~MediaKeySession):
+ (WebCore::MediaKeySession::close):
+ (WebCore::MediaKeySession::setError): Deleted.
+ (WebCore::MediaKeySession::sessionId): Deleted.
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
+ (WebCore::CDMSessionMediaSourceAVFObjC::setSessionId):
+ * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm:
+ (-[CDMSessionMediaSourceAVFObjCListener initWithParent:]):
+ (-[CDMSessionMediaSourceAVFObjCObserver dealloc]):
+ (-[CDMSessionMediaSourceAVFObjCObserver beginObserving:]):
+ (-[CDMSessionMediaSourceAVFObjCObserver stopObserving:]):
+ (-[CDMSessionMediaSourceAVFObjCObserver invalidate]):
+ (-[CDMSessionMediaSourceAVFObjCListener observeValueForKeyPath:ofObject:change:context:]):
+ (WebCore::CDMSessionMediaSourceAVFObjC::CDMSessionMediaSourceAVFObjC):
+ (WebCore::CDMSessionMediaSourceAVFObjC::~CDMSessionMediaSourceAVFObjC):
+ (WebCore::CDMSessionMediaSourceAVFObjC::releaseKeys):
+ (WebCore::CDMSessionMediaSourceAVFObjC::update):
+ (WebCore::CDMSessionMediaSourceAVFObjC::addSourceBuffer):
+ (WebCore::CDMSessionMediaSourceAVFObjC::removeSourceBuffer):
+
+2015-01-14 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merged r173791. <rdar://problem/19424150>
</span><span class="cx">
</span><span class="cx"> 2014-09-19 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (178456 => 178457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2015-01-14 23:39:11 UTC (rev 178456)
+++ branches/safari-600.5-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2015-01-14 23:44:22 UTC (rev 178457)
</span><span class="lines">@@ -59,7 +59,12 @@
</span><span class="cx">
</span><span class="cx"> MediaKeySession::~MediaKeySession()
</span><span class="cx"> {
</span><del>- close();
</del><ins>+ if (m_session) {
+ m_session->setClient(nullptr);
+ m_session = nullptr;
+ }
+
+ m_asyncEventQueue.cancelAllEvents();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaKeySession::setError(MediaKeyError* error)
</span><span class="lines">@@ -69,12 +74,8 @@
</span><span class="cx">
</span><span class="cx"> void MediaKeySession::close()
</span><span class="cx"> {
</span><del>- if (m_session) {
</del><ins>+ if (m_session)
</ins><span class="cx"> m_session->releaseKeys();
</span><del>- m_session->setClient(nullptr);
- }
- m_session = nullptr;
- m_asyncEventQueue.cancelAllEvents();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& MediaKeySession::sessionId() const
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h (178456 => 178457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-01-14 23:39:11 UTC (rev 178456)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h 2015-01-14 23:44:22 UTC (rev 178457)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
</span><span class="cx">
</span><span class="cx"> OBJC_CLASS AVStreamSession;
</span><ins>+OBJC_CLASS CDMSessionMediaSourceAVFObjCObserver;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -55,6 +56,8 @@
</span><span class="cx"> void addSourceBuffer(SourceBufferPrivateAVFObjC*);
</span><span class="cx"> void removeSourceBuffer(SourceBufferPrivateAVFObjC*);
</span><span class="cx">
</span><ins>+ void setSessionId(const String& sessionId) { m_sessionId = sessionId; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> PassRefPtr<Uint8Array> generateKeyReleaseMessage(unsigned short& errorCode, unsigned long& systemCode);
</span><span class="cx">
</span><span class="lines">@@ -64,6 +67,7 @@
</span><span class="cx"> RefPtr<Uint8Array> m_initData;
</span><span class="cx"> RefPtr<Uint8Array> m_certificate;
</span><span class="cx"> RetainPtr<NSData> m_expiredSession;
</span><ins>+ RetainPtr<CDMSessionMediaSourceAVFObjCObserver> m_dataParserObserver;
</ins><span class="cx"> String m_sessionId;
</span><span class="cx"> enum { Normal, KeyRelease } m_mode;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebCoreplatformgraphicsavfoundationobjcCDMSessionMediaSourceAVFObjCmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm (178456 => 178457)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-01-14 23:39:11 UTC (rev 178456)
+++ branches/safari-600.5-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm 2015-01-14 23:44:22 UTC (rev 178457)
</span><span class="lines">@@ -49,10 +49,11 @@
</span><span class="cx"> - (void)processContentKeyResponseError:(NSError *)error forTrackID:(CMPersistentTrackID)trackID;
</span><span class="cx"> - (void)renewExpiringContentKeyResponseDataForTrackID:(CMPersistentTrackID)trackID;
</span><span class="cx"> - (NSData *)streamingContentKeyRequestDataForApp:(NSData *)appIdentifier contentIdentifier:(NSData *)contentIdentifier trackID:(CMPersistentTrackID)trackID options:(NSDictionary *)options error:(NSError **)outError;
</span><ins>+- (NSData *)sessionIdentifier;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface AVStreamSession : NSObject
</span><del>-- (instancetype)initWithAppIdentifier:(NSData *)appIdentifier storageDirectoryAtURL:(NSURL *)storageURL;
</del><ins>+- (instancetype)initWithAppIdentifier:(NSData *)appIdentifier storageDirectoryAtURL:(NSURL *)storageURL error:(NSError **)outError;
</ins><span class="cx"> - (void)addStreamDataParser:(AVStreamDataParser *)streamDataParser;
</span><span class="cx"> - (void)removeStreamDataParser:(AVStreamDataParser *)streamDataParser;
</span><span class="cx"> - (void)expire;
</span><span class="lines">@@ -60,22 +61,89 @@
</span><span class="cx"> + (void)removePendingExpiredSessionReports:(NSArray *)expiredSessionReports withAppIdentifier:(NSData *)appIdentifier;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@interface CDMSessionMediaSourceAVFObjCObserver : NSObject {
+ WebCore::CDMSessionMediaSourceAVFObjC *m_parent;
+ HashSet<RetainPtr<AVStreamDataParser>> m_parsers;
+}
+@end
+
+@implementation CDMSessionMediaSourceAVFObjCObserver
+- (id)initWithParent:(WebCore::CDMSessionMediaSourceAVFObjC *)parent
+{
+ if ((self = [super init]))
+ m_parent = parent;
+ return self;
+}
+
+- (void)dealloc
+{
+ [self invalidate];
+ [super dealloc];
+}
+
+- (void)beginObserving:(AVStreamDataParser *)parser
+{
+ ASSERT(!m_parsers.contains(parser));
+ m_parsers.add(parser);
+ [parser addObserver:self forKeyPath:@"sessionIdentifier" options:(NSKeyValueObservingOptionNew|NSKeyValueObservingOptionInitial) context:nullptr];
+}
+
+- (void)stopObserving:(AVStreamDataParser *)parser
+{
+ ASSERT(m_parsers.contains(parser));
+ m_parsers.remove(parser);
+ [parser removeObserver:self forKeyPath:@"sessionIdentifier" context:nullptr];
+}
+
+- (void)invalidate
+{
+ m_parent = nullptr;
+ for (auto& parser : m_parsers)
+ [parser removeObserver:self forKeyPath:@"sessionIdentifier" context:nullptr];
+ m_parsers.clear();
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void*)context
+{
+ UNUSED_PARAM(object);
+ UNUSED_PARAM(change);
+ UNUSED_PARAM(context);
+
+ if ([keyPath isEqual:@"sessionIdentifier"]) {
+ NSData* identifier = [change valueForKey:NSKeyValueChangeNewKey];
+ if ([identifier isKindOfClass:[NSNull class]])
+ return;
+
+ RetainPtr<NSString> sessionIdentifierString = adoptNS([[NSString alloc] initWithData:identifier encoding:(NSUTF8StringEncoding)]);
+ if (m_parent)
+ m_parent->setSessionId(sessionIdentifierString.get());
+ return;
+ }
+
+ ASSERT_NOT_REACHED();
+}
+@end
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> CDMSessionMediaSourceAVFObjC::CDMSessionMediaSourceAVFObjC()
</span><span class="cx"> : m_client(nullptr)
</span><del>- , m_sessionId(createCanonicalUUIDString())
</del><ins>+ , m_dataParserObserver(adoptNS([[CDMSessionMediaSourceAVFObjCObserver alloc] initWithParent:this]))
</ins><span class="cx"> , m_mode(Normal)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CDMSessionMediaSourceAVFObjC::~CDMSessionMediaSourceAVFObjC()
</span><span class="cx"> {
</span><del>- if (m_streamSession) {
- for (auto& sourceBuffer : m_sourceBuffers)
</del><ins>+ for (auto& sourceBuffer : m_sourceBuffers) {
+ if (m_streamSession)
</ins><span class="cx"> [m_streamSession removeStreamDataParser:sourceBuffer->parser()];
</span><del>- m_streamSession = nil;
</del><ins>+
+ [sourceBuffer->parser() removeObserver:m_dataParserObserver.get() forKeyPath:@"sessionIdentifier" context:nullptr];
</ins><span class="cx"> }
</span><ins>+
+ m_streamSession = nil;
+ [m_dataParserObserver invalidate];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Uint8Array> CDMSessionMediaSourceAVFObjC::generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode)
</span><span class="lines">@@ -105,15 +173,20 @@
</span><span class="cx">
</span><span class="cx"> void CDMSessionMediaSourceAVFObjC::releaseKeys()
</span><span class="cx"> {
</span><del>- if (m_mode == KeyRelease) {
- RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
- [getAVStreamSessionClass() removePendingExpiredSessionReports:@[m_expiredSession.get()] withAppIdentifier:certificateData.get()];
- return;
- }
-
</del><span class="cx"> if (m_streamSession) {
</span><span class="cx"> LOG(Media, "CDMSessionMediaSourceAVFObjC::releaseKeys(%p) - expiring stream session", this);
</span><span class="cx"> [m_streamSession expire];
</span><ins>+
+ RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
+ NSArray* expiredSessions = [getAVStreamSessionClass() pendingExpiredSessionReportsWithAppIdentifier:certificateData.get()];
+ for (NSData* expiredSessionData in expiredSessions) {
+ NSDictionary *expiredSession = [NSPropertyListSerialization propertyListWithData:expiredSessionData options:kCFPropertyListImmutable format:nullptr error:nullptr];
+ if ([expiredSession objectForKey:m_sessionId]) {
+ m_expiredSession = expiredSessionData;
+ m_client->sendMessage(Uint8Array::create(static_cast<const uint8_t*>([m_expiredSession bytes]), [m_expiredSession length]).get(), emptyString());
+ break;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -161,6 +234,17 @@
</span><span class="cx"> m_certificate = key;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (isEqual(key, "acknowledged")) {
+ if (!m_expiredSession) {
+ errorCode = MediaPlayer::InvalidPlayerState;
+ return false;
+ }
+
+ RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
+ [getAVStreamSessionClass() removePendingExpiredSessionReports:@[m_expiredSession.get()] withAppIdentifier:certificateData.get()];
+ m_expiredSession = nullptr;
+ }
+
</ins><span class="cx"> RefPtr<SourceBufferPrivateAVFObjC> protectedSourceBuffer;
</span><span class="cx"> for (auto& sourceBuffer : m_sourceBuffers) {
</span><span class="cx"> if (sourceBuffer->protectedTrackID() != -1) {
</span><span class="lines">@@ -171,8 +255,8 @@
</span><span class="cx">
</span><span class="cx"> if (shouldGenerateKeyRequest) {
</span><span class="cx"> RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
</span><del>- if (getAVStreamSessionClass()) {
- m_streamSession = adoptNS([[getAVStreamSessionClass() alloc] initWithAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:sessionStorageDirectory()]]);
</del><ins>+ if (getAVStreamSessionClass() && [getAVStreamSessionClass() instancesRespondToSelector:@selector(initWithAppIdentifier:storageDirectoryAtURL:error:)]) {
+ m_streamSession = adoptNS([[getAVStreamSessionClass() alloc] initWithAppIdentifier:certificateData.get() storageDirectoryAtURL:[NSURL fileURLWithPath:sessionStorageDirectory()] error:nil]);
</ins><span class="cx"> for (auto& sourceBuffer : m_sourceBuffers)
</span><span class="cx"> [m_streamSession addStreamDataParser:sourceBuffer->parser()];
</span><span class="cx"> LOG(Media, "CDMSessionMediaSourceAVFObjC::update(%p) - created stream session %p", this, m_streamSession.get());
</span><span class="lines">@@ -189,6 +273,9 @@
</span><span class="cx"> NSError* error = nil;
</span><span class="cx"> RetainPtr<NSData> request = [protectedSourceBuffer->parser() streamingContentKeyRequestDataForApp:certificateData.get() contentIdentifier:initData.get() trackID:protectedSourceBuffer->protectedTrackID() options:nil error:&error];
</span><span class="cx">
</span><ins>+ if (![protectedSourceBuffer->parser() respondsToSelector:@selector(sessionIdentifier)])
+ m_sessionId = createCanonicalUUIDString();
+
</ins><span class="cx"> if (error) {
</span><span class="cx"> LOG(Media, "CDMSessionMediaSourceAVFObjC::update(%p) - error:%@", this, [error description]);
</span><span class="cx"> errorCode = MediaPlayer::InvalidPlayerState;
</span><span class="lines">@@ -207,6 +294,7 @@
</span><span class="cx"> systemCode = 0;
</span><span class="cx"> RetainPtr<NSData> keyData = adoptNS([[NSData alloc] initWithBytes:key->data() length:key->length()]);
</span><span class="cx"> [protectedSourceBuffer->parser() processContentKeyResponseData:keyData.get() forTrackID:protectedSourceBuffer->protectedTrackID()];
</span><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -236,6 +324,8 @@
</span><span class="cx">
</span><span class="cx"> if (m_streamSession)
</span><span class="cx"> [m_streamSession addStreamDataParser:sourceBuffer->parser()];
</span><ins>+
+ [m_dataParserObserver beginObserving:sourceBuffer->parser()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CDMSessionMediaSourceAVFObjC::removeSourceBuffer(SourceBufferPrivateAVFObjC* sourceBuffer)
</span><span class="lines">@@ -248,6 +338,8 @@
</span><span class="cx">
</span><span class="cx"> sourceBuffer->unregisterForErrorNotifications(this);
</span><span class="cx"> m_sourceBuffers.remove(m_sourceBuffers.find(sourceBuffer));
</span><ins>+
+ [m_dataParserObserver stopObserving:sourceBuffer->parser()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Uint8Array> CDMSessionMediaSourceAVFObjC::generateKeyReleaseMessage(unsigned short& errorCode, unsigned long& systemCode)
</span></span></pre>
</div>
</div>
</body>
</html>