Index: webrtc/modules/video_coding/packet.cc |
diff --git a/webrtc/modules/video_coding/packet.cc b/webrtc/modules/video_coding/packet.cc |
index 4d5ba7c5cfe898e7bc14442447108cf9f242f4bb..643a10a346f0ab6f1146eb361155f85eeacf4a23 100644 |
--- a/webrtc/modules/video_coding/packet.cc |
+++ b/webrtc/modules/video_coding/packet.cc |
@@ -27,7 +27,7 @@ |
timesNacked(-1), |
frameType(kEmptyFrame), |
codec(kVideoCodecUnknown), |
- is_first_packet_in_frame(false), |
+ isFirstPacket(false), |
completeNALU(kNaluUnset), |
insertStartCode(false), |
width(0), |
@@ -49,7 +49,7 @@ |
timesNacked(-1), |
frameType(rtpHeader.frameType), |
codec(kVideoCodecUnknown), |
- is_first_packet_in_frame(rtpHeader.type.Video.is_first_packet_in_frame), |
+ isFirstPacket(rtpHeader.type.Video.isFirstPacket), |
completeNALU(kNaluComplete), |
insertStartCode(false), |
width(rtpHeader.type.Video.width), |
@@ -61,7 +61,7 @@ |
video_header.rotation = rtpHeader.type.Video.rotation; |
} |
// Playout decisions are made entirely based on first packet in a frame. |
- if (is_first_packet_in_frame) { |
+ if (isFirstPacket) { |
video_header.playout_delay = rtpHeader.type.Video.playout_delay; |
} else { |
video_header.playout_delay = {-1, -1}; |
@@ -79,7 +79,7 @@ |
timesNacked = -1; |
frameType = kEmptyFrame; |
codec = kVideoCodecUnknown; |
- is_first_packet_in_frame = false; |
+ isFirstPacket = false; |
completeNALU = kNaluUnset; |
insertStartCode = false; |
width = 0; |
@@ -93,9 +93,9 @@ |
// Handle all packets within a frame as depending on the previous packet |
// TODO(holmer): This should be changed to make fragments independent |
// when the VP8 RTP receiver supports fragments. |
- if (is_first_packet_in_frame && markerBit) |
+ if (isFirstPacket && markerBit) |
completeNALU = kNaluComplete; |
- else if (is_first_packet_in_frame) |
+ else if (isFirstPacket) |
completeNALU = kNaluStart; |
else if (markerBit) |
completeNALU = kNaluEnd; |
@@ -105,9 +105,9 @@ |
codec = kVideoCodecVP8; |
return; |
case kRtpVideoVp9: |
- if (is_first_packet_in_frame && markerBit) |
+ if (isFirstPacket && markerBit) |
completeNALU = kNaluComplete; |
- else if (is_first_packet_in_frame) |
+ else if (isFirstPacket) |
completeNALU = kNaluStart; |
else if (markerBit) |
completeNALU = kNaluEnd; |
@@ -117,13 +117,13 @@ |
codec = kVideoCodecVP9; |
return; |
case kRtpVideoH264: |
- is_first_packet_in_frame = videoHeader.is_first_packet_in_frame; |
- if (is_first_packet_in_frame) |
+ isFirstPacket = videoHeader.isFirstPacket; |
+ if (isFirstPacket) |
insertStartCode = true; |
- if (is_first_packet_in_frame && markerBit) { |
+ if (isFirstPacket && markerBit) { |
completeNALU = kNaluComplete; |
- } else if (is_first_packet_in_frame) { |
+ } else if (isFirstPacket) { |
completeNALU = kNaluStart; |
} else if (markerBit) { |
completeNALU = kNaluEnd; |