| Index: media/base/video_decoder.h
|
| diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h
|
| index 97566da048687f6ba03d8b254e468c111f2f7091..46116456316dcccfc45fca40e48175406ff6ee33 100644
|
| --- a/media/base/video_decoder.h
|
| +++ b/media/base/video_decoder.h
|
| @@ -16,8 +16,7 @@ namespace media {
|
| class DemuxerStream;
|
| class VideoFrame;
|
|
|
| -class MEDIA_EXPORT VideoDecoder
|
| - : public base::RefCountedThreadSafe<VideoDecoder> {
|
| +class MEDIA_EXPORT VideoDecoder {
|
| public:
|
| // Status codes for read operations on VideoDecoder.
|
| enum Status {
|
| @@ -26,6 +25,9 @@ class MEDIA_EXPORT VideoDecoder
|
| kDecryptError // Decrypting error happened.
|
| };
|
|
|
| + VideoDecoder();
|
| + virtual ~VideoDecoder();
|
| +
|
| // Initializes a VideoDecoder with the given DemuxerStream, executing the
|
| // |status_cb| upon completion.
|
| // |statistics_cb| is used to update the global pipeline statistics.
|
| @@ -77,11 +79,7 @@ class MEDIA_EXPORT VideoDecoder
|
| // use a fixed set of VideoFrames for decoding.
|
| virtual bool HasOutputFrameAvailable() const;
|
|
|
| - protected:
|
| - friend class base::RefCountedThreadSafe<VideoDecoder>;
|
| - virtual ~VideoDecoder();
|
| - VideoDecoder();
|
| -
|
| + private:
|
| DISALLOW_COPY_AND_ASSIGN(VideoDecoder);
|
| };
|
|
|
|
|