f93be584f7
Reason for revert: For some reason, payload_type_mapper.cc is not being picked up in Chrome builds, leading to undefined references. Reverting while investigating. Original issue's description: > WebRtcVoiceEngine: Use AudioDecoderFactory to generate recv codecs. > > Changed WebRtcVoiceEngine to present receive codecs from the formats > provided by its decoder factory. Added supported formats to > BuiltinAudioDecoderFactory. Added helper functions for creating some > simple decoder factories for mocking. > > Created a PayloadTypeMapper for assigning payload types to formats. I > think we'll eventually want to use this further up, or possibly in > both the audio and video sides. It would be best if the engines didn't > have to talk payload types at all, but it might be more difficult to > get around when payload types depend on each-other, like the RTX > codecs for video. > > This CL also includes some changes to rtc::Optional. I've put them in > a separate CL that should (or should not) land first, making these > changes void. > See: https://codereview.webrtc.org/2072713002/ > > BUG=webrtc:5805 > > Committed: https://crrev.com/95eb1ba0db79d8fd134ae61b0a24648598684e8a > Cr-Commit-Position: refs/heads/master@{#13459} TBR=ivoc@webrtc.org,tina.legrand@webrtc.org,tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5805 Review-Url: https://codereview.webrtc.org/2151453002 Cr-Commit-Position: refs/heads/master@{#13460}
63 lines
2.1 KiB
C++
63 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
|
|
#define WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "webrtc/config.h"
|
|
#include "webrtc/media/base/mediaengine.h"
|
|
|
|
namespace webrtc {
|
|
class AudioDeviceModule;
|
|
}
|
|
namespace cricket {
|
|
class WebRtcVideoDecoderFactory;
|
|
class WebRtcVideoEncoderFactory;
|
|
}
|
|
|
|
namespace cricket {
|
|
|
|
class WebRtcMediaEngineFactory {
|
|
public:
|
|
// TODO(ossu): Backwards-compatible interface. Will be deprecated once the
|
|
// audio decoder factory is fully plumbed and used throughout WebRTC.
|
|
// See: crbug.com/webrtc/6000
|
|
static MediaEngineInterface* Create(
|
|
webrtc::AudioDeviceModule* adm,
|
|
WebRtcVideoEncoderFactory* video_encoder_factory,
|
|
WebRtcVideoDecoderFactory* video_decoder_factory);
|
|
|
|
static MediaEngineInterface* Create(
|
|
webrtc::AudioDeviceModule* adm,
|
|
const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
|
|
audio_decoder_factory,
|
|
WebRtcVideoEncoderFactory* video_encoder_factory,
|
|
WebRtcVideoDecoderFactory* video_decoder_factory);
|
|
};
|
|
|
|
// Verify that extension IDs are within 1-byte extension range and are not
|
|
// overlapping.
|
|
bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
|
|
|
|
// Discard any extensions not validated by the 'supported' predicate. Duplicate
|
|
// extensions are removed if 'filter_redundant_extensions' is set, and also any
|
|
// mutually exclusive extensions (see implementation for details) are removed.
|
|
std::vector<webrtc::RtpExtension> FilterRtpExtensions(
|
|
const std::vector<webrtc::RtpExtension>& extensions,
|
|
bool (*supported)(const std::string&),
|
|
bool filter_redundant_extensions);
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_
|