H264POC: Re-compute PicOrderCnt for duplicate frame_nums.

media/video/h264_poc_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include "base/files/file_path.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/macros.h"
 #include "media/base/test_data_util.h"
@@ skipping 174 matching lines @@
   slice_hdr_.frame_num = 0;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(24, poc_);
 
   // Ref frame, wrapping from before has been cleared.
   slice_hdr_.frame_num = 1;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(1, poc_);
 }
 
+// Despite being invalid, videos with diplicate non-keyframe |frame_num| values

[DaleCurtis, 2016/06/02 18:53:02]

duplicate.

[sandersd (OOO until July 31), 2016/06/02 18:58:55]

Done.

+// are common.

[DaleCurtis, 2016/06/02 18:53:02]

Add link to bugs?

[sandersd (OOO until July 31), 2016/06/02 18:58:55]

Done.

+TEST_F(H264POCTest, PicOrderCntType1_DupFrameNum) {
+  sps_.pic_order_cnt_type = 1;
+  sps_.log2_max_frame_num_minus4 = 0;  // 16
+  sps_.num_ref_frames_in_pic_order_cnt_cycle = 2;
+  sps_.expected_delta_per_pic_order_cnt_cycle = 3;
+  sps_.offset_for_ref_frame[0] = 1;
+  sps_.offset_for_ref_frame[1] = 2;
+
+  // Initial IDR with POC 0.
+  slice_hdr_.idr_pic_flag = true;
+  slice_hdr_.frame_num = 0;
+  ASSERT_TRUE(ComputePOC());
+  ASSERT_EQ(0, poc_);
+
+  // Ref frame.
+  slice_hdr_.idr_pic_flag = false;
+  slice_hdr_.frame_num = 1;
+  ASSERT_TRUE(ComputePOC());
+  ASSERT_EQ(1, poc_);
+
+  // Duplicate |frame_num| frame.
+  slice_hdr_.frame_num = 1;
+  slice_hdr_.delta_pic_order_cnt0 = 1;
+  ASSERT_TRUE(ComputePOC());
+  ASSERT_EQ(2, poc_);
+}
+
 TEST_F(H264POCTest, PicOrderCntType2) {
   sps_.pic_order_cnt_type = 2;
 
   // Initial IDR with POC 0.
   slice_hdr_.idr_pic_flag = true;
   slice_hdr_.frame_num = 0;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(0, poc_);
 
   // Ref frame.
@@ skipping 44 matching lines @@
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(32, poc_);
 
   // Ref frame, wrapping from before has been cleared.
   slice_hdr_.frame_num = 1;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(2, poc_);
 }
 
 }  // namespace media