Implement timing frames.

webrtc/modules/rtp_rtcp/source/rtp_utility.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.
  */
 
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 
-#include <string.h>
-
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
 
 namespace webrtc {
 
 RtpData* NullObjectRtpData() {
   static NullRtpData null_rtp_data;
   return &null_rtp_data;
@@ skipping 226 matching lines @@
   header->extension.videoRotation = kVideoRotation_0;
 
   // May not be present in packet.
   header->extension.playout_delay.min_ms = -1;
   header->extension.playout_delay.max_ms = -1;
 
   // May not be present in packet.
   header->extension.hasVideoContentType = false;
   header->extension.videoContentType = VideoContentType::UNSPECIFIED;
 
+  header->extension.hasVideoTiming = false;
+  header->extension.videoTiming = {0u, 0u, 0u, 0u, 0u, false};
+
   if (X) {
     /* RTP header extension, RFC 3550.
      0                   1                   2                   3
      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |      defined by profile       |           length              |
     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     |                        header extension                       |
     |                             ....                              |
     */
@@ skipping 191 matching lines @@
           //   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 
           if (ptr[0] <
               static_cast<uint8_t>(VideoContentType::TOTAL_CONTENT_TYPES)) {
             header->extension.hasVideoContentType = true;
             header->extension.videoContentType =
                 static_cast<VideoContentType>(ptr[0]);
           }
           break;
         }
+        case kRtpExtensionVideoTiming: {
+          if (len != 9) {
+            LOG(LS_WARNING) << "Incorrect video timing len: " << len;
+            return;
+          }
+          //  0                   1                   2                   3
+          //  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
+          // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          // |  ID   | len=9 |  encode start ms delta          | encode finish |
+          // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          // | ms delta      |  packetizer finish ms delta     |   pacer exit  |
+          // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          // | ms delta      |  network timestamp ms delta     |               |
+          // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+          header->extension.hasVideoTiming = true;
+          header->extension.videoTiming.encode_start_ms_delta =
+              ByteReader<uint16_t, 2>::ReadBigEndian(ptr);
+          header->extension.videoTiming.encode_finish_ms_delta =
+              ByteReader<uint16_t, 2>::ReadBigEndian(ptr + 2);
+          header->extension.videoTiming.packetization_finish_ms_delta =
+              ByteReader<uint16_t, 2>::ReadBigEndian(ptr + 4);
+          header->extension.videoTiming.pacer_exit_ms_delta =
+              ByteReader<uint16_t, 2>::ReadBigEndian(ptr + 6);
+          header->extension.videoTiming.network_timstamp_ms_delta =
+              ByteReader<uint16_t, 2>::ReadBigEndian(ptr + 8);
+          break;
+        }

[sprang_webrtc, 2017/05/31 11:12:55]

Wouldn't it be possible to wrap |ptr| in an ArrayView and pass that and the
header->extension.videoTiming pointer to the static parse method in extension
header class from this cl? 

Would at least avoid some code duplication...

[ilnik, 2017/05/31 15:17:45]

Done.

         case kRtpExtensionRtpStreamId: {
           header->extension.stream_id.Set(rtc::MakeArrayView(ptr, len + 1));
           break;
         }
         case kRtpExtensionRepairedRtpStreamId: {
           header->extension.repaired_stream_id.Set(
               rtc::MakeArrayView(ptr, len + 1));
           break;
         }
         case kRtpExtensionNone:
         case kRtpExtensionNumberOfExtensions: {
           RTC_NOTREACHED() << "Invalid extension type: " << type;
           return;
         }
       }
     }
     ptr += (len + 1);
   }
 }
 
 }  // namespace RtpUtility
 }  // namespace webrtc