Diff
Modified: trunk/Source/WTF/ChangeLog (213935 => 213936)
--- 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)
@@ -1,3 +1,14 @@
+2017-03-13 Jer Noble <jer.no...@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):
+
2017-03-14 Yusuke Suzuki <utatane....@gmail.com>
Add secondsAs<T> methods to Seconds to convert it to integers with clamp
Modified: trunk/Source/WTF/wtf/MediaTime.h (213935 => 213936)
--- 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)
@@ -130,6 +130,9 @@
MediaTime toTimeScale(uint32_t, RoundingFlags = RoundingFlags::HalfAwayFromZero) const;
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, MediaTime&);
+
private:
void setTimeScale(uint32_t, RoundingFlags = RoundingFlags::HalfAwayFromZero);
@@ -144,8 +147,23 @@
inline MediaTime operator*(int32_t lhs, const MediaTime& rhs) { return rhs.operator*(lhs); }
WTF_EXPORT_PRIVATE extern MediaTime abs(const MediaTime& rhs);
+
+template<class Encoder>
+void MediaTime::encode(Encoder& encoder) const
+{
+ encoder << m_timeValue << m_timeScale << m_timeFlags;
}
+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);
+}
+
+}
+
using WTF::MediaTime;
using WTF::abs;
Modified: trunk/Source/WebCore/ChangeLog (213935 => 213936)
--- 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)
@@ -1,3 +1,30 @@
+2017-03-13 Jer Noble <jer.no...@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):
+
2017-03-14 Jer Noble <jer.no...@apple.com>
Adapt CARingBuffer to be usable across processes
Modified: trunk/Source/WebCore/platform/audio/mac/CAAudioStreamDescription.h (213935 => 213936)
--- 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)
@@ -30,7 +30,7 @@
namespace WebCore {
-bool operator==(const AudioStreamBasicDescription&, const AudioStreamBasicDescription&);
+WEBCORE_EXPORT bool operator==(const AudioStreamBasicDescription&, const AudioStreamBasicDescription&);
inline bool operator!=(const AudioStreamBasicDescription& a, const AudioStreamBasicDescription& b) { return !(a == b); }
class CAAudioStreamDescription final : public AudioStreamDescription {
@@ -76,6 +76,9 @@
const AudioStreamBasicDescription& streamDescription() const { return m_streamDescription; }
AudioStreamBasicDescription& streamDescription() { return m_streamDescription; }
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, CAAudioStreamDescription&);
+
private:
void calculateFormat();
@@ -84,6 +87,36 @@
mutable PCMFormat m_format { None };
};
+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);
+}
+
inline CAAudioStreamDescription toCAAudioStreamDescription(const AudioStreamDescription& description)
{
ASSERT(description.platformDescription().type == PlatformDescription::CAAudioStreamBasicType);
Modified: trunk/Source/WebCore/platform/mediastream/CaptureDevice.h (213935 => 213936)
--- 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)
@@ -59,6 +59,7 @@
bool enabled() const { return m_enabled; }
void setEnabled(bool enabled) { m_enabled = enabled; }
+
private:
String m_persistentId;
DeviceType m_type { DeviceType::Unknown };
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h (213935 => 213936)
--- 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)
@@ -49,12 +49,12 @@
}
bool supportsWidth() const { return m_supportedConstraints.supportsWidth(); }
- unsigned long width() const { return m_width; }
- void setWidth(unsigned long width) { m_width = width; }
+ uint32_t width() const { return m_width; }
+ void setWidth(uint32_t width) { m_width = width; }
bool supportsHeight() const { return m_supportedConstraints.supportsHeight(); }
- unsigned long height() const { return m_height; }
- void setHeight(unsigned long height) { m_height = height; }
+ uint32_t height() const { return m_height; }
+ void setHeight(uint32_t height) { m_height = height; }
bool supportsAspectRatio() const { return m_supportedConstraints.supportsAspectRatio(); }
float aspectRatio() const { return m_aspectRatio; }
@@ -73,12 +73,12 @@
void setVolume(double volume) { m_volume = volume; }
bool supportsSampleRate() const { return m_supportedConstraints.supportsSampleRate(); }
- unsigned long sampleRate() const { return m_sampleRate; }
- void setSampleRate(unsigned long sampleRate) { m_sampleRate = sampleRate; }
+ uint32_t sampleRate() const { return m_sampleRate; }
+ void setSampleRate(uint32_t sampleRate) { m_sampleRate = sampleRate; }
bool supportsSampleSize() const { return m_supportedConstraints.supportsSampleSize(); }
- unsigned long sampleSize() const { return m_sampleSize; }
- void setSampleSize(unsigned long sampleSize) { m_sampleSize = sampleSize; }
+ uint32_t sampleSize() const { return m_sampleSize; }
+ void setSampleSize(uint32_t sampleSize) { m_sampleSize = sampleSize; }
bool supportsEchoCancellation() const { return m_supportedConstraints.supportsEchoCancellation(); }
bool echoCancellation() const { return m_echoCancellation; }
@@ -94,15 +94,18 @@
void setSupportedConstraits(const RealtimeMediaSourceSupportedConstraints& supportedConstraints) { m_supportedConstraints = supportedConstraints; }
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, RealtimeMediaSourceSettings&);
+
private:
- unsigned long m_width { 0 };
- unsigned long m_height { 0 };
+ uint32_t m_width { 0 };
+ uint32_t m_height { 0 };
float m_aspectRatio { 0 };
float m_frameRate { 0 };
VideoFacingMode m_facingMode { Unknown };
double m_volume { 0 };
- unsigned long m_sampleRate { 0 };
- unsigned long m_sampleSize { 0 };
+ uint32_t m_sampleRate { 0 };
+ uint32_t m_sampleSize { 0 };
bool m_echoCancellation { 0 };
AtomicString m_deviceId;
@@ -111,6 +114,40 @@
RealtimeMediaSourceSupportedConstraints m_supportedConstraints;
};
+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);
+}
+
} // namespace WebCore
#endif // RealtimeMediaSourceSettings_h
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSupportedConstraints.h (213935 => 213936)
--- 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)
@@ -96,6 +96,9 @@
static const AtomicString& nameForConstraint(MediaConstraintType);
static MediaConstraintType constraintFromName(const String&);
+ template<class Encoder> void encode(Encoder&) const;
+ template<class Decoder> static bool decode(Decoder&, RealtimeMediaSourceSupportedConstraints&);
+
private:
bool m_supportsWidth { false };
bool m_supportsHeight { false };
@@ -110,6 +113,38 @@
bool m_supportsGroupId { false };
};
+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);
+}
+
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebKit2/ChangeLog (213935 => 213936)
--- 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)
@@ -1,3 +1,16 @@
+2017-03-13 Jer Noble <jer.no...@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):
+
2017-03-14 Jer Noble <jer.no...@apple.com>
Adapt CARingBuffer to be usable across processes
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (213935 => 213936)
--- 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)
@@ -2348,45 +2348,16 @@
#if ENABLE(MEDIA_STREAM)
void ArgumentCoder<MediaConstraintsData>::encode(Encoder& encoder, const WebCore::MediaConstraintsData& constraint)
{
- encoder << constraint.mandatoryConstraints;
-
- auto& advancedConstraints = constraint.advancedConstraints;
- encoder << static_cast<uint64_t>(advancedConstraints.size());
- for (const auto& advancedConstraint : advancedConstraints)
- encoder << advancedConstraint;
-
- encoder << constraint.isValid;
+ encoder << constraint.mandatoryConstraints
+ << constraint.advancedConstraints
+ << constraint.isValid;
}
bool ArgumentCoder<MediaConstraintsData>::decode(Decoder& decoder, WebCore::MediaConstraintsData& constraints)
{
- 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;
+ return decoder.decode(constraints.mandatoryConstraints)
+ && decoder.decode(constraints.advancedConstraints)
+ && decoder.decode(constraints.isValid);
}
void ArgumentCoder<CaptureDevice>::encode(Encoder& encoder, const WebCore::CaptureDevice& device)
