Index: chrome/renderer/media/ipc_video_decoder.h |
diff --git a/chrome/renderer/media/ipc_video_decoder.h b/chrome/renderer/media/ipc_video_decoder.h |
index 40a80984307d3031b24e3eb6788a7cf512315a7c..55393ab9bafc065adc991c975ea887b198513dfd 100644 |
--- a/chrome/renderer/media/ipc_video_decoder.h |
+++ b/chrome/renderer/media/ipc_video_decoder.h |
@@ -50,24 +50,10 @@ class IpcVideoDecoder : public VideoDecoder, |
virtual bool ProvidesBuffer(); |
private: |
- void OnSeekComplete(FilterCallback* callback); |
- void OnReadComplete(Buffer* buffer); |
- void ReadCompleteTask(scoped_refptr<Buffer> buffer); |
- |
- private: |
friend class FilterFactoryImpl2<IpcVideoDecoder, |
VideoDecodeEngine*, |
MessageLoop*>; |
- private: |
- int32 width_; |
- int32 height_; |
- MediaFormat media_format_; |
- |
- scoped_ptr<FilterCallback> flush_callback_; |
- scoped_ptr<FilterCallback> initialize_callback_; |
- scoped_ptr<FilterCallback> stop_callback_; |
- |
enum DecoderState { |
kUnInitialized, |
kPlaying, |
@@ -77,6 +63,19 @@ class IpcVideoDecoder : public VideoDecoder, |
kEnded, |
kStopped, |
}; |
+ |
+ void OnSeekComplete(FilterCallback* callback); |
+ void OnReadComplete(Buffer* buffer); |
+ void ReadCompleteTask(scoped_refptr<Buffer> buffer); |
+ |
+ int32 width_; |
+ int32 height_; |
+ MediaFormat media_format_; |
+ |
+ scoped_ptr<FilterCallback> flush_callback_; |
+ scoped_ptr<FilterCallback> initialize_callback_; |
+ scoped_ptr<FilterCallback> stop_callback_; |
+ |
DecoderState state_; |
// Tracks the number of asynchronous reads issued to |demuxer_stream_|. |
@@ -97,4 +96,3 @@ class IpcVideoDecoder : public VideoDecoder, |
} // namespace media |
#endif // CHROME_RENDERER_MEDIA_IPC_VIDEO_DECODER_H_ |
- |