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

Side by Side Diff: media/base/video_decoder_config.h

Issue 7461016: Replace VideoDecoder::media_format() with significantly simpler width()/height() methods. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: 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 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_BASE_VIDEO_DECODER_CONFIG_H_ 5 #ifndef MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 6 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 enum VideoCodec { 13 enum VideoCodec {
14 kUnknown, 14 kUnknown,
15 kCodecH264, 15 kCodecH264,
16 kCodecVC1, 16 kCodecVC1,
17 kCodecMPEG2, 17 kCodecMPEG2,
18 kCodecMPEG4, 18 kCodecMPEG4,
19 kCodecTheora, 19 kCodecTheora,
20 kCodecVP8, 20 kCodecVP8,
21
22 // DO NOT ADD RANDOM VIDEO CODECS!
23 //
24 // The only acceptable time to add a new codec is if there is production code
25 // that uses said codec in the same CL.
21 }; 26 };
22 27
23 class VideoDecoderConfig { 28 class VideoDecoderConfig {
24 public: 29 public:
25 VideoDecoderConfig(VideoCodec codec, int width, int height, 30 VideoDecoderConfig(VideoCodec codec, int width, int height,
26 int surface_width, int surface_height, 31 int surface_width, int surface_height,
27 int frame_rate_numerator, int frame_rate_denominator, 32 int frame_rate_numerator, int frame_rate_denominator,
28 uint8* extra_data, size_t extra_data_size); 33 uint8* extra_data, size_t extra_data_size);
29 ~VideoDecoderConfig(); 34 ~VideoDecoderConfig();
30 35
(...skipping 26 matching lines...) Expand all
57 // Optional byte data required to initialize video decoders. 62 // Optional byte data required to initialize video decoders.
58 scoped_array<uint8> extra_data_; 63 scoped_array<uint8> extra_data_;
59 size_t extra_data_size_; 64 size_t extra_data_size_;
60 65
61 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig); 66 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig);
62 }; 67 };
63 68
64 } // namespace media 69 } // namespace media
65 70
66 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 71 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698