mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1847074 - Vendor libwebrtc from 8fbabf340d 

Upstream commit: https://webrtc.googlesource.com/src/+/8fbabf340da0bd6c9f1450a8c4522c54390598a1
    [M115] Revert mid check in SdpOfferAnswerHandler::CreateDataChannel.

    This check was added here:
      https://webrtc-review.googlesource.com/c/src/+/300544

    When createOffer is used before createAnswer, this check would cause
    SetupDataChannelTransport_n to not be called for the remote channel.

    (cherry picked from commit 299cdc9057fb8925f1692ac8c7573f51b7872df6)

    Bug: webrtc:15258
    Change-Id: Ifdab35d1b0260ff03fef4beff13acf8090d59d8f
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/310460
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
    Cr-Original-Commit-Position: refs/heads/main@{#40357}
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/313620
    Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
    Cr-Commit-Position: refs/branch-heads/5790@{#8}
    Cr-Branched-From: 2eacbbc03a4a41ea658661225eb1c8fc07884c33-refs/heads/main@{#40122}
This commit is contained in:
Michael Froman 2023-08-14 15:01:53 -05:00
Родитель 0ba94b2d03
Коммит d0bed050b9
3 изменённых файлов: 6 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
third_party/libwebrtc/README.moz-ff-commit поставляемый
Просмотреть файл

@ -24045,3 +24045,6 @@ f5ffd45855
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
2abe6e2214
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
8fbabf340d

2
third_party/libwebrtc/README.mozilla поставляемый
Просмотреть файл

@ -16052,3 +16052,5 @@ libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc
libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-08-14T19:59:50.566324.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-08-14T20:00:42.527963.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-08-14T20:01:41.084155.

6
third_party/libwebrtc/pc/sdp_offer_answer.cc поставляемый
Просмотреть файл

@ -5113,11 +5113,7 @@ RTCError SdpOfferAnswerHandler::CreateChannels(const SessionDescription& desc) {
bool SdpOfferAnswerHandler::CreateDataChannel(const std::string& mid) {
RTC_DCHECK_RUN_ON(signaling_thread());
if (pc_->sctp_mid().has_value()) {
RTC_DCHECK_EQ(mid, *pc_->sctp_mid());
return true; // data channel already created.
}
RTC_DCHECK(!pc_->sctp_mid().has_value() || mid == pc_->sctp_mid().value());
RTC_LOG(LS_INFO) << "Creating data channel, mid=" << mid;
absl::optional<std::string> transport_name =