Remove rtp depacketizer workarouds for hevc SC as client stack no longer send SC

Change-Id: I166225be2d52ae1e8d10de76d6b9aacb3c9cd9f0
Reviewed-on: https://git-ccr-1.devtools.intel.com/gerrit/78818
Reviewed-by: Qiu, Jianlin <[email protected]>
Tested-by: Qiu, Jianlin <[email protected]>

Author: taste1981

webrtc/modules/rtp_rtcp/source/rtp_format_h265.cc

@@ -46,11 +46,22 @@ static const size_t kHevcLengthFieldSize = 2;
 static const size_t kHevcApHeaderSize = kHevcNalHeaderSize + kHevcLengthFieldSize;
 
 
-enum HevcNalHdrMasks {kHevcFbit = 0x80, kHevcTypeMask= 0x7E, kHevcLayerIDHMask = 0x1,
-                  kHevcLayerIDLMask = 0xF8, kHevcTIDMask = 0x7, kHevcTypeMaskN = 0x81, kHevcTypeMaskInFuHeader=0x3F};
+enum HevcNalHdrMasks {
+    kHevcFbit = 0x80,
+    kHevcTypeMask= 0x7E,
+    kHevcLayerIDHMask = 0x1,
+    kHevcLayerIDLMask = 0xF8,
+    kHevcTIDMask = 0x7,
+    kHevcTypeMaskN = 0x81,
+    kHevcTypeMaskInFuHeader=0x3F
+};
 
 // Bit masks for FU headers.
-enum HevcFuDefs { kHevcSBit = 0x80, kHevcEBit = 0x40, kHevcFuTypeBit = 0x3F };
+enum HevcFuDefs {
+    kHevcSBit = 0x80,
+    kHevcEBit = 0x40,
+    kHevcFuTypeBit = 0x3F
+};
 
 bool VerifyApNaluLengths(const uint8_t* nalu_ptr, size_t length_remaining) {
   while (length_remaining > 0) {
@@ -74,23 +85,14 @@ bool ParseHevcSingleNalu(RtpDepacketizer::ParsedPayload* parsed_payload,
   parsed_payload->type.Video.width = 0;
   parsed_payload->type.Video.height = 0;
   parsed_payload->type.Video.codec = kRtpVideoH265;
-  //parsed_payload->type.Video.isFirstPacket = true;
   RTPVideoHeaderH265* h265_header =
       &parsed_payload->type.Video.codecHeader.H265;
 
   if (payload_data_length <= 4)
        return false;
 
-  if ((payload_data[0] == 0 && payload_data[1] == 0 && payload_data[2] == 1) ||
-       (payload_data[0] == 0 && payload_data[1] == 0 && payload_data[2] == 0 && payload_data[3] == 1)) {
-       uint8_t single_nal_type = (payload_data[2] == 1) ? ((payload_data[3] >> 1) & 0x7F) : ((payload_data[4] >> 1) & 0x7F);
-       h265_header->packetization_type = kH265SingleNalu;
-       h265_header->nalu_type = single_nal_type;
-       parsed_payload->frame_type = kVideoFrameKey;
-       return true;
-  }
-  const uint8_t* nalu_start = payload_data + kHevcNalHeaderSize;
-  size_t nalu_length = payload_data_length - kHevcNalHeaderSize;
+  const uint8_t* nalu_start = payload_data  /*kHevcNalHeaderSize*/;
+  size_t nalu_length = payload_data_length /*- kHevcNalHeaderSize*/;
   //nal type is at bit 6:1
   uint8_t nal_type = (payload_data[0] >>1) & 0x7F;
   if (nal_type == kHevcAp) {
@@ -111,6 +113,7 @@ bool ParseHevcSingleNalu(RtpDepacketizer::ParsedPayload* parsed_payload,
     nalu_length -= kHevcApHeaderSize;
     h265_header->packetization_type = kH265AP;
   } else {
+    parsed_payload->type.Video.is_first_packet_in_frame = true;
     h265_header->packetization_type = kH265SingleNalu;
   }
   h265_header->nalu_type = nal_type;
@@ -179,7 +182,7 @@ bool ParseHevcFuNalu(RtpDepacketizer::ParsedPayload* parsed_payload,
   parsed_payload->type.Video.width = 0;
   parsed_payload->type.Video.height = 0;
   parsed_payload->type.Video.codec = kRtpVideoH265;
-  //parsed_payload->type.Video.isFirstPacket = first_fragment;
+  parsed_payload->type.Video.is_first_packet_in_frame = first_fragment;
   RTPVideoHeaderH265* h265_header =
       &parsed_payload->type.Video.codecHeader.H265;
   h265_header->packetization_type = kH265FU;

webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc

@@ -100,10 +100,7 @@ int32_t RTPReceiverVideo::ParseRtpPacket(WebRtcRTPHeader* rtp_header,
 
   rtp_header->type.Video.playout_delay =
       rtp_header->header.extension.playout_delay;
-#ifndef DISABLE_H265
-  if (rtp_header->type.Video.codec == webrtc::kRtpVideoH265)
-    rtp_header->type.Video.is_first_packet_in_frame = is_first_packet;
-#endif
+
   return data_callback_->OnReceivedPayloadData(parsed_payload.payload,
                                                parsed_payload.payload_length,
                                                rtp_header) == 0

webrtc/modules/video_coding/packet.cc

@@ -136,7 +136,7 @@ void VCMPacket::CopyCodecSpecifics(const RTPVideoHeader& videoHeader) {
     case kRtpVideoH265:
       is_first_packet_in_frame = videoHeader.is_first_packet_in_frame;
       if (is_first_packet_in_frame)
-        insertStartCode = false;
+        insertStartCode = true;
       if (is_first_packet_in_frame && markerBit) {
         completeNALU = kNaluComplete;
       } else if (is_first_packet_in_frame) {