Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Side by Side Diff: webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc

Issue 2911193002: Implement timing frames. (Closed)
Patch Set: Fixing tests pass 3 Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 new webrtc::EncodedImage(payload, payload_size, payload_size)); 1045 new webrtc::EncodedImage(payload, payload_size, payload_size));
1046 image->_encodedWidth = width_; 1046 image->_encodedWidth = width_;
1047 image->_encodedHeight = height_; 1047 image->_encodedHeight = height_;
1048 image->_timeStamp = output_timestamp_; 1048 image->_timeStamp = output_timestamp_;
1049 image->capture_time_ms_ = output_render_time_ms_; 1049 image->capture_time_ms_ = output_render_time_ms_;
1050 image->rotation_ = output_rotation_; 1050 image->rotation_ = output_rotation_;
1051 image->content_type_ = 1051 image->content_type_ =
1052 (codec_mode_ == webrtc::VideoCodecMode::kScreensharing) 1052 (codec_mode_ == webrtc::VideoCodecMode::kScreensharing)
1053 ? webrtc::VideoContentType::SCREENSHARE 1053 ? webrtc::VideoContentType::SCREENSHARE
1054 : webrtc::VideoContentType::UNSPECIFIED; 1054 : webrtc::VideoContentType::UNSPECIFIED;
1055 image->timing_.is_timing_frame = false;
1055 image->_frameType = 1056 image->_frameType =
1056 (key_frame ? webrtc::kVideoFrameKey : webrtc::kVideoFrameDelta); 1057 (key_frame ? webrtc::kVideoFrameKey : webrtc::kVideoFrameDelta);
1057 image->_completeFrame = true; 1058 image->_completeFrame = true;
1058 webrtc::CodecSpecificInfo info; 1059 webrtc::CodecSpecificInfo info;
1059 memset(&info, 0, sizeof(info)); 1060 memset(&info, 0, sizeof(info));
1060 info.codecType = codec_type; 1061 info.codecType = codec_type;
1061 if (codec_type == kVideoCodecVP8) { 1062 if (codec_type == kVideoCodecVP8) {
1062 info.codecSpecific.VP8.pictureId = picture_id_; 1063 info.codecSpecific.VP8.pictureId = picture_id_;
1063 info.codecSpecific.VP8.nonReference = false; 1064 info.codecSpecific.VP8.nonReference = false;
1064 info.codecSpecific.VP8.simulcastIdx = 0; 1065 info.codecSpecific.VP8.simulcastIdx = 0;
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 } 1361 }
1361 } 1362 }
1362 1363
1363 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder( 1364 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(
1364 webrtc::VideoEncoder* encoder) { 1365 webrtc::VideoEncoder* encoder) {
1365 ALOGD << "Destroy video encoder."; 1366 ALOGD << "Destroy video encoder.";
1366 delete encoder; 1367 delete encoder;
1367 } 1368 }
1368 1369
1369 } // namespace webrtc_jni 1370 } // namespace webrtc_jni
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698