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

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

Issue 2995953002: Revert of Add a flags field to video timing extension. (Closed)
Patch Set: Created 3 years, 4 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 1144 matching lines...) Expand 10 before | Expand all | Expand 10 after
1155 new webrtc::EncodedImage(payload, payload_size, payload_size)); 1155 new webrtc::EncodedImage(payload, payload_size, payload_size));
1156 image->_encodedWidth = width_; 1156 image->_encodedWidth = width_;
1157 image->_encodedHeight = height_; 1157 image->_encodedHeight = height_;
1158 image->_timeStamp = output_timestamp_; 1158 image->_timeStamp = output_timestamp_;
1159 image->capture_time_ms_ = output_render_time_ms_; 1159 image->capture_time_ms_ = output_render_time_ms_;
1160 image->rotation_ = output_rotation_; 1160 image->rotation_ = output_rotation_;
1161 image->content_type_ = 1161 image->content_type_ =
1162 (codec_mode_ == webrtc::VideoCodecMode::kScreensharing) 1162 (codec_mode_ == webrtc::VideoCodecMode::kScreensharing)
1163 ? webrtc::VideoContentType::SCREENSHARE 1163 ? webrtc::VideoContentType::SCREENSHARE
1164 : webrtc::VideoContentType::UNSPECIFIED; 1164 : webrtc::VideoContentType::UNSPECIFIED;
1165 image->timing_.flags = webrtc::TimingFrameFlags::kInvalid; 1165 image->timing_.is_timing_frame = false;
1166 image->_frameType = 1166 image->_frameType =
1167 (key_frame ? webrtc::kVideoFrameKey : webrtc::kVideoFrameDelta); 1167 (key_frame ? webrtc::kVideoFrameKey : webrtc::kVideoFrameDelta);
1168 image->_completeFrame = true; 1168 image->_completeFrame = true;
1169 webrtc::CodecSpecificInfo info; 1169 webrtc::CodecSpecificInfo info;
1170 memset(&info, 0, sizeof(info)); 1170 memset(&info, 0, sizeof(info));
1171 info.codecType = codec_type; 1171 info.codecType = codec_type;
1172 if (codec_type == kVideoCodecVP8) { 1172 if (codec_type == kVideoCodecVP8) {
1173 info.codecSpecific.VP8.pictureId = picture_id_; 1173 info.codecSpecific.VP8.pictureId = picture_id_;
1174 info.codecSpecific.VP8.nonReference = false; 1174 info.codecSpecific.VP8.nonReference = false;
1175 info.codecSpecific.VP8.simulcastIdx = 0; 1175 info.codecSpecific.VP8.simulcastIdx = 0;
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 static_cast<uint8_t*>(jni->GetDirectBufferAddress(j_buffer_u)); 1493 static_cast<uint8_t*>(jni->GetDirectBufferAddress(j_buffer_u));
1494 uint8_t* buffer_v = 1494 uint8_t* buffer_v =
1495 static_cast<uint8_t*>(jni->GetDirectBufferAddress(j_buffer_v)); 1495 static_cast<uint8_t*>(jni->GetDirectBufferAddress(j_buffer_v));
1496 1496
1497 reinterpret_cast<MediaCodecVideoEncoder*>(native_encoder) 1497 reinterpret_cast<MediaCodecVideoEncoder*>(native_encoder)
1498 ->FillInputBuffer(jni, input_buffer, buffer_y, stride_y, buffer_u, 1498 ->FillInputBuffer(jni, input_buffer, buffer_y, stride_y, buffer_u,
1499 stride_u, buffer_v, stride_v); 1499 stride_u, buffer_v, stride_v);
1500 } 1500 }
1501 1501
1502 } // namespace webrtc_jni 1502 } // namespace webrtc_jni
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698