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

Unified Diff: media/filters/ffmpeg_video_decoder.h

Issue 10669022: Add status parameter to DemuxerStream::ReadCB (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index 0f077553fe7daa00f8fd0aacf7dc257fbb4fb472..0ba475da44ebfec92ec9171bcf26f8b66ad417f3 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -8,6 +8,7 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "media/base/decryptor.h"
+#include "media/base/demuxer_stream.h"
#include "media/base/video_decoder.h"
class MessageLoop;
@@ -57,11 +58,13 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
// Reads from the demuxer stream with corresponding callback method.
void ReadFromDemuxerStream();
- void DecryptOrDecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer);
+ void DecryptOrDecodeBuffer(DemuxerStream::Status status,
+ const scoped_refptr<DecoderBuffer>& buffer);
// Carries out the buffer processing operation scheduled by
// DecryptOrDecodeBuffer().
- void DoDecryptOrDecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer);
+ void DoDecryptOrDecodeBuffer(DemuxerStream::Status status,
+ const scoped_refptr<DecoderBuffer>& buffer);
// Callback called by the decryptor to deliver decrypted data buffer and
// reporting decrypt status. This callback could be called synchronously or
@@ -77,9 +80,6 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
bool Decode(const scoped_refptr<DecoderBuffer>& buffer,
scoped_refptr<VideoFrame>* video_frame);
- // Delivers the frame to |read_cb_| and resets the callback.
- void DeliverFrame(const scoped_refptr<VideoFrame>& video_frame);
-
// Releases resources associated with |codec_context_| and |av_frame_|
// and resets them to NULL.
void ReleaseFFmpegResources();
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698