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

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

Issue 7867051: Introduce AudioDecoderConfig to migrate away from GetAVStream(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: forgot files 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
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" 10 #include "media/base/media_export.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 enum VideoCodec { 14 enum VideoCodec {
15 kUnknown, 15 kUnknownVideoCodec,
16 kCodecH264, 16 kCodecH264,
17 kCodecVC1, 17 kCodecVC1,
18 kCodecMPEG2, 18 kCodecMPEG2,
19 kCodecMPEG4, 19 kCodecMPEG4,
20 kCodecTheora, 20 kCodecTheora,
21 kCodecVP8, 21 kCodecVP8,
22 22
23 // DO NOT ADD RANDOM VIDEO CODECS! 23 // DO NOT ADD RANDOM VIDEO CODECS!
24 // 24 //
25 // The only acceptable time to add a new codec is if there is production code 25 // The only acceptable time to add a new codec is if there is production code
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // Optional byte data required to initialize video decoders. 63 // Optional byte data required to initialize video decoders.
64 scoped_array<uint8> extra_data_; 64 scoped_array<uint8> extra_data_;
65 size_t extra_data_size_; 65 size_t extra_data_size_;
66 66
67 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig); 67 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoDecoderConfig);
68 }; 68 };
69 69
70 } // namespace media 70 } // namespace media
71 71
72 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 72 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698