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

Unified Diff: media/cdm/cdm_adapter.cc

Issue 1769593002: Add 4 VP9 profiles to the media::VideoCodecProfile enum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hevc-codec-7
Patch Set: Added some comments and dchecks Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/video_decoder_config.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/cdm_adapter.cc
diff --git a/media/cdm/cdm_adapter.cc b/media/cdm/cdm_adapter.cc
index a25e7f99304a0de5063449686e58bd1b5225e812..91e598c113e2294884cc2f5afc3ddc4477484a1f 100644
--- a/media/cdm/cdm_adapter.cc
+++ b/media/cdm/cdm_adapter.cc
@@ -153,7 +153,14 @@ cdm::VideoDecoderConfig::VideoCodecProfile ToCdmVideoCodecProfile(
VideoCodecProfile profile) {
switch (profile) {
case VP8PROFILE_ANY:
- case VP9PROFILE_ANY:
+ // TODO(servolk): See crbug.com/592074. We'll need to update this code to
+ // handle different VP9 profiles properly after adding VP9 profiles in
+ // media/cdm/api/content_decryption_module.h in a separate CL.
+ // For now return kProfileNotNeeded to avoid breaking unit tests.
+ case VP9PROFILE_PROFILE0:
+ case VP9PROFILE_PROFILE1:
+ case VP9PROFILE_PROFILE2:
+ case VP9PROFILE_PROFILE3:
return cdm::VideoDecoderConfig::kProfileNotNeeded;
case H264PROFILE_BASELINE:
return cdm::VideoDecoderConfig::kH264ProfileBaseline;
« no previous file with comments | « media/base/video_decoder_config.cc ('k') | media/ffmpeg/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698