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

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

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update include order and rebase Created 5 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
« no previous file with comments | « media/cast/sender/vp8_encoder.cc ('k') | media/filters/vpx_video_decoder.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 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" 8 #include "base/memory/scoped_ptr.h"
9 #include "media/base/limits.h" 9 #include "media/base/limits.h"
10 10
11 // Include libvpx header files. 11 // Include libvpx header files.
12 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide 12 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide
13 // backwards compatibility for legacy applications using the library. 13 // backwards compatibility for legacy applications using the library.
14 #define VPX_CODEC_DISABLE_COMPAT 1 14 #define VPX_CODEC_DISABLE_COMPAT 1
15 extern "C" { 15 extern "C" {
16 // Note: vpx_decoder.h must be first or compile will fail. 16 // Note: vpx_decoder.h must be first or compile will fail.
17 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" 17 #include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h"
18 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" // NOLINT 18 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h" // NOLINT
19 } 19 }
20 20
21 // Enable USE_COPYPLANE_WITH_LIBVPX to use |CopyPlane()| instead of memcpy to 21 // Enable USE_COPYPLANE_WITH_LIBVPX to use |CopyPlane()| instead of memcpy to
22 // copy video frame data. 22 // copy video frame data.
23 // #define USE_COPYPLANE_WITH_LIBVPX 1 23 // #define USE_COPYPLANE_WITH_LIBVPX 1
24 24
25 namespace media { 25 namespace media {
26 26
27 static const int kDecodeThreads = 2; 27 static const int kDecodeThreads = 2;
28 28
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 vpx_image_->stride[VPX_PLANE_Y]); 185 vpx_image_->stride[VPX_PLANE_Y]);
186 cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane, 186 cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane,
187 vpx_image_->stride[VPX_PLANE_U]); 187 vpx_image_->stride[VPX_PLANE_U]);
188 cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane, 188 cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane,
189 vpx_image_->stride[VPX_PLANE_V]); 189 vpx_image_->stride[VPX_PLANE_V]);
190 190
191 return true; 191 return true;
192 } 192 }
193 193
194 } // namespace media 194 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/vp8_encoder.cc ('k') | media/filters/vpx_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698