| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "content/renderer/media/video_track_recorder.h" | 5 #include "content/renderer/media/video_track_recorder.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 "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| 11 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 12 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
| 13 #include "media/base/video_frame.h" | 13 #include "media/base/video_frame.h" |
| 14 | 14 |
| 15 extern "C" { | 15 extern "C" { |
| 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/vp8cx.h" | 19 #include "third_party/libvpx_new/source/libvpx/vpx/vp8cx.h" |
| 20 #include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" | 20 #include "third_party/libvpx_new/source/libvpx/vpx/vpx_encoder.h" |
| 21 } | 21 } |
| 22 | 22 |
| 23 using media::VideoFrame; | 23 using media::VideoFrame; |
| 24 using media::VideoFrameMetadata; | 24 using media::VideoFrameMetadata; |
| 25 | 25 |
| 26 namespace content { | 26 namespace content { |
| 27 | 27 |
| 28 namespace { | 28 namespace { |
| 29 | 29 |
| 30 const vpx_codec_flags_t kNoFlags = 0; | 30 const vpx_codec_flags_t kNoFlags = 0; |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 track_.reset(); | 339 track_.reset(); |
| 340 } | 340 } |
| 341 | 341 |
| 342 void VideoTrackRecorder::OnVideoFrameForTesting( | 342 void VideoTrackRecorder::OnVideoFrameForTesting( |
| 343 const scoped_refptr<media::VideoFrame>& frame, | 343 const scoped_refptr<media::VideoFrame>& frame, |
| 344 base::TimeTicks timestamp) { | 344 base::TimeTicks timestamp) { |
| 345 encoder_->StartFrameEncode(frame, timestamp); | 345 encoder_->StartFrameEncode(frame, timestamp); |
| 346 } | 346 } |
| 347 | 347 |
| 348 } // namespace content | 348 } // namespace content |
| OLD | NEW |