| Index: content/common/gpu/media/v4l2_video_encode_accelerator.cc
|
| diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.cc b/content/common/gpu/media/v4l2_video_encode_accelerator.cc
|
| index 8f59509836f6bfb42e9619a8408c91c1950a8912..0d6276f772c43102e92cdb3cc648a9c02f39689b 100644
|
| --- a/content/common/gpu/media/v4l2_video_encode_accelerator.cc
|
| +++ b/content/common/gpu/media/v4l2_video_encode_accelerator.cc
|
| @@ -69,7 +69,7 @@
|
| }
|
|
|
| V4L2VideoEncodeAccelerator::V4L2VideoEncodeAccelerator(
|
| - const scoped_refptr<V4L2Device>& device)
|
| + scoped_ptr<V4L2Device> device)
|
| : child_message_loop_proxy_(base::MessageLoopProxy::current()),
|
| output_buffer_byte_size_(0),
|
| device_input_format_(media::VideoFrame::UNKNOWN),
|
| @@ -77,7 +77,7 @@
|
| output_format_fourcc_(0),
|
| encoder_state_(kUninitialized),
|
| stream_header_size_(0),
|
| - device_(device),
|
| + device_(device.Pass()),
|
| input_streamon_(false),
|
| input_buffer_queued_count_(0),
|
| input_memory_type_(V4L2_MEMORY_USERPTR),
|
| @@ -138,9 +138,9 @@
|
| DVLOG(1) << "Input format not supported by the HW, will convert to "
|
| << media::VideoFrame::FormatToString(device_input_format_);
|
|
|
| - scoped_refptr<V4L2Device> device =
|
| + scoped_ptr<V4L2Device> device =
|
| V4L2Device::Create(V4L2Device::kImageProcessor);
|
| - image_processor_.reset(new V4L2ImageProcessor(device));
|
| + image_processor_.reset(new V4L2ImageProcessor(device.Pass()));
|
|
|
| // Convert from input_format to device_input_format_, keeping the size
|
| // at visible_size_ and requiring the output buffers to be of at least
|
| @@ -842,7 +842,7 @@
|
| DCHECK(!output_streamon_);
|
|
|
| output_format_fourcc_ =
|
| - V4L2Device::VideoCodecProfileToV4L2PixFmt(output_profile, false);
|
| + V4L2Device::VideoCodecProfileToV4L2PixFmt(output_profile);
|
| if (!output_format_fourcc_) {
|
| LOG(ERROR) << "Initialize(): invalid output_profile=" << output_profile;
|
| return false;
|
|
|