Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(608)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/ffmpeg_video_decoder_unittest.cc

Issue 11275088: Remove implicit scoped_refptr operator T* Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/pipeline_integration_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1ec73db6b51767b42e1cc95cb8a069e92a0a8f1a..c096c3cbdd6aadfe8e435fbb31ba014df2d18f25 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -59,7 +59,7 @@ static scoped_refptr<DecoderBuffer> CreateFakeEncryptedBuffer() {
}
ACTION_P(ReturnBuffer, buffer) {
- arg0.Run(buffer ? DemuxerStream::kOk : DemuxerStream::kAborted, buffer);
+ arg0.Run(buffer.get() ? DemuxerStream::kOk : DemuxerStream::kAborted, buffer);
}
ACTION_P2(RunDecryptCB, status, buffer) {
@@ -109,7 +109,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
void InitializeWithConfigAndStatus(const VideoDecoderConfig& config,
PipelineStatus status) {
- EXPECT_CALL(*demuxer_, video_decoder_config())
+ EXPECT_CALL(*demuxer_.get(), video_decoder_config())
.WillRepeatedly(ReturnRef(config));
decoder_->Initialize(demuxer_, NewExpectedStatusCB(status),
@@ -156,7 +156,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
DecodeSingleFrame(i_frame_buffer_, &status, &video_frame);
EXPECT_EQ(VideoDecoder::kOk, status);
- ASSERT_TRUE(video_frame);
+ ASSERT_TRUE(video_frame.get());
EXPECT_FALSE(video_frame->IsEndOfStream());
}
@@ -167,7 +167,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
VideoDecoder::Status status;
Read(&status, &video_frame);
EXPECT_EQ(VideoDecoder::kOk, status);
- ASSERT_TRUE(video_frame);
+ ASSERT_TRUE(video_frame.get());
EXPECT_TRUE(video_frame->IsEndOfStream());
}
@@ -178,7 +178,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
void DecodeSingleFrame(const scoped_refptr<DecoderBuffer>& buffer,
VideoDecoder::Status* status,
scoped_refptr<VideoFrame>* video_frame) {
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillOnce(ReturnBuffer(buffer))
.WillRepeatedly(ReturnBuffer(end_of_stream_buffer_));
@@ -202,7 +202,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile(test_file_name);
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillOnce(ReturnBuffer(i_frame_buffer_))
.WillOnce(ReturnBuffer(buffer))
.WillRepeatedly(ReturnBuffer(end_of_stream_buffer_));
@@ -216,8 +216,8 @@ class FFmpegVideoDecoderTest : public testing::Test {
gfx::Size original_size = kVisibleRect.size();
EXPECT_EQ(VideoDecoder::kOk, status_a);
EXPECT_EQ(VideoDecoder::kOk, status_b);
- ASSERT_TRUE(video_frame_a);
- ASSERT_TRUE(video_frame_b);
+ ASSERT_TRUE(video_frame_a.get());
+ ASSERT_TRUE(video_frame_b.get());
EXPECT_EQ(original_size.width(), video_frame_a->data_size().width());
EXPECT_EQ(original_size.height(), video_frame_a->data_size().height());
EXPECT_EQ(expected_width, video_frame_b->data_size().width());
@@ -355,7 +355,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_Normal) {
DecodeSingleFrame(i_frame_buffer_, &status, &video_frame);
EXPECT_EQ(VideoDecoder::kOk, status);
- ASSERT_TRUE(video_frame);
+ ASSERT_TRUE(video_frame.get());
EXPECT_FALSE(video_frame->IsEndOfStream());
}
@@ -373,7 +373,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_0ByteFrame) {
scoped_refptr<VideoFrame> video_frame_b;
scoped_refptr<VideoFrame> video_frame_c;
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillOnce(ReturnBuffer(i_frame_buffer_))
.WillOnce(ReturnBuffer(zero_byte_buffer))
.WillOnce(ReturnBuffer(i_frame_buffer_))
@@ -390,9 +390,9 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_0ByteFrame) {
EXPECT_EQ(VideoDecoder::kOk, status_b);
EXPECT_EQ(VideoDecoder::kOk, status_c);
- ASSERT_TRUE(video_frame_a);
- ASSERT_TRUE(video_frame_b);
- ASSERT_TRUE(video_frame_c);
+ ASSERT_TRUE(video_frame_a.get());
+ ASSERT_TRUE(video_frame_b.get());
+ ASSERT_TRUE(video_frame_c.get());
EXPECT_FALSE(video_frame_a->IsEndOfStream());
EXPECT_FALSE(video_frame_b->IsEndOfStream());
@@ -402,7 +402,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_0ByteFrame) {
TEST_F(FFmpegVideoDecoderTest, DecodeFrame_DecodeError) {
Initialize();
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillOnce(ReturnBuffer(corrupt_i_frame_buffer_))
.WillRepeatedly(ReturnBuffer(i_frame_buffer_));
@@ -435,7 +435,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeFrame_DecodeErrorAtEndOfStream) {
DecodeSingleFrame(corrupt_i_frame_buffer_, &status, &video_frame);
EXPECT_EQ(VideoDecoder::kOk, status);
- ASSERT_TRUE(video_frame);
+ ASSERT_TRUE(video_frame.get());
EXPECT_TRUE(video_frame->IsEndOfStream());
}
@@ -476,7 +476,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_Normal) {
DecodeSingleFrame(encrypted_i_frame_buffer_, &status, &video_frame);
EXPECT_EQ(VideoDecoder::kOk, status);
- ASSERT_TRUE(video_frame);
+ ASSERT_TRUE(video_frame.get());
EXPECT_FALSE(video_frame->IsEndOfStream());
}
@@ -485,7 +485,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_DecryptError) {
InitializeWithEncryptedConfig();
// Simulate decoding a single encrypted frame.
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillRepeatedly(ReturnBuffer(encrypted_i_frame_buffer_));
EXPECT_CALL(*decryptor_,
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _))
@@ -508,7 +508,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_NoDecryptionKey) {
InitializeWithEncryptedConfig();
// Simulate decoding a single encrypted frame.
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillRepeatedly(ReturnBuffer(encrypted_i_frame_buffer_));
EXPECT_CALL(*decryptor_,
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _))
@@ -532,7 +532,7 @@ TEST_F(FFmpegVideoDecoderTest, DecodeEncryptedFrame_CorruptedBufferReturned) {
InitializeWithEncryptedConfig();
// Simulate decoding a single encrypted frame.
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillRepeatedly(ReturnBuffer(encrypted_i_frame_buffer_));
EXPECT_CALL(*decryptor_,
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _))
@@ -579,7 +579,7 @@ TEST_F(FFmpegVideoDecoderTest, Reset_DuringPendingRead) {
Initialize();
DemuxerStream::ReadCB read_cb;
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillOnce(SaveArg<0>(&read_cb));
decoder_->Read(read_cb_);
@@ -602,7 +602,7 @@ TEST_F(FFmpegVideoDecoderTest, Reset_DuringPendingRead) {
TEST_F(FFmpegVideoDecoderTest, Reset_DuringPendingDecrypt) {
InitializeWithEncryptedConfig();
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillRepeatedly(ReturnBuffer(encrypted_i_frame_buffer_));
EXPECT_CALL(*decryptor_,
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _))
@@ -644,7 +644,7 @@ TEST_F(FFmpegVideoDecoderTest, Stop_DuringPendingRead) {
Initialize();
DemuxerStream::ReadCB read_cb;
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillOnce(SaveArg<0>(&read_cb));
decoder_->Read(read_cb_);
@@ -665,7 +665,7 @@ TEST_F(FFmpegVideoDecoderTest, Stop_DuringPendingRead) {
TEST_F(FFmpegVideoDecoderTest, Stop_DuringPendingDecrypt) {
InitializeWithEncryptedConfig();
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillRepeatedly(ReturnBuffer(encrypted_i_frame_buffer_));
EXPECT_CALL(*decryptor_,
Decrypt(Decryptor::kVideo, encrypted_i_frame_buffer_, _))
@@ -685,7 +685,7 @@ TEST_F(FFmpegVideoDecoderTest, Stop_DuringPendingDecrypt) {
TEST_F(FFmpegVideoDecoderTest, AbortPendingRead) {
Initialize();
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillOnce(ReturnBuffer(scoped_refptr<DecoderBuffer>()));
VideoDecoder::Status status;
@@ -706,7 +706,7 @@ TEST_F(FFmpegVideoDecoderTest, AbortPendingReadDuringReset) {
// Request a read on the decoder and run the MessageLoop to
// ensure that the demuxer has been called.
decoder_->Read(read_cb_);
- EXPECT_CALL(*demuxer_, Read(_))
+ EXPECT_CALL(*demuxer_.get(), Read(_))
.WillOnce(SaveArg<0>(&read_cb));
message_loop_.RunAllPending();
ASSERT_FALSE(read_cb.is_null());
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698