| 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_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" | 10 #include "media/base/media_export.h" |
| 11 #include "ui/gfx/rect.h" | 11 #include "ui/gfx/rect.h" |
| 12 #include "ui/gfx/size.h" | 12 #include "ui/gfx/size.h" |
| 13 | 13 |
| 14 namespace media { | 14 namespace media { |
| 15 | 15 |
| 16 enum VideoCodec { | 16 enum VideoCodec { |
| 17 kUnknown, | 17 kUnknownVideoCodec, |
| 18 kCodecH264, | 18 kCodecH264, |
| 19 kCodecVC1, | 19 kCodecVC1, |
| 20 kCodecMPEG2, | 20 kCodecMPEG2, |
| 21 kCodecMPEG4, | 21 kCodecMPEG4, |
| 22 kCodecTheora, | 22 kCodecTheora, |
| 23 kCodecVP8, | 23 kCodecVP8, |
| 24 | 24 |
| 25 // DO NOT ADD RANDOM VIDEO CODECS! | 25 // DO NOT ADD RANDOM VIDEO CODECS! |
| 26 // | 26 // |
| 27 // The only acceptable time to add a new codec is if there is production code | 27 // The only acceptable time to add a new codec is if there is production code |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 // Optional byte data required to initialize video decoders. | 68 // Optional byte data required to initialize video decoders. |
| 69 scoped_array<uint8> extra_data_; | 69 scoped_array<uint8> extra_data_; |
| 70 size_t extra_data_size_; | 70 size_t extra_data_size_; |
| 71 | 71 |
| 72 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig); | 72 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig); |
| 73 }; | 73 }; |
| 74 | 74 |
| 75 } // namespace media | 75 } // namespace media |
| 76 | 76 |
| 77 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ | 77 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ |
| OLD | NEW |