| Index: webrtc/modules/video_coding/packet.cc
|
| diff --git a/webrtc/modules/video_coding/packet.cc b/webrtc/modules/video_coding/packet.cc
|
| index e8c06a69771e86aaaa57aacc8e9237ba455927ec..942f1826b16b28fe316dea003e98fb7e71edab3d 100644
|
| --- a/webrtc/modules/video_coding/packet.cc
|
| +++ b/webrtc/modules/video_coding/packet.cc
|
| @@ -32,7 +32,7 @@ VCMPacket::VCMPacket()
|
| insertStartCode(false),
|
| width(0),
|
| height(0),
|
| - codecSpecificHeader() {}
|
| + video_header() {}
|
|
|
| VCMPacket::VCMPacket(const uint8_t* ptr,
|
| const size_t size,
|
| @@ -53,8 +53,15 @@ VCMPacket::VCMPacket(const uint8_t* ptr,
|
| insertStartCode(false),
|
| width(rtpHeader.type.Video.width),
|
| height(rtpHeader.type.Video.height),
|
| - codecSpecificHeader(rtpHeader.type.Video) {
|
| + video_header(rtpHeader.type.Video) {
|
| CopyCodecSpecifics(rtpHeader.type.Video);
|
| +
|
| + if (markerBit) {
|
| + video_header.rotation = rtpHeader.type.Video.rotation;
|
| + }
|
| + if (isFirstPacket) {
|
| + video_header.playout_delay = rtpHeader.type.Video.playout_delay;
|
| + }
|
| }
|
|
|
| VCMPacket::VCMPacket(const uint8_t* ptr,
|
| @@ -70,7 +77,6 @@ VCMPacket::VCMPacket(const uint8_t* ptr,
|
| sizeBytes(size),
|
| markerBit(mBit),
|
| timesNacked(-1),
|
| -
|
| frameType(kVideoFrameDelta),
|
| codec(kVideoCodecUnknown),
|
| isFirstPacket(false),
|
| @@ -78,7 +84,7 @@ VCMPacket::VCMPacket(const uint8_t* ptr,
|
| insertStartCode(false),
|
| width(0),
|
| height(0),
|
| - codecSpecificHeader() {}
|
| + video_header() {}
|
|
|
| void VCMPacket::Reset() {
|
| payloadType = 0;
|
| @@ -96,13 +102,10 @@ void VCMPacket::Reset() {
|
| insertStartCode = false;
|
| width = 0;
|
| height = 0;
|
| - memset(&codecSpecificHeader, 0, sizeof(RTPVideoHeader));
|
| + memset(&video_header, 0, sizeof(RTPVideoHeader));
|
| }
|
|
|
| void VCMPacket::CopyCodecSpecifics(const RTPVideoHeader& videoHeader) {
|
| - if (markerBit) {
|
| - codecSpecificHeader.rotation = videoHeader.rotation;
|
| - }
|
| switch (videoHeader.codec) {
|
| case kRtpVideoVp8:
|
| // Handle all packets within a frame as depending on the previous packet
|
|
|