Revert of Detect H264 slices of the same frame in VEAUnittest

media/gpu/video_encode_accelerator_unittest.cc

 // Copyright 2013 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 <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 28 matching lines @@
 #include "media/base/cdm_context.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_util.h"
 #include "media/base/test_data_util.h"
 #include "media/base/video_decoder.h"
 #include "media/base/video_frame.h"
 #include "media/filters/ffmpeg_glue.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #if defined(USE_V4L2_CODEC)
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/gpu/v4l2_video_encode_accelerator.h"
 #endif
@@ skipping 539 matching lines @@
  public:
   explicit H264Validator(const FrameFoundCallback& frame_cb)
       : StreamValidator(frame_cb),
         seen_sps_(false),
         seen_pps_(false),
         seen_idr_(false) {}
 
   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_;
 };
 
 void H264Validator::ProcessStreamBuffer(const uint8_t* stream, size_t size) {
   h264_parser_.SetStream(stream, static_cast<off_t>(size));
 
   while (1) {
     H264NALU nalu;
     H264Parser::Result result;
 
     result = h264_parser_.AdvanceToNextNALU(&nalu);
     if (result == H264Parser::kEOStream)
       break;
 
     ASSERT_EQ(H264Parser::kOk, result);
 
     bool keyframe = false;
 
     switch (nalu.nal_unit_type) {
       case H264NALU::kIDRSlice:
         ASSERT_TRUE(seen_sps_);
         ASSERT_TRUE(seen_pps_);
         seen_idr_ = true;
         keyframe = true;
       // 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;
       }
 
       case H264NALU::kSPS: {
         int sps_id;
         ASSERT_EQ(H264Parser::kOk, h264_parser_.ParseSPS(&sps_id));
         seen_sps_ = true;
         break;
       }
 
       case H264NALU::kPPS: {
         ASSERT_TRUE(seen_sps_);
         int pps_id;
         ASSERT_EQ(H264Parser::kOk, h264_parser_.ParsePPS(&pps_id));
         seen_pps_ = true;
         break;
       }
 
       default:
         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 {
  public:
   explicit VP8Validator(const FrameFoundCallback& frame_cb)
       : StreamValidator(frame_cb), seen_keyframe_(false) {}
 
   void ProcessStreamBuffer(const uint8_t* stream, size_t size) override;
 
  private:
   // Have we already got a keyframe in the stream?
   bool seen_keyframe_;
@@ skipping 1549 matching lines @@
                         VideoEncodeAcceleratorTest,
                         ::testing::Values(std::make_tuple(3,
                                                           false,
                                                           0,
                                                           false,
                                                           false,
                                                           false,
                                                           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,
     VideoEncodeAcceleratorTest,
     ::testing::Values(
         std::make_tuple(1, false, 0, true, false, false, false, false, false)));
 #endif  // defined(OS_WIN)
 
 #endif  // defined(OS_CHROMEOS)
 
@@ skipping 85 matching lines @@
 
   media::g_env =
       reinterpret_cast<media::VideoEncodeAcceleratorTestEnvironment*>(
           testing::AddGlobalTestEnvironment(
               new media::VideoEncodeAcceleratorTestEnvironment(
                   std::move(test_stream_data), log_path, run_at_fps,
                   needs_encode_latency, verify_all_output)));
 
   return RUN_ALL_TESTS();
 }