Index: content/common/gpu/media/v4l2_video_encode_accelerator.h |
diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.h b/content/common/gpu/media/v4l2_video_encode_accelerator.h |
index 6613d5e53ffdd250a44d200fcad9e70251390e7d..60cb8fdd6cbe4d623b051e0e69887bae6ffecac4 100644 |
--- a/content/common/gpu/media/v4l2_video_encode_accelerator.h |
+++ b/content/common/gpu/media/v4l2_video_encode_accelerator.h |
@@ -42,7 +42,7 @@ namespace content { |
class CONTENT_EXPORT V4L2VideoEncodeAccelerator |
: public media::VideoEncodeAccelerator { |
public: |
- explicit V4L2VideoEncodeAccelerator(scoped_ptr<V4L2Device> device); |
+ explicit V4L2VideoEncodeAccelerator(scoped_refptr<V4L2Device> device); |
virtual ~V4L2VideoEncodeAccelerator(); |
// media::VideoEncodeAccelerator implementation. |
@@ -154,9 +154,8 @@ class CONTENT_EXPORT V4L2VideoEncodeAccelerator |
// Error notification (using PostTask() to child thread, if necessary). |
void NotifyError(Error error); |
- // Set the encoder_thread_ state (using PostTask to encoder thread, if |
- // necessary). |
- void SetEncoderState(State state); |
+ // Set the encoder_state_ to kError and notify the client (if necessary). |
+ void SetErrorState(Error error); |
// |
// Other utility functions. Called on encoder_thread_, unless |
@@ -225,7 +224,7 @@ class CONTENT_EXPORT V4L2VideoEncodeAccelerator |
std::list<scoped_refptr<media::VideoFrame> > encoder_input_queue_; |
// Encoder device. |
- scoped_ptr<V4L2Device> device_; |
+ scoped_refptr<V4L2Device> device_; |
// Input queue state. |
bool input_streamon_; |