media/filters/ffmpeg_demuxer.h - Issue 10447035: Introducing DecoderBuffer and general Buffer cleanup. - Code Review

Chromium Code Reviews

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

(1131)

My Issues | Starred Open | Closed | All

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 10447035: Introducing DecoderBuffer and general Buffer cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Buffer Bonanza! Created 8 years, 7 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

« media/filters/chunk_demuxer_unittest.cc ('K') | « media/filters/ffmpeg_audio_decoder_unittest.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | media/filters/ffmpeg_video_decoder_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/filters/ffmpeg_demuxer.h

diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h

index e0864e7c1b1b666bfb8e873d983fa6f97d21d29b..f504c5774d6ac77a6fc02d2fe654120d2e1e3b6a 100644

--- a/media/filters/ffmpeg_demuxer.h

+++ b/media/filters/ffmpeg_demuxer.h

@@ -29,7 +29,7 @@

#include "base/gtest_prod_util.h"

#include "base/synchronization/waitable_event.h"

#include "media/base/audio_decoder_config.h"

-#include "media/base/buffers.h"

+#include "media/base/decoder_buffer.h"

#include "media/base/demuxer.h"

#include "media/base/pipeline.h"

#include "media/base/video_decoder_config.h"

@@ -111,7 +111,7 @@ class FFmpegDemuxerStream : public DemuxerStream {

bool discontinuous_;

bool stopped_;

- typedef std::deque<scoped_refptr<Buffer> > BufferQueue;

+ typedef std::deque<scoped_refptr<DecoderBuffer> > BufferQueue;

BufferQueue buffer_queue_;

typedef std::deque<ReadCB> ReadQueue;

« media/filters/chunk_demuxer_unittest.cc ('K') | « media/filters/ffmpeg_audio_decoder_unittest.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | media/filters/ffmpeg_video_decoder_unittest.cc » ('J')

Powered by Google App Engine

This is Rietveld 408576698