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

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

Issue 1734613003: Move libvpx_new to libvpx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc ('k') | media/media.gyp » ('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/vpx_video_decoder.h" 5 #include "media/filters/vpx_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 21 matching lines...) Expand all
32 #include "base/trace_event/trace_event.h" 32 #include "base/trace_event/trace_event.h"
33 #include "media/base/bind_to_current_loop.h" 33 #include "media/base/bind_to_current_loop.h"
34 #include "media/base/decoder_buffer.h" 34 #include "media/base/decoder_buffer.h"
35 #include "media/base/media_switches.h" 35 #include "media/base/media_switches.h"
36 36
37 // Include libvpx header files. 37 // Include libvpx header files.
38 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide 38 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide
39 // backwards compatibility for legacy applications using the library. 39 // backwards compatibility for legacy applications using the library.
40 #define VPX_CODEC_DISABLE_COMPAT 1 40 #define VPX_CODEC_DISABLE_COMPAT 1
41 extern "C" { 41 extern "C" {
42 #include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h" 42 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
43 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h" 43 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
44 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_frame_buffer.h" 44 #include "third_party/libvpx/source/libvpx/vpx/vpx_frame_buffer.h"
45 } 45 }
46 46
47 #include "third_party/libyuv/include/libyuv/convert.h" 47 #include "third_party/libyuv/include/libyuv/convert.h"
48 48
49 namespace media { 49 namespace media {
50 50
51 // High resolution VP9 decodes can block the main task runner for too long, 51 // High resolution VP9 decodes can block the main task runner for too long,
52 // preventing demuxing, audio decoding, and other control activities. In those 52 // preventing demuxing, audio decoding, and other control activities. In those
53 // cases share a thread per process for higher resolution decodes. 53 // cases share a thread per process for higher resolution decodes.
54 // 54 //
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 (*video_frame)->visible_data(VideoFrame::kUPlane), 725 (*video_frame)->visible_data(VideoFrame::kUPlane),
726 (*video_frame)->stride(VideoFrame::kUPlane), 726 (*video_frame)->stride(VideoFrame::kUPlane),
727 (*video_frame)->visible_data(VideoFrame::kVPlane), 727 (*video_frame)->visible_data(VideoFrame::kVPlane),
728 (*video_frame)->stride(VideoFrame::kVPlane), coded_size.width(), 728 (*video_frame)->stride(VideoFrame::kVPlane), coded_size.width(),
729 coded_size.height()); 729 coded_size.height());
730 730
731 return true; 731 return true;
732 } 732 }
733 733
734 } // namespace media 734 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698