media/filters/ffmpeg_video_decoder.h - Issue 7932005: Reland r101418: Fix aspect ratio and clarify video frame dimensions

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

Issue 7932005: Reland r101418: Fix aspect ratio and clarify video frame dimensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/gtest_prod_util.h"	10 #include "base/gtest_prod_util.h"

(...skipping 21 matching lines...) Expand all Loading...
32 virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;	32 virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;

33 virtual void Pause(FilterCallback* callback) OVERRIDE;	33 virtual void Pause(FilterCallback* callback) OVERRIDE;

34 virtual void Flush(FilterCallback* callback) OVERRIDE;	34 virtual void Flush(FilterCallback* callback) OVERRIDE;

35	35

36 // Decoder implementation.	36 // Decoder implementation.

37 virtual void Initialize(DemuxerStream* demuxer_stream,	37 virtual void Initialize(DemuxerStream* demuxer_stream,

38 FilterCallback* callback,	38 FilterCallback* callback,

39 StatisticsCallback* stats_callback) OVERRIDE;	39 StatisticsCallback* stats_callback) OVERRIDE;

40 virtual void ProduceVideoFrame(	40 virtual void ProduceVideoFrame(

41 scoped_refptr<VideoFrame> video_frame) OVERRIDE;	41 scoped_refptr<VideoFrame> video_frame) OVERRIDE;

42 virtual int width() OVERRIDE;	42 virtual gfx::Size natural_size() OVERRIDE;

43 virtual int height() OVERRIDE;

44	43

45 private:	44 private:

46 // VideoDecodeEngine::EventHandler interface.	45 // VideoDecodeEngine::EventHandler interface.

47 virtual void OnInitializeComplete(const VideoCodecInfo& info) OVERRIDE;	46 virtual void OnInitializeComplete(const VideoCodecInfo& info) OVERRIDE;

48 virtual void OnUninitializeComplete() OVERRIDE;	47 virtual void OnUninitializeComplete() OVERRIDE;

49 virtual void OnFlushComplete() OVERRIDE;	48 virtual void OnFlushComplete() OVERRIDE;

50 virtual void OnSeekComplete() OVERRIDE;	49 virtual void OnSeekComplete() OVERRIDE;

51 virtual void OnError() OVERRIDE;	50 virtual void OnError() OVERRIDE;

52 virtual void ProduceVideoSample(scoped_refptr<Buffer> buffer) OVERRIDE;	51 virtual void ProduceVideoSample(scoped_refptr<Buffer> buffer) OVERRIDE;

53 virtual void ConsumeVideoFrame(	52 virtual void ConsumeVideoFrame(

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111	110

112 // Pointer to the demuxer stream that will feed us compressed buffers.	111 // Pointer to the demuxer stream that will feed us compressed buffers.

113 scoped_refptr<DemuxerStream> demuxer_stream_;	112 scoped_refptr<DemuxerStream> demuxer_stream_;

114	113

115 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);	114 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);

116 };	115 };

117	116

118 } // namespace media	117 } // namespace media

119	118

120 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_	119 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_

OLD	NEW