commit 3417eb49f65df5ca9456af7e29136766cd3d02af
author stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue May 21 15:25:53 2013 +0000
committer stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue May 21 15:25:53 2013 +0000
tree 1f7d98a106a3e69500df837f517034fd14075708
parent 956aa7e0874f2e08c335a82a2c32f400fac8b031

Consolidate GetFrame and InsertPacket and move NACK list processing to after a packet has been successfully inserted.

TEST=trybots
BUG=1799
R=mikhal@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1509004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4080 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/video_coding/main/source/packet.cc

diff --git a/webrtc/modules/video_coding/main/source/packet.cc b/webrtc/modules/video_coding/main/source/packet.cc
index 10eba70..4604572 100644
--- a/webrtc/modules/video_coding/main/source/packet.cc
+++ b/webrtc/modules/video_coding/main/source/packet.cc
@@ -28,12 +28,14 @@
     isFirstPacket(false),
     completeNALU(kNaluUnset),
     insertStartCode(false),
+    width(0),
+    height(0),
     codecSpecificHeader() {
 }
 
 VCMPacket::VCMPacket(const uint8_t* ptr,
-                               const uint32_t size,
-                               const WebRtcRTPHeader& rtpHeader) :
+                     const uint32_t size,
+                     const WebRtcRTPHeader& rtpHeader) :
     payloadType(rtpHeader.header.payloadType),
     timestamp(rtpHeader.header.timestamp),
     seqNum(rtpHeader.header.sequenceNumber),
@@ -46,6 +48,8 @@
     isFirstPacket(rtpHeader.type.Video.isFirstPacket),
     completeNALU(kNaluComplete),
     insertStartCode(false),
+    width(rtpHeader.type.Video.width),
+    height(rtpHeader.type.Video.height),
     codecSpecificHeader(rtpHeader.type.Video)
 {
     CopyCodecSpecifics(rtpHeader.type.Video);
@@ -64,6 +68,8 @@
     isFirstPacket(false),
     completeNALU(kNaluComplete),
     insertStartCode(false),
+    width(0),
+    height(0),
     codecSpecificHeader()
 {}
 
@@ -79,6 +85,8 @@
   isFirstPacket = false;
   completeNALU = kNaluUnset;
   insertStartCode = false;
+  width = 0;
+  height = 0;
   memset(&codecSpecificHeader, 0, sizeof(RTPVideoHeader));
 }