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

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

Issue 7601002: Revert r95841 due to failing media_unittests on linux_shared bot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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/base/state_matrix.h ('k') | media/base/video_frame.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "media/base/media_export.h"
11 10
12 namespace media { 11 namespace media {
13 12
14 enum VideoCodec { 13 enum VideoCodec {
15 kUnknown, 14 kUnknown,
16 kCodecH264, 15 kCodecH264,
17 kCodecVC1, 16 kCodecVC1,
18 kCodecMPEG2, 17 kCodecMPEG2,
19 kCodecMPEG4, 18 kCodecMPEG4,
20 kCodecTheora, 19 kCodecTheora,
21 kCodecVP8, 20 kCodecVP8,
22 21
23 // DO NOT ADD RANDOM VIDEO CODECS! 22 // DO NOT ADD RANDOM VIDEO CODECS!
24 // 23 //
25 // The only acceptable time to add a new codec is if there is production code 24 // The only acceptable time to add a new codec is if there is production code
26 // that uses said codec in the same CL. 25 // that uses said codec in the same CL.
27 }; 26 };
28 27
29 class MEDIA_EXPORT VideoDecoderConfig { 28 class VideoDecoderConfig {
30 public: 29 public:
31 VideoDecoderConfig(VideoCodec codec, int width, int height, 30 VideoDecoderConfig(VideoCodec codec, int width, int height,
32 int surface_width, int surface_height, 31 int surface_width, int surface_height,
33 int frame_rate_numerator, int frame_rate_denominator, 32 int frame_rate_numerator, int frame_rate_denominator,
34 uint8* extra_data, size_t extra_data_size); 33 uint8* extra_data, size_t extra_data_size);
35 ~VideoDecoderConfig(); 34 ~VideoDecoderConfig();
36 35
37 VideoCodec codec() const; 36 VideoCodec codec() const;
38 int width() const; 37 int width() const;
39 int height() const; 38 int height() const;
(...skipping 23 matching lines...) Expand all
63 // Optional byte data required to initialize video decoders. 62 // Optional byte data required to initialize video decoders.
64 scoped_array<uint8> extra_data_; 63 scoped_array<uint8> extra_data_;
65 size_t extra_data_size_; 64 size_t extra_data_size_;
66 65
67 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig); 66 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig);
68 }; 67 };
69 68
70 } // namespace media 69 } // namespace media
71 70
72 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 71 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
OLDNEW
« no previous file with comments | « media/base/state_matrix.h ('k') | media/base/video_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698