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

Side by Side Diff: media/filters/ffmpeg_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/ffmpeg_video_decoder.h ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('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/ffmpeg_video_decoder.h" 5 #include "media/filters/ffmpeg_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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 0); 164 0);
165 return 0; 165 return 0;
166 } 166 }
167 167
168 std::string FFmpegVideoDecoder::GetDisplayName() const { 168 std::string FFmpegVideoDecoder::GetDisplayName() const {
169 return "FFmpegVideoDecoder"; 169 return "FFmpegVideoDecoder";
170 } 170 }
171 171
172 void FFmpegVideoDecoder::Initialize(const VideoDecoderConfig& config, 172 void FFmpegVideoDecoder::Initialize(const VideoDecoderConfig& config,
173 bool low_delay, 173 bool low_delay,
174 const SetCdmReadyCB& /* set_cdm_ready_cb */, 174 CdmContext* /* cdm_context */,
175 const InitCB& init_cb, 175 const InitCB& init_cb,
176 const OutputCB& output_cb) { 176 const OutputCB& output_cb) {
177 DCHECK(thread_checker_.CalledOnValidThread()); 177 DCHECK(thread_checker_.CalledOnValidThread());
178 DCHECK(config.IsValidConfig()); 178 DCHECK(config.IsValidConfig());
179 DCHECK(!output_cb.is_null()); 179 DCHECK(!output_cb.is_null());
180 180
181 InitCB bound_init_cb = BindToCurrentLoop(init_cb); 181 InitCB bound_init_cb = BindToCurrentLoop(init_cb);
182 182
183 if (config.is_encrypted()) { 183 if (config.is_encrypted()) {
184 bound_init_cb.Run(false); 184 bound_init_cb.Run(false);
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) { 375 if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
376 ReleaseFFmpegResources(); 376 ReleaseFFmpegResources();
377 return false; 377 return false;
378 } 378 }
379 379
380 av_frame_.reset(av_frame_alloc()); 380 av_frame_.reset(av_frame_alloc());
381 return true; 381 return true;
382 } 382 }
383 383
384 } // namespace media 384 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_video_decoder.h ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698