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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender_video.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 (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 if (frame_type == kVideoFrameKey || current_rotation != last_rotation_ || 325 if (frame_type == kVideoFrameKey || current_rotation != last_rotation_ ||
326 current_rotation != kVideoRotation_0) 326 current_rotation != kVideoRotation_0)
327 last_packet->SetExtension<VideoOrientation>(current_rotation); 327 last_packet->SetExtension<VideoOrientation>(current_rotation);
328 last_rotation_ = current_rotation; 328 last_rotation_ = current_rotation;
329 // Report content type only for key frames. 329 // Report content type only for key frames.
330 if (frame_type == kVideoFrameKey && 330 if (frame_type == kVideoFrameKey &&
331 video_header->content_type != VideoContentType::UNSPECIFIED) { 331 video_header->content_type != VideoContentType::UNSPECIFIED) {
332 last_packet->SetExtension<VideoContentTypeExtension>( 332 last_packet->SetExtension<VideoContentTypeExtension>(
333 video_header->content_type); 333 video_header->content_type);
334 } 334 }
335 if (video_header->video_timing.flags != TimingFrameFlags::kInvalid) { 335 if (video_header->video_timing.is_timing_frame) {
336 last_packet->SetExtension<VideoTimingExtension>( 336 last_packet->SetExtension<VideoTimingExtension>(
337 video_header->video_timing); 337 video_header->video_timing);
338 } 338 }
339 } 339 }
340 340
341 // FEC settings. 341 // FEC settings.
342 const FecProtectionParams& fec_params = 342 const FecProtectionParams& fec_params =
343 frame_type == kVideoFrameKey ? key_fec_params_ : delta_fec_params_; 343 frame_type == kVideoFrameKey ? key_fec_params_ : delta_fec_params_;
344 if (flexfec_enabled()) 344 if (flexfec_enabled())
345 flexfec_sender_->SetFecParameters(fec_params); 345 flexfec_sender_->SetFecParameters(fec_params);
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 rtc::CritScope cs(&crit_); 447 rtc::CritScope cs(&crit_);
448 return retransmission_settings_; 448 return retransmission_settings_;
449 } 449 }
450 450
451 void RTPSenderVideo::SetSelectiveRetransmissions(uint8_t settings) { 451 void RTPSenderVideo::SetSelectiveRetransmissions(uint8_t settings) {
452 rtc::CritScope cs(&crit_); 452 rtc::CritScope cs(&crit_);
453 retransmission_settings_ = settings; 453 retransmission_settings_ = settings;
454 } 454 }
455 455
456 } // namespace webrtc 456 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc ('k') | webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698