Revert of H264POC: Allow gaps in frame_num.

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 34 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(H264POCTest);
 };
 
 TEST_F(H264POCTest, PicOrderCntType0) {
   sps_.pic_order_cnt_type = 0;
   sps_.log2_max_pic_order_cnt_lsb_minus4 = 0;  // 16
 
   // 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 with POC lsb 8.
   slice_hdr_.idr_pic_flag = false;
-  slice_hdr_.frame_num = 1;
   slice_hdr_.pic_order_cnt_lsb = 8;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(8, poc_);
 
   // Ref frame with POC lsb 0. This should be detected as wrapping, as the
   // (negative) gap is at least half the maximum.
   slice_hdr_.pic_order_cnt_lsb = 0;
-  slice_hdr_.frame_num = 2;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(16, poc_);
 
   // Ref frame with POC lsb 9. This should be detected as negative wrapping,
   // as the (positive) gap is more than half the maximum.
   slice_hdr_.pic_order_cnt_lsb = 9;
-  slice_hdr_.frame_num = 3;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(9, poc_);
 }
 
 TEST_F(H264POCTest, PicOrderCntType0_WithMMCO5) {
   sps_.pic_order_cnt_type = 0;
   sps_.log2_max_pic_order_cnt_lsb_minus4 = 0;  // 16
 
   // Initial IDR with POC 0.
   slice_hdr_.idr_pic_flag = true;
-  slice_hdr_.frame_num = 0;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(0, poc_);
 
   // Skip ahead.
   slice_hdr_.idr_pic_flag = false;
-  slice_hdr_.frame_num = 1;
   slice_hdr_.pic_order_cnt_lsb = 8;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(8, poc_);
 
-  slice_hdr_.frame_num = 2;
   slice_hdr_.pic_order_cnt_lsb = 0;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(16, poc_);
 
-  slice_hdr_.frame_num = 3;
   slice_hdr_.pic_order_cnt_lsb = 8;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(24, poc_);
 
-  slice_hdr_.frame_num = 4;
+  SetMMCO5();
   slice_hdr_.pic_order_cnt_lsb = 0;
-  SetMMCO5();
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(32, poc_);
 
   // Due to the MMCO5 above, this is relative to 0, but also detected as
   // positive wrapping.
-  slice_hdr_.frame_num = 5;
   slice_hdr_.pic_order_cnt_lsb = 8;
   ASSERT_TRUE(ComputePOC());
   ASSERT_EQ(24, poc_);
 }
 
 TEST_F(H264POCTest, PicOrderCntType1) {
   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;
@@ skipping 122 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