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

Side by Side Diff: content/renderer/pepper/content_decryptor_delegate.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, 8 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
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 #include "content/renderer/pepper/content_decryptor_delegate.h" 5 #include "content/renderer/pepper/content_decryptor_delegate.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 return PP_VIDEOCODEC_VP9; 162 return PP_VIDEOCODEC_VP9;
163 default: 163 default:
164 return PP_VIDEOCODEC_UNKNOWN; 164 return PP_VIDEOCODEC_UNKNOWN;
165 } 165 }
166 } 166 }
167 167
168 PP_VideoCodecProfile MediaVideoCodecProfileToPpVideoCodecProfile( 168 PP_VideoCodecProfile MediaVideoCodecProfileToPpVideoCodecProfile(
169 media::VideoCodecProfile profile) { 169 media::VideoCodecProfile profile) {
170 switch (profile) { 170 switch (profile) {
171 case media::VP8PROFILE_ANY: 171 case media::VP8PROFILE_ANY:
172 case media::VP9PROFILE_ANY: 172 case media::VP9PROFILE_PROFILE0:
173 case media::VP9PROFILE_PROFILE1:
174 case media::VP9PROFILE_PROFILE2:
175 case media::VP9PROFILE_PROFILE3:
173 return PP_VIDEOCODECPROFILE_NOT_NEEDED; 176 return PP_VIDEOCODECPROFILE_NOT_NEEDED;
174 case media::H264PROFILE_BASELINE: 177 case media::H264PROFILE_BASELINE:
175 return PP_VIDEOCODECPROFILE_H264_BASELINE; 178 return PP_VIDEOCODECPROFILE_H264_BASELINE;
176 case media::H264PROFILE_MAIN: 179 case media::H264PROFILE_MAIN:
177 return PP_VIDEOCODECPROFILE_H264_MAIN; 180 return PP_VIDEOCODECPROFILE_H264_MAIN;
178 case media::H264PROFILE_EXTENDED: 181 case media::H264PROFILE_EXTENDED:
179 return PP_VIDEOCODECPROFILE_H264_EXTENDED; 182 return PP_VIDEOCODECPROFILE_H264_EXTENDED;
180 case media::H264PROFILE_HIGH: 183 case media::H264PROFILE_HIGH:
181 return PP_VIDEOCODECPROFILE_H264_HIGH; 184 return PP_VIDEOCODECPROFILE_H264_HIGH;
182 case media::H264PROFILE_HIGH10PROFILE: 185 case media::H264PROFILE_HIGH10PROFILE:
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1289 empty_frames); 1292 empty_frames);
1290 } 1293 }
1291 1294
1292 if (!video_decode_cb_.is_null()) 1295 if (!video_decode_cb_.is_null())
1293 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL); 1296 video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
1294 1297
1295 cdm_promise_adapter_.Clear(); 1298 cdm_promise_adapter_.Clear();
1296 } 1299 }
1297 1300
1298 } // namespace content 1301 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/media/vaapi_wrapper.cc ('k') | content/renderer/pepper/pepper_video_decoder_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698