Index: media/filters/ffmpeg_video_decoder_unittest.cc |
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc |
index fa91d50ed5f03d22389baf819c3dbf6ebb3e393e..a60c3353029dc902266d64aa8748644ee795c330 100644 |
--- a/media/filters/ffmpeg_video_decoder_unittest.cc |
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc |
@@ -101,14 +101,14 @@ class FFmpegVideoDecoderTest : public testing::Test { |
// Sets up expectations and actions to put FFmpegVideoDecoder in an active |
// decoding state. |
void EnterDecodingState() { |
- EXPECT_EQ(VideoDecoder::kOk, DecodeSingleFrame(i_frame_buffer_)); |
+ EXPECT_EQ(DecodeStatus::OK, DecodeSingleFrame(i_frame_buffer_)); |
ASSERT_EQ(1U, output_frames_.size()); |
} |
// Sets up expectations and actions to put FFmpegVideoDecoder in an end |
// of stream state. |
void EnterEndOfStreamState() { |
- EXPECT_EQ(VideoDecoder::kOk, DecodeSingleFrame(end_of_stream_buffer_)); |
+ EXPECT_EQ(DecodeStatus::OK, DecodeSingleFrame(end_of_stream_buffer_)); |
ASSERT_FALSE(output_frames_.empty()); |
} |
@@ -118,30 +118,29 @@ class FFmpegVideoDecoderTest : public testing::Test { |
// Decodes all buffers in |input_buffers| and push all successfully decoded |
// output frames into |output_frames|. |
// Returns the last decode status returned by the decoder. |
- VideoDecoder::Status DecodeMultipleFrames(const InputBuffers& input_buffers) { |
+ DecodeStatus DecodeMultipleFrames(const InputBuffers& input_buffers) { |
for (InputBuffers::const_iterator iter = input_buffers.begin(); |
iter != input_buffers.end(); |
++iter) { |
- VideoDecoder::Status status = Decode(*iter); |
+ DecodeStatus status = Decode(*iter); |
switch (status) { |
- case VideoDecoder::kOk: |
+ case DecodeStatus::OK: |
break; |
- case VideoDecoder::kAborted: |
+ case DecodeStatus::ABORTED: |
NOTREACHED(); |
- case VideoDecoder::kDecodeError: |
+ case DecodeStatus::DECODE_ERROR: |
DCHECK(output_frames_.empty()); |
return status; |
} |
} |
- return VideoDecoder::kOk; |
+ return DecodeStatus::OK; |
} |
// Decodes the single compressed frame in |buffer| and writes the |
// uncompressed output to |video_frame|. This method works with single |
// and multithreaded decoders. End of stream buffers are used to trigger |
// the frame to be returned in the multithreaded decoder case. |
- VideoDecoder::Status DecodeSingleFrame( |
- const scoped_refptr<DecoderBuffer>& buffer) { |
+ DecodeStatus DecodeSingleFrame(const scoped_refptr<DecoderBuffer>& buffer) { |
InputBuffers input_buffers; |
input_buffers.push_back(buffer); |
input_buffers.push_back(end_of_stream_buffer_); |
@@ -163,10 +162,9 @@ class FFmpegVideoDecoderTest : public testing::Test { |
input_buffers.push_back(buffer); |
input_buffers.push_back(end_of_stream_buffer_); |
- VideoDecoder::Status status = |
- DecodeMultipleFrames(input_buffers); |
+ DecodeStatus status = DecodeMultipleFrames(input_buffers); |
- EXPECT_EQ(VideoDecoder::kOk, status); |
+ EXPECT_EQ(DecodeStatus::OK, status); |
ASSERT_EQ(2U, output_frames_.size()); |
gfx::Size original_size = kVisibleRect.size(); |
@@ -180,8 +178,8 @@ class FFmpegVideoDecoderTest : public testing::Test { |
output_frames_[1]->visible_rect().size().height()); |
} |
- VideoDecoder::Status Decode(const scoped_refptr<DecoderBuffer>& buffer) { |
- VideoDecoder::Status status; |
+ DecodeStatus Decode(const scoped_refptr<DecoderBuffer>& buffer) { |
+ DecodeStatus status; |
EXPECT_CALL(*this, DecodeDone(_)).WillOnce(SaveArg<0>(&status)); |
decoder_->Decode(buffer, decode_cb_); |
@@ -196,7 +194,7 @@ class FFmpegVideoDecoderTest : public testing::Test { |
output_frames_.push_back(frame); |
} |
- MOCK_METHOD1(DecodeDone, void(VideoDecoder::Status)); |
+ MOCK_METHOD1(DecodeDone, void(DecodeStatus)); |
base::MessageLoop message_loop_; |
scoped_ptr<FFmpegVideoDecoder> decoder_; |
@@ -250,7 +248,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_Normal) { |
Initialize(); |
// Simulate decoding a single frame. |
- EXPECT_EQ(VideoDecoder::kOk, DecodeSingleFrame(i_frame_buffer_)); |
+ EXPECT_EQ(DecodeStatus::OK, DecodeSingleFrame(i_frame_buffer_)); |
ASSERT_EQ(1U, output_frames_.size()); |
} |
@@ -267,9 +265,9 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_0ByteFrame) { |
input_buffers.push_back(i_frame_buffer_); |
input_buffers.push_back(end_of_stream_buffer_); |
- VideoDecoder::Status status = DecodeMultipleFrames(input_buffers); |
+ DecodeStatus status = DecodeMultipleFrames(input_buffers); |
- EXPECT_EQ(VideoDecoder::kOk, status); |
+ EXPECT_EQ(DecodeStatus::OK, status); |
ASSERT_EQ(2U, output_frames_.size()); |
} |
@@ -279,14 +277,14 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_DecodeError) { |
// The error is only raised on the second decode attempt, so we expect at |
// least one successful decode but we don't expect valid frame to be decoded. |
// During the second decode attempt an error is raised. |
- EXPECT_EQ(VideoDecoder::kOk, Decode(corrupt_i_frame_buffer_)); |
+ EXPECT_EQ(DecodeStatus::OK, Decode(corrupt_i_frame_buffer_)); |
EXPECT_TRUE(output_frames_.empty()); |
- EXPECT_EQ(VideoDecoder::kDecodeError, Decode(i_frame_buffer_)); |
+ EXPECT_EQ(DecodeStatus::DECODE_ERROR, Decode(i_frame_buffer_)); |
EXPECT_TRUE(output_frames_.empty()); |
// After a decode error occurred, all following decodes will return |
- // kDecodeError. |
- EXPECT_EQ(VideoDecoder::kDecodeError, Decode(i_frame_buffer_)); |
+ // DecodeStatus::DECODE_ERROR. |
+ EXPECT_EQ(DecodeStatus::DECODE_ERROR, Decode(i_frame_buffer_)); |
EXPECT_TRUE(output_frames_.empty()); |
} |
@@ -294,7 +292,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_DecodeError) { |
TEST_F(FFmpegVideoDecoderTest, DecodeFrame_DecodeErrorAtEndOfStream) { |
Initialize(); |
- EXPECT_EQ(VideoDecoder::kDecodeError, |
+ EXPECT_EQ(DecodeStatus::DECODE_ERROR, |
DecodeSingleFrame(corrupt_i_frame_buffer_)); |
} |