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

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

Issue 2480293002: New jitter buffer experiment. (Closed)
Patch Set: Nit fix. 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 LOG(LS_INFO) << "Received first " 283 LOG(LS_INFO) << "Received first "
284 << (frame->Complete() ? "complete" : "incomplete") 284 << (frame->Complete() ? "complete" : "incomplete")
285 << " decodable video frame"; 285 << " decodable video frame";
286 } 286 }
287 287
288 const int32_t ret = Decode(*frame); 288 const int32_t ret = Decode(*frame);
289 _receiver.ReleaseFrame(frame); 289 _receiver.ReleaseFrame(frame);
290 return ret; 290 return ret;
291 } 291 }
292 292
293 // Used for the WebRTC-NewVideoJitterBuffer experiment.
294 // TODO(philipel): Clean up among the Decode functions as we replace
295 // VCMEncodedFrame with FrameObject.
296 int32_t VideoReceiver::Decode(const webrtc::VCMEncodedFrame* frame) {
297 rtc::CritScope lock(&receive_crit_);
298 return Decode(*frame);
299 }
300
293 int32_t VideoReceiver::RequestSliceLossIndication( 301 int32_t VideoReceiver::RequestSliceLossIndication(
294 const uint64_t pictureID) const { 302 const uint64_t pictureID) const {
295 TRACE_EVENT1("webrtc", "RequestSLI", "picture_id", pictureID); 303 TRACE_EVENT1("webrtc", "RequestSLI", "picture_id", pictureID);
296 rtc::CritScope cs(&process_crit_); 304 rtc::CritScope cs(&process_crit_);
297 if (_frameTypeCallback != nullptr) { 305 if (_frameTypeCallback != nullptr) {
298 const int32_t ret = 306 const int32_t ret =
299 _frameTypeCallback->SliceLossIndicationRequest(pictureID); 307 _frameTypeCallback->SliceLossIndicationRequest(pictureID);
300 if (ret < 0) { 308 if (ret < 0) {
301 return ret; 309 return ret;
302 } 310 }
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack, 504 _receiver.SetNackSettings(max_nack_list_size, max_packet_age_to_nack,
497 max_incomplete_time_ms); 505 max_incomplete_time_ms);
498 } 506 }
499 507
500 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) { 508 int VideoReceiver::SetMinReceiverDelay(int desired_delay_ms) {
501 return _receiver.SetMinReceiverDelay(desired_delay_ms); 509 return _receiver.SetMinReceiverDelay(desired_delay_ms);
502 } 510 }
503 511
504 } // namespace vcm 512 } // namespace vcm
505 } // namespace webrtc 513 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698