Integration of VP9 packetization.

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

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 41 matching lines @@
 
 int VCMSessionInfo::HighSequenceNumber() const {
   if (packets_.empty())
     return empty_seq_num_high_;
   if (empty_seq_num_high_ == -1)
     return packets_.back().seqNum;
   return LatestSequenceNumber(packets_.back().seqNum, empty_seq_num_high_);
 }
 
 int VCMSessionInfo::PictureId() const {
-  if (packets_.empty() ||
-      packets_.front().codecSpecificHeader.codec != kRtpVideoVp8)
+  if (packets_.empty())
     return kNoPictureId;
-  return packets_.front().codecSpecificHeader.codecHeader.VP8.pictureId;
+  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;
 }
 
 int VCMSessionInfo::TemporalId() const {
-  if (packets_.empty() ||
-      packets_.front().codecSpecificHeader.codec != kRtpVideoVp8)
+  if (packets_.empty())
     return kNoTemporalIdx;
-  return packets_.front().codecSpecificHeader.codecHeader.VP8.temporalIdx;
+  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;
 }
 
 bool VCMSessionInfo::LayerSync() const {
   if (packets_.empty() ||
         packets_.front().codecSpecificHeader.codec != kRtpVideoVp8)
     return false;
   return packets_.front().codecSpecificHeader.codecHeader.VP8.layerSync;
 }
 
 int VCMSessionInfo::Tl0PicId() const {
-  if (packets_.empty() ||
-      packets_.front().codecSpecificHeader.codec != kRtpVideoVp8)
+  if (packets_.empty())
     return kNoTl0PicIdx;
-  return packets_.front().codecSpecificHeader.codecHeader.VP8.tl0PicIdx;
+  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.

 }
 
 bool VCMSessionInfo::NonReference() const {
   if (packets_.empty() ||
       packets_.front().codecSpecificHeader.codec != kRtpVideoVp8)
     return false;
   return packets_.front().codecSpecificHeader.codecHeader.VP8.nonReference;
 }
 
 void VCMSessionInfo::Reset() {
@@ skipping 433 matching lines @@
   if (empty_seq_num_high_ == -1)
     empty_seq_num_high_ = seq_num;
   else
     empty_seq_num_high_ = LatestSequenceNumber(seq_num, empty_seq_num_high_);
   if (empty_seq_num_low_ == -1 || IsNewerSequenceNumber(empty_seq_num_low_,
                                                         seq_num))
     empty_seq_num_low_ = seq_num;
 }
 
 }  // namespace webrtc