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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.cc

Issue 2990463002: [EXPERIMENTAL] Generic stereo codec with index header sending merged frames
Patch Set: Created 3 years, 5 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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 } 343 }
344 if (payload_type_ == payload_type) { 344 if (payload_type_ == payload_type) {
345 if (!audio_configured_) { 345 if (!audio_configured_) {
346 *video_type = video_->VideoCodecType(); 346 *video_type = video_->VideoCodecType();
347 } 347 }
348 return 0; 348 return 0;
349 } 349 }
350 std::map<int8_t, RtpUtility::Payload*>::iterator it = 350 std::map<int8_t, RtpUtility::Payload*>::iterator it =
351 payload_type_map_.find(payload_type); 351 payload_type_map_.find(payload_type);
352 if (it == payload_type_map_.end()) { 352 if (it == payload_type_map_.end()) {
353 LOG(LS_WARNING) << "Payload type " << static_cast<int>(payload_type) 353 LOG(LS_ERROR) << "Payload type " << static_cast<int>(payload_type)
354 << " not registered."; 354 << " not registered.";
355 return -1; 355 return -1;
356 } 356 }
357 SetSendPayloadType(payload_type); 357 SetSendPayloadType(payload_type);
358 RtpUtility::Payload* payload = it->second; 358 RtpUtility::Payload* payload = it->second;
359 assert(payload); 359 assert(payload);
360 if (!payload->audio && !audio_configured_) { 360 if (!payload->audio && !audio_configured_) {
361 video_->SetVideoCodecType(payload->typeSpecific.Video.videoCodecType); 361 video_->SetVideoCodecType(payload->typeSpecific.Video.videoCodecType);
362 *video_type = payload->typeSpecific.Video.videoCodecType; 362 *video_type = payload->typeSpecific.Video.videoCodecType;
363 } 363 }
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
1303 rtc::CritScope lock(&send_critsect_); 1303 rtc::CritScope lock(&send_critsect_);
1304 packet->SetTimestamp(last_rtp_timestamp_); 1304 packet->SetTimestamp(last_rtp_timestamp_);
1305 packet->set_capture_time_ms(capture_time_ms_); 1305 packet->set_capture_time_ms(capture_time_ms_);
1306 } 1306 }
1307 AssignSequenceNumber(packet.get()); 1307 AssignSequenceNumber(packet.get());
1308 SendToNetwork(std::move(packet), StorageType::kDontRetransmit, 1308 SendToNetwork(std::move(packet), StorageType::kDontRetransmit,
1309 RtpPacketSender::Priority::kLowPriority); 1309 RtpPacketSender::Priority::kLowPriority);
1310 } 1310 }
1311 1311
1312 } // namespace webrtc 1312 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698