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

Side by Side Diff: webrtc/media/engine/payload_type_mapper.h

Issue 2516993002: Pass SdpAudioFormat through Channel, without converting to CodecInst (Closed)
Patch Set: . Created 4 years 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 #ifndef WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ 11 #ifndef WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
12 #define WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ 12 #define WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
13 13
14 #include <map> 14 #include <map>
15 #include <set> 15 #include <set>
16 16
17 #include "webrtc/base/optional.h" 17 #include "webrtc/base/optional.h"
18 #include "webrtc/media/base/codec.h" 18 #include "webrtc/media/base/codec.h"
19 #include "webrtc/modules/audio_coding/codecs/audio_format.h" 19 #include "webrtc/modules/audio_coding/codecs/audio_format.h"
20 20
21 namespace cricket { 21 namespace cricket {
22 22
23 webrtc::SdpAudioFormat AudioCodecToSdp(const AudioCodec& ac);
the sun 2016/12/08 10:53:52 nit: "Sdp" -> "SdpAudioFormat", or maybe just call
kwiberg-webrtc 2016/12/09 02:39:01 Done.
24
23 class PayloadTypeMapper { 25 class PayloadTypeMapper {
24 public: 26 public:
25 PayloadTypeMapper(); 27 PayloadTypeMapper();
26 ~PayloadTypeMapper(); 28 ~PayloadTypeMapper();
27 29
28 // Finds the current payload type for |format| or assigns a new one, if no 30 // Finds the current payload type for |format| or assigns a new one, if no
29 // current mapping exists. Will return an empty value if it was unable to 31 // current mapping exists. Will return an empty value if it was unable to
30 // create a mapping, i.e. if all dynamic payload type ids have been used up. 32 // create a mapping, i.e. if all dynamic payload type ids have been used up.
31 rtc::Optional<int> GetMappingFor(const webrtc::SdpAudioFormat& format); 33 rtc::Optional<int> GetMappingFor(const webrtc::SdpAudioFormat& format);
32 34
(...skipping 12 matching lines...) Expand all
45 }; 47 };
46 48
47 int next_unused_payload_type_; 49 int next_unused_payload_type_;
48 int max_payload_type_; 50 int max_payload_type_;
49 std::map<webrtc::SdpAudioFormat, int, SdpAudioFormatOrdering> mappings_; 51 std::map<webrtc::SdpAudioFormat, int, SdpAudioFormatOrdering> mappings_;
50 std::set<int> used_payload_types_; 52 std::set<int> used_payload_types_;
51 }; 53 };
52 54
53 } // namespace cricket 55 } // namespace cricket
54 #endif // WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_ 56 #endif // WEBRTC_MEDIA_ENGINE_PAYLOAD_TYPE_MAPPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698