| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/modules/video_coding/generic_encoder.h" | 11 #include "webrtc/modules/video_coding/generic_encoder.h" |
| 12 | 12 |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "webrtc/api/video/i420_buffer.h" |
| 15 #include "webrtc/base/checks.h" | 16 #include "webrtc/base/checks.h" |
| 16 #include "webrtc/base/logging.h" | 17 #include "webrtc/base/logging.h" |
| 17 #include "webrtc/base/trace_event.h" | 18 #include "webrtc/base/trace_event.h" |
| 18 #include "webrtc/modules/video_coding/encoded_frame.h" | 19 #include "webrtc/modules/video_coding/encoded_frame.h" |
| 19 #include "webrtc/modules/video_coding/media_optimization.h" | 20 #include "webrtc/modules/video_coding/media_optimization.h" |
| 20 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 21 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
| 21 | 22 |
| 22 namespace webrtc { | 23 namespace webrtc { |
| 23 | 24 |
| 24 VCMGenericEncoder::VCMGenericEncoder( | 25 VCMGenericEncoder::VCMGenericEncoder( |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 media_opt_->UpdateWithEncodedData(encoded_image); | 167 media_opt_->UpdateWithEncodedData(encoded_image); |
| 167 if (internal_source_) { | 168 if (internal_source_) { |
| 168 // Signal to encoder to drop next frame. | 169 // Signal to encoder to drop next frame. |
| 169 result.drop_next_frame = media_opt_->DropFrame(); | 170 result.drop_next_frame = media_opt_->DropFrame(); |
| 170 } | 171 } |
| 171 } | 172 } |
| 172 return result; | 173 return result; |
| 173 } | 174 } |
| 174 | 175 |
| 175 } // namespace webrtc | 176 } // namespace webrtc |
| OLD | NEW |