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

Unified Diff: media/filters/ffmpeg_audio_decoder.h

Issue 10669022: Add status parameter to DemuxerStream::ReadCB (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix seek_tester build buster Created 8 years, 5 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: media/filters/ffmpeg_audio_decoder.h
diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h
index bf3b1e45b28ec20a2ba1dec9df5ce39b3e3081b8..46af8f0b2340160d2378d512da9c8f2e6ae95522 100644
--- a/media/filters/ffmpeg_audio_decoder.h
+++ b/media/filters/ffmpeg_audio_decoder.h
@@ -10,6 +10,7 @@
#include "base/callback.h"
#include "base/message_loop.h"
#include "media/base/audio_decoder.h"
+#include "media/base/demuxer_stream.h"
struct AVCodecContext;
struct AVFrame;
@@ -43,11 +44,13 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
const StatisticsCB& statistics_cb);
void DoReset(const base::Closure& closure);
void DoRead(const ReadCB& read_cb);
- void DoDecodeBuffer(const scoped_refptr<DecoderBuffer>& input);
+ void DoDecodeBuffer(DemuxerStream::Status status,
+ const scoped_refptr<DecoderBuffer>& input);
// Reads from the demuxer stream with corresponding callback method.
void ReadFromDemuxerStream();
- void DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer);
+ void DecodeBuffer(DemuxerStream::Status status,
+ const scoped_refptr<DecoderBuffer>& buffer);
// Updates the output buffer's duration and timestamp based on the input
// buffer. Will fall back to an estimated timestamp if the input lacks a
@@ -57,9 +60,6 @@ class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
// Calculates duration based on size of decoded audio bytes.
base::TimeDelta CalculateDuration(int size);
- // Delivers decoded samples to |read_cb_| and resets the callback.
- void DeliverSamples(const scoped_refptr<Buffer>& samples);
-
// This is !is_null() iff Initialize() hasn't been called.
base::Callback<MessageLoop*()> message_loop_factory_cb_;
MessageLoop* message_loop_;

Powered by Google App Engine
This is Rietveld 408576698