hevc fix after windows client update to M60

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

Author: taste1981

webrtc/modules/rtp_rtcp/source/rtp_format_h265.cc

@@ -74,14 +74,25 @@ 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;
+  //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;
   //nal type is at bit 6:1
-  uint8_t nal_type = (payload_data[0] >>1) & kHevcTypeMask;
+  uint8_t nal_type = (payload_data[0] >>1) & 0x7F;
   if (nal_type == kHevcAp) {
     // Skip the PayloadHdr. Also for simplicity, we don't support the DONL/DOND inclusion
     // in aggregation packet.
@@ -124,7 +135,8 @@ bool ParseHevcSingleNalu(RtpDepacketizer::ParsedPayload* parsed_payload,
       parsed_payload->frame_type = kVideoFrameKey;
       break;
     default:
-      parsed_payload->frame_type = kVideoFrameDelta;
+      parsed_payload->frame_type = kVideoFrameKey;
+      //parsed_payload->frame_type = kVideoFrameDelta;
       break;
   }
   return true;
@@ -161,12 +173,13 @@ bool ParseHevcFuNalu(RtpDepacketizer::ParsedPayload* parsed_payload,
   if (original_nal_type == kIdrNLp || original_nal_type == kIdrWRadl) {
     parsed_payload->frame_type = kVideoFrameKey;
   } else {
-    parsed_payload->frame_type = kVideoFrameDelta;
+    parsed_payload->frame_type = kVideoFrameKey;
+    //parsed_payload->frame_type = kVideoFrameDelta;
   }
   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.isFirstPacket = first_fragment;
   RTPVideoHeaderH265* h265_header =
       &parsed_payload->type.Video.codecHeader.H265;
   h265_header->packetization_type = kH265FU;
@@ -266,7 +279,8 @@ int RtpPacketizerH265::PacketizeAp(size_t fragment_index) {
 
     // Next fragment.
     ++fragment_index;
-    if (fragment_index == input_fragments_.size())
+    //if (fragment_index == input_fragments_.size())
+    if (true)
       break;
     fragment = &input_fragments_[fragment_index];
 

webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc

@@ -18,6 +18,7 @@
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
+#include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
@@ -99,6 +100,10 @@ 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 = true;
+        insertStartCode = false;
       if (is_first_packet_in_frame && markerBit) {
         completeNALU = kNaluComplete;
       } else if (is_first_packet_in_frame) {