Skip to content
Permalink
Browse files
[Mac][MSE] Exception thrown from ~MediaPlayerPrivateMediaSourceAVFObj…
…C().

https://bugs.webkit.org/show_bug.cgi?id=133656

Reviewed by Eric Carlson.

AVSampleBufferRenderSynchronizer can't handle being passed a NULL observer, so only attempt
to remove the time jumped or duration observer if one was actually created.

* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::~MediaPlayerPrivateMediaSourceAVFObjC):


Canonical link: https://commits.webkit.org/151632@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@169718 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
jernoble committed Jun 9, 2014
1 parent f66dfca commit 45043566e106e4e18c0aa59a509f6227e4712dca
Showing 2 changed files with 17 additions and 2 deletions.
@@ -1,3 +1,16 @@
2014-06-09 Jer Noble <jer.noble@apple.com>

[Mac][MSE] Exception thrown from ~MediaPlayerPrivateMediaSourceAVFObjC().
https://bugs.webkit.org/show_bug.cgi?id=133656

Reviewed by Eric Carlson.

AVSampleBufferRenderSynchronizer can't handle being passed a NULL observer, so only attempt
to remove the time jumped or duration observer if one was actually created.

* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::~MediaPlayerPrivateMediaSourceAVFObjC):

2014-06-09 Zalan Bujtas <zalan@apple.com>

Subpixel rendering: Pixelsnapping empty rounded rect results in NaN radii width/height.
@@ -165,8 +165,10 @@ static void CMTimebaseEffectiveRateChangedCallback(CMNotificationCenterRef, cons
CMNotificationCenterRef nc = CMNotificationCenterGetDefaultLocalCenter();
CMNotificationCenterRemoveListener(nc, this, CMTimebaseEffectiveRateChangedCallback, kCMTimebaseNotification_EffectiveRateChanged, timebase);

[m_synchronizer removeTimeObserver:m_timeJumpedObserver.get()];
[m_synchronizer removeTimeObserver:m_durationObserver.get()];
if (m_timeJumpedObserver)
[m_synchronizer removeTimeObserver:m_timeJumpedObserver.get()];
if (m_durationObserver)
[m_synchronizer removeTimeObserver:m_durationObserver.get()];
}

#pragma mark -

0 comments on commit 4504356

Please sign in to comment.