commit b5207b488b035eae4d11dfdcca9526d5a70c9c09
author Philip Eliasson <philipel@webrtc.org> Thu Mar 14 18:14:14 2019 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Mar 14 18:14:33 2019 +0000
tree 36d5fcc243a1d80995190e3ec413689e326314ab
parent 38e6c66f4aa8af6bd342107e24cb699a0b353d2c

Revert "SeqNumUnwrapper::Unwrap now returns int64_t instead of uint64_t."

This reverts commit b0f968a761b715da4cf81e4b9c3cab0ccd322cf2.

Reason for revert: Need to update DecodedFramesHistory to manage negative picture IDs.

Original change's description:
> SeqNumUnwrapper::Unwrap now returns int64_t instead of uint64_t.
> 
> Bug: webrtc:10263
> Change-Id: Idaeae6be01bd4eba0691226c958d70e114161ffd
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127295
> Commit-Queue: Philip Eliasson <philipel@webrtc.org>
> Reviewed-by: Johannes Kron <kron@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27129}

TBR=kwiberg@webrtc.org,eladalon@webrtc.org,terelius@webrtc.org,philipel@webrtc.org,kron@webrtc.org

Change-Id: I529bb0475bd21a80fa244278aff1fd912a85c169
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10263
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127885
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27135}

modules/video_coding/loss_notification_controller.cc

diff --git a/modules/video_coding/loss_notification_controller.cc b/modules/video_coding/loss_notification_controller.cc
index 44cca34..6e07bd1 100644
--- a/modules/video_coding/loss_notification_controller.cc
+++ b/modules/video_coding/loss_notification_controller.cc
@@ -69,7 +69,7 @@
 
   if (packet.generic_descriptor->FirstPacketInSubFrame()) {
     const uint16_t frame_id = packet.generic_descriptor->FrameId();
-    const int64_t unwrapped_frame_id = frame_id_unwrapper_.Unwrap(frame_id);
+    const uint64_t unwrapped_frame_id = frame_id_unwrapper_.Unwrap(frame_id);
 
     // Ignore repeated or reordered frames.
     // TODO(TODO(bugs.webrtc.org/10336): Handle frame reordering.
@@ -124,7 +124,7 @@
     return;
   }
 
-  const int64_t unwrapped_frame_id = frame_id_unwrapper_.Unwrap(frame_id);
+  const uint64_t unwrapped_frame_id = frame_id_unwrapper_.Unwrap(frame_id);
   if (!AllDependenciesDecodable(unwrapped_frame_id, frame_dependency_diffs)) {
     return;
   }
@@ -142,7 +142,7 @@
 }
 
 bool LossNotificationController::AllDependenciesDecodable(
-    int64_t unwrapped_frame_id,
+    uint64_t unwrapped_frame_id,
     rtc::ArrayView<const uint16_t> frame_dependency_diffs) const {
   RTC_DCHECK_CALLED_SEQUENTIALLY(&sequenced_task_checker_);
 
@@ -154,7 +154,8 @@
   // One possibility that is ignored, is that the packet may be corrupt.
 
   for (uint16_t frame_dependency_diff : frame_dependency_diffs) {
-    const int64_t unwrapped_ref_frame_id =
+    RTC_DCHECK_GT(unwrapped_frame_id, frame_dependency_diff);
+    const uint64_t unwrapped_ref_frame_id =
         unwrapped_frame_id - frame_dependency_diff;
 
     const auto ref_frame_it =