summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/audio/audio_input_controller.cc4
-rw-r--r--media/audio/audio_output_controller.cc8
-rw-r--r--media/base/data_buffer_unittest.cc10
-rw-r--r--media/base/pipeline_impl_unittest.cc2
-rw-r--r--media/base/seekable_buffer_unittest.cc4
-rw-r--r--media/base/video_frame.cc12
-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
13 files changed, 34 insertions, 34 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index fc4b97d..45ab2c4 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -42,8 +42,8 @@ scoped_refptr<AudioInputController> AudioInputController::Create(
return factory_->Create(event_handler, params, samples_per_packet);
}
- scoped_refptr<AudioInputController> controller = new AudioInputController(
- event_handler);
+ scoped_refptr<AudioInputController> controller(new AudioInputController(
+ event_handler));
// Start the thread and post a task to create the audio input stream.
controller->thread_.Start();
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 602e232..4ba0f3e 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -58,8 +58,8 @@ scoped_refptr<AudioOutputController> AudioOutputController::Create(
return NULL;
// Starts the audio controller thread.
- scoped_refptr<AudioOutputController> controller = new AudioOutputController(
- event_handler, buffer_capacity, NULL);
+ scoped_refptr<AudioOutputController> controller(new AudioOutputController(
+ event_handler, buffer_capacity, NULL));
controller->message_loop_ =
AudioManager::GetAudioManager()->GetMessageLoop();
@@ -83,8 +83,8 @@ scoped_refptr<AudioOutputController> AudioOutputController::CreateLowLatency(
return NULL;
// Starts the audio controller thread.
- scoped_refptr<AudioOutputController> controller = new AudioOutputController(
- event_handler, 0, sync_reader);
+ scoped_refptr<AudioOutputController> controller(new AudioOutputController(
+ event_handler, 0, sync_reader));
controller->message_loop_ =
AudioManager::GetAudioManager()->GetMessageLoop();
diff --git a/media/base/data_buffer_unittest.cc b/media/base/data_buffer_unittest.cc
index 2d014ffa..8e40d1a 100644
--- a/media/base/data_buffer_unittest.cc
+++ b/media/base/data_buffer_unittest.cc
@@ -15,7 +15,7 @@ TEST(DataBufferTest, StreamSampleImpl) {
const base::TimeDelta kDurationB = base::TimeDelta::FromMicroseconds(5678);
// Create a DataBuffer.
- scoped_refptr<DataBuffer> buffer = new DataBuffer(0);
+ scoped_refptr<DataBuffer> buffer(new DataBuffer(0));
ASSERT_TRUE(buffer);
buffer->SetTimestamp(kTimestampA);
@@ -38,10 +38,10 @@ TEST(DataBufferTest, StreamSampleImpl) {
TEST(DataBufferTest, Ctors) {
const size_t kTestSize = 10;
- scoped_refptr<DataBuffer> buffer = new DataBuffer(0);
+ scoped_refptr<DataBuffer> buffer(new DataBuffer(0));
EXPECT_FALSE(buffer->GetData());
- scoped_refptr<DataBuffer> buffer2 = new DataBuffer(kTestSize);
+ scoped_refptr<DataBuffer> buffer2(new DataBuffer(kTestSize));
EXPECT_EQ(0u, buffer2->GetDataSize());
EXPECT_EQ(kTestSize, buffer2->GetBufferSize());
}
@@ -53,7 +53,7 @@ TEST(DataBufferTest, WritableBufferImpl) {
const size_t kNewDataSize = arraysize(kNewData);
// Create a DataBuffer.
- scoped_refptr<DataBuffer> buffer = new DataBuffer(kDataSize);
+ scoped_refptr<DataBuffer> buffer(new DataBuffer(kDataSize));
ASSERT_TRUE(buffer);
uint8* data = buffer->GetWritableData();
@@ -66,7 +66,7 @@ TEST(DataBufferTest, WritableBufferImpl) {
ASSERT_EQ(0, memcmp(read_only_data, kData, kDataSize));
EXPECT_FALSE(buffer->IsEndOfStream());
- scoped_refptr<DataBuffer> buffer2 = new DataBuffer(kNewDataSize + 10);
+ scoped_refptr<DataBuffer> buffer2(new DataBuffer(kNewDataSize + 10));
data = buffer2->GetWritableData();
ASSERT_TRUE(data);
ASSERT_EQ(kNewDataSize + 10, buffer2->GetBufferSize());
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index 544e000..eef63566 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -118,7 +118,7 @@ class PipelineImplTest : public ::testing::Test {
// Configure the demuxer to return the streams.
for (size_t i = 0; i < streams->size(); ++i) {
- scoped_refptr<DemuxerStream> stream = (*streams)[i];
+ scoped_refptr<DemuxerStream> stream((*streams)[i]);
EXPECT_CALL(*mocks_->demuxer(), GetStream(i))
.WillRepeatedly(Return(stream));
}
diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc
index 50f5d15..9602d50 100644
--- a/media/base/seekable_buffer_unittest.cc
+++ b/media/base/seekable_buffer_unittest.cc
@@ -225,7 +225,7 @@ TEST_F(SeekableBufferTest, SeekBackward) {
TEST_F(SeekableBufferTest, GetCurrentChunk) {
const size_t kSeekSize = kWriteSize / 3;
- scoped_refptr<media::DataBuffer> buffer = new media::DataBuffer(kWriteSize);
+ scoped_refptr<media::DataBuffer> buffer(new media::DataBuffer(kWriteSize));
memcpy(buffer->GetWritableData(), data_, kWriteSize);
buffer->SetDataSize(kWriteSize);
@@ -325,7 +325,7 @@ TEST_F(SeekableBufferTest, GetTime) {
EXPECT_EQ(kInvalidTimestamp.ToInternalValue(),
buffer_.current_time().ToInternalValue());
- scoped_refptr<media::DataBuffer> buffer = new media::DataBuffer(kWriteSize);
+ scoped_refptr<media::DataBuffer> buffer(new media::DataBuffer(kWriteSize));
memcpy(buffer->GetWritableData(), data_, kWriteSize);
buffer->SetDataSize(kWriteSize);
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 57a4d0d..332c3c5 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -39,8 +39,8 @@ void VideoFrame::CreateFrame(VideoFrame::Format format,
DCHECK(width * height < 100000000);
DCHECK(frame_out);
bool alloc_worked = false;
- scoped_refptr<VideoFrame> frame =
- new VideoFrame(VideoFrame::TYPE_SYSTEM_MEMORY, format, width, height);
+ scoped_refptr<VideoFrame> frame(
+ new VideoFrame(VideoFrame::TYPE_SYSTEM_MEMORY, format, width, height));
if (frame) {
frame->SetTimestamp(timestamp);
frame->SetDuration(duration);
@@ -85,8 +85,8 @@ void VideoFrame::CreateFrameExternal(SurfaceType type,
void* private_buffer,
scoped_refptr<VideoFrame>* frame_out) {
DCHECK(frame_out);
- scoped_refptr<VideoFrame> frame =
- new VideoFrame(type, format, width, height);
+ scoped_refptr<VideoFrame> frame(
+ new VideoFrame(type, format, width, height));
if (frame) {
frame->SetTimestamp(timestamp);
frame->SetDuration(duration);
@@ -108,8 +108,8 @@ void VideoFrame::CreateFrameGlTexture(Format format,
GlTexture const textures[kMaxPlanes],
scoped_refptr<VideoFrame>* frame_out) {
DCHECK(frame_out);
- scoped_refptr<VideoFrame> frame =
- new VideoFrame(TYPE_GL_TEXTURE, format, width, height);
+ scoped_refptr<VideoFrame> frame(
+ new VideoFrame(TYPE_GL_TEXTURE, format, width, height));
if (frame) {
frame->external_memory_ = true;
frame->planes_ = GetNumberOfPlanes(format);
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));
generated by cgit v1.1 at 2024-09-19 16:30:22 +0000