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

Side by Side Diff: webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.cc

Issue 11791006: Roll speex, flac, libvpx DEPS to get shim header changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « remoting/codec/video_encoder_vp8.cc ('k') | no next file » | 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 "webkit/media/crypto/ppapi/libvpx_cdm_video_decoder.h" 5 #include "webkit/media/crypto/ppapi/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/buffers.h" 9 #include "media/base/buffers.h"
10 #include "media/base/limits.h" 10 #include "media/base/limits.h"
11 11
12 // Include libvpx header files. 12 // Include libvpx header files.
13 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide 13 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide
14 // backwards compatibility for legacy applications using the library. 14 // backwards compatibility for legacy applications using the library.
15 #define VPX_CODEC_DISABLE_COMPAT 1 15 #define VPX_CODEC_DISABLE_COMPAT 1
16 extern "C" { 16 extern "C" {
17 #include "third_party/libvpx/libvpx.h" 17 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
18 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
18 } 19 }
19 20
20 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h" 21 #include "webkit/media/crypto/ppapi/cdm/content_decryption_module.h"
21 22
22 // Enable USE_COPYPLANE_WITH_LIBVPX to use |CopyPlane()| instead of memcpy to 23 // Enable USE_COPYPLANE_WITH_LIBVPX to use |CopyPlane()| instead of memcpy to
23 // copy video frame data. 24 // copy video frame data.
24 // #define USE_COPYPLANE_WITH_LIBVPX 1 25 // #define USE_COPYPLANE_WITH_LIBVPX 1
25 26
26 namespace webkit_media { 27 namespace webkit_media {
27 28
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane, 260 cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane,
260 vpx_image_->stride[VPX_PLANE_U]); 261 vpx_image_->stride[VPX_PLANE_U]);
261 cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane, 262 cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane,
262 vpx_image_->stride[VPX_PLANE_V]); 263 vpx_image_->stride[VPX_PLANE_V]);
263 #endif // USE_COPYPLANE_WITH_LIBVPX 264 #endif // USE_COPYPLANE_WITH_LIBVPX
264 265
265 return true; 266 return true;
266 } 267 }
267 268
268 } // namespace webkit_media 269 } // namespace webkit_media
OLDNEW
« no previous file with comments | « remoting/codec/video_encoder_vp8.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698