Chromium Code Reviews| 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 93958ee89322f75002fb941dae49522c01e41bd2..3cb9abab9d6522dabf9e4a63a4e2bd2921970eea 100644 |
| --- a/media/gpu/video_encode_accelerator_unittest.cc |
| +++ b/media/gpu/video_encode_accelerator_unittest.cc |
| @@ -959,9 +959,6 @@ class VEAClient : public VideoEncodeAccelerator::Client { |
| // The timer used to feed the encoder with the input frames. |
| std::unique_ptr<base::RepeatingTimer> input_timer_; |
| - |
| - // The timestamps for each frame in the order of CreateFrame() invocation. |
| - std::queue<base::TimeDelta> frame_timestamps_; |
| }; |
| VEAClient::VEAClient(TestStream* test_stream, |
| @@ -1236,10 +1233,6 @@ void VEAClient::BitstreamBufferReady(int32_t bitstream_buffer_id, |
| if (state_ == CS_FINISHED || state_ == CS_VALIDATED) |
| return; |
| - ASSERT_FALSE(frame_timestamps_.empty()); |
| - ASSERT_EQ(timestamp, frame_timestamps_.front()); |
|
wuchengli
2016/06/15 08:59:21
Use EXPECT so the rest of this function can be run
|
| - frame_timestamps_.pop(); |
|
wuchengli
2016/06/15 08:59:21
One input buffer can generate more than one output
|
| - |
| encoded_stream_size_since_last_check_ += payload_size; |
| const uint8_t* stream_ptr = static_cast<const uint8_t*>(shm->memory()); |
| @@ -1379,7 +1372,6 @@ void VEAClient::FeedEncoderWithOneInput() { |
| int32_t input_id; |
| scoped_refptr<media::VideoFrame> video_frame = |
| PrepareInputFrame(pos_in_input_stream_, &input_id); |
| - frame_timestamps_.push(video_frame->timestamp()); |
| pos_in_input_stream_ += test_stream_->aligned_buffer_size; |
| bool force_keyframe = false; |