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

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

Issue 743483002: Emit Media Source codec names as media_log events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix missed call to ChunkDemuxer constructor. Created 6 years, 1 month 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 18 matching lines...) Expand all
29 kCodecVP8, 29 kCodecVP8,
30 kCodecVP9, 30 kCodecVP9,
31 // DO NOT ADD RANDOM VIDEO CODECS! 31 // DO NOT ADD RANDOM VIDEO CODECS!
32 // 32 //
33 // The only acceptable time to add a new codec is if there is production code 33 // The only acceptable time to add a new codec is if there is production code
34 // that uses said codec in the same CL. 34 // that uses said codec in the same CL.
35 35
36 kVideoCodecMax = kCodecVP9 // Must equal the last "real" codec above. 36 kVideoCodecMax = kCodecVP9 // Must equal the last "real" codec above.
37 }; 37 };
38 38
39 const char* VideoCodecName(VideoCodec video_codec);
DaleCurtis 2014/11/19 00:01:56 same suggestion as audio.
watk 2014/11/19 19:18:09 Done.
40
39 // Video stream profile. This *must* match PP_VideoDecoder_Profile. 41 // Video stream profile. This *must* match PP_VideoDecoder_Profile.
40 // (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) and 42 // (enforced in webkit/plugins/ppapi/ppb_video_decoder_impl.cc) and
41 // gpu::VideoCodecProfile. 43 // gpu::VideoCodecProfile.
42 enum VideoCodecProfile { 44 enum VideoCodecProfile {
43 // Keep the values in this enum unique, as they imply format (h.264 vs. VP8, 45 // Keep the values in this enum unique, as they imply format (h.264 vs. VP8,
44 // for example), and keep the values for a particular format grouped 46 // for example), and keep the values for a particular format grouped
45 // together for clarity. 47 // together for clarity.
46 VIDEO_CODEC_PROFILE_UNKNOWN = -1, 48 VIDEO_CODEC_PROFILE_UNKNOWN = -1,
47 VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN, 49 VIDEO_CODEC_PROFILE_MIN = VIDEO_CODEC_PROFILE_UNKNOWN,
48 H264PROFILE_MIN = 0, 50 H264PROFILE_MIN = 0,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 bool is_encrypted_; 153 bool is_encrypted_;
152 154
153 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler 155 // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
154 // generated copy constructor and assignment operator. Since the extra data is 156 // generated copy constructor and assignment operator. Since the extra data is
155 // typically small, the performance impact is minimal. 157 // typically small, the performance impact is minimal.
156 }; 158 };
157 159
158 } // namespace media 160 } // namespace media
159 161
160 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_ 162 #endif // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698