summaryrefslogtreecommitdiffstats
path: root/media/filters
diff options
context:
space:
mode:
Diffstat (limited to 'media/filters')
-rw-r--r--media/filters/audio_renderer_base_unittest.cc6
-rw-r--r--media/filters/decoder_base_unittest.cc6
-rw-r--r--media/filters/ffmpeg_demuxer.cc4
-rw-r--r--media/filters/ffmpeg_demuxer_unittest.cc2
-rw-r--r--media/filters/ffmpeg_video_decoder.cc2
-rw-r--r--media/filters/file_data_source_unittest.cc6
-rw-r--r--media/filters/video_renderer_base_unittest.cc2
7 files changed, 14 insertions, 14 deletions
diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc
index 03de168..de4f3c6 100644
--- a/media/filters/audio_renderer_base_unittest.cc
+++ b/media/filters/audio_renderer_base_unittest.cc
@@ -149,7 +149,7 @@ TEST_F(AudioRendererBaseTest, Initialize_Successful) {
// Now satisfy the read requests. Our callback should be executed after
// exiting this loop.
while (pending_reads_) {
- scoped_refptr<DataBuffer> buffer = new DataBuffer(1024);
+ scoped_refptr<DataBuffer> buffer(new DataBuffer(1024));
buffer->SetDataSize(1024);
--pending_reads_;
decoder_->consume_audio_samples_callback()->Run(buffer);
@@ -190,7 +190,7 @@ TEST_F(AudioRendererBaseTest, OneCompleteReadCycle) {
const uint32 kDataSize = 1024;
uint32 bytes_buffered = 0;
while (pending_reads_) {
- scoped_refptr<DataBuffer> buffer = new DataBuffer(kDataSize);
+ scoped_refptr<DataBuffer> buffer(new DataBuffer(kDataSize));
buffer->SetDataSize(kDataSize);
decoder_->consume_audio_samples_callback()->Run(buffer);
--pending_reads_;
@@ -219,7 +219,7 @@ TEST_F(AudioRendererBaseTest, OneCompleteReadCycle) {
EXPECT_EQ(kMaxQueueSize, pending_reads_);
// Fulfill the read with an end-of-stream packet.
- scoped_refptr<DataBuffer> last_buffer = new DataBuffer(0);
+ scoped_refptr<DataBuffer> last_buffer(new DataBuffer(0));
decoder_->consume_audio_samples_callback()->Run(last_buffer);
--pending_reads_;
diff --git a/media/filters/decoder_base_unittest.cc b/media/filters/decoder_base_unittest.cc
index 41dcf9a..d280895 100644
--- a/media/filters/decoder_base_unittest.cc
+++ b/media/filters/decoder_base_unittest.cc
@@ -96,7 +96,7 @@ ACTION(Initialize) {
}
ACTION_P(SaveDecodeRequest, list) {
- scoped_refptr<Buffer> buffer = arg0;
+ scoped_refptr<Buffer> buffer(arg0);
list->push_back(buffer);
}
@@ -120,11 +120,11 @@ ACTION(CompleteDemuxRequest) {
// \ ReadCallback() -> client
TEST(DecoderBaseTest, FlowControl) {
MessageLoop message_loop;
- scoped_refptr<MockDecoderImpl> decoder = new MockDecoderImpl();
+ scoped_refptr<MockDecoderImpl> decoder(new MockDecoderImpl());
MockDecoderCallback read_callback;
decoder->set_consume_audio_samples_callback(
NewCallback(&read_callback, &MockDecoderCallback::OnReadComplete));
- scoped_refptr<MockDemuxerStream> demuxer_stream = new MockDemuxerStream();
+ scoped_refptr<MockDemuxerStream> demuxer_stream(new MockDemuxerStream());
StrictMock<MockFilterCallback> callback;
decoder->set_message_loop(&message_loop);
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 493108a..658bd8a 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -126,8 +126,8 @@ void FFmpegDemuxerStream::EnqueuePacket(AVPacket* packet) {
}
// Enqueue the callback and attempt to satisfy a read immediately.
- scoped_refptr<Buffer> buffer =
- new AVPacketBuffer(packet, timestamp, duration);
+ scoped_refptr<Buffer> buffer(
+ new AVPacketBuffer(packet, timestamp, duration));
if (!buffer) {
NOTREACHED() << "Unable to allocate AVPacketBuffer";
return;
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index ecf87b5..97f16d3 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -669,7 +669,7 @@ void RunCallback(size_t size, DataSource::ReadCallback* callback) {
TEST_F(FFmpegDemuxerTest, ProtocolRead) {
// Creates a demuxer.
- scoped_refptr<MockFFmpegDemuxer> demuxer = new MockFFmpegDemuxer();
+ scoped_refptr<MockFFmpegDemuxer> demuxer(new MockFFmpegDemuxer());
ASSERT_TRUE(demuxer);
demuxer->set_host(&host_);
demuxer->set_message_loop(&message_loop_);
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 45357f2..7ce8f1d 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -234,7 +234,7 @@ void FFmpegVideoDecoder::OnFormatChange(VideoStreamInfo stream_info) {
}
void FFmpegVideoDecoder::OnReadComplete(Buffer* buffer_in) {
- scoped_refptr<Buffer> buffer = buffer_in;
+ scoped_refptr<Buffer> buffer(buffer_in);
message_loop()->PostTask(
FROM_HERE,
NewRunnableMethod(this,
diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc
index 48d999e..b606feb 100644
--- a/media/filters/file_data_source_unittest.cc
+++ b/media/filters/file_data_source_unittest.cc
@@ -62,7 +62,7 @@ TEST(FileDataSourceTest, OpenFile) {
EXPECT_CALL(callback, OnFilterCallback());
EXPECT_CALL(callback, OnCallbackDestroyed());
- scoped_refptr<FileDataSource> filter = new FileDataSource();
+ scoped_refptr<FileDataSource> filter(new FileDataSource());
filter->set_host(&host);
filter->Initialize(TestFileURL(), callback.NewCallback());
@@ -79,7 +79,7 @@ TEST(FileDataSourceTest, ReadData) {
// Create our mock filter host and initialize the data source.
NiceMock<MockFilterHost> host;
NiceMock<MockFilterCallback> callback;
- scoped_refptr<FileDataSource> filter = new FileDataSource();
+ scoped_refptr<FileDataSource> filter(new FileDataSource());
filter->set_host(&host);
filter->Initialize(TestFileURL(), callback.NewCallback());
@@ -116,7 +116,7 @@ TEST(FileDataSourceTest, Seek) {
EXPECT_CALL(callback, OnCallbackDestroyed());
const base::TimeDelta kZero;
- scoped_refptr<FileDataSource> filter = new FileDataSource();
+ scoped_refptr<FileDataSource> filter(new FileDataSource());
filter->Seek(kZero, callback.NewCallback());
EXPECT_CALL(callback, OnFilterCallback());
diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc
index e27e445..ba7280ad 100644
--- a/media/filters/video_renderer_base_unittest.cc
+++ b/media/filters/video_renderer_base_unittest.cc
@@ -113,7 +113,7 @@ TEST_F(VideoRendererBaseTest, Initialize_BadMediaFormat) {
// Don't set a media format.
MediaFormat media_format;
- scoped_refptr<MockVideoDecoder> bad_decoder = new MockVideoDecoder();
+ scoped_refptr<MockVideoDecoder> bad_decoder(new MockVideoDecoder());
EXPECT_CALL(*bad_decoder, media_format())
.WillRepeatedly(ReturnRef(media_format));