| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/base/decoder_vp8.h" | 5 #include "remoting/base/decoder_vp8.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | |
| 8 #include "media/base/media.h" | 7 #include "media/base/media.h" |
| 9 #include "media/base/yuv_convert.h" | 8 #include "media/base/yuv_convert.h" |
| 10 #include "remoting/base/util.h" | 9 #include "remoting/base/util.h" |
| 11 | 10 |
| 12 extern "C" { | 11 extern "C" { |
| 13 #define VPX_CODEC_DISABLE_COMPAT 1 | 12 #define VPX_CODEC_DISABLE_COMPAT 1 |
| 14 #include "third_party/libvpx/include/vpx/vpx_codec.h" | 13 #include "third_party/libvpx/include/vpx/vpx_codec.h" |
| 15 #include "third_party/libvpx/include/vpx/vpx_decoder.h" | 14 #include "third_party/libvpx/include/vpx/vpx_decoder.h" |
| 16 #include "third_party/libvpx/include/vpx/vp8dx.h" | 15 #include "third_party/libvpx/include/vpx/vp8dx.h" |
| 17 } | 16 } |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 | 101 |
| 103 bool DecoderVp8::IsReadyForData() { | 102 bool DecoderVp8::IsReadyForData() { |
| 104 return state_ == kReady; | 103 return state_ == kReady; |
| 105 } | 104 } |
| 106 | 105 |
| 107 VideoPacketFormat::Encoding DecoderVp8::Encoding() { | 106 VideoPacketFormat::Encoding DecoderVp8::Encoding() { |
| 108 return VideoPacketFormat::ENCODING_VP8; | 107 return VideoPacketFormat::ENCODING_VP8; |
| 109 } | 108 } |
| 110 | 109 |
| 111 } // namespace remoting | 110 } // namespace remoting |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 5270010:
Revert 67662 - FBTF: Remove unneeded headers from base/ (part 10)... (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/