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

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

Issue 1469353010: Configure MediaCodec with CDM in ADVA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again Created 4 years, 11 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
« no previous file with comments | « media/base/audio_decoder_config.cc ('k') | media/base/video_codecs.cc » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_CODECS_H_ 5 #ifndef MEDIA_BASE_VIDEO_CODECS_H_
6 #define MEDIA_BASE_VIDEO_CODECS_H_ 6 #define MEDIA_BASE_VIDEO_CODECS_H_
7 7
8 #include <string>
9 #include "media/base/media_export.h"
10
8 namespace media { 11 namespace media {
9 12
10 enum VideoCodec { 13 enum VideoCodec {
11 // These values are histogrammed over time; do not change their ordinal 14 // These values are histogrammed over time; do not change their ordinal
12 // values. When deleting a codec replace it with a dummy value; when adding a 15 // values. When deleting a codec replace it with a dummy value; when adding a
13 // codec, do so at the bottom (and update kVideoCodecMax). 16 // codec, do so at the bottom (and update kVideoCodecMax).
14 kUnknownVideoCodec = 0, 17 kUnknownVideoCodec = 0,
15 kCodecH264, 18 kCodecH264,
16 kCodecVC1, 19 kCodecVC1,
17 kCodecMPEG2, 20 kCodecMPEG2,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, 55 H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH,
53 VP8PROFILE_MIN = 11, 56 VP8PROFILE_MIN = 11,
54 VP8PROFILE_ANY = VP8PROFILE_MIN, 57 VP8PROFILE_ANY = VP8PROFILE_MIN,
55 VP8PROFILE_MAX = VP8PROFILE_ANY, 58 VP8PROFILE_MAX = VP8PROFILE_ANY,
56 VP9PROFILE_MIN = 12, 59 VP9PROFILE_MIN = 12,
57 VP9PROFILE_ANY = VP9PROFILE_MIN, 60 VP9PROFILE_ANY = VP9PROFILE_MIN,
58 VP9PROFILE_MAX = VP9PROFILE_ANY, 61 VP9PROFILE_MAX = VP9PROFILE_ANY,
59 VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, 62 VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX,
60 }; 63 };
61 64
65 std::string MEDIA_EXPORT GetCodecName(VideoCodec codec);
66 std::string MEDIA_EXPORT GetProfileName(VideoCodecProfile profile);
67
62 } // namespace media 68 } // namespace media
63 69
64 #endif // MEDIA_BASE_VIDEO_CODECS_H_ 70 #endif // MEDIA_BASE_VIDEO_CODECS_H_
OLDNEW
« no previous file with comments | « media/base/audio_decoder_config.cc ('k') | media/base/video_codecs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698