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

Unified Diff: media/filters/ffmpeg_audio_decoder.cc

Issue 193303002: WeakPtr destruction order cleanup: media edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 9 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
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.h ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_audio_decoder.cc
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index 5f1c37118b492b6d54c364d715b7864aad933563..2524d7b0f547d6fcbe7c504a5d5aa3753b01b06e 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -4,9 +4,7 @@
#include "media/filters/ffmpeg_audio_decoder.h"
-#include "base/bind.h"
#include "base/callback_helpers.h"
-#include "base/location.h"
#include "base/single_thread_task_runner.h"
#include "media/base/audio_buffer.h"
#include "media/base/audio_bus.h"
@@ -14,9 +12,7 @@
#include "media/base/audio_timestamp_helper.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/decoder_buffer.h"
-#include "media/base/demuxer.h"
#include "media/base/limits.h"
-#include "media/base/pipeline.h"
#include "media/base/sample_format.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/filters/ffmpeg_glue.h"
@@ -123,7 +119,6 @@ static int GetAudioBuffer(struct AVCodecContext* s, AVFrame* frame, int flags) {
FFmpegAudioDecoder::FFmpegAudioDecoder(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
: task_runner_(task_runner),
- weak_factory_(this),
state_(kUninitialized),
bytes_per_channel_(0),
channel_layout_(CHANNEL_LAYOUT_NONE),
@@ -145,7 +140,6 @@ void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config,
DCHECK(!config.is_encrypted());
FFmpegGlue::InitializeFFmpeg();
- weak_this_ = weak_factory_.GetWeakPtr();
config_ = config;
PipelineStatusCB initialize_cb = BindToCurrentLoop(status_cb);
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.h ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698