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

Unified Diff: media/filters/ffmpeg_video_decoder.h

Issue 7461016: Replace VideoDecoder::media_format() with significantly simpler width()/height() methods. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: fixes Created 9 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/base/video_decoder_config.h ('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 38a3bcc7bd85d8f3e2a5bbdd795548ac1f64a5d3..5324bf215d11b77c436f93968e71e91cff4c495b 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -37,9 +37,10 @@ class FFmpegVideoDecoder
virtual void Initialize(DemuxerStream* demuxer_stream,
FilterCallback* callback,
StatisticsCallback* stats_callback);
- virtual const MediaFormat& media_format();
virtual void ProduceVideoFrame(scoped_refptr<VideoFrame> video_frame);
virtual bool ProvidesBuffer();
+ virtual int width();
+ virtual int height();
private:
// VideoDecodeEngine::EventHandler interface.
@@ -91,7 +92,6 @@ class FFmpegVideoDecoder
virtual void SetVideoDecodeEngineForTest(VideoDecodeEngine* engine);
MessageLoop* message_loop_;
- MediaFormat media_format_;
PtsStream pts_stream_; // Stream of presentation timestamps.
DecoderState state_;
« no previous file with comments | « media/base/video_decoder_config.h ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698