Index: media/base/video_codecs.h |
diff --git a/media/base/video_codecs.h b/media/base/video_codecs.h |
index 188b5449f7906ccb5485122ef6f75563ddde4c0b..33e234d07b97aaabe8cd8e4eaaec8883d36d5eee 100644 |
--- a/media/base/video_codecs.h |
+++ b/media/base/video_codecs.h |
@@ -8,6 +8,7 @@ |
#include <stdint.h> |
#include <string> |
#include "media/base/media_export.h" |
+#include "media/media_features.h" |
namespace media { |
@@ -54,10 +55,15 @@ enum VideoCodecProfile { |
H264PROFILE_STEREOHIGH = 9, |
H264PROFILE_MULTIVIEWHIGH = 10, |
H264PROFILE_MAX = H264PROFILE_MULTIVIEWHIGH, |
- VP8PROFILE_MIN = 11, |
+ HEVCPROFILE_MAIN, |
ddorwin
2016/02/18 17:30:02
All other codecs follow this format:
MIN
FOO=MIN
B
servolk
2016/02/18 19:16:20
Done (I've also removed unnecessary explicit assig
ddorwin
2016/02/18 21:52:22
+dalecurtis to confirm there are not any problems
DaleCurtis
2016/02/18 22:04:55
You can't do this since these are logged to UMA, t
ddorwin
2016/02/18 22:21:41
Ahh, thanks. I checked one of the other enums for
servolk
2016/02/18 22:28:51
Ok, I'll move the HEVC profiles after VP8/VP9, but
DaleCurtis
2016/02/19 23:15:17
Doesn't really matter if we're sure or not; these
servolk
2016/02/19 23:47:55
Done (I've also restored the explicit value number
servolk
2016/02/19 23:57:31
Btw, I've also just noticed that there's a mismatc
|
+ HEVCPROFILE_MIN = HEVCPROFILE_MAIN, |
+ HEVCPROFILE_MAIN10, |
+ HEVCPROFILE_MAIN_STILL_PICTURE, |
ddorwin
2016/02/18 17:30:02
This is just an image right? Do you have plans to
servolk
2016/02/18 19:16:20
Yes, this is a single video frame, i.e. essentiall
|
+ HEVCPROFILE_MAX = HEVCPROFILE_MAIN_STILL_PICTURE, |
+ VP8PROFILE_MIN, |
VP8PROFILE_ANY = VP8PROFILE_MIN, |
VP8PROFILE_MAX = VP8PROFILE_ANY, |
- VP9PROFILE_MIN = 12, |
+ VP9PROFILE_MIN, |
VP9PROFILE_ANY = VP9PROFILE_MIN, |
VP9PROFILE_MAX = VP9PROFILE_ANY, |
VIDEO_CODEC_PROFILE_MAX = VP9PROFILE_MAX, |
@@ -71,6 +77,12 @@ MEDIA_EXPORT bool ParseAVCCodecId(const std::string& codec_id, |
VideoCodecProfile* profile, |
uint8_t* level_idc); |
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING) |
+MEDIA_EXPORT bool ParseHEVCCodecId(const std::string& codec_id, |
ddorwin
2016/02/18 17:30:03
Why have these been moved from mime_util and expos
servolk
2016/02/18 19:16:20
I've exposed them as media_export to make them acc
ddorwin
2016/02/18 21:52:22
I'd like to understand more about that usage - not
servolk
2016/02/18 22:28:51
Sure, we can probably move that discussion to a se
|
+ VideoCodecProfile* profile, |
+ uint8_t* level_idc); |
+#endif |
+ |
} // namespace media |
#endif // MEDIA_BASE_VIDEO_CODECS_H_ |