Changeset 167639 in webkit

Timestamp:

Apr 21, 2014 5:57:39 PM (10 years ago)

Author:

jer.noble@apple.com

Message:

[MSE][Mac] AVSampleBufferDisplayLayer and AudioRenderer is overretained.
​https://bugs.webkit.org/show_bug.cgi?id=131963

Reviewed by Jon Honeycutt.

Adopt the results of -[[class alloc] init] rather than retaining them.

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

(WebCore::SourceBufferPrivateAVFObjC::hasVideo):
(WebCore::SourceBufferPrivateAVFObjC::trackDidChangeEnabled):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-21  Jer Noble  <jer.noble@apple.com>
+
+        [MSE][Mac] AVSampleBufferDisplayLayer and AudioRenderer is overretained.
+        https://bugs.webkit.org/show_bug.cgi?id=131963
+
+        Reviewed by Jon Honeycutt.
+
+        Adopt the results of -[[class alloc] init] rather than retaining them.
+
+        * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+        (WebCore::SourceBufferPrivateAVFObjC::hasVideo):
+        (WebCore::SourceBufferPrivateAVFObjC::trackDidChangeEnabled):
+
 2014-04-21  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -544 +544 @@
         [m_parser setShouldProvideMediaData:YES forTrackID:trackID];
         if (!m_displayLayer) {
-            m_displayLayer = [[getAVSampleBufferDisplayLayerClass() alloc] init];
+            m_displayLayer = adoptNS([[getAVSampleBufferDisplayLayerClass() alloc] init]);
             [m_displayLayer requestMediaDataWhenReadyOnQueue:dispatch_get_main_queue() usingBlock:^{
                 didBecomeReadyForMoreSamples(trackID);
@@ -565 +565 @@
     } else {
         [m_parser setShouldProvideMediaData:YES forTrackID:trackID];
-        AVSampleBufferAudioRenderer* renderer;
+        RetainPtr<AVSampleBufferAudioRenderer> renderer;
         if (!m_audioRenderers.count(trackID)) {
-            renderer = [[getAVSampleBufferAudioRendererClass() alloc] init];
+            renderer = adoptNS([[getAVSampleBufferAudioRendererClass() alloc] init]);
             [renderer requestMediaDataWhenReadyOnQueue:dispatch_get_main_queue() usingBlock:^{
                 didBecomeReadyForMoreSamples(trackID);
@@ -576 +576 @@
 
         if (m_mediaSource)
-            m_mediaSource->player()->addAudioRenderer(renderer);
+            m_mediaSource->player()->addAudioRenderer(renderer.get());
     }
 }