More android build fixes with DiffServ. (#140)

Author: taste1981

p2p/base/dtls_transport_internal.h

@@ -66,8 +66,6 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal {
 
   virtual DtlsTransportState dtls_state() const = 0;
 
-  virtual cricket::MediaType media_type() const = 0;
-
   virtual int component() const = 0;
 
   virtual bool IsDtlsActive() const = 0;

p2p/client/basic_port_allocator.cc

@@ -1250,6 +1250,7 @@ void AllocationSequence::Init() {
     case cricket::MediaType::MEDIA_TYPE_DATA:
       min_port = session_->allocator_->min_data_port();
       max_port = session_->allocator_->max_data_port();
+      break;
     case cricket::MediaType::MEDIA_TYPE_SCREEN:
       min_port = session_->allocator_->min_screen_port();
       max_port = session_->allocator_->max_screen_port();
@@ -1448,6 +1449,7 @@ void AllocationSequence::CreateUDPPorts() {
       case cricket::MediaType::MEDIA_TYPE_DATA:
         min_port = session_->allocator_->min_data_port();
         max_port = session_->allocator_->max_data_port();
+	break;
       case cricket::MediaType::MEDIA_TYPE_SCREEN:
         min_port = session_->allocator_->min_screen_port();
         max_port = session_->allocator_->max_screen_port();
@@ -1504,6 +1506,7 @@ void AllocationSequence::CreateTCPPorts() {
     case cricket::MediaType::MEDIA_TYPE_DATA:
       min_port = session_->allocator_->min_data_port();
       max_port = session_->allocator_->max_data_port();
+      break;
     case cricket::MediaType::MEDIA_TYPE_SCREEN:
       min_port = session_->allocator_->min_screen_port();
       max_port = session_->allocator_->max_screen_port();
@@ -1552,6 +1555,7 @@ void AllocationSequence::CreateStunPorts() {
     case cricket::MediaType::MEDIA_TYPE_DATA:
       min_port = session_->allocator_->min_data_port();
       max_port = session_->allocator_->max_data_port();
+      break;
     case cricket::MediaType::MEDIA_TYPE_SCREEN:
       min_port = session_->allocator_->min_screen_port();
       max_port = session_->allocator_->max_screen_port();
@@ -1663,6 +1667,7 @@ void AllocationSequence::CreateTurnPort(const RelayServerConfig& config) {
         case cricket::MediaType::MEDIA_TYPE_DATA:
           min_port = session_->allocator_->min_data_port();
           max_port = session_->allocator_->max_data_port();
+	  break;
         case cricket::MediaType::MEDIA_TYPE_SCREEN:
           min_port = session_->allocator_->min_screen_port();
           max_port = session_->allocator_->max_screen_port();

pc/peer_connection_factory.cc

@@ -136,6 +136,13 @@ RtpCapabilities PeerConnectionFactory::GetRtpSenderCapabilities(
           cricket_codecs,
           channel_manager()->GetDefaultEnabledVideoRtpHeaderExtensions());
     }
+    case cricket::MEDIA_TYPE_SCREEN: {
+      cricket::VideoCodecs cricket_codecs;
+      channel_manager()->GetSupportedVideoSendCodecs(&cricket_codecs);
+      return ToRtpCapabilities(
+          cricket_codecs,
+          channel_manager()->GetDefaultEnabledVideoRtpHeaderExtensions());
+    }
     case cricket::MEDIA_TYPE_DATA:
       return RtpCapabilities();
     case cricket::MEDIA_TYPE_UNSUPPORTED:
@@ -162,6 +169,13 @@ RtpCapabilities PeerConnectionFactory::GetRtpReceiverCapabilities(
           cricket_codecs,
           channel_manager()->GetDefaultEnabledVideoRtpHeaderExtensions());
     }
+    case cricket::MEDIA_TYPE_SCREEN: {
+      cricket::VideoCodecs cricket_codecs;
+      channel_manager()->GetSupportedVideoReceiveCodecs(&cricket_codecs);
+      return ToRtpCapabilities(
+          cricket_codecs,
+          channel_manager()->GetDefaultEnabledVideoRtpHeaderExtensions());
+    }
     case cricket::MEDIA_TYPE_DATA:
       return RtpCapabilities();
     case cricket::MEDIA_TYPE_UNSUPPORTED:

pc/sdp_offer_answer.cc

@@ -568,6 +568,8 @@ static absl::string_view GetDefaultMidForPlanB(cricket::MediaType media_type) {
       return cricket::CN_VIDEO;
     case cricket::MEDIA_TYPE_DATA:
       return cricket::CN_DATA;
+    case cricket::MEDIA_TYPE_SCREEN:
+      return cricket::CN_VIDEO;
     case cricket::MEDIA_TYPE_UNSUPPORTED:
       return "not supported";
   }