Revert of Add content type information to encoded images and corresponding rtp extension header

webrtc/modules/rtp_rtcp/source/rtp_utility.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 236 matching lines @@
   header->extension.audioLevel = 0;
 
   // May not be present in packet.
   header->extension.hasVideoRotation = false;
   header->extension.videoRotation = kVideoRotation_0;
 
   // May not be present in packet.
   header->extension.playout_delay.min_ms = -1;
   header->extension.playout_delay.max_ms = -1;
 
-  // May not be present in packet.
-  header->extension.hasVideoContentType = false;
-  header->extension.videoContentType = VideoContentType::UNSPECIFIED;
-
   if (X) {
     /* RTP header extension, RFC 3550.
      0                   1                   2                   3
      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |      defined by profile       |           length              |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |                        header extension                       |
     |                             ....                              |
     */
@@ skipping 172 matching lines @@
           //  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
           int min_playout_delay = (ptr[0] << 4) | ((ptr[1] >> 4) & 0xf);
           int max_playout_delay = ((ptr[1] & 0xf) << 8) | ptr[2];
           header->extension.playout_delay.min_ms =
               min_playout_delay * PlayoutDelayLimits::kGranularityMs;
           header->extension.playout_delay.max_ms =
               max_playout_delay * PlayoutDelayLimits::kGranularityMs;
           break;
         }
-        case kRtpExtensionVideoContentType: {
-          if (len != 0) {
-            LOG(LS_WARNING) << "Incorrect video content type len: " << len;
-            return;
-          }
-          //    0                   1
-          //    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
-          //   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-          //   |  ID   | len=0 | Content type  |
-          //   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-
-          if (ptr[0] <
-              static_cast<uint8_t>(VideoContentType::TOTAL_CONTENT_TYPES)) {
-            header->extension.hasVideoContentType = true;
-            header->extension.videoContentType =
-                static_cast<VideoContentType>(ptr[0]);
-          }
-          break;
-        }
         case kRtpExtensionNone:
         case kRtpExtensionNumberOfExtensions: {
           RTC_NOTREACHED() << "Invalid extension type: " << type;
           return;
         }
       }
     }
     ptr += (len + 1);
   }
 }
 
 }  // namespace RtpUtility
 }  // namespace webrtc