Title: [211823] trunk/Source/WebCore
- Revision
- 211823
- Author
- achristen...@apple.com
- Date
- 2017-02-07 11:34:44 -0800 (Tue, 07 Feb 2017)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211822 => 211823)
--- trunk/Source/WebCore/ChangeLog 2017-02-07 19:15:22 UTC (rev 211822)
+++ trunk/Source/WebCore/ChangeLog 2017-02-07 19:34:44 UTC (rev 211823)
@@ -1,3 +1,20 @@
+2017-02-07 Alex Christensen <achristen...@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_hor...@apple.com>
Remove accidentally-added (in r211409) patch reject file
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp (211822 => 211823)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp 2017-02-07 19:15:22 UTC (rev 211822)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp 2017-02-07 19:34:44 UTC (rev 211823)
@@ -147,7 +147,7 @@
settingsDidChange();
}
- mediaDataUpdated(MediaSampleAVFObjC::create(sample));
+ videoSampleAvailable(MediaSampleAVFObjC::create(sample));
}
static inline void drawImage(ImageBuffer& imageBuffer, CGImageRef image, const FloatRect& rect)
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp (211822 => 211823)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp 2017-02-07 19:15:22 UTC (rev 211822)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp 2017-02-07 19:34:44 UTC (rev 211823)
@@ -31,12 +31,13 @@
#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();
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h (211822 => 211823)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h 2017-02-07 19:15:22 UTC (rev 211822)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h 2017-02-07 19:34:44 UTC (rev 211823)
@@ -44,12 +44,12 @@
class RealtimeOutgoingAudioSource final : public RefCounted<RealtimeOutgoingAudioSource>, public webrtc::AudioSourceInterface, private RealtimeMediaSource::Observer {
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); }
virtual void RemoveSink(webrtc::AudioTrackSinkInterface* sink) { m_sinks.removeFirst(sink); }
@@ -66,7 +66,7 @@
void sourceMutedChanged() final { }
void sourceSettingsChanged() final { }
bool preventSourceFromStopping() final { return false; }
- void sourceHasMoreMediaData(MediaSample&) final;
+ void audioSamplesAvailable(const MediaTime&, void*, const AudioStreamDescription&, size_t) final;
void convertAndSendMonoSamples();
void convertAndSendStereoSamples();
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp (211822 => 211823)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp 2017-02-07 19:15:22 UTC (rev 211822)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp 2017-02-07 19:34:44 UTC (rev 211823)
@@ -41,7 +41,7 @@
RealtimeOutgoingVideoSource::RealtimeOutgoingVideoSource(Ref<RealtimeMediaSource>&& videoSource)
: m_videoSource(WTFMove(videoSource))
{
- m_videoSource->addObserver(this);
+ m_videoSource->addObserver(*this);
}
bool RealtimeOutgoingVideoSource::GetStats(Stats*)
@@ -61,7 +61,7 @@
m_sinks.removeFirst(sink);
}
-void RealtimeOutgoingVideoSource::sourceHasMoreMediaData(MediaSample& sample)
+void RealtimeOutgoingVideoSource::videoSampleAvailable(MediaSample& sample)
{
if (!m_sinks.size())
return;
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.h (211822 => 211823)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.h 2017-02-07 19:15:22 UTC (rev 211822)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.h 2017-02-07 19:34:44 UTC (rev 211823)
@@ -70,7 +70,7 @@
void sourceStopped() final { }
void sourceMutedChanged() final { }
void sourceSettingsChanged() final { }
- void sourceHasMoreMediaData(MediaSample&) final;
+ void videoSampleAvailable(MediaSample&) final;
Vector<rtc::VideoSinkInterface<webrtc::VideoFrame>*> m_sinks;
Ref<RealtimeMediaSource> m_videoSource;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
