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

Side by Side Diff: media/filters/ffmpeg_video_decoder.h

Issue 8351045: Change DemuxerStream::ReadCallback to use ref-counted buffers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: forgot some &s Created 9 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "media/base/filters.h" 10 #include "media/base/filters.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 kNormal, 57 kNormal,
58 kFlushCodec, 58 kFlushCodec,
59 kDecodeFinished, 59 kDecodeFinished,
60 kPausing, 60 kPausing,
61 kFlushing, 61 kFlushing,
62 kStopped 62 kStopped
63 }; 63 };
64 64
65 void OnFlushComplete(const base::Closure& callback); 65 void OnFlushComplete(const base::Closure& callback);
66 void OnSeekComplete(const base::Closure& callback); 66 void OnSeekComplete(const base::Closure& callback);
67 void OnReadComplete(Buffer* buffer); 67 void OnReadComplete(const scoped_refptr<Buffer>& buffer);
68 68 void OnReadCompleteTask(const scoped_refptr<Buffer>& buffer);
69 // TODO(jiesun): until demuxer pass scoped_refptr<Buffer>: we could not merge
70 // this with OnReadComplete
71 void OnReadCompleteTask(scoped_refptr<Buffer> buffer);
72 69
73 // Flush the output buffers that we had held in Paused state. 70 // Flush the output buffers that we had held in Paused state.
74 void FlushBuffers(); 71 void FlushBuffers();
75 72
76 // Injection point for unittest to provide a mock engine. Takes ownership of 73 // Injection point for unittest to provide a mock engine. Takes ownership of
77 // the provided engine. 74 // the provided engine.
78 virtual void SetVideoDecodeEngineForTest(VideoDecodeEngine* engine); 75 virtual void SetVideoDecodeEngineForTest(VideoDecodeEngine* engine);
79 76
80 MessageLoop* message_loop_; 77 MessageLoop* message_loop_;
81 78
(...skipping 16 matching lines...) Expand all
98 95
99 // Pointer to the demuxer stream that will feed us compressed buffers. 96 // Pointer to the demuxer stream that will feed us compressed buffers.
100 scoped_refptr<DemuxerStream> demuxer_stream_; 97 scoped_refptr<DemuxerStream> demuxer_stream_;
101 98
102 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); 99 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
103 }; 100 };
104 101
105 } // namespace media 102 } // namespace media
106 103
107 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 104 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698