Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)." becau…

talk/session/media/mediasession.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 1890 matching lines @@
   return static_cast<const VideoContentDescription*>(
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
 }
 
 const DataContentDescription* GetFirstDataContentDescription(
     const SessionDescription* sdesc) {
   return static_cast<const DataContentDescription*>(
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
 }
 
-bool GetMediaChannelNameFromComponent(
-    int component, MediaType media_type, std::string* channel_name) {
-  if (media_type == MEDIA_TYPE_AUDIO) {
-    if (component == ICE_CANDIDATE_COMPONENT_RTP) {
-      *channel_name = GICE_CHANNEL_NAME_RTP;
-      return true;
-    } else if (component == ICE_CANDIDATE_COMPONENT_RTCP) {
-      *channel_name = GICE_CHANNEL_NAME_RTCP;
-      return true;
-    }
-  } else if (media_type == MEDIA_TYPE_VIDEO) {
-    if (component == ICE_CANDIDATE_COMPONENT_RTP) {
-      *channel_name = GICE_CHANNEL_NAME_VIDEO_RTP;
-      return true;
-    } else if (component == ICE_CANDIDATE_COMPONENT_RTCP) {
-      *channel_name = GICE_CHANNEL_NAME_VIDEO_RTCP;
-      return true;
-    }
-  } else if (media_type == MEDIA_TYPE_DATA) {
-    if (component == ICE_CANDIDATE_COMPONENT_RTP) {
-      *channel_name = GICE_CHANNEL_NAME_DATA_RTP;
-      return true;
-    } else if (component == ICE_CANDIDATE_COMPONENT_RTCP) {
-      *channel_name = GICE_CHANNEL_NAME_DATA_RTCP;
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool GetMediaComponentFromChannelName(
-    const std::string& channel_name, int* component) {
-  if (channel_name == GICE_CHANNEL_NAME_RTP ||
-      channel_name == GICE_CHANNEL_NAME_VIDEO_RTP ||
-      channel_name == GICE_CHANNEL_NAME_DATA_RTP) {
-    *component = ICE_CANDIDATE_COMPONENT_RTP;
-    return true;
-  } else if (channel_name == GICE_CHANNEL_NAME_RTCP ||
-             channel_name == GICE_CHANNEL_NAME_VIDEO_RTCP ||
-             channel_name == GICE_CHANNEL_NAME_DATA_RTP) {
-    *component = ICE_CANDIDATE_COMPONENT_RTCP;
-    return true;
-  }
-
-  return false;
-}
-
-bool GetMediaTypeFromChannelName(
-    const std::string& channel_name, MediaType* media_type) {
-  if (channel_name == GICE_CHANNEL_NAME_RTP ||
-      channel_name == GICE_CHANNEL_NAME_RTCP) {
-    *media_type = MEDIA_TYPE_AUDIO;
-    return true;
-  } else if (channel_name == GICE_CHANNEL_NAME_VIDEO_RTP ||
-             channel_name == GICE_CHANNEL_NAME_VIDEO_RTCP) {
-    *media_type = MEDIA_TYPE_VIDEO;
-    return true;
-  } else if (channel_name == GICE_CHANNEL_NAME_DATA_RTP ||
-             channel_name == GICE_CHANNEL_NAME_DATA_RTCP) {
-    *media_type = MEDIA_TYPE_DATA;
-    return true;
-  }
-
-  return false;
-}
-
 }  // namespace cricket