<!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>[213936] trunk/Source</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/213936">213936</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-03-14 13:50:47 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make classes used by Media Stream encode/decode friendly
https://bugs.webkit.org/show_bug.cgi?id=169567
Reviewed by Eric Carlson.
Source/WebCore:
Add encode() and decode() methods and implementations to a variety of media stream related classes.
* platform/audio/mac/CAAudioStreamDescription.h:
(WebCore::CAAudioStreamDescription::encode):
(WebCore::CAAudioStreamDescription::decode):
* platform/mediastream/RealtimeMediaSourceSettings.h:
(WebCore::RealtimeMediaSourceSettings::width):
(WebCore::RealtimeMediaSourceSettings::setWidth):
(WebCore::RealtimeMediaSourceSettings::height):
(WebCore::RealtimeMediaSourceSettings::setHeight):
(WebCore::RealtimeMediaSourceSettings::sampleRate):
(WebCore::RealtimeMediaSourceSettings::setSampleRate):
(WebCore::RealtimeMediaSourceSettings::sampleSize):
(WebCore::RealtimeMediaSourceSettings::setSampleSize):
(WebCore::RealtimeMediaSourceSettings::encode):
(WebCore::RealtimeMediaSourceSettings::decode):
* platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
(WebCore::RealtimeMediaSourceSupportedConstraints::encode):
(WebCore::RealtimeMediaSourceSupportedConstraints::decode):
Source/WebKit2:
Make the encoder and decoder for MediaConstraintsData a little less wordy.
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<MediaConstraintsData>::encode):
(IPC::ArgumentCoder<MediaConstraintsData>::decode):
Source/WTF:
* wtf/MediaTime.h:
(WTF::MediaTime::encode):
(WTF::MediaTime::decode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMediaTimeh">trunk/Source/WTF/wtf/MediaTime.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiomacCAAudioStreamDescriptionh">trunk/Source/WebCore/platform/audio/mac/CAAudioStreamDescription.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamCaptureDeviceh">trunk/Source/WebCore/platform/mediastream/CaptureDevice.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceSettingsh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceSupportedConstraintsh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WTF/ChangeLog 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-13 Jer Noble <jer.noble@apple.com>
+
+ Make classes used by Media Stream encode/decode friendly
+ https://bugs.webkit.org/show_bug.cgi?id=169567
+
+ Reviewed by Eric Carlson.
+
+ * wtf/MediaTime.h:
+ (WTF::MediaTime::encode):
+ (WTF::MediaTime::decode):
+
</ins><span class="cx"> 2017-03-14 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Add secondsAs<T> methods to Seconds to convert it to integers with clamp
</span></span></pre></div>
<a id="trunkSourceWTFwtfMediaTimeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MediaTime.h (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MediaTime.h 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WTF/wtf/MediaTime.h 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -130,6 +130,9 @@
</span><span class="cx">
</span><span class="cx"> MediaTime toTimeScale(uint32_t, RoundingFlags = RoundingFlags::HalfAwayFromZero) const;
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, MediaTime&);
+
</ins><span class="cx"> private:
</span><span class="cx"> void setTimeScale(uint32_t, RoundingFlags = RoundingFlags::HalfAwayFromZero);
</span><span class="cx">
</span><span class="lines">@@ -144,8 +147,23 @@
</span><span class="cx"> inline MediaTime operator*(int32_t lhs, const MediaTime& rhs) { return rhs.operator*(lhs); }
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE extern MediaTime abs(const MediaTime& rhs);
</span><ins>+
+template<class Encoder>
+void MediaTime::encode(Encoder& encoder) const
+{
+ encoder << m_timeValue << m_timeScale << m_timeFlags;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+template<class Decoder>
+bool MediaTime::decode(Decoder& decoder, MediaTime& time)
+{
+ return decoder.decode(time.m_timeValue)
+ && decoder.decode(time.m_timeScale)
+ && decoder.decode(time.m_timeFlags);
+}
+
+}
+
</ins><span class="cx"> using WTF::MediaTime;
</span><span class="cx"> using WTF::abs;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WebCore/ChangeLog 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2017-03-13 Jer Noble <jer.noble@apple.com>
+
+ Make classes used by Media Stream encode/decode friendly
+ https://bugs.webkit.org/show_bug.cgi?id=169567
+
+ Reviewed by Eric Carlson.
+
+ Add encode() and decode() methods and implementations to a variety of media stream related classes.
+
+ * platform/audio/mac/CAAudioStreamDescription.h:
+ (WebCore::CAAudioStreamDescription::encode):
+ (WebCore::CAAudioStreamDescription::decode):
+ * platform/mediastream/RealtimeMediaSourceSettings.h:
+ (WebCore::RealtimeMediaSourceSettings::width):
+ (WebCore::RealtimeMediaSourceSettings::setWidth):
+ (WebCore::RealtimeMediaSourceSettings::height):
+ (WebCore::RealtimeMediaSourceSettings::setHeight):
+ (WebCore::RealtimeMediaSourceSettings::sampleRate):
+ (WebCore::RealtimeMediaSourceSettings::setSampleRate):
+ (WebCore::RealtimeMediaSourceSettings::sampleSize):
+ (WebCore::RealtimeMediaSourceSettings::setSampleSize):
+ (WebCore::RealtimeMediaSourceSettings::encode):
+ (WebCore::RealtimeMediaSourceSettings::decode):
+ * platform/mediastream/RealtimeMediaSourceSupportedConstraints.h:
+ (WebCore::RealtimeMediaSourceSupportedConstraints::encode):
+ (WebCore::RealtimeMediaSourceSupportedConstraints::decode):
+
</ins><span class="cx"> 2017-03-14 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Adapt CARingBuffer to be usable across processes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiomacCAAudioStreamDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/mac/CAAudioStreamDescription.h (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/mac/CAAudioStreamDescription.h 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WebCore/platform/audio/mac/CAAudioStreamDescription.h 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool operator==(const AudioStreamBasicDescription&, const AudioStreamBasicDescription&);
</del><ins>+WEBCORE_EXPORT bool operator==(const AudioStreamBasicDescription&, const AudioStreamBasicDescription&);
</ins><span class="cx"> inline bool operator!=(const AudioStreamBasicDescription& a, const AudioStreamBasicDescription& b) { return !(a == b); }
</span><span class="cx">
</span><span class="cx"> class CAAudioStreamDescription final : public AudioStreamDescription {
</span><span class="lines">@@ -76,6 +76,9 @@
</span><span class="cx"> const AudioStreamBasicDescription& streamDescription() const { return m_streamDescription; }
</span><span class="cx"> AudioStreamBasicDescription& streamDescription() { return m_streamDescription; }
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, CAAudioStreamDescription&);
+
</ins><span class="cx"> private:
</span><span class="cx"> void calculateFormat();
</span><span class="cx">
</span><span class="lines">@@ -84,6 +87,36 @@
</span><span class="cx"> mutable PCMFormat m_format { None };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void CAAudioStreamDescription::encode(Encoder& encoder) const
+{
+ encoder << m_streamDescription.mSampleRate
+ << m_streamDescription.mFormatID
+ << m_streamDescription.mFormatFlags
+ << m_streamDescription.mBytesPerPacket
+ << m_streamDescription.mFramesPerPacket
+ << m_streamDescription.mBytesPerFrame
+ << m_streamDescription.mChannelsPerFrame
+ << m_streamDescription.mBitsPerChannel
+ << m_streamDescription.mReserved;
+ encoder.encodeEnum(m_format);
+}
+
+template<class Decoder>
+bool CAAudioStreamDescription::decode(Decoder& decoder, CAAudioStreamDescription& description)
+{
+ return decoder.decode(description.m_streamDescription.mSampleRate)
+ && decoder.decode(description.m_streamDescription.mFormatID)
+ && decoder.decode(description.m_streamDescription.mFormatFlags)
+ && decoder.decode(description.m_streamDescription.mBytesPerPacket)
+ && decoder.decode(description.m_streamDescription.mFramesPerPacket)
+ && decoder.decode(description.m_streamDescription.mBytesPerFrame)
+ && decoder.decode(description.m_streamDescription.mChannelsPerFrame)
+ && decoder.decode(description.m_streamDescription.mBitsPerChannel)
+ && decoder.decode(description.m_streamDescription.mReserved)
+ && decoder.decodeEnum(description.m_format);
+}
+
</ins><span class="cx"> inline CAAudioStreamDescription toCAAudioStreamDescription(const AudioStreamDescription& description)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(description.platformDescription().type == PlatformDescription::CAAudioStreamBasicType);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamCaptureDeviceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/CaptureDevice.h (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/CaptureDevice.h 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WebCore/platform/mediastream/CaptureDevice.h 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx">
</span><span class="cx"> bool enabled() const { return m_enabled; }
</span><span class="cx"> void setEnabled(bool enabled) { m_enabled = enabled; }
</span><ins>+
</ins><span class="cx"> private:
</span><span class="cx"> String m_persistentId;
</span><span class="cx"> DeviceType m_type { DeviceType::Unknown };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -49,12 +49,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool supportsWidth() const { return m_supportedConstraints.supportsWidth(); }
</span><del>- unsigned long width() const { return m_width; }
- void setWidth(unsigned long width) { m_width = width; }
</del><ins>+ uint32_t width() const { return m_width; }
+ void setWidth(uint32_t width) { m_width = width; }
</ins><span class="cx">
</span><span class="cx"> bool supportsHeight() const { return m_supportedConstraints.supportsHeight(); }
</span><del>- unsigned long height() const { return m_height; }
- void setHeight(unsigned long height) { m_height = height; }
</del><ins>+ uint32_t height() const { return m_height; }
+ void setHeight(uint32_t height) { m_height = height; }
</ins><span class="cx">
</span><span class="cx"> bool supportsAspectRatio() const { return m_supportedConstraints.supportsAspectRatio(); }
</span><span class="cx"> float aspectRatio() const { return m_aspectRatio; }
</span><span class="lines">@@ -73,12 +73,12 @@
</span><span class="cx"> void setVolume(double volume) { m_volume = volume; }
</span><span class="cx">
</span><span class="cx"> bool supportsSampleRate() const { return m_supportedConstraints.supportsSampleRate(); }
</span><del>- unsigned long sampleRate() const { return m_sampleRate; }
- void setSampleRate(unsigned long sampleRate) { m_sampleRate = sampleRate; }
</del><ins>+ uint32_t sampleRate() const { return m_sampleRate; }
+ void setSampleRate(uint32_t sampleRate) { m_sampleRate = sampleRate; }
</ins><span class="cx">
</span><span class="cx"> bool supportsSampleSize() const { return m_supportedConstraints.supportsSampleSize(); }
</span><del>- unsigned long sampleSize() const { return m_sampleSize; }
- void setSampleSize(unsigned long sampleSize) { m_sampleSize = sampleSize; }
</del><ins>+ uint32_t sampleSize() const { return m_sampleSize; }
+ void setSampleSize(uint32_t sampleSize) { m_sampleSize = sampleSize; }
</ins><span class="cx">
</span><span class="cx"> bool supportsEchoCancellation() const { return m_supportedConstraints.supportsEchoCancellation(); }
</span><span class="cx"> bool echoCancellation() const { return m_echoCancellation; }
</span><span class="lines">@@ -94,15 +94,18 @@
</span><span class="cx">
</span><span class="cx"> void setSupportedConstraits(const RealtimeMediaSourceSupportedConstraints& supportedConstraints) { m_supportedConstraints = supportedConstraints; }
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, RealtimeMediaSourceSettings&);
+
</ins><span class="cx"> private:
</span><del>- unsigned long m_width { 0 };
- unsigned long m_height { 0 };
</del><ins>+ uint32_t m_width { 0 };
+ uint32_t m_height { 0 };
</ins><span class="cx"> float m_aspectRatio { 0 };
</span><span class="cx"> float m_frameRate { 0 };
</span><span class="cx"> VideoFacingMode m_facingMode { Unknown };
</span><span class="cx"> double m_volume { 0 };
</span><del>- unsigned long m_sampleRate { 0 };
- unsigned long m_sampleSize { 0 };
</del><ins>+ uint32_t m_sampleRate { 0 };
+ uint32_t m_sampleSize { 0 };
</ins><span class="cx"> bool m_echoCancellation { 0 };
</span><span class="cx">
</span><span class="cx"> AtomicString m_deviceId;
</span><span class="lines">@@ -111,6 +114,40 @@
</span><span class="cx"> RealtimeMediaSourceSupportedConstraints m_supportedConstraints;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void RealtimeMediaSourceSettings::encode(Encoder& encoder) const
+{
+ encoder << m_width
+ << m_height
+ << m_aspectRatio
+ << m_frameRate
+ << m_volume
+ << m_sampleRate
+ << m_sampleSize
+ << m_echoCancellation
+ << m_deviceId
+ << m_groupId
+ << m_supportedConstraints;
+ encoder.encodeEnum(m_facingMode);
+}
+
+template<class Decoder>
+bool RealtimeMediaSourceSettings::decode(Decoder& decoder, RealtimeMediaSourceSettings& settings)
+{
+ return decoder.decode(settings.m_width)
+ && decoder.decode(settings.m_height)
+ && decoder.decode(settings.m_aspectRatio)
+ && decoder.decode(settings.m_frameRate)
+ && decoder.decode(settings.m_volume)
+ && decoder.decode(settings.m_sampleRate)
+ && decoder.decode(settings.m_sampleSize)
+ && decoder.decode(settings.m_echoCancellation)
+ && decoder.decode(settings.m_deviceId)
+ && decoder.decode(settings.m_groupId)
+ && decoder.decode(settings.m_supportedConstraints)
+ && decoder.decodeEnum(settings.m_facingMode);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // RealtimeMediaSourceSettings_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceSupportedConstraintsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -96,6 +96,9 @@
</span><span class="cx"> static const AtomicString& nameForConstraint(MediaConstraintType);
</span><span class="cx"> static MediaConstraintType constraintFromName(const String&);
</span><span class="cx">
</span><ins>+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, RealtimeMediaSourceSupportedConstraints&);
+
</ins><span class="cx"> private:
</span><span class="cx"> bool m_supportsWidth { false };
</span><span class="cx"> bool m_supportsHeight { false };
</span><span class="lines">@@ -110,6 +113,38 @@
</span><span class="cx"> bool m_supportsGroupId { false };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<class Encoder>
+void RealtimeMediaSourceSupportedConstraints::encode(Encoder& encoder) const
+{
+ encoder << m_supportsWidth
+ << m_supportsHeight
+ << m_supportsAspectRatio
+ << m_supportsFrameRate
+ << m_supportsFacingMode
+ << m_supportsVolume
+ << m_supportsSampleRate
+ << m_supportsSampleSize
+ << m_supportsEchoCancellation
+ << m_supportsDeviceId
+ << m_supportsGroupId;
+}
+
+template<class Decoder>
+bool RealtimeMediaSourceSupportedConstraints::decode(Decoder& decoder, RealtimeMediaSourceSupportedConstraints& constraints)
+{
+ return decoder.decode(constraints.m_supportsWidth)
+ && decoder.decode(constraints.m_supportsHeight)
+ && decoder.decode(constraints.m_supportsAspectRatio)
+ && decoder.decode(constraints.m_supportsFrameRate)
+ && decoder.decode(constraints.m_supportsFacingMode)
+ && decoder.decode(constraints.m_supportsVolume)
+ && decoder.decode(constraints.m_supportsSampleRate)
+ && decoder.decode(constraints.m_supportsSampleSize)
+ && decoder.decode(constraints.m_supportsEchoCancellation)
+ && decoder.decode(constraints.m_supportsDeviceId)
+ && decoder.decode(constraints.m_supportsGroupId);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-13 Jer Noble <jer.noble@apple.com>
+
+ Make classes used by Media Stream encode/decode friendly
+ https://bugs.webkit.org/show_bug.cgi?id=169567
+
+ Reviewed by Eric Carlson.
+
+ Make the encoder and decoder for MediaConstraintsData a little less wordy.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<MediaConstraintsData>::encode):
+ (IPC::ArgumentCoder<MediaConstraintsData>::decode):
+
</ins><span class="cx"> 2017-03-14 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Adapt CARingBuffer to be usable across processes
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (213935 => 213936)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2017-03-14 20:45:52 UTC (rev 213935)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2017-03-14 20:50:47 UTC (rev 213936)
</span><span class="lines">@@ -2348,45 +2348,16 @@
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> void ArgumentCoder<MediaConstraintsData>::encode(Encoder& encoder, const WebCore::MediaConstraintsData& constraint)
</span><span class="cx"> {
</span><del>- encoder << constraint.mandatoryConstraints;
-
- auto& advancedConstraints = constraint.advancedConstraints;
- encoder << static_cast<uint64_t>(advancedConstraints.size());
- for (const auto& advancedConstraint : advancedConstraints)
- encoder << advancedConstraint;
-
- encoder << constraint.isValid;
</del><ins>+ encoder << constraint.mandatoryConstraints
+ << constraint.advancedConstraints
+ << constraint.isValid;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ArgumentCoder<MediaConstraintsData>::decode(Decoder& decoder, WebCore::MediaConstraintsData& constraints)
</span><span class="cx"> {
</span><del>- MediaTrackConstraintSetMap mandatoryConstraints;
- if (!decoder.decode(mandatoryConstraints))
- return false;
-
- uint64_t advancedCount;
- if (!decoder.decode(advancedCount))
- return false;
-
- Vector<MediaTrackConstraintSetMap> advancedConstraints;
- advancedConstraints.reserveInitialCapacity(advancedCount);
- for (size_t i = 0; i < advancedCount; ++i) {
- MediaTrackConstraintSetMap map;
- if (!decoder.decode(map))
- return false;
-
- advancedConstraints.uncheckedAppend(WTFMove(map));
- }
-
- bool isValid;
- if (!decoder.decode(isValid))
- return false;
-
- constraints.mandatoryConstraints = WTFMove(mandatoryConstraints);
- constraints.advancedConstraints = WTFMove(advancedConstraints);
- constraints.isValid = isValid;
-
- return true;
</del><ins>+ return decoder.decode(constraints.mandatoryConstraints)
+ && decoder.decode(constraints.advancedConstraints)
+ && decoder.decode(constraints.isValid);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ArgumentCoder<CaptureDevice>::encode(Encoder& encoder, const WebCore::CaptureDevice& device)
</span></span></pre>
</div>
</div>
</body>
</html>