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

Unified Diff: media/filters/ffmpeg_audio_decoder.h

Issue 10540067: Switch to using avcodec_decode_audio4, avcodec_alloc_context3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tools. Created 8 years, 6 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/audio_file_reader.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_audio_decoder.h
diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
index 5dbe8959722fc8d2b4d79fbc97c1a93e4fe75071..bf3b1e45b28ec20a2ba1dec9df5ce39b3e3081b8 100644
--- a/media/filters/ffmpeg_audio_decoder.h
+++ b/media/filters/ffmpeg_audio_decoder.h
@@ -12,6 +12,7 @@
#include "media/base/audio_decoder.h"
struct AVCodecContext;
+struct AVFrame;
namespace media {
@@ -74,11 +75,8 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
base::TimeDelta estimated_next_timestamp_;
- // Holds decoded audio. As required by FFmpeg, input/output buffers should
- // be allocated with suitable padding and alignment. av_malloc() provides
- // us that guarantee.
- const int decoded_audio_size_;
- uint8* decoded_audio_; // Allocated via av_malloc().
+ // Holds decoded audio.
+ AVFrame* av_frame_;
ReadCB read_cb_;
« no previous file with comments | « media/filters/audio_file_reader.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698