Title: [213424] trunk/Source
- Revision
- 213424
- Author
- [email protected]
- Date
- 2017-03-04 09:31:06 -0800 (Sat, 04 Mar 2017)
Log Message
Cleanup after r213418
https://bugs.webkit.org/show_bug.cgi?id=169165
Patch by Alex Christensen <[email protected]> on 2017-03-04
Reviewed by Youenn Fablet.
Source/ThirdParty/libwebrtc:
* WebKit/patch-libwebrtc:
I made another change after the last patch I uploaded to stop crashing.
This should be reflected in our patch.
Source/WebCore:
* platform/mediastream/mac/RealtimeIncomingAudioSource.cpp:
(WebCore::RealtimeIncomingAudioSource::OnData):
Restore the assertion I removed.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (213423 => 213424)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-03-04 17:15:40 UTC (rev 213423)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-03-04 17:31:06 UTC (rev 213424)
@@ -1,3 +1,14 @@
+2017-03-04 Alex Christensen <[email protected]>
+
+ Cleanup after r213418
+ https://bugs.webkit.org/show_bug.cgi?id=169165
+
+ Reviewed by Youenn Fablet.
+
+ * WebKit/patch-libwebrtc:
+ I made another change after the last patch I uploaded to stop crashing.
+ This should be reflected in our patch.
+
2017-03-03 Youenn Fablet <[email protected]>
[WebRTC] Update libwebrtc source code
Modified: trunk/Source/ThirdParty/libwebrtc/WebKit/patch-libwebrtc (213423 => 213424)
--- trunk/Source/ThirdParty/libwebrtc/WebKit/patch-libwebrtc 2017-03-04 17:15:40 UTC (rev 213423)
+++ trunk/Source/ThirdParty/libwebrtc/WebKit/patch-libwebrtc 2017-03-04 17:31:06 UTC (rev 213424)
@@ -1249,6 +1249,20 @@
virtual bool SendData(
const SendDataParams& params,
+diff --git a/webrtc/media/engine/internalencoderfactory.cc b/webrtc/media/engine/internalencoderfactory.cc
+index 544070f..2b4e6ef 100644
+--- a/webrtc/media/engine/internalencoderfactory.cc
++++ b/webrtc/media/engine/internalencoderfactory.cc
+@@ -33,7 +33,8 @@ bool IsFlexfecAdvertisedFieldTrialEnabled() {
+ } // namespace
+
+ InternalEncoderFactory::InternalEncoderFactory() {
+- supported_codecs_.push_back(cricket::VideoCodec(kVp8CodecName));
++ if (webrtc::VP8Decoder::IsSupported())
++ supported_codecs_.push_back(cricket::VideoCodec(kVp8CodecName));
+ if (webrtc::VP9Encoder::IsSupported())
+ supported_codecs_.push_back(cricket::VideoCodec(kVp9CodecName));
+ if (webrtc::H264Encoder::IsSupported()) {
diff --git a/webrtc/media/engine/webrtcvideocapturer.cc b/webrtc/media/engine/webrtcvideocapturer.cc
index 11458d1..133c758 100644
--- a/webrtc/media/engine/webrtcvideocapturer.cc
Modified: trunk/Source/WebCore/ChangeLog (213423 => 213424)
--- trunk/Source/WebCore/ChangeLog 2017-03-04 17:15:40 UTC (rev 213423)
+++ trunk/Source/WebCore/ChangeLog 2017-03-04 17:31:06 UTC (rev 213424)
@@ -1,3 +1,14 @@
+2017-03-04 Alex Christensen <[email protected]>
+
+ Cleanup after r213418
+ https://bugs.webkit.org/show_bug.cgi?id=169165
+
+ Reviewed by Youenn Fablet.
+
+ * platform/mediastream/mac/RealtimeIncomingAudioSource.cpp:
+ (WebCore::RealtimeIncomingAudioSource::OnData):
+ Restore the assertion I removed.
+
2017-03-04 Commit Queue <[email protected]>
Unreviewed, rolling out r213379.
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp (213423 => 213424)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp 2017-03-04 17:15:40 UTC (rev 213423)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp 2017-03-04 17:31:06 UTC (rev 213424)
@@ -81,7 +81,7 @@
return;
ASSERT(bitsPerSample == 16);
- // FIXME: We ought to be able to assert numberOfChannels == 2.
+ ASSERT(numberOfChannels == 2);
ASSERT(sampleRate == 48000);
CMTime startTime = CMTimeMake(m_numberOfFrames, sampleRate);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
