| OLD | NEW |
|---|
| 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/sender/video_encoder.h" | 5 #include "media/cast/sender/video_encoder.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" |
| 7 #include "media/cast/sender/external_video_encoder.h" | 8 #include "media/cast/sender/external_video_encoder.h" |
| 8 #include "media/cast/sender/video_encoder_impl.h" | 9 #include "media/cast/sender/video_encoder_impl.h" |
| 9 | 10 |
| 10 #if defined(OS_MACOSX) | 11 #if defined(OS_MACOSX) |
| 11 #include "media/cast/sender/h264_vt_encoder.h" | 12 #include "media/cast/sender/h264_vt_encoder.h" |
| 12 #endif | 13 #endif |
| 13 | 14 |
| 14 namespace media { | 15 namespace media { |
| 15 namespace cast { | 16 namespace cast { |
| 16 | 17 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 58 |
| 58 scoped_ptr<VideoFrameFactory> VideoEncoder::CreateVideoFrameFactory() { | 59 scoped_ptr<VideoFrameFactory> VideoEncoder::CreateVideoFrameFactory() { |
| 59 return nullptr; | 60 return nullptr; |
| 60 } | 61 } |
| 61 | 62 |
| 62 void VideoEncoder::EmitFrames() { | 63 void VideoEncoder::EmitFrames() { |
| 63 } | 64 } |
| 64 | 65 |
| 65 } // namespace cast | 66 } // namespace cast |
| 66 } // namespace media | 67 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master