Integration of VP9 packetization.

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

Index: webrtc/modules/video_coding/main/source/session_info.cc
diff --git a/webrtc/modules/video_coding/main/source/session_info.cc b/webrtc/modules/video_coding/main/source/session_info.cc
index 8eba432643ce0164614f9bc82c412c399efbeaaa..d2810a05cccaa39f24da27431a73ccae729edb07 100644
--- a/webrtc/modules/video_coding/main/source/session_info.cc
+++ b/webrtc/modules/video_coding/main/source/session_info.cc
@@ -59,17 +59,25 @@ int VCMSessionInfo::HighSequenceNumber() const {
 }
 
 int VCMSessionInfo::PictureId() const {
-  if (packets_.empty() ||
-      packets_.front().codecSpecificHeader.codec != kRtpVideoVp8)
+  if (packets_.empty())
+    return kNoPictureId;
+  if (packets_.front().codecSpecificHeader.codec == kRtpVideoVp8)
+    return packets_.front().codecSpecificHeader.codecHeader.VP8.pictureId;
+  else if (packets_.front().codecSpecificHeader.codec == kRtpVideoVp9)
+    return packets_.front().codecSpecificHeader.codecHeader.VP9.pictureId;
+  else

[stefan-webrtc, 2015/07/09 14:49:00]

This starts to grow out of control... We should think about a way of making this
code more generic. Do you have any suggestions up front?

[åsapersson, 2015/07/29 12:10:13]

Agree. Maybe in a separate cl.

     return kNoPictureId;
-  return packets_.front().codecSpecificHeader.codecHeader.VP8.pictureId;
 }
 
 int VCMSessionInfo::TemporalId() const {
-  if (packets_.empty() ||
-      packets_.front().codecSpecificHeader.codec != kRtpVideoVp8)
+  if (packets_.empty())
+    return kNoTemporalIdx;
+  if (packets_.front().codecSpecificHeader.codec == kRtpVideoVp8)
+    return packets_.front().codecSpecificHeader.codecHeader.VP8.temporalIdx;
+  else if (packets_.front().codecSpecificHeader.codec == kRtpVideoVp9)
+    return packets_.front().codecSpecificHeader.codecHeader.VP9.temporalIdx;
+  else
     return kNoTemporalIdx;
-  return packets_.front().codecSpecificHeader.codecHeader.VP8.temporalIdx;
 }
 
 bool VCMSessionInfo::LayerSync() const {
@@ -80,10 +88,14 @@ bool VCMSessionInfo::LayerSync() const {
 }
 
 int VCMSessionInfo::Tl0PicId() const {
-  if (packets_.empty() ||
-      packets_.front().codecSpecificHeader.codec != kRtpVideoVp8)
+  if (packets_.empty())
+    return kNoTl0PicIdx;
+  if (packets_.front().codecSpecificHeader.codec == kRtpVideoVp8)
+    return packets_.front().codecSpecificHeader.codecHeader.VP8.tl0PicIdx;
+  else if (packets_.front().codecSpecificHeader.codec == kRtpVideoVp9)
+    return packets_.front().codecSpecificHeader.codecHeader.VP9.tl0PicIdx;
+  else
     return kNoTl0PicIdx;

[stefan-webrtc, 2015/07/09 14:49:00]

{} for all multi-line if-statements.

[åsapersson, 2015/07/29 12:10:13]

Done.

-  return packets_.front().codecSpecificHeader.codecHeader.VP8.tl0PicIdx;
 }
 
 bool VCMSessionInfo::NonReference() const {