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

Side by Side Diff: media/filters/vpx_video_decoder.cc

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 "media/filters/vpx_video_decoder.h" 5 #include "media/filters/vpx_video_decoder.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 200
201 VpxVideoDecoder::~VpxVideoDecoder() { 201 VpxVideoDecoder::~VpxVideoDecoder() {
202 DCHECK(task_runner_->BelongsToCurrentThread()); 202 DCHECK(task_runner_->BelongsToCurrentThread());
203 CloseDecoder(); 203 CloseDecoder();
204 } 204 }
205 205
206 std::string VpxVideoDecoder::GetDisplayName() const { 206 std::string VpxVideoDecoder::GetDisplayName() const {
207 return "VpxVideoDecoder"; 207 return "VpxVideoDecoder";
208 } 208 }
209 209
210 void VpxVideoDecoder::Initialize(const VideoDecoderConfig& config, 210 void VpxVideoDecoder::Initialize(
211 bool low_delay, 211 const VideoDecoderConfig& config,
212 const PipelineStatusCB& status_cb, 212 bool /* low_delay */,
213 const OutputCB& output_cb) { 213 const PipelineStatusCB& status_cb,
214 const OutputCB& output_cb,
215 const base::Closure& /* waiting_for_encryption_key_cb */) {
214 DCHECK(task_runner_->BelongsToCurrentThread()); 216 DCHECK(task_runner_->BelongsToCurrentThread());
215 DCHECK(config.IsValidConfig()); 217 DCHECK(config.IsValidConfig());
216 DCHECK(!config.is_encrypted()); 218 DCHECK(!config.is_encrypted());
217 DCHECK(decode_cb_.is_null()); 219 DCHECK(decode_cb_.is_null());
218 220
219 if (!ConfigureDecoder(config)) { 221 if (!ConfigureDecoder(config)) {
220 status_cb.Run(DECODER_ERROR_NOT_SUPPORTED); 222 status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
221 return; 223 return;
222 } 224 }
223 225
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get()); 513 vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get());
512 return; 514 return;
513 } 515 }
514 CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y], 516 CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y],
515 vpx_image_alpha->stride[VPX_PLANE_Y], 517 vpx_image_alpha->stride[VPX_PLANE_Y],
516 vpx_image_alpha->d_h, 518 vpx_image_alpha->d_h,
517 video_frame->get()); 519 video_frame->get());
518 } 520 }
519 521
520 } // namespace media 522 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698