| OLD | NEW |
| 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/scoped_vpx_codec.h" | 5 #include "remoting/codec/scoped_vpx_codec.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 | 8 |
| 9 extern "C" { | 9 extern "C" { |
| 10 #define VPX_CODEC_DISABLE_COMPAT 1 | 10 #define VPX_CODEC_DISABLE_COMPAT 1 |
| 11 #include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" | 11 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_codec.h" |
| 12 } | 12 } |
| 13 namespace remoting { | 13 namespace remoting { |
| 14 | 14 |
| 15 void VpxCodecDeleter::operator()(vpx_codec_ctx_t* codec) { | 15 void VpxCodecDeleter::operator()(vpx_codec_ctx_t* codec) { |
| 16 if (codec) { | 16 if (codec) { |
| 17 vpx_codec_err_t ret = vpx_codec_destroy(codec); | 17 vpx_codec_err_t ret = vpx_codec_destroy(codec); |
| 18 CHECK_EQ(ret, VPX_CODEC_OK) << "Failed to destroy codec"; | 18 CHECK_EQ(ret, VPX_CODEC_OK) << "Failed to destroy codec"; |
| 19 delete codec; | 19 delete codec; |
| 20 } | 20 } |
| 21 } | 21 } |
| 22 | 22 |
| 23 } // namespace remoting | 23 } // namespace remoting |
| OLD | NEW |