From 03e3117d87e7b70d2658cdd4141b1bc5239ba11d Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Tue, 12 Mar 2013 09:59:27 +0000 Subject: [PATCH] Removed redundant VP8 width/height and made sure the generic width/height is set. Review URL: https://webrtc-codereview.appspot.com/1158005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3656 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/interface/module_common_types.h | 4 ---- webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/webrtc/modules/interface/module_common_types.h b/webrtc/modules/interface/module_common_types.h index 5eae219772..6fd61720d9 100644 --- a/webrtc/modules/interface/module_common_types.h +++ b/webrtc/modules/interface/module_common_types.h @@ -71,8 +71,6 @@ struct RTPVideoHeaderVP8 keyIdx = kNoKeyIdx; partitionId = 0; beginningOfPartition = false; - frameWidth = 0; - frameHeight = 0; } bool nonReference; // Frame is discardable. @@ -87,8 +85,6 @@ struct RTPVideoHeaderVP8 int partitionId; // VP8 partition ID bool beginningOfPartition; // True if this packet is the first // in a VP8 partition. Otherwise false - int frameWidth; // Exists for key frames. - int frameHeight; // Exists for key frames. }; union RTPVideoTypeHeader { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc index 9433ee01ce..326f30a89e 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc @@ -359,8 +359,8 @@ WebRtc_Word32 RTPReceiverVideo::ReceiveVp8Codec( } to_header->keyIdx = from_header->hasKeyIdx ? from_header->keyIdx : kNoKeyIdx; - to_header->frameWidth = from_header->frameWidth; - to_header->frameHeight = from_header->frameHeight; + rtp_header->type.Video.width = from_header->frameWidth; + rtp_header->type.Video.height = from_header->frameHeight; to_header->partitionId = from_header->partitionID; to_header->beginningOfPartition = from_header->beginningOfPartition;