OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 input_image.video_frame_buffer()->StrideV(), | 318 input_image.video_frame_buffer()->StrideV(), |
319 src_width, src_height, | 319 src_width, src_height, |
320 dst_buffer->MutableDataY(), dst_buffer->StrideY(), | 320 dst_buffer->MutableDataY(), dst_buffer->StrideY(), |
321 dst_buffer->MutableDataU(), dst_buffer->StrideU(), | 321 dst_buffer->MutableDataU(), dst_buffer->StrideU(), |
322 dst_buffer->MutableDataV(), dst_buffer->StrideV(), | 322 dst_buffer->MutableDataV(), dst_buffer->StrideV(), |
323 dst_width, dst_height, | 323 dst_width, dst_height, |
324 libyuv::kFilterBilinear); | 324 libyuv::kFilterBilinear); |
325 | 325 |
326 int ret = streaminfos_[stream_idx].encoder->Encode( | 326 int ret = streaminfos_[stream_idx].encoder->Encode( |
327 VideoFrame(dst_buffer, input_image.timestamp(), | 327 VideoFrame(dst_buffer, input_image.timestamp(), |
328 input_image.render_time_ms(), webrtc::kVideoRotation_0), | 328 input_image.render_time_ms(), webrtc::kVideoRotation_0, |
| 329 webrtc::VideoContentType::kDefault), |
329 codec_specific_info, &stream_frame_types); | 330 codec_specific_info, &stream_frame_types); |
330 if (ret != WEBRTC_VIDEO_CODEC_OK) { | 331 if (ret != WEBRTC_VIDEO_CODEC_OK) { |
331 return ret; | 332 return ret; |
332 } | 333 } |
333 } | 334 } |
334 } | 335 } |
335 | 336 |
336 return WEBRTC_VIDEO_CODEC_OK; | 337 return WEBRTC_VIDEO_CODEC_OK; |
337 } | 338 } |
338 | 339 |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 if (!Initialized() || NumberOfStreams(codec_) != 1) | 469 if (!Initialized() || NumberOfStreams(codec_) != 1) |
469 return VideoEncoder::ScalingSettings(false); | 470 return VideoEncoder::ScalingSettings(false); |
470 return streaminfos_[0].encoder->GetScalingSettings(); | 471 return streaminfos_[0].encoder->GetScalingSettings(); |
471 } | 472 } |
472 | 473 |
473 const char* SimulcastEncoderAdapter::ImplementationName() const { | 474 const char* SimulcastEncoderAdapter::ImplementationName() const { |
474 return implementation_name_.c_str(); | 475 return implementation_name_.c_str(); |
475 } | 476 } |
476 | 477 |
477 } // namespace webrtc | 478 } // namespace webrtc |
OLD | NEW |