Cleanup after r213418
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Mar 2017 17:31:06 +0000 (17:31 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Mar 2017 17:31:06 +0000 (17:31 +0000)
https://bugs.webkit.org/show_bug.cgi?id=169165

Patch by Alex Christensen <achristensen@webkit.org> 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@213424 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/WebKit/patch-libwebrtc
Source/WebCore/ChangeLog
Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp

index 2eb1ee8..648c66a 100644 (file)
@@ -1,3 +1,14 @@
+2017-03-04  Alex Christensen  <achristensen@webkit.org>
+
+        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  <youenn@apple.com>
 
         [WebRTC] Update libwebrtc source code
index 5b3fc96..34d9709 100644 (file)
@@ -1249,6 +1249,20 @@ index ca02c72..dcdf6f8 100644
  
    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
index bbc2bfb..afba125 100644 (file)
@@ -1,3 +1,14 @@
+2017-03-04  Alex Christensen  <achristensen@webkit.org>
+
+        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  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r213379.
index 01b43bb..11a63ff 100644 (file)
@@ -81,7 +81,7 @@ void RealtimeIncomingAudioSource::OnData(const void* audioData, int bitsPerSampl
         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);