Merge pull request #487 from taste1981/m88

jianjunz · web-flow · commit 8b309425dfef · 2021-02-20T14:18:05.000+08:00
Upgrade webrtc stack to M88
diff --git a/DEPS b/DEPS
@@ -319,7 +319,7 @@ deps = {
     Var('chromium_git') + '/infra/luci/client-py.git' + '@' +  Var('swarming_revision'),
   # WebRTC-only dependencies (not present in Chromium).
   'src/third_party/webrtc':
-    Var('deps_webrtc_git') + '/owt-deps-webrtc' + '@' + '05d78cc78a30bd97e6411b8180b4dd24d6027efa',
+    Var('deps_webrtc_git') + '/owt-deps-webrtc' + '@' + '2619b2535ce802ac36466a5f7141e40903691ba1',
  'src/third_party/accessibility_test_framework': {
       'packages': [
           {
diff --git a/jenkins/windows.jenkinsfile b/jenkins/windows.jenkinsfile
@@ -15,18 +15,27 @@ pipeline {
         timeout(time: 40, unit: "MINUTES")
     }
     stages {
+        stage("init paramters"){
+            steps {
+                script {
+                    if (env.CHANGE_TARGET == null){
+                        env.CHANGE_TARGET = env.GIT_BRANCH
+                    }
+                }
+            }
+        }
         stage("BuildAndEnv"){
             parallel {
                 stage("build") {
                     agent{
                         node {
                             label "windows"
-                            customWorkspace "$env.windowsCIPath/src"
+                            customWorkspace "${env.windowsCIPathBranch}_${env.CHANGE_TARGET}/src"
                         }
                     }
                     steps {
                         echo "$GIT_COMMIT"
-                        bat "%windowsCIPath%/buildSdk.bat %GIT_COMMIT%"
+                        bat "%windowsCIPathBranch%_%CHANGE_TARGET%/buildSdk.bat %GIT_COMMIT%"
                     }
                 }
                 stage("startMcu") {
@@ -124,4 +133,3 @@ pipeline {
         }
     }
 }
-
diff --git a/scripts/prepare_dev.py b/scripts/prepare_dev.py
@@ -20,6 +20,7 @@
 FFMPEG_PATH = os.path.join(THIRD_PARTY_PATH, 'ffmpeg')
 WEBRTC_OVERRIDES_PATH = os.path.join(THIRD_PARTY_PATH, 'webrtc_overrides')
 BUILD_PATH = os.path.join(HOME_PATH, 'build')
+CONFIG_PATH = os.path.join(BUILD_PATH, 'config')
 TOOL_PATH = os.path.join(HOME_PATH, 'tools')
 BASE_PATH = os.path.join(HOME_PATH, 'base')
 platform = os.name
@@ -50,6 +51,10 @@ def _patch(ignoreFailures=False):
                                 cwd=applyPath)
             else:
                 sys.exit(1)
+    # create empty gclient_args.gni under bulid/config if not already
+    gclientArgPath = os.path.join(CONFIG_PATH, 'gclient_args.gni')
+    if not os.path.isfile(gclientArgPath):
+        open(gclientArgPath, "w").close()
 
 def main(argv):
   _patch()
diff --git a/talk/owt/sdk/base/customizedvideoencoderproxy.cc b/talk/owt/sdk/base/customizedvideoencoderproxy.cc
@@ -211,6 +211,8 @@ int32_t CustomizedVideoEncoderProxy::Encode(
       info.codecSpecific.H264.idr_frame = is_idr;
       info.codecSpecific.H264.base_layer_sync = (!is_idr && (temporal_id > 0));
     }
+    encodedframe._frameType = is_idr ? webrtc::VideoFrameType::kVideoFrameKey
+                                     : webrtc::VideoFrameType::kVideoFrameDelta;
   }
   const auto result = callback_->OnEncodedImage(encodedframe, &info);
   if (result.error != webrtc::EncodedImageCallback::Result::Error::OK) {
diff --git a/talk/owt/sdk/p2p/p2ppeerconnectionchannel.cc b/talk/owt/sdk/p2p/p2ppeerconnectionchannel.cc
@@ -503,7 +503,17 @@ void P2PPeerConnectionChannel::OnMessageSignal(Json::Value& message) {
                               &sdp_mline_index);
     webrtc::IceCandidateInterface* ice_candidate = webrtc::CreateIceCandidate(
         sdp_mid, sdp_mline_index, candidate, nullptr);
-    peer_connection_->AddIceCandidate(ice_candidate);
+    if(peer_connection_->remote_description()){
+      if (!peer_connection_->AddIceCandidate(ice_candidate)) {
+        RTC_LOG(LS_WARNING) << "Failed to add remote candidate.";
+      }
+    } else{
+      webrtc::MutexLock lock(&pending_remote_candidates_crit_);
+      pending_remote_candidates_.push_back(
+          std::unique_ptr<webrtc::IceCandidateInterface>(ice_candidate));
+      RTC_LOG(LS_VERBOSE) << "Remote candidate is stored because remote "
+                             "session description is missing.";
+    }
   }
 }
 void P2PPeerConnectionChannel::OnMessageTracksAdded(
@@ -561,44 +571,47 @@ void P2PPeerConnectionChannel::OnMessageTrackSources(
 void P2PPeerConnectionChannel::OnMessageStreamInfo(Json::Value& stream_info) {
   // Stream information is useless in native layer.
 }
+
 void P2PPeerConnectionChannel::OnSignalingChange(
     PeerConnectionInterface::SignalingState new_state) {
   RTC_LOG(LS_INFO) << "Signaling state changed: " << new_state;
-  switch (new_state) {
-    case PeerConnectionInterface::SignalingState::kStable:
-      if (pending_remote_sdp_) {
-        scoped_refptr<FunctionalSetRemoteDescriptionObserver> observer =
-            FunctionalSetRemoteDescriptionObserver::Create(std::bind(
-                &P2PPeerConnectionChannel::OnSetRemoteDescriptionComplete, this,
-                std::placeholders::_1));
-        std::string sdp_string;
-        if (!pending_remote_sdp_->ToString(&sdp_string)) {
-          RTC_LOG(LS_ERROR) << "Error parsing local description.";
-          RTC_DCHECK(false);
-        }
-        std::vector<AudioCodec> audio_codecs;
-        for (auto& audio_enc_param : configuration_.audio) {
-          audio_codecs.push_back(audio_enc_param.codec.name);
-        }
-        sdp_string = SdpUtils::SetPreferAudioCodecs(sdp_string, audio_codecs);
-        std::vector<VideoCodec> video_codecs;
-        for (auto& video_enc_param : configuration_.video) {
-          video_codecs.push_back(video_enc_param.codec.name);
-        }
-        sdp_string = SdpUtils::SetPreferVideoCodecs(sdp_string, video_codecs);
-        std::unique_ptr<webrtc::SessionDescriptionInterface> new_desc(
-            webrtc::CreateSessionDescription(pending_remote_sdp_->type(),
-                                             sdp_string, nullptr));
-        pending_remote_sdp_.reset();
-        peer_connection_->SetRemoteDescription(std::move(new_desc), observer);
-      } else {
-        CheckWaitedList();
+  if (new_state == PeerConnectionInterface::SignalingState::kStable) {
+    if (pending_remote_sdp_) {
+      scoped_refptr<FunctionalSetRemoteDescriptionObserver> observer =
+          FunctionalSetRemoteDescriptionObserver::Create(std::bind(
+              &P2PPeerConnectionChannel::OnSetRemoteDescriptionComplete, this,
+              std::placeholders::_1));
+      std::string sdp_string;
+      if (!pending_remote_sdp_->ToString(&sdp_string)) {
+        RTC_LOG(LS_ERROR) << "Error parsing local description.";
+        RTC_DCHECK(false);
       }
-      break;
-    default:
-      break;
+      std::vector<AudioCodec> audio_codecs;
+      for (auto& audio_enc_param : configuration_.audio) {
+        audio_codecs.push_back(audio_enc_param.codec.name);
+      }
+      sdp_string = SdpUtils::SetPreferAudioCodecs(sdp_string, audio_codecs);
+      std::vector<VideoCodec> video_codecs;
+      for (auto& video_enc_param : configuration_.video) {
+        video_codecs.push_back(video_enc_param.codec.name);
+      }
+      sdp_string = SdpUtils::SetPreferVideoCodecs(sdp_string, video_codecs);
+      std::unique_ptr<webrtc::SessionDescriptionInterface> new_desc(
+          webrtc::CreateSessionDescription(pending_remote_sdp_->type(),
+                                           sdp_string, nullptr));
+      pending_remote_sdp_.reset();
+      peer_connection_->SetRemoteDescription(std::move(new_desc), observer);
+    } else {
+      CheckWaitedList();
+    }
+  }
+
+  if (new_state == PeerConnectionInterface::SignalingState::kStable ||
+      new_state == PeerConnectionInterface::SignalingState::kHaveRemoteOffer) {
+    DrainPendingRemoteCandidates();
   }
 }
+
 void P2PPeerConnectionChannel::OnAddStream(
     rtc::scoped_refptr<MediaStreamInterface> stream) {
   Json::Value stream_tracks;
@@ -1247,6 +1260,17 @@ void P2PPeerConnectionChannel::DrainPendingMessages() {
     pending_messages_.clear();
   }
 }
+
+void P2PPeerConnectionChannel::DrainPendingRemoteCandidates() {
+  webrtc::MutexLock lock(&pending_remote_candidates_crit_);
+  for (auto& ice_candidate : pending_remote_candidates_) {
+    if (!peer_connection_->AddIceCandidate(ice_candidate.get())) {
+      RTC_LOG(LS_WARNING) << "Failed to add remote candidate.";
+    }
+  }
+  pending_remote_candidates_.clear();
+}
+
 Json::Value P2PPeerConnectionChannel::UaInfo() {
   Json::Value ua;
   // SDK info includes verison and type.
diff --git a/talk/owt/sdk/p2p/p2ppeerconnectionchannel.h b/talk/owt/sdk/p2p/p2ppeerconnectionchannel.h
@@ -159,6 +159,7 @@ class P2PPeerConnectionChannel : public P2PSignalingReceiverInterface,
   // Send all messages in pending message list.
   void DrainPendingMessages();
   // Cleans all variables associated with last peerconnection.
+  void DrainPendingRemoteCandidates();
   void CleanLastPeerConnection();
   // Returns user agent info as JSON object.
   Json::Value UaInfo();
@@ -212,6 +213,10 @@ class P2PPeerConnectionChannel : public P2PSignalingReceiverInterface,
       pending_messages_;
   // Protects |pending_messages_|.
   std::mutex pending_messages_mutex_;
+  webrtc::Mutex pending_remote_candidates_crit_;
+  std::vector<std::unique_ptr<webrtc::IceCandidateInterface>>
+      pending_remote_candidates_
+          RTC_GUARDED_BY(pending_remote_candidates_crit_);
   // Indicates whether remote client supports WebRTC Plan B
   // (https://tools.ietf.org/html/draft-uberti-rtcweb-plan-00).
   // If plan B is not supported, at most one audio/video track is supported.

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ deps = {`
`319`	`319`	`Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),`
`320`	`320`	`# WebRTC-only dependencies (not present in Chromium).`
`321`	`321`	`'src/third_party/webrtc':`
`322`		`- Var('deps_webrtc_git') + '/owt-deps-webrtc' + '@' + '05d78cc78a30bd97e6411b8180b4dd24d6027efa',`
	`322`	`+ Var('deps_webrtc_git') + '/owt-deps-webrtc' + '@' + '2619b2535ce802ac36466a5f7141e40903691ba1',`
`323`	`323`	`'src/third_party/accessibility_test_framework': {`
`324`	`324`	`'packages': [`
`325`	`325`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,18 +15,27 @@ pipeline {`
`15`	`15`	`timeout(time: 40, unit: "MINUTES")`
`16`	`16`	`}`
`17`	`17`	`stages {`
	`18`	`+ stage("init paramters"){`
	`19`	`+ steps {`
	`20`	`+ script {`
	`21`	`+ if (env.CHANGE_TARGET == null){`
	`22`	`+ env.CHANGE_TARGET = env.GIT_BRANCH`
	`23`	`+ }`
	`24`	`+ }`
	`25`	`+ }`
	`26`	`+ }`
`18`	`27`	`stage("BuildAndEnv"){`
`19`	`28`	`parallel {`
`20`	`29`	`stage("build") {`
`21`	`30`	`agent{`
`22`	`31`	`node {`
`23`	`32`	`label "windows"`
`24`		`- customWorkspace "$env.windowsCIPath/src"`
	`33`	`+ customWorkspace "${env.windowsCIPathBranch}_${env.CHANGE_TARGET}/src"`
`25`	`34`	`}`
`26`	`35`	`}`
`27`	`36`	`steps {`
`28`	`37`	`echo "$GIT_COMMIT"`
`29`		`- bat "%windowsCIPath%/buildSdk.bat %GIT_COMMIT%"`
	`38`	`+ bat "%windowsCIPathBranch%_%CHANGE_TARGET%/buildSdk.bat %GIT_COMMIT%"`
`30`	`39`	`}`
`31`	`40`	`}`
`32`	`41`	`stage("startMcu") {`
`@@ -124,4 +133,3 @@ pipeline {`
`124`	`133`	`}`
`125`	`134`	`}`
`126`	`135`	`}`
`127`		`-`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,8 @@ int32_t CustomizedVideoEncoderProxy::Encode(`
`211`	`211`	`info.codecSpecific.H264.idr_frame = is_idr;`
`212`	`212`	`info.codecSpecific.H264.base_layer_sync = (!is_idr && (temporal_id > 0));`
`213`	`213`	`}`
	`214`	`+ encodedframe._frameType = is_idr ? webrtc::VideoFrameType::kVideoFrameKey`
	`215`	`+ : webrtc::VideoFrameType::kVideoFrameDelta;`
`214`	`216`	`}`
`215`	`217`	`const auto result = callback_->OnEncodedImage(encodedframe, &info);`
`216`	`218`	`if (result.error != webrtc::EncodedImageCallback::Result::Error::OK) {`