Set H.264 frame type correctly.

Author: taste1981

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) {

talk/owt/sdk/p2p/p2ppeerconnectionchannel.cc

@@ -508,7 +508,7 @@ void P2PPeerConnectionChannel::OnMessageSignal(Json::Value& message) {
         RTC_LOG(LS_WARNING) << "Failed to add remote candidate.";
       }
     } else{
-      rtc::CritScope cs(&pending_remote_candidates_crit_);
+      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 "
@@ -1262,7 +1262,7 @@ void P2PPeerConnectionChannel::DrainPendingMessages() {
 }
 
 void P2PPeerConnectionChannel::DrainPendingRemoteCandidates() {
-  rtc::CritScope cs(&pending_remote_candidates_crit_);
+  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.";

talk/owt/sdk/p2p/p2ppeerconnectionchannel.h

@@ -213,7 +213,7 @@ class P2PPeerConnectionChannel : public P2PSignalingReceiverInterface,
       pending_messages_;
   // Protects |pending_messages_|.
   std::mutex pending_messages_mutex_;
-  rtc::CriticalSection pending_remote_candidates_crit_;
+  webrtc::Mutex pending_remote_candidates_crit_;
   std::vector<std::unique_ptr<webrtc::IceCandidateInterface>>
       pending_remote_candidates_
           RTC_GUARDED_BY(pending_remote_candidates_crit_);