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

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

Issue 547913002: MediaLog: Log selected audio/video decoder name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use property instead of log. Created 6 years, 3 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 : task_runner_(task_runner), 195 : task_runner_(task_runner),
196 state_(kUninitialized), 196 state_(kUninitialized),
197 vpx_codec_(NULL), 197 vpx_codec_(NULL),
198 vpx_codec_alpha_(NULL) {} 198 vpx_codec_alpha_(NULL) {}
199 199
200 VpxVideoDecoder::~VpxVideoDecoder() { 200 VpxVideoDecoder::~VpxVideoDecoder() {
201 DCHECK(task_runner_->BelongsToCurrentThread()); 201 DCHECK(task_runner_->BelongsToCurrentThread());
202 CloseDecoder(); 202 CloseDecoder();
203 } 203 }
204 204
205 std::string VpxVideoDecoder::GetDisplayName() const {
206 return "VpxVideoDecoder";
207 }
208
205 void VpxVideoDecoder::Initialize(const VideoDecoderConfig& config, 209 void VpxVideoDecoder::Initialize(const VideoDecoderConfig& config,
206 bool low_delay, 210 bool low_delay,
207 const PipelineStatusCB& status_cb, 211 const PipelineStatusCB& status_cb,
208 const OutputCB& output_cb) { 212 const OutputCB& output_cb) {
209 DCHECK(task_runner_->BelongsToCurrentThread()); 213 DCHECK(task_runner_->BelongsToCurrentThread());
210 DCHECK(config.IsValidConfig()); 214 DCHECK(config.IsValidConfig());
211 DCHECK(!config.is_encrypted()); 215 DCHECK(!config.is_encrypted());
212 DCHECK(decode_cb_.is_null()); 216 DCHECK(decode_cb_.is_null());
213 217
214 if (!ConfigureDecoder(config)) { 218 if (!ConfigureDecoder(config)) {
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get()); 494 vpx_image->stride[VPX_PLANE_Y], vpx_image->d_h, video_frame->get());
491 return; 495 return;
492 } 496 }
493 CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y], 497 CopyAPlane(vpx_image_alpha->planes[VPX_PLANE_Y],
494 vpx_image->stride[VPX_PLANE_Y], 498 vpx_image->stride[VPX_PLANE_Y],
495 vpx_image->d_h, 499 vpx_image->d_h,
496 video_frame->get()); 500 video_frame->get());
497 } 501 }
498 502
499 } // namespace media 503 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698