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

Side by Side Diff: remoting/codec/video_encoder_vpx.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 | « remoting/codec/video_decoder_vpx.cc ('k') | remoting/remoting.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 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 "remoting/codec/video_encoder_vpx.h" 5 #include "remoting/codec/video_encoder_vpx.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/sys_info.h" 9 #include "base/sys_info.h"
10 #include "remoting/base/util.h" 10 #include "remoting/base/util.h"
11 #include "remoting/proto/video.pb.h" 11 #include "remoting/proto/video.pb.h"
12 #include "third_party/libyuv/include/libyuv/convert_from_argb.h" 12 #include "third_party/libyuv/include/libyuv/convert_from_argb.h"
13 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" 13 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
14 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" 14 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
15 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h" 15 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
16 16
17 extern "C" { 17 extern "C" {
18 #define VPX_CODEC_DISABLE_COMPAT 1 18 #define VPX_CODEC_DISABLE_COMPAT 1
19 #include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" 19 #include "third_party/libvpx_new/source/libvpx/vpx/vp8cx.h"
20 #include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" 20 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_encoder.h"
21 } 21 }
22 22
23 namespace remoting { 23 namespace remoting {
24 24
25 namespace { 25 namespace {
26 26
27 // Number of bytes in an RGBx pixel. 27 // Number of bytes in an RGBx pixel.
28 const int kBytesPerRgbPixel = 4; 28 const int kBytesPerRgbPixel = 4;
29 29
30 // Defines the dimension of a macro block. This is used to compute the active 30 // Defines the dimension of a macro block. This is used to compute the active
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 kMacroBlockSize * (y + 1))); 540 kMacroBlockSize * (y + 1)));
541 } 541 }
542 x0 = x1 + 1; 542 x0 = x1 + 1;
543 } 543 }
544 } 544 }
545 updated_region->IntersectWith( 545 updated_region->IntersectWith(
546 webrtc::DesktopRect::MakeWH(image_->w, image_->h)); 546 webrtc::DesktopRect::MakeWH(image_->w, image_->h));
547 } 547 }
548 548
549 } // namespace remoting 549 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/codec/video_decoder_vpx.cc ('k') | remoting/remoting.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698