OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 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 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1041 new webrtc::EncodedImage(payload, payload_size, payload_size)); | 1041 new webrtc::EncodedImage(payload, payload_size, payload_size)); |
1042 image->_encodedWidth = width_; | 1042 image->_encodedWidth = width_; |
1043 image->_encodedHeight = height_; | 1043 image->_encodedHeight = height_; |
1044 image->_timeStamp = output_timestamp_; | 1044 image->_timeStamp = output_timestamp_; |
1045 image->capture_time_ms_ = output_render_time_ms_; | 1045 image->capture_time_ms_ = output_render_time_ms_; |
1046 image->rotation_ = output_rotation_; | 1046 image->rotation_ = output_rotation_; |
1047 image->content_type_ = | 1047 image->content_type_ = |
1048 (codec_mode_ == webrtc::VideoCodecMode::kScreensharing) | 1048 (codec_mode_ == webrtc::VideoCodecMode::kScreensharing) |
1049 ? webrtc::VideoContentType::SCREENSHARE | 1049 ? webrtc::VideoContentType::SCREENSHARE |
1050 : webrtc::VideoContentType::UNSPECIFIED; | 1050 : webrtc::VideoContentType::UNSPECIFIED; |
| 1051 image->timing_.is_timing_frame = false; |
1051 image->_frameType = | 1052 image->_frameType = |
1052 (key_frame ? webrtc::kVideoFrameKey : webrtc::kVideoFrameDelta); | 1053 (key_frame ? webrtc::kVideoFrameKey : webrtc::kVideoFrameDelta); |
1053 image->_completeFrame = true; | 1054 image->_completeFrame = true; |
1054 webrtc::CodecSpecificInfo info; | 1055 webrtc::CodecSpecificInfo info; |
1055 memset(&info, 0, sizeof(info)); | 1056 memset(&info, 0, sizeof(info)); |
1056 info.codecType = codec_type; | 1057 info.codecType = codec_type; |
1057 if (codec_type == kVideoCodecVP8) { | 1058 if (codec_type == kVideoCodecVP8) { |
1058 info.codecSpecific.VP8.pictureId = picture_id_; | 1059 info.codecSpecific.VP8.pictureId = picture_id_; |
1059 info.codecSpecific.VP8.nonReference = false; | 1060 info.codecSpecific.VP8.nonReference = false; |
1060 info.codecSpecific.VP8.simulcastIdx = 0; | 1061 info.codecSpecific.VP8.simulcastIdx = 0; |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1356 } | 1357 } |
1357 } | 1358 } |
1358 | 1359 |
1359 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder( | 1360 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder( |
1360 webrtc::VideoEncoder* encoder) { | 1361 webrtc::VideoEncoder* encoder) { |
1361 ALOGD << "Destroy video encoder."; | 1362 ALOGD << "Destroy video encoder."; |
1362 delete encoder; | 1363 delete encoder; |
1363 } | 1364 } |
1364 | 1365 |
1365 } // namespace webrtc_jni | 1366 } // namespace webrtc_jni |
OLD | NEW |