Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: trunk/src/media/filters/ffmpeg_video_decoder.h

Issue 14320005: Revert 194993 "Remove reference counting from media::VideoDecode..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/media/filters/ffmpeg_video_decoder.h
===================================================================
--- trunk/src/media/filters/ffmpeg_video_decoder.h (revision 195011)
+++ trunk/src/media/filters/ffmpeg_video_decoder.h (working copy)
@@ -8,7 +8,7 @@
#include <list>
#include "base/callback.h"
-#include "base/memory/weak_ptr.h"
+#include "base/memory/ref_counted.h"
#include "media/base/demuxer_stream.h"
#include "media/base/video_decoder.h"
@@ -27,7 +27,6 @@
public:
explicit FFmpegVideoDecoder(
const scoped_refptr<base::MessageLoopProxy>& message_loop);
- virtual ~FFmpegVideoDecoder();
// VideoDecoder implementation.
virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
@@ -42,6 +41,9 @@
// documentation inside FFmpeg.
int GetVideoBuffer(AVCodecContext *codec_context, AVFrame* frame);
+ protected:
+ virtual ~FFmpegVideoDecoder();
+
private:
enum DecoderState {
kUninitialized,
@@ -72,8 +74,6 @@
void DoReset();
scoped_refptr<base::MessageLoopProxy> message_loop_;
- base::WeakPtrFactory<FFmpegVideoDecoder> weak_factory_;
- base::WeakPtr<FFmpegVideoDecoder> weak_this_;
DecoderState state_;
« no previous file with comments | « trunk/src/media/filters/decrypting_video_decoder_unittest.cc ('k') | trunk/src/media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698