diff options
author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /media/filters/ffmpeg_video_decoder_unittest.cc | |
parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'media/filters/ffmpeg_video_decoder_unittest.cc')
-rw-r--r-- | media/filters/ffmpeg_video_decoder_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc index 13bec96acb..9663dd1360 100644 --- a/media/filters/ffmpeg_video_decoder_unittest.cc +++ b/media/filters/ffmpeg_video_decoder_unittest.cc @@ -99,7 +99,7 @@ class FFmpegVideoDecoderTest : public testing::Test { EXPECT_EQ(VideoDecoder::kOk, status); ASSERT_TRUE(video_frame.get()); - EXPECT_FALSE(video_frame->IsEndOfStream()); + EXPECT_FALSE(video_frame->end_of_stream()); } // Sets up expectations and actions to put FFmpegVideoDecoder in an end @@ -110,7 +110,7 @@ class FFmpegVideoDecoderTest : public testing::Test { DecodeSingleFrame(end_of_stream_buffer_, &status, &video_frame); EXPECT_EQ(VideoDecoder::kOk, status); ASSERT_TRUE(video_frame.get()); - EXPECT_TRUE(video_frame->IsEndOfStream()); + EXPECT_TRUE(video_frame->end_of_stream()); } typedef std::vector<scoped_refptr<DecoderBuffer> > InputBuffers; @@ -140,7 +140,7 @@ class FFmpegVideoDecoderTest : public testing::Test { switch (status) { case VideoDecoder::kOk: DCHECK(frame); - if (!frame->IsEndOfStream()) { + if (!frame->end_of_stream()) { output_frames->push_back(frame); continue; } else { // EOS @@ -177,7 +177,7 @@ class FFmpegVideoDecoderTest : public testing::Test { if (output_frames.size() == 1U) *video_frame = output_frames[0]; else - *video_frame = VideoFrame::CreateEmptyFrame(); + *video_frame = VideoFrame::CreateEOSFrame(); } // Decodes |i_frame_buffer_| and then decodes the data contained in @@ -359,7 +359,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_Normal) { EXPECT_EQ(VideoDecoder::kOk, status); ASSERT_TRUE(video_frame.get()); - EXPECT_FALSE(video_frame->IsEndOfStream()); + EXPECT_FALSE(video_frame->end_of_stream()); } // Verify current behavior for 0 byte frames. FFmpeg simply ignores @@ -381,8 +381,8 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_0ByteFrame) { EXPECT_EQ(VideoDecoder::kOk, status); ASSERT_EQ(2U, output_frames.size()); - EXPECT_FALSE(output_frames[0]->IsEndOfStream()); - EXPECT_FALSE(output_frames[1]->IsEndOfStream()); + EXPECT_FALSE(output_frames[0]->end_of_stream()); + EXPECT_FALSE(output_frames[1]->end_of_stream()); } TEST_F(FFmpegVideoDecoderTest, DecodeFrame_DecodeError) { @@ -422,7 +422,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_DecodeErrorAtEndOfStream) { EXPECT_EQ(VideoDecoder::kOk, status); ASSERT_TRUE(video_frame.get()); - EXPECT_TRUE(video_frame->IsEndOfStream()); + EXPECT_TRUE(video_frame->end_of_stream()); } // Decode |i_frame_buffer_| and then a frame with a larger width and verify |