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

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

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix compile errors Created 4 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
« no previous file with comments | « media/filters/vpx_video_decoder.h ('k') | media/renderers/audio_renderer_impl.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 "media/filters/vpx_video_decoder.h" 5 #include "media/filters/vpx_video_decoder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 // Ensure CloseDecoder() released the offload thread. 368 // Ensure CloseDecoder() released the offload thread.
369 DCHECK(!offload_task_runner_); 369 DCHECK(!offload_task_runner_);
370 } 370 }
371 371
372 std::string VpxVideoDecoder::GetDisplayName() const { 372 std::string VpxVideoDecoder::GetDisplayName() const {
373 return "VpxVideoDecoder"; 373 return "VpxVideoDecoder";
374 } 374 }
375 375
376 void VpxVideoDecoder::Initialize(const VideoDecoderConfig& config, 376 void VpxVideoDecoder::Initialize(const VideoDecoderConfig& config,
377 bool /* low_delay */, 377 bool /* low_delay */,
378 const SetCdmReadyCB& /* set_cdm_ready_cb */, 378 CdmContext* /* cdm_context */,
379 const InitCB& init_cb, 379 const InitCB& init_cb,
380 const OutputCB& output_cb) { 380 const OutputCB& output_cb) {
381 DCHECK(thread_checker_.CalledOnValidThread()); 381 DCHECK(thread_checker_.CalledOnValidThread());
382 DCHECK(config.IsValidConfig()); 382 DCHECK(config.IsValidConfig());
383 383
384 InitCB bound_init_cb = BindToCurrentLoop(init_cb); 384 InitCB bound_init_cb = BindToCurrentLoop(init_cb);
385 385
386 if (config.is_encrypted() || !ConfigureDecoder(config)) { 386 if (config.is_encrypted() || !ConfigureDecoder(config)) {
387 bound_init_cb.Run(false); 387 bound_init_cb.Run(false);
388 return; 388 return;
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 (*video_frame)->visible_data(VideoFrame::kUPlane), 725 (*video_frame)->visible_data(VideoFrame::kUPlane),
726 (*video_frame)->stride(VideoFrame::kUPlane), 726 (*video_frame)->stride(VideoFrame::kUPlane),
727 (*video_frame)->visible_data(VideoFrame::kVPlane), 727 (*video_frame)->visible_data(VideoFrame::kVPlane),
728 (*video_frame)->stride(VideoFrame::kVPlane), coded_size.width(), 728 (*video_frame)->stride(VideoFrame::kVPlane), coded_size.width(),
729 coded_size.height()); 729 coded_size.height());
730 730
731 return true; 731 return true;
732 } 732 }
733 733
734 } // namespace media 734 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/vpx_video_decoder.h ('k') | media/renderers/audio_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698