<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211823] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211823">211823</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-02-07 11:34:44 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix libwebrtc build after <a href="http://trac.webkit.org/projects/webkit/changeset/211728">r211728</a>
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeIncomingVideoSourcecpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourcecpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourceh">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourcecpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourceh">trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211822 => 211823)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-02-07 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove accidentally-added (in r211409) patch reject file
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeIncomingVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingVideoSource.cpp (211822 => 211823)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> settingsDidChange();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- mediaDataUpdated(MediaSampleAVFObjC::create(sample));
</del><ins>+ videoSampleAvailable(MediaSampleAVFObjC::create(sample));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline void drawImage(ImageBuffer& imageBuffer, CGImageRef image, const FloatRect& rect)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.cpp (211822 => 211823)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,12 +31,13 @@
</span><span class="cx">
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><span class="cx">
</span><ins>+#include "NotImplemented.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void RealtimeOutgoingAudioSource::sourceHasMoreMediaData(MediaSample& mediaSample)
</del><ins>+void RealtimeOutgoingAudioSource::audioSamplesAvailable(const MediaTime&, void*, const AudioStreamDescription&, size_t)
</ins><span class="cx"> {
</span><del>- // FIXME: Implement this.
- UNUSED_PARAM(mediaSample);
</del><ins>+ notImplemented();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingAudioSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingAudioSource.h (211822 => 211823)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> class RealtimeOutgoingAudioSource final : public RefCounted<RealtimeOutgoingAudioSource>, public webrtc::AudioSourceInterface, private RealtimeMediaSource::Observer {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<RealtimeOutgoingAudioSource> create(Ref<RealtimeMediaSource>&& audioSource) { return adoptRef(*new RealtimeOutgoingAudioSource(WTFMove(audioSource))); }
</span><del>- ~RealtimeOutgoingAudioSource() { m_audioSource->removeObserver(this); }
</del><ins>+ ~RealtimeOutgoingAudioSource() { m_audioSource->removeObserver(*this); }
</ins><span class="cx">
</span><span class="cx"> void setTrack(rtc::scoped_refptr<webrtc::AudioTrackInterface>&& track) { m_track = WTFMove(track); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RealtimeOutgoingAudioSource(Ref<RealtimeMediaSource>&& audioSource) : m_audioSource(WTFMove(audioSource)) { m_audioSource->addObserver(this); }
</del><ins>+ explicit RealtimeOutgoingAudioSource(Ref<RealtimeMediaSource>&& audioSource) : m_audioSource(WTFMove(audioSource)) { m_audioSource->addObserver(*this); }
</ins><span class="cx">
</span><span class="cx"> virtual void AddSink(webrtc::AudioTrackSinkInterface* sink) { m_sinks.append(sink); }
</span><span class="cx"> virtual void RemoveSink(webrtc::AudioTrackSinkInterface* sink) { m_sinks.removeFirst(sink); }
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> void sourceMutedChanged() final { }
</span><span class="cx"> void sourceSettingsChanged() final { }
</span><span class="cx"> bool preventSourceFromStopping() final { return false; }
</span><del>- void sourceHasMoreMediaData(MediaSample&) final;
</del><ins>+ void audioSamplesAvailable(const MediaTime&, void*, const AudioStreamDescription&, size_t) final;
</ins><span class="cx">
</span><span class="cx"> void convertAndSendMonoSamples();
</span><span class="cx"> void convertAndSendStereoSamples();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.cpp (211822 => 211823)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> RealtimeOutgoingVideoSource::RealtimeOutgoingVideoSource(Ref<RealtimeMediaSource>&& videoSource)
</span><span class="cx"> : m_videoSource(WTFMove(videoSource))
</span><span class="cx"> {
</span><del>- m_videoSource->addObserver(this);
</del><ins>+ m_videoSource->addObserver(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RealtimeOutgoingVideoSource::GetStats(Stats*)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> m_sinks.removeFirst(sink);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RealtimeOutgoingVideoSource::sourceHasMoreMediaData(MediaSample& sample)
</del><ins>+void RealtimeOutgoingVideoSource::videoSampleAvailable(MediaSample& sample)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_sinks.size())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeOutgoingVideoSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSource.h (211822 => 211823)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> void sourceStopped() final { }
</span><span class="cx"> void sourceMutedChanged() final { }
</span><span class="cx"> void sourceSettingsChanged() final { }
</span><del>- void sourceHasMoreMediaData(MediaSample&) final;
</del><ins>+ void videoSampleAvailable(MediaSample&) final;
</ins><span class="cx">
</span><span class="cx"> Vector<rtc::VideoSinkInterface<webrtc::VideoFrame>*> m_sinks;
</span><span class="cx"> Ref<RealtimeMediaSource> m_videoSource;
</span></span></pre>
</div>
</div>
</body>
</html>