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

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 2497773003: Use different RTX payload types for different H264 profiles (Closed)
Patch Set: Fix bug and add test. 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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
11 #include "webrtc/media/engine/webrtcvideoengine2.h" 11 #include "webrtc/media/engine/webrtcvideoengine2.h"
12 12
13 #include <stdio.h> 13 #include <stdio.h>
14 #include <algorithm> 14 #include <algorithm>
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 #include <utility> 17 #include <utility>
18 18
19 #include "webrtc/base/copyonwritebuffer.h" 19 #include "webrtc/base/copyonwritebuffer.h"
20 #include "webrtc/base/logging.h" 20 #include "webrtc/base/logging.h"
21 #include "webrtc/base/stringutils.h" 21 #include "webrtc/base/stringutils.h"
22 #include "webrtc/base/timeutils.h" 22 #include "webrtc/base/timeutils.h"
23 #include "webrtc/base/trace_event.h" 23 #include "webrtc/base/trace_event.h"
24 #include "webrtc/call.h" 24 #include "webrtc/call.h"
25 #include "webrtc/common_video/h264/profile_level_id.h"
25 #include "webrtc/media/engine/constants.h" 26 #include "webrtc/media/engine/constants.h"
26 #include "webrtc/media/engine/simulcast.h" 27 #include "webrtc/media/engine/simulcast.h"
27 #include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h" 28 #include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
28 #include "webrtc/media/engine/webrtcmediaengine.h" 29 #include "webrtc/media/engine/webrtcmediaengine.h"
29 #include "webrtc/media/engine/webrtcvideoencoderfactory.h" 30 #include "webrtc/media/engine/webrtcvideoencoderfactory.h"
30 #include "webrtc/media/engine/webrtcvoiceengine.h" 31 #include "webrtc/media/engine/webrtcvoiceengine.h"
31 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" 32 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
32 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h" 33 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
33 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" 34 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
34 #include "webrtc/system_wrappers/include/field_trial.h" 35 #include "webrtc/system_wrappers/include/field_trial.h"
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 // don't recognize? 398 // don't recognize?
398 void AddCodecAndMaybeRtxCodec(const VideoCodec& codec, 399 void AddCodecAndMaybeRtxCodec(const VideoCodec& codec,
399 std::vector<VideoCodec>* codecs) { 400 std::vector<VideoCodec>* codecs) {
400 codecs->push_back(codec); 401 codecs->push_back(codec);
401 int rtx_payload_type = 0; 402 int rtx_payload_type = 0;
402 if (CodecNamesEq(codec.name, kVp8CodecName)) { 403 if (CodecNamesEq(codec.name, kVp8CodecName)) {
403 rtx_payload_type = kDefaultRtxVp8PlType; 404 rtx_payload_type = kDefaultRtxVp8PlType;
404 } else if (CodecNamesEq(codec.name, kVp9CodecName)) { 405 } else if (CodecNamesEq(codec.name, kVp9CodecName)) {
405 rtx_payload_type = kDefaultRtxVp9PlType; 406 rtx_payload_type = kDefaultRtxVp9PlType;
406 } else if (CodecNamesEq(codec.name, kH264CodecName)) { 407 } else if (CodecNamesEq(codec.name, kH264CodecName)) {
407 rtx_payload_type = kDefaultRtxH264PlType; 408 // Parse H264 profile.
409 const rtc::Optional<webrtc::H264::ProfileLevelId> profile_level_id =
410 webrtc::H264::ParseSdpProfileLevelId(codec.params);
411 if (!profile_level_id)
412 return;
413 const webrtc::H264::Profile profile = profile_level_id->profile;
414 // In H.264, we only support rtx for constrained baseline and constrained
415 // high profile.
416 if (profile == webrtc::H264::kProfileConstrainedBaseline) {
417 rtx_payload_type = kDefaultRtxH264ConstrainedBaselinePlType;
418 } else if (profile == webrtc::H264::kProfileConstrainedHigh) {
419 rtx_payload_type = kDefaultRtxH264ConstrainedHighPlType;
420 } else {
421 return;
422 }
408 } else if (CodecNamesEq(codec.name, kRedCodecName)) { 423 } else if (CodecNamesEq(codec.name, kRedCodecName)) {
409 rtx_payload_type = kDefaultRtxRedPlType; 424 rtx_payload_type = kDefaultRtxRedPlType;
410 } else { 425 } else {
411 return; 426 return;
412 } 427 }
413 codecs->push_back(VideoCodec::CreateRtxCodec(rtx_payload_type, codec.id)); 428 codecs->push_back(VideoCodec::CreateRtxCodec(rtx_payload_type, codec.id));
414 } 429 }
415 430
416 std::vector<VideoCodec> DefaultVideoCodecList() { 431 std::vector<VideoCodec> DefaultVideoCodecList() {
417 std::vector<VideoCodec> codecs; 432 std::vector<VideoCodec> codecs;
(...skipping 2157 matching lines...) Expand 10 before | Expand all | Expand 10 after
2575 rtx_mapping[video_codecs[i].codec.id] != 2590 rtx_mapping[video_codecs[i].codec.id] !=
2576 ulpfec_config.red_payload_type) { 2591 ulpfec_config.red_payload_type) {
2577 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2592 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2578 } 2593 }
2579 } 2594 }
2580 2595
2581 return video_codecs; 2596 return video_codecs;
2582 } 2597 }
2583 2598
2584 } // namespace cricket 2599 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/payload_type_mapper_unittest.cc ('k') | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698