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

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

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.cc
===================================================================
--- trunk/src/media/filters/ffmpeg_video_decoder.cc (revision 195011)
+++ trunk/src/media/filters/ffmpeg_video_decoder.cc (working copy)
@@ -58,7 +58,6 @@
FFmpegVideoDecoder::FFmpegVideoDecoder(
const scoped_refptr<base::MessageLoopProxy>& message_loop)
: message_loop_(message_loop),
- weak_factory_(this),
state_(kUninitialized),
codec_context_(NULL),
av_frame_(NULL) {
@@ -135,7 +134,6 @@
const StatisticsCB& statistics_cb) {
DCHECK(message_loop_->BelongsToCurrentThread());
PipelineStatusCB initialize_cb = BindToCurrentLoop(status_cb);
- weak_this_ = weak_factory_.GetWeakPtr();
FFmpegGlue::InitializeFFmpeg();
DCHECK(!demuxer_stream_) << "Already initialized.";
@@ -226,8 +224,7 @@
DCHECK_NE(state_, kUninitialized);
DCHECK_NE(state_, kDecodeFinished);
DCHECK(!read_cb_.is_null());
- demuxer_stream_->Read(base::Bind(
- &FFmpegVideoDecoder::BufferReady, weak_this_));
+ demuxer_stream_->Read(base::Bind(&FFmpegVideoDecoder::BufferReady, this));
}
void FFmpegVideoDecoder::BufferReady(
« no previous file with comments | « trunk/src/media/filters/ffmpeg_video_decoder.h ('k') | trunk/src/media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698