<!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>[192028] 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/192028">192028</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2015-11-04 10:55:07 -0800 (Wed, 04 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] A RealtimeMediaSource should begin producing data automatically
https://bugs.webkit.org/show_bug.cgi?id=150851
rdar://problem/23380636
A RealtimeMediaSource should be producing data unless it is muted, which is not under the
control of the application, so a local source should begin producing data as soon as it
is added to a stream. Remove "producing data" and "enabled" observer callbacks because
they don't provide anything that the "muted" callback already provides.
Reviewed by Jer Noble.
* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::trackProducingDataChanged): Deleted.
* Modules/mediastream/MediaStreamTrack.h:
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::didCreateStream): Tell sources to begin producing data.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::load): Don't call stream->startProducingData,
it isn't necessary.
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setReadyState): Call characteristicsChanged
when the readyState changes.
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::trackProducingDataChanged): Deleted.
* platform/mediastream/MediaStreamPrivate.h:
* platform/mediastream/MediaStreamTrackPrivate.cpp:
(WebCore::MediaStreamTrackPrivate::sourceProducingDataChanged): Deleted.
(WebCore::MediaStreamTrackPrivate::sourceEnabledChanged): Deleted.
* platform/mediastream/MediaStreamTrackPrivate.h:
* platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::isProducingDataDidChange): Deleted.
(WebCore::RealtimeMediaSource::setEnabled): Deleted.
* platform/mediastream/RealtimeMediaSource.h:
* platform/mediastream/mac/AVAudioCaptureSource.mm:
(WebCore::AVAudioCaptureSource::captureOutputDidOutputSampleBufferFromConnection): !enabled() -> muted().
* platform/mediastream/mac/AVMediaCaptureSource.mm:
(WebCore::AVMediaCaptureSource::captureSessionIsRunningDidChange): Don't call isProducingDataDidChange..
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::processNewFrame): !enabled() -> muted().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamTrackh">trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp">trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVAudioCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm">trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/ChangeLog 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+2015-11-04 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] A RealtimeMediaSource should begin producing data automatically
+ https://bugs.webkit.org/show_bug.cgi?id=150851
+ rdar://problem/23380636
+
+ A RealtimeMediaSource should be producing data unless it is muted, which is not under the
+ control of the application, so a local source should begin producing data as soon as it
+ is added to a stream. Remove "producing data" and "enabled" observer callbacks because
+ they don't provide anything that the "muted" callback already provides.
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::trackProducingDataChanged): Deleted.
+ * Modules/mediastream/MediaStreamTrack.h:
+
+ * Modules/mediastream/UserMediaRequest.cpp:
+ (WebCore::UserMediaRequest::didCreateStream): Tell sources to begin producing data.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::load): Don't call stream->startProducingData,
+ it isn't necessary.
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::setReadyState): Call characteristicsChanged
+ when the readyState changes.
+
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::trackProducingDataChanged): Deleted.
+ * platform/mediastream/MediaStreamPrivate.h:
+
+ * platform/mediastream/MediaStreamTrackPrivate.cpp:
+ (WebCore::MediaStreamTrackPrivate::sourceProducingDataChanged): Deleted.
+ (WebCore::MediaStreamTrackPrivate::sourceEnabledChanged): Deleted.
+ * platform/mediastream/MediaStreamTrackPrivate.h:
+
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::isProducingDataDidChange): Deleted.
+ (WebCore::RealtimeMediaSource::setEnabled): Deleted.
+ * platform/mediastream/RealtimeMediaSource.h:
+
+ * platform/mediastream/mac/AVAudioCaptureSource.mm:
+ (WebCore::AVAudioCaptureSource::captureOutputDidOutputSampleBufferFromConnection): !enabled() -> muted().
+
+ * platform/mediastream/mac/AVMediaCaptureSource.mm:
+ (WebCore::AVMediaCaptureSource::captureSessionIsRunningDidChange): Don't call isProducingDataDidChange..
+
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::processNewFrame): !enabled() -> muted().
+
</ins><span class="cx"> 2015-11-04 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] <video> elements without audio tracks should not interrupt music
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -233,11 +233,6 @@
</span><span class="cx"> configureTrackRendering();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamTrack::trackProducingDataChanged(MediaStreamTrackPrivate&)
-{
- configureTrackRendering();
-}
-
</del><span class="cx"> void MediaStreamTrack::trackEnabledChanged(MediaStreamTrackPrivate&)
</span><span class="cx"> {
</span><span class="cx"> configureTrackRendering();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamTrackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -118,7 +118,6 @@
</span><span class="cx"> void trackEnded(MediaStreamTrackPrivate&) override;
</span><span class="cx"> void trackMutedChanged(MediaStreamTrackPrivate&) override;
</span><span class="cx"> void trackStatesChanged(MediaStreamTrackPrivate&) override;
</span><del>- void trackProducingDataChanged(MediaStreamTrackPrivate&) override;
</del><span class="cx"> void trackEnabledChanged(MediaStreamTrackPrivate&) override;
</span><span class="cx">
</span><span class="cx"> Vector<Observer*> m_observers;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamUserMediaRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -165,12 +165,16 @@
</span><span class="cx"> // 4 - Create the MediaStream and pass it to the success callback.
</span><span class="cx"> RefPtr<MediaStream> stream = MediaStream::create(*m_scriptExecutionContext, privateStream);
</span><span class="cx"> if (m_audioConstraints) {
</span><del>- for (auto& track : stream->getAudioTracks())
</del><ins>+ for (auto& track : stream->getAudioTracks()) {
</ins><span class="cx"> track->applyConstraints(*m_audioConstraints);
</span><ins>+ track->source()->startProducingData();
+ }
</ins><span class="cx"> }
</span><span class="cx"> if (m_videoConstraints) {
</span><del>- for (auto& track : stream->getVideoTracks())
</del><ins>+ for (auto& track : stream->getVideoTracks()) {
</ins><span class="cx"> track->applyConstraints(*m_videoConstraints);
</span><ins>+ track->source()->startProducingData();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_promise.resolve(stream);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -122,7 +122,6 @@
</span><span class="cx">
</span><span class="cx"> m_mediaStreamPrivate = &stream;
</span><span class="cx"> m_mediaStreamPrivate->addObserver(*this);
</span><del>- m_mediaStreamPrivate->startProducingData();
</del><span class="cx">
</span><span class="cx"> m_previewLayer = nullptr;
</span><span class="cx"> m_ended = !m_mediaStreamPrivate->active();
</span><span class="lines">@@ -453,6 +452,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_readyState = readyState;
</span><ins>+ characteristicsChanged();
</ins><span class="cx">
</span><span class="cx"> m_player->readyStateChanged();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -273,13 +273,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamPrivate::trackProducingDataChanged(MediaStreamTrackPrivate&)
-{
- scheduleDeferredTask([this] {
- characteristicsChanged();
- });
-}
-
</del><span class="cx"> void MediaStreamPrivate::scheduleDeferredTask(std::function<void()> function)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(function);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx"> void trackEnded(MediaStreamTrackPrivate&) override { }
</span><span class="cx"> void trackMutedChanged(MediaStreamTrackPrivate&) override;
</span><span class="cx"> void trackStatesChanged(MediaStreamTrackPrivate&) override;
</span><del>- void trackProducingDataChanged(MediaStreamTrackPrivate&) override;
</del><span class="cx"> void trackEnabledChanged(MediaStreamTrackPrivate&) override;
</span><span class="cx">
</span><span class="cx"> void characteristicsChanged();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -178,18 +178,6 @@
</span><span class="cx"> observer->trackStatesChanged(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamTrackPrivate::sourceProducingDataChanged()
-{
- for (auto& observer : m_observers)
- observer->trackProducingDataChanged(*this);
-}
-
-void MediaStreamTrackPrivate::sourceEnabledChanged()
-{
- for (auto& observer : m_observers)
- observer->trackEnabledChanged(*this);
-}
-
</del><span class="cx"> bool MediaStreamTrackPrivate::preventSourceFromStopping()
</span><span class="cx"> {
</span><span class="cx"> return !m_isEnded;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamTrackPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> virtual void trackEnded(MediaStreamTrackPrivate&) = 0;
</span><span class="cx"> virtual void trackMutedChanged(MediaStreamTrackPrivate&) = 0;
</span><span class="cx"> virtual void trackStatesChanged(MediaStreamTrackPrivate&) = 0;
</span><del>- virtual void trackProducingDataChanged(MediaStreamTrackPrivate&) = 0;
</del><span class="cx"> virtual void trackEnabledChanged(MediaStreamTrackPrivate&) = 0;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -101,9 +100,7 @@
</span><span class="cx"> void sourceStopped() override final;
</span><span class="cx"> void sourceMutedChanged() override final;
</span><span class="cx"> void sourceStatesChanged() override final;
</span><del>- void sourceProducingDataChanged() override final;
</del><span class="cx"> bool preventSourceFromStopping() override final;
</span><del>- void sourceEnabledChanged() override final;
</del><span class="cx">
</span><span class="cx"> Vector<Observer*> m_observers;
</span><span class="cx"> RefPtr<RealtimeMediaSource> m_source;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -101,22 +101,6 @@
</span><span class="cx"> observer->sourceStatesChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RealtimeMediaSource::isProducingDataDidChange()
-{
- for (auto& observer : m_observers)
- observer->sourceProducingDataChanged();
-}
-
-void RealtimeMediaSource::setEnabled(bool enabled)
-{
- if (m_enabled == enabled)
- return;
-
- m_enabled = enabled;
- for (auto& observer : m_observers)
- observer->sourceEnabledChanged();
-}
-
</del><span class="cx"> bool RealtimeMediaSource::readonly() const
</span><span class="cx"> {
</span><span class="cx"> return m_readonly;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -63,8 +63,6 @@
</span><span class="cx"> virtual void sourceStopped() = 0;
</span><span class="cx"> virtual void sourceMutedChanged() = 0;
</span><span class="cx"> virtual void sourceStatesChanged() = 0;
</span><del>- virtual void sourceProducingDataChanged() = 0;
- virtual void sourceEnabledChanged() = 0;
</del><span class="cx">
</span><span class="cx"> // Observer state queries.
</span><span class="cx"> virtual bool preventSourceFromStopping() = 0;
</span><span class="lines">@@ -101,16 +99,12 @@
</span><span class="cx"> virtual bool remote() const { return m_remote; }
</span><span class="cx"> virtual void setRemote(bool remote) { m_remote = remote; }
</span><span class="cx">
</span><del>- virtual void setEnabled(bool);
- virtual bool enabled() const { return m_enabled; }
-
</del><span class="cx"> void addObserver(Observer*);
</span><span class="cx"> void removeObserver(Observer*);
</span><span class="cx">
</span><span class="cx"> virtual void startProducingData() { }
</span><span class="cx"> virtual void stopProducingData() { }
</span><span class="cx"> virtual bool isProducingData() const { return false; }
</span><del>- virtual void isProducingDataDidChange();
</del><span class="cx">
</span><span class="cx"> void stop(Observer* callingObserver = nullptr);
</span><span class="cx"> void requestStop(Observer* callingObserver = nullptr);
</span><span class="lines">@@ -137,7 +131,6 @@
</span><span class="cx"> bool m_muted;
</span><span class="cx"> bool m_readonly;
</span><span class="cx"> bool m_remote;
</span><del>- bool m_enabled { true };
</del><span class="cx">
</span><span class="cx"> unsigned m_fitnessScore;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVAudioCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> void AVAudioCaptureSource::captureOutputDidOutputSampleBufferFromConnection(AVCaptureOutputType*, CMSampleBufferRef sampleBuffer, AVCaptureConnectionType*)
</span><span class="cx"> {
</span><del>- if (!enabled())
</del><ins>+ if (muted())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CMFormatDescriptionRef formatDescription = CMSampleBufferGetFormatDescription(sampleBuffer);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVMediaCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -210,7 +210,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isRunning = state;
</span><del>- isProducingDataDidChange();
</del><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacAVVideoCaptureSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (192027 => 192028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-11-04 18:48:47 UTC (rev 192027)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2015-11-04 18:55:07 UTC (rev 192028)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Ignore frames delivered when the session is not running, we want to hang onto the last image
</span><span class="cx"> // delivered before it stopped.
</span><del>- if (m_lastImage && (!isProducingData() || !enabled()))
</del><ins>+ if (m_lastImage && (!isProducingData() || muted()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> CMFormatDescriptionRef formatDescription = CMSampleBufferGetFormatDescription(sampleBuffer.get());
</span></span></pre>
</div>
</div>
</body>
</html>