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

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: samples_per_second 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/base/pipeline_status.h ('k') | media/ffmpeg/ffmpeg_common.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" 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
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_
OLDNEW
« no previous file with comments | « media/base/pipeline_status.h ('k') | media/ffmpeg/ffmpeg_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698