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

Side by Side Diff: media/cast/receiver/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/cast.gyp ('k') | media/cast/sender/vp8_encoder.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/cast/receiver/video_decoder.h" 5 #include "media/cast/receiver/video_decoder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "media/base/video_util.h" 13 #include "media/base/video_util.h"
14 #include "media/cast/cast_defines.h" 14 #include "media/cast/cast_defines.h"
15 #include "media/cast/cast_environment.h" 15 #include "media/cast/cast_environment.h"
16 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide 16 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide
17 // backwards compatibility for legacy applications using the library. 17 // backwards compatibility for legacy applications using the library.
18 #define VPX_CODEC_DISABLE_COMPAT 1 18 #define VPX_CODEC_DISABLE_COMPAT 1
19 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" 19 #include "third_party/libvpx_new/source/libvpx/vpx/vp8dx.h"
20 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" 20 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_decoder.h"
21 #include "ui/gfx/geometry/size.h" 21 #include "ui/gfx/geometry/size.h"
22 22
23 namespace media { 23 namespace media {
24 namespace cast { 24 namespace cast {
25 25
26 // Base class that handles the common problem of detecting dropped frames, and 26 // Base class that handles the common problem of detecting dropped frames, and
27 // then invoking the Decode() method implemented by the subclasses to convert 27 // then invoking the Decode() method implemented by the subclasses to convert
28 // the encoded payload data into a usable video frame. 28 // the encoded payload data into a usable video frame.
29 class VideoDecoder::ImplBase 29 class VideoDecoder::ImplBase
30 : public base::RefCountedThreadSafe<VideoDecoder::ImplBase> { 30 : public base::RefCountedThreadSafe<VideoDecoder::ImplBase> {
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 cast_environment_->PostTask(CastEnvironment::VIDEO, 251 cast_environment_->PostTask(CastEnvironment::VIDEO,
252 FROM_HERE, 252 FROM_HERE,
253 base::Bind(&VideoDecoder::ImplBase::DecodeFrame, 253 base::Bind(&VideoDecoder::ImplBase::DecodeFrame,
254 impl_, 254 impl_,
255 base::Passed(&encoded_frame), 255 base::Passed(&encoded_frame),
256 callback)); 256 callback));
257 } 257 }
258 258
259 } // namespace cast 259 } // namespace cast
260 } // namespace media 260 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/cast.gyp ('k') | media/cast/sender/vp8_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698