From 8b6995b3d4ae65a3e730d50c00b9fe41d6dbe407 Mon Sep 17 00:00:00 2001
From: philipel <philipel@webrtc.org>
Date: Wed, 9 Jan 2019 12:39:18 +0100
Subject: [PATCH] Avoid creating frames with packets of different timestamps.

Bug: None
Change-Id: Ieca71f844d546c2e97b95131153913f138842acd
Reviewed-on: https://webrtc-review.googlesource.com/c/116680
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26176}
---
 modules/video_coding/packet_buffer.cc                | 2 ++
 modules/video_coding/video_packet_buffer_unittest.cc | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc
index 80c66661fb..4ef0b007bd 100644
--- a/modules/video_coding/packet_buffer.cc
+++ b/modules/video_coding/packet_buffer.cc
@@ -266,6 +266,8 @@ bool PacketBuffer::PotentialNewFrame(uint16_t seq_num) const {
       static_cast<uint16_t>(sequence_buffer_[index].seq_num - 1)) {
     return false;
   }
+  if (data_buffer_[prev_index].timestamp != data_buffer_[index].timestamp)
+    return false;
   if (sequence_buffer_[prev_index].continuous)
     return true;
 
diff --git a/modules/video_coding/video_packet_buffer_unittest.cc b/modules/video_coding/video_packet_buffer_unittest.cc
index ee890dd4bd..c546d72eac 100644
--- a/modules/video_coding/video_packet_buffer_unittest.cc
+++ b/modules/video_coding/video_packet_buffer_unittest.cc
@@ -706,6 +706,13 @@ TEST_F(TestPacketBuffer, FramesAfterClear) {
   CheckFrame(9057);
 }
 
+TEST_F(TestPacketBuffer, SameFrameDifferentTimestamps) {
+  Insert(0, kKeyFrame, kFirst, kNotLast, 0, nullptr, 1000);
+  Insert(1, kKeyFrame, kNotFirst, kLast, 0, nullptr, 1001);
+
+  ASSERT_EQ(0UL, frames_from_callback_.size());
+}
+
 TEST_F(TestPacketBuffer, DontLeakPayloadData) {
   // NOTE! Any eventual leak is suppose to be detected by valgrind
   //       or any other similar tool.