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

Side by Side Diff: media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase Created 4 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h" 5 #include "media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h"
9 #include "media/base/limits.h" 8 #include "media/base/limits.h"
10 9
11 // Include libvpx header files. 10 // Include libvpx header files.
12 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide 11 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide
13 // backwards compatibility for legacy applications using the library. 12 // backwards compatibility for legacy applications using the library.
14 #define VPX_CODEC_DISABLE_COMPAT 1 13 #define VPX_CODEC_DISABLE_COMPAT 1
15 extern "C" { 14 extern "C" {
16 // Note: vpx_decoder.h must be first or compile will fail. 15 // Note: vpx_decoder.h must be first or compile will fail.
17 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" 16 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
18 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" // NOLINT 17 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" // NOLINT
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 vpx_image_->stride[VPX_PLANE_Y]); 184 vpx_image_->stride[VPX_PLANE_Y]);
186 cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane, 185 cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane,
187 vpx_image_->stride[VPX_PLANE_U]); 186 vpx_image_->stride[VPX_PLANE_U]);
188 cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane, 187 cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane,
189 vpx_image_->stride[VPX_PLANE_V]); 188 vpx_image_->stride[VPX_PLANE_V]);
190 189
191 return true; 190 return true;
192 } 191 }
193 192
194 } // namespace media 193 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h ('k') | media/cdm/simple_cdm_allocator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698