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

Side by Side Diff: webrtc/modules/video_coding/video_receiver.cc

Issue 2405173006: Remove deprected functions from EncodedImageCallback and RtpRtcp (Closed)
Patch Set: fix android Created 4 years, 1 month 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 (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 drop_frames_until_keyframe_ = false; 263 drop_frames_until_keyframe_ = false;
264 } 264 }
265 } 265 }
266 266
267 if (pre_decode_image_callback_) { 267 if (pre_decode_image_callback_) {
268 EncodedImage encoded_image(frame->EncodedImage()); 268 EncodedImage encoded_image(frame->EncodedImage());
269 int qp = -1; 269 int qp = -1;
270 if (qp_parser_.GetQp(*frame, &qp)) { 270 if (qp_parser_.GetQp(*frame, &qp)) {
271 encoded_image.qp_ = qp; 271 encoded_image.qp_ = qp;
272 } 272 }
273 pre_decode_image_callback_->Encoded(encoded_image, frame->CodecSpecific(), 273 pre_decode_image_callback_->OnEncodedImage(encoded_image,
274 nullptr); 274 frame->CodecSpecific(), nullptr);
275 } 275 }
276 276
277 rtc::CritScope cs(&receive_crit_); 277 rtc::CritScope cs(&receive_crit_);
278 // If this frame was too late, we should adjust the delay accordingly 278 // If this frame was too late, we should adjust the delay accordingly
279 _timing.UpdateCurrentDelay(frame->RenderTimeMs(), 279 _timing.UpdateCurrentDelay(frame->RenderTimeMs(),
280 clock_->TimeInMilliseconds()); 280 clock_->TimeInMilliseconds());
281 281
282 if (first_frame_received_()) { 282 if (first_frame_received_()) {
283 LOG(LS_INFO) << "Received first " 283 LOG(LS_INFO) << "Received first "
284 << (frame->Complete() ? "complete" : "incomplete") 284 << (frame->Complete() ? "complete" : "incomplete")
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, 496 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack,
497 max_incomplete_time_ms); 497 max_incomplete_time_ms);
498 } 498 }
499 499
500 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { 500 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) {
501 return _receiver.SetMinReceiverDelay(desired_delay_ms); 501 return _receiver.SetMinReceiverDelay(desired_delay_ms);
502 } 502 }
503 503
504 } // namespace vcm 504 } // namespace vcm
505 } // namespace webrtc 505 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc ('k') | webrtc/test/configurable_frame_size_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698