Index: content/common/gpu/media/v4l2_video_decode_accelerator.h |
diff --git a/content/common/gpu/media/v4l2_video_decode_accelerator.h b/content/common/gpu/media/v4l2_video_decode_accelerator.h |
index c6da742fc5491e9bdcbdfd9a965bd26c9dd4d84f..aeb94deac64016fd9eb435171f64067074e3f9f3 100644 |
--- a/content/common/gpu/media/v4l2_video_decode_accelerator.h |
+++ b/content/common/gpu/media/v4l2_video_decode_accelerator.h |
@@ -14,6 +14,7 @@ |
#include "base/callback_forward.h" |
#include "base/memory/linked_ptr.h" |
+#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/synchronization/waitable_event.h" |
#include "base/threading/thread.h" |
@@ -80,7 +81,7 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator |
EGLContext egl_context, |
const base::WeakPtr<Client>& io_client_, |
const base::Callback<bool(void)>& make_context_current, |
- scoped_ptr<V4L2Device> device, |
+ scoped_refptr<V4L2Device> device, |
scherkus (not reviewing)
2015/01/13 01:25:00
const ref
Pawel Osciak
2015/01/13 11:33:35
Done.
|
const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy); |
virtual ~V4L2VideoDecodeAccelerator(); |
@@ -261,9 +262,8 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator |
// Error notification (using PostTask() to child thread, if necessary). |
void NotifyError(Error error); |
- // Set the decoder_thread_ state (using PostTask to decoder thread, if |
- // necessary). |
- void SetDecoderState(State state); |
+ // Set the decoder_state_ to kError and notify the client (if necessary). |
+ void SetErrorState(Error error); |
// |
// Other utility functions. Called on decoder_thread_, unless |
@@ -341,7 +341,7 @@ class CONTENT_EXPORT V4L2VideoDecodeAccelerator |
// BitstreamBuffer we're presently reading. |
scoped_ptr<BitstreamBufferRef> decoder_current_bitstream_buffer_; |
// The V4L2Device this class is operating upon. |
- scoped_ptr<V4L2Device> device_; |
+ scoped_refptr<V4L2Device> device_; |
// FlushTask() and ResetTask() should not affect buffers that have been |
// queued afterwards. For flushing or resetting the pipeline then, we will |
// delay these buffers until after the flush or reset completes. |