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

Side by Side Diff: content/renderer/pepper/ppb_video_decoder_impl.cc

Issue 418193003: Using PROFILE_ANY for vp8 and vp9 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 4 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 | « content/renderer/pepper/pepper_video_decoder_host.cc ('k') | media/base/video_decoder_config.h » ('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 (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/ppb_video_decoder_impl.h" 5 #include "content/renderer/pepper/ppb_video_decoder_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 case PP_VIDEODECODER_H264PROFILE_HIGH444PREDICTIVEPROFILE: 58 case PP_VIDEODECODER_H264PROFILE_HIGH444PREDICTIVEPROFILE:
59 return media::H264PROFILE_HIGH444PREDICTIVEPROFILE; 59 return media::H264PROFILE_HIGH444PREDICTIVEPROFILE;
60 case PP_VIDEODECODER_H264PROFILE_SCALABLEBASELINE: 60 case PP_VIDEODECODER_H264PROFILE_SCALABLEBASELINE:
61 return media::H264PROFILE_SCALABLEBASELINE; 61 return media::H264PROFILE_SCALABLEBASELINE;
62 case PP_VIDEODECODER_H264PROFILE_SCALABLEHIGH: 62 case PP_VIDEODECODER_H264PROFILE_SCALABLEHIGH:
63 return media::H264PROFILE_SCALABLEHIGH; 63 return media::H264PROFILE_SCALABLEHIGH;
64 case PP_VIDEODECODER_H264PROFILE_STEREOHIGH: 64 case PP_VIDEODECODER_H264PROFILE_STEREOHIGH:
65 return media::H264PROFILE_STEREOHIGH; 65 return media::H264PROFILE_STEREOHIGH;
66 case PP_VIDEODECODER_H264PROFILE_MULTIVIEWHIGH: 66 case PP_VIDEODECODER_H264PROFILE_MULTIVIEWHIGH:
67 return media::H264PROFILE_MULTIVIEWHIGH; 67 return media::H264PROFILE_MULTIVIEWHIGH;
68 case PP_VIDEODECODER_VP8PROFILE_MAIN: 68 case PP_VIDEODECODER_VP8PROFILE_ANY:
69 return media::VP8PROFILE_MAIN; 69 return media::VP8PROFILE_ANY;
70 default: 70 default:
71 return media::VIDEO_CODEC_PROFILE_UNKNOWN; 71 return media::VIDEO_CODEC_PROFILE_UNKNOWN;
72 } 72 }
73 } 73 }
74 74
75 PP_VideoDecodeError_Dev MediaToPPError( 75 PP_VideoDecodeError_Dev MediaToPPError(
76 media::VideoDecodeAccelerator::Error error) { 76 media::VideoDecodeAccelerator::Error error) {
77 switch (error) { 77 switch (error) {
78 case media::VideoDecodeAccelerator::ILLEGAL_STATE: 78 case media::VideoDecodeAccelerator::ILLEGAL_STATE:
79 return PP_VIDEODECODERERROR_ILLEGAL_STATE; 79 return PP_VIDEODECODERERROR_ILLEGAL_STATE;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 DCHECK(RenderThreadImpl::current()); 287 DCHECK(RenderThreadImpl::current());
288 RunBitstreamBufferCallback(bitstream_buffer_id, PP_OK); 288 RunBitstreamBufferCallback(bitstream_buffer_id, PP_OK);
289 } 289 }
290 290
291 void PPB_VideoDecoder_Impl::NotifyFlushDone() { 291 void PPB_VideoDecoder_Impl::NotifyFlushDone() {
292 DCHECK(RenderThreadImpl::current()); 292 DCHECK(RenderThreadImpl::current());
293 RunFlushCallback(PP_OK); 293 RunFlushCallback(PP_OK);
294 } 294 }
295 295
296 } // namespace content 296 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_video_decoder_host.cc ('k') | media/base/video_decoder_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698