Changeset 211823 in webkit

Timestamp:

Feb 7, 2017, 11:34:44 AM (8 years ago)

Author:

achristensen@apple.com

Message:

Fix libwebrtc build after r211728
​https://bugs.webkit.org/show_bug.cgi?id=167821

• platform/mediastream/mac/RealtimeIncomingVideoSource.cpp:

(WebCore::RealtimeIncomingVideoSource::processNewSample):

• platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp:

(WebCore::RealtimeOutgoingAudioSource::audioSamplesAvailable):
(WebCore::RealtimeOutgoingAudioSource::sourceHasMoreMediaData): Deleted.

• platform/mediastream/mac/RealtimeOutgoingAudioSource.h:
• platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp:

(WebCore::RealtimeOutgoingVideoSource::RealtimeOutgoingVideoSource):
(WebCore::RealtimeOutgoingVideoSource::videoSampleAvailable):
(WebCore::RealtimeOutgoingVideoSource::sourceHasMoreMediaData): Deleted.

• platform/mediastream/mac/RealtimeOutgoingVideoSource.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/mac/RealtimeIncomingVideoSource.cpp (modified) (1 diff)
• platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp (modified) (1 diff)
• platform/mediastream/mac/RealtimeOutgoingAudioSource.h (modified) (2 diffs)
• platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp (modified) (2 diffs)
• platform/mediastream/mac/RealtimeOutgoingVideoSource.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-07  Alex Christensen  <achristensen@webkit.org>
+
+        Fix libwebrtc build after r211728
+        https://bugs.webkit.org/show_bug.cgi?id=167821
+
+        * platform/mediastream/mac/RealtimeIncomingVideoSource.cpp:
+        (WebCore::RealtimeIncomingVideoSource::processNewSample):
+        * platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp:
+        (WebCore::RealtimeOutgoingAudioSource::audioSamplesAvailable):
+        (WebCore::RealtimeOutgoingAudioSource::sourceHasMoreMediaData): Deleted.
+        * platform/mediastream/mac/RealtimeOutgoingAudioSource.h:
+        * platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp:
+        (WebCore::RealtimeOutgoingVideoSource::RealtimeOutgoingVideoSource):
+        (WebCore::RealtimeOutgoingVideoSource::videoSampleAvailable):
+        (WebCore::RealtimeOutgoingVideoSource::sourceHasMoreMediaData): Deleted.
+        * platform/mediastream/mac/RealtimeOutgoingVideoSource.h:
+
 2017-02-07  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp

@@ -148 +148 @@
     }
 
-    mediaDataUpdated(MediaSampleAVFObjC::create(sample));
+    videoSampleAvailable(MediaSampleAVFObjC::create(sample));
 }
 

trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp

@@ -32 +32 @@
 #if USE(LIBWEBRTC)
 
+#include "NotImplemented.h"
+
 namespace WebCore {
 
-void RealtimeOutgoingAudioSource::sourceHasMoreMediaData(MediaSample& mediaSample)
+void RealtimeOutgoingAudioSource::audioSamplesAvailable(const MediaTime&, void*, const AudioStreamDescription&, size_t)
 {
-    // FIXME: Implement this.
-    UNUSED_PARAM(mediaSample);
+    notImplemented();
 }
 

trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h

@@ -45 +45 @@
 public:
     static Ref<RealtimeOutgoingAudioSource> create(Ref<RealtimeMediaSource>&& audioSource) { return adoptRef(*new RealtimeOutgoingAudioSource(WTFMove(audioSource))); }
-    ~RealtimeOutgoingAudioSource() { m_audioSource->removeObserver(this); }
+    ~RealtimeOutgoingAudioSource() { m_audioSource->removeObserver(*this); }
 
     void setTrack(rtc::scoped_refptr<webrtc::AudioTrackInterface>&& track) { m_track = WTFMove(track); }
 
 private:
-    explicit RealtimeOutgoingAudioSource(Ref<RealtimeMediaSource>&& audioSource) : m_audioSource(WTFMove(audioSource)) { m_audioSource->addObserver(this); }
+    explicit RealtimeOutgoingAudioSource(Ref<RealtimeMediaSource>&& audioSource) : m_audioSource(WTFMove(audioSource)) { m_audioSource->addObserver(*this); }
 
     virtual void AddSink(webrtc::AudioTrackSinkInterface* sink) { m_sinks.append(sink); }
@@ -67 +67 @@
     void sourceSettingsChanged() final { }
     bool preventSourceFromStopping() final { return false; }
-    void sourceHasMoreMediaData(MediaSample&) final;
+    void audioSamplesAvailable(const MediaTime&, void*, const AudioStreamDescription&, size_t) final;
 
     void convertAndSendMonoSamples();

trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp

@@ -42 +42 @@
     : m_videoSource(WTFMove(videoSource))
 {
-    m_videoSource->addObserver(this);
+    m_videoSource->addObserver(*this);
 }
 
@@ -62 +62 @@
 }
 
-void RealtimeOutgoingVideoSource::sourceHasMoreMediaData(MediaSample& sample)
+void RealtimeOutgoingVideoSource::videoSampleAvailable(MediaSample& sample)
 {
     if (!m_sinks.size())

trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.h

@@ -71 +71 @@
     void sourceMutedChanged() final { }
     void sourceSettingsChanged() final { }
-    void sourceHasMoreMediaData(MediaSample&) final;
+    void videoSampleAvailable(MediaSample&) final;
 
     Vector<rtc::VideoSinkInterface<webrtc::VideoFrame>*> m_sinks;