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

Unified Diff: media/filters/ffmpeg_video_decoder.h

Issue 10824141: Remove VideoDecoder::natural_size() & added VideoFrame::natural_size(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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_video_decoder.h
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
index 4d26380457e20b37297c1a01949be5d846ab3db5..7ae88892317f5ba9bd63ef9619c355b648d8650d 100644
--- a/media/filters/ffmpeg_video_decoder.h
+++ b/media/filters/ffmpeg_video_decoder.h
@@ -31,7 +31,6 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
virtual void Read(const ReadCB& read_cb) OVERRIDE;
virtual void Reset(const base::Closure& closure) OVERRIDE;
virtual void Stop(const base::Closure& closure) OVERRIDE;
- virtual const gfx::Size& natural_size() OVERRIDE;
// Must be called prior to initialization if decrypted buffers will be
// encountered.
@@ -107,12 +106,7 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
AVCodecContext* codec_context_;
AVFrame* av_frame_;
- // Frame rate of the video.
- int frame_rate_numerator_;
- int frame_rate_denominator_;
acolwell GONE FROM CHROMIUM 2012/08/01 23:58:13 Missed these on my last CL.
-
- // TODO(scherkus): I think this should be calculated by VideoRenderers based
- // on information provided by VideoDecoders (i.e., aspect ratio).
+ // Natural size for the last VideoDecoderConfig received.
Ami GONE FROM CHROMIUM 2012/08/02 00:16:14 Why does this get to live?
acolwell GONE FROM CHROMIUM 2012/08/02 02:16:30 Removed.
gfx::Size natural_size_;
// Pointer to the demuxer stream that will feed us compressed buffers.

Powered by Google App Engine
This is Rietveld 408576698