Revert of Detect H264 slices of the same frame in VEAUnittest

media/gpu/video_encode_accelerator_unittest.cc

Index: media/gpu/video_encode_accelerator_unittest.cc
diff --git a/media/gpu/video_encode_accelerator_unittest.cc b/media/gpu/video_encode_accelerator_unittest.cc
index 7f925a69a3959f53bff5c907c70eff31fe434c4d..11f019b9b8920f25fe9a4cb6aba7aba87a73efb2 100644
--- a/media/gpu/video_encode_accelerator_unittest.cc
+++ b/media/gpu/video_encode_accelerator_unittest.cc
@@ -46,8 +46,6 @@
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/h264_parser.h"
 #include "media/filters/ivf_parser.h"
-#include "media/gpu/h264_decoder.h"
-#include "media/gpu/h264_dpb.h"
 #include "media/gpu/video_accelerator_unittest_helpers.h"
 #include "media/video/fake_video_encode_accelerator.h"
 #include "media/video/video_encode_accelerator.h"
@@ -607,17 +605,10 @@
   void ProcessStreamBuffer(const uint8_t* stream, size_t size) override;
 
  private:
-  bool IsNewPicture(const H264SliceHeader& slice_hdr);
-  bool UpdateCurrentPicture(const H264SliceHeader& slice_hdr);
-
   // Set to true when encoder provides us with the corresponding NALU type.
   bool seen_sps_;
   bool seen_pps_;
   bool seen_idr_;
-
-  scoped_refptr<H264Picture> curr_pic_;
-  int curr_sps_id_ = -1;
-  int curr_pps_id_ = -1;
 
   H264Parser h264_parser_;
 };
@@ -646,14 +637,9 @@
       // fallthrough
       case H264NALU::kNonIDRSlice: {
         ASSERT_TRUE(seen_idr_);
-        H264SliceHeader slice_hdr;
-        ASSERT_EQ(H264Parser::kOk,
-                  h264_parser_.ParseSliceHeader(nalu, &slice_hdr));
-        if (IsNewPicture(slice_hdr)) {
-          if (!frame_cb_.Run(keyframe))
-            return;
-          ASSERT_TRUE(UpdateCurrentPicture(slice_hdr));
-        }
+        seen_sps_ = seen_pps_ = false;
+        if (!frame_cb_.Run(keyframe))
+          return;
         break;
       }
 
@@ -676,36 +662,6 @@
         break;
     }
   }
-}
-
-bool H264Validator::IsNewPicture(const H264SliceHeader& slice_hdr) {
-  if (!curr_pic_)
-    return true;
-  return H264Decoder::IsNewPrimaryCodedPicture(
-      curr_pic_, curr_pps_id_, h264_parser_.GetSPS(curr_sps_id_), slice_hdr);
-}
-
-bool H264Validator::UpdateCurrentPicture(const H264SliceHeader& slice_hdr) {
-  curr_pps_id_ = slice_hdr.pic_parameter_set_id;
-  const H264PPS* pps = h264_parser_.GetPPS(curr_pps_id_);
-  if (!pps) {
-    LOG(ERROR) << "Cannot parse pps.";
-    return false;
-  }
-
-  curr_sps_id_ = pps->seq_parameter_set_id;
-  const H264SPS* sps = h264_parser_.GetSPS(curr_sps_id_);
-  if (!sps) {
-    LOG(ERROR) << "Cannot parse sps.";
-    return false;
-  }
-
-  curr_pic_ = H264Decoder::CreateH264PictureFromSliceHeader(sps, slice_hdr);
-  if (!curr_pic_) {
-    LOG(FATAL) << "Cannot initialize current frame.";
-    return false;
-  }
-  return true;
 }
 
 class VP8Validator : public StreamValidator {
@@ -2277,13 +2233,6 @@
                                                           false,
                                                           false,
                                                           false)));
-
-INSTANTIATE_TEST_CASE_P(
-    VerifyTimestamp,
-    VideoEncodeAcceleratorTest,
-    ::testing::Values(
-        std::make_tuple(1, false, 0, false, false, false, false, false, true)));
-
 #if defined(OS_WIN)
 INSTANTIATE_TEST_CASE_P(
     ForceBitrate,