Changeset 187164 in webkit

Timestamp:

Jul 22, 2015 10:17:12 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Remove revealing getVideoTracks() and getAudioTracks()
​https://bugs.webkit.org/show_bug.cgi?id=147126
<rdar://problem/21908723>

Patch by Matthew Daiter <​mdaiter@apple.com> on 2015-07-22
Reviewed by Eric Carlson.

• Modules/mediastream/MediaStream.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::load): Modded to use
tracks() instead of getVideo/AudioTracks()
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer): Ditto
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::playInternal): Ditto
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::pauseInternal): Ditto
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setMuted): Ditto
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::naturalSize): Ditto
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::hasVideo): Ditto
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::hasAudio): Ditto
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentMediaTime):
Changed to a FIXME

• platform/mediastream/MediaStreamPrivate.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStream.h (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h (modified) (2 diffs)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (modified) (8 diffs)
• platform/mediastream/MediaStreamPrivate.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-22  Matthew Daiter  <mdaiter@apple.com>
+
+        Remove revealing getVideoTracks() and getAudioTracks()
+        https://bugs.webkit.org/show_bug.cgi?id=147126
+        <rdar://problem/21908723>
+
+        Reviewed by Eric Carlson.
+
+        * Modules/mediastream/MediaStream.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::MediaPlayerPrivateMediaStreamAVFObjC):
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::load): Modded to use
+        tracks() instead of getVideo/AudioTracks()
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::platformLayer): Ditto
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::playInternal): Ditto
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::pauseInternal): Ditto
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setMuted): Ditto
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::naturalSize): Ditto
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::hasVideo): Ditto
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::hasAudio): Ditto
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::currentMediaTime):
+        Changed to a FIXME
+        * platform/mediastream/MediaStreamPrivate.h:
+
 2015-07-22  Matthew Daiter  <mdaiter@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaStream.h

@@ -65 +65 @@
     MediaStreamTrack* getTrackById(String);
 
-    Vector<RefPtr<MediaStreamTrack>> getAudioTracks() override final;
-    Vector<RefPtr<MediaStreamTrack>> getVideoTracks() override final;
+    Vector<RefPtr<MediaStreamTrack>> getAudioTracks();
+    Vector<RefPtr<MediaStreamTrack>> getVideoTracks();
     Vector<RefPtr<MediaStreamTrack>> getTracks() const;
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.h

@@ -82 +82 @@
 #endif
 #if ENABLE(MEDIA_STREAM)
-    void load(MediaStreamPrivate*) override;
+    void load(MediaStreamPrivate&) override;
 #endif
     void cancelLoad() override;
@@ -152 +152 @@
     RefPtr<MediaStreamPrivateAVFObjC> m_MediaStreamPrivate;
     RetainPtr<AVAsset> m_asset;
+    RetainPtr<AVCaptureVideoPreviewLayer> m_previewLayer;
     RetainPtr<AVSampleBufferDisplayLayer> m_sampleBufferDisplayLayer;
     Vector<RetainPtr<AVSampleBufferAudioRenderer>> m_sampleBufferAudioRenderers;

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

@@ -79 +79 @@
     , m_loadingProgressed(false)
 {
+
 }
 
@@ -133 +134 @@
 #pragma mark MediaPlayerPrivateInterface Overrides
 
-void MediaPlayerPrivateMediaStreamAVFObjC::load(MediaStreamPrivate* client)
-{
-    m_MediaStreamPrivate = MediaStreamPrivateAVFObjC::create(this, client->client());
-    for (auto track : m_MediaStreamPrivate->client()->getVideoTracks()) {
-        client->addTrack(&track->privateTrack(), MediaStreamPrivate::NotifyClientOption::DontNotify);
-        client->client()->didAddTrackToPrivate(track->privateTrack());
-        if (track->readyState() == "live") {
+void MediaPlayerPrivateMediaStreamAVFObjC::load(MediaStreamPrivate& client)
+{
+    m_MediaStreamPrivate = MediaStreamPrivateAVFObjC::create(*this, *client.client());
+    for (auto track : client.tracks()) {
+        m_MediaStreamPrivate->addTrack(WTF::move(track), MediaStreamPrivate::NotifyClientOption::DontNotify);
+        m_MediaStreamPrivate->client()->didAddTrackToPrivate(*track);
+        if (!track->ended()) {
             track->source()->startProducingData();
             track->setEnabled(true);
         }
     }
-    for (auto track : m_MediaStreamPrivate->client()->getAudioTracks()) {
-        client->addTrack(&track->privateTrack(), MediaStreamPrivate::NotifyClientOption::DontNotify);
-        client->client()->didAddTrackToPrivate(track->privateTrack());
-        if (track->readyState() == "live") {
-            track->source()->startProducingData();
-            track->setEnabled(true);
-        }
+    m_previewLayer = nullptr;
+    for (auto track : m_MediaStreamPrivate->tracks()) {
+        if (track->type() == RealtimeMediaSource::Type::Video)
+            m_previewLayer = static_cast<AVVideoCaptureSource*>(track->source())->previewLayer();
     }
     m_player->client().mediaPlayerRenderingModeChanged(m_player);
@@ -173 +171 @@
 PlatformLayer* MediaPlayerPrivateMediaStreamAVFObjC::platformLayer() const
 {
-    if (!m_MediaStreamPrivate)
-        return MediaPlayerPrivateInterface::platformLayer();
-    for (auto track : m_MediaStreamPrivate->client()->getVideoTracks()) {
-        // FIXME(146858): Just grab the first webcam for now, we can manage more later
-        AVVideoCaptureSource* capture = (AVVideoCaptureSource*)track->source();
-        return (PlatformLayer*)[getAVCaptureVideoPreviewLayerClass() layerWithSession:capture->session()];
-    }
-    return MediaPlayerPrivateInterface::platformLayer();
+    if (!m_previewLayer)
+        return nullptr;
+    return static_cast<PlatformLayer*>(m_previewLayer);
 }
 
@@ -199 +192 @@
         [m_synchronizer setRate:m_rate];
 
-    for (auto track : m_MediaStreamPrivate->client()->getVideoTracks())
-        track->source()->startProducingData();
-    for (auto track : m_MediaStreamPrivate->client()->getAudioTracks())
+    for (auto track : m_MediaStreamPrivate->tracks())
         track->source()->startProducingData();
 }
@@ -219 +210 @@
     m_playing = false;
 
-    for (auto track : m_MediaStreamPrivate->client()->getVideoTracks())
-        track->source()->stopProducingData();
-    for (auto track : m_MediaStreamPrivate->client()->getAudioTracks())
+    for (auto track : m_MediaStreamPrivate->tracks())
         track->source()->stopProducingData();
 }
@@ -242 +231 @@
 void MediaPlayerPrivateMediaStreamAVFObjC::setMuted(bool muted)
 {
-    for (auto track : m_MediaStreamPrivate->client()->getAudioTracks())
-        track->source()->setMuted(muted);
+    for (auto track : m_MediaStreamPrivate->tracks()) {
+        if (track->type() == RealtimeMediaSource::Type::Audio)
+            track->source()->setMuted(muted);
+    }
 }
 
 FloatSize MediaPlayerPrivateMediaStreamAVFObjC::naturalSize() const
 {
-    FloatSize floatSize;
-    for (auto track : m_MediaStreamPrivate->client()->getVideoTracks()) {
-        AVVideoCaptureSource* source = (AVVideoCaptureSource*)track->source();
-        if (!source->stopped() && track->enabled()) {
-            if (source->width() > floatSize.width())
-                floatSize.setWidth(source->width());
-            if (source->height() > floatSize.height())
-                floatSize.setHeight(source->height());
+    FloatSize floatSize(0, 0);
+    for (auto track : m_MediaStreamPrivate->tracks()) {
+        if (track->type() == RealtimeMediaSource::Type::Video) {
+            AVVideoCaptureSource* source = (AVVideoCaptureSource*)track->source();
+            if (!source->stopped() && track->enabled()) {
+                if (source->width() > floatSize.width())
+                    floatSize.setWidth(source->width());
+                if (source->height() > floatSize.height())
+                    floatSize.setHeight(source->height());
+            }
         }
     }
@@ -263 +256 @@
 bool MediaPlayerPrivateMediaStreamAVFObjC::hasVideo() const
 {
-    return !m_MediaStreamPrivate->client()->getVideoTracks().isEmpty();
+    for (auto track : m_MediaStreamPrivate->tracks()) {
+        if (track->type() == RealtimeMediaSource::Type::Video)
+            return true;
+    }
+    return false;
 }
 
 bool MediaPlayerPrivateMediaStreamAVFObjC::hasAudio() const
 {
-    return !m_MediaStreamPrivate->client()->getAudioTracks().isEmpty();
+    for (auto track : m_MediaStreamPrivate->tracks()) {
+        if (track->type() == RealtimeMediaSource::Type::Audio)
+            return true;
+    }
+    return false;
 }
 
@@ -283 +284 @@
 MediaTime MediaPlayerPrivateMediaStreamAVFObjC::currentMediaTime() const
 {
-    MediaTime synchronizerTime = toMediaTime(CMTimebaseGetTime([m_synchronizer timebase]));
-    if (synchronizerTime < MediaTime::zeroTime())
-        return MediaTime::zeroTime();
-    return synchronizerTime;
+    // FIXME(147125): Must implement this later
+    return MediaTime::zeroTime();
 }
 

trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h

@@ -54 +54 @@
     virtual void didAddTrackToPrivate(MediaStreamTrackPrivate&) = 0;
     virtual void didRemoveTrackFromPrivate(MediaStreamTrackPrivate&) = 0;
-    virtual Vector<RefPtr<MediaStreamTrack>> getVideoTracks() = 0;
-    virtual Vector<RefPtr<MediaStreamTrack>> getAudioTracks() = 0;
 };