Reason for revert: Intend to fix perf problem and reland. Original issue's description: > Revert of Delete class SSRCDatabase, and its global ssrc registry. (patchset #20 id:370001 of https://codereview.webrtc.org/2644303002/ ) > > Reason for revert: > Breaks webrtc_perf_tests reliably: > https://build.chromium.org/p/client.webrtc.perf/builders/Android32%20Tests%20%28L%20Nexus5%29/builds/1780 > https://build.chromium.org/p/client.webrtc.perf/builders/Android32%20Tests%20%28L%20Nexus4%29/builds/178 > > We're actively working on getting a quick version of webrtc_perf_tests up on the trybots again to prevent breakages like this: https://bugs.chromium.org/p/webrtc/issues/detail?id=7101 > > Original issue's description: > > Delete class SSRCDatabase, and its global ssrc registry, > > and the method RTPSender::GenerateNewSSRC. > > > > It's now mandatory for higher layers to call SetSSRC, RTPSender > > no longer allocates any ssrc by default. > > > > BUG=webrtc:4306,webrtc:6887 > > > > Review-Url: https://codereview.webrtc.org/2644303002 > > Cr-Commit-Position: refs/heads/master@{#16670} > > Committed:b78d4d1383> > TBR=solenberg@webrtc.org,stefan@webrtc.org,danilchap@webrtc.org,ivoc@webrtc.org,nisse@webrtc.org > NOTRY=True > BUG=webrtc:4306,webrtc:6887 > > Review-Url: https://codereview.webrtc.org/2700413002 > Cr-Commit-Position: refs/heads/master@{#16693} > Committed:b5848ecbf5TBR=solenberg@webrtc.org,stefan@webrtc.org,danilchap@webrtc.org,ivoc@webrtc.org,kjellander@webrtc.org,kjellander@google.com # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:4306,webrtc:6887 Review-Url: https://codereview.webrtc.org/2702203002 Cr-Commit-Position: refs/heads/master@{#16737}
129 lines
3.9 KiB
C++
129 lines
3.9 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_VOICE_ENGINE_CHANNEL_MANAGER_H
|
|
#define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/random.h"
|
|
#include "webrtc/base/scoped_ref_ptr.h"
|
|
#include "webrtc/system_wrappers/include/atomic32.h"
|
|
#include "webrtc/typedefs.h"
|
|
#include "webrtc/voice_engine/include/voe_base.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioDecoderFactory;
|
|
|
|
namespace voe {
|
|
|
|
class Channel;
|
|
|
|
// Shared-pointer implementation for keeping track of Channels. The underlying
|
|
// shared instance will be dropped when no more ChannelOwners point to it.
|
|
//
|
|
// One common source of ChannelOwner instances are
|
|
// ChannelManager::CreateChannel() and ChannelManager::GetChannel(...).
|
|
// It has a similar use case to shared_ptr in C++11. Should this move to C++11
|
|
// in the future, this class should be replaced by exactly that.
|
|
//
|
|
// To access the underlying Channel, use .channel().
|
|
// IsValid() implements a convenience method as an alternative for checking
|
|
// whether the underlying pointer is NULL or not.
|
|
//
|
|
// Channel channel_owner = channel_manager.GetChannel(channel_id);
|
|
// if (channel_owner.IsValid())
|
|
// channel_owner.channel()->...;
|
|
//
|
|
class ChannelOwner {
|
|
public:
|
|
explicit ChannelOwner(Channel* channel);
|
|
ChannelOwner(const ChannelOwner& channel_owner);
|
|
|
|
~ChannelOwner();
|
|
|
|
ChannelOwner& operator=(const ChannelOwner& other);
|
|
|
|
Channel* channel() const { return channel_ref_->channel.get(); }
|
|
bool IsValid() { return channel_ref_->channel.get() != NULL; }
|
|
int use_count() const { return channel_ref_->ref_count.Value(); }
|
|
private:
|
|
// Shared instance of a Channel. Copying ChannelOwners increase the reference
|
|
// count and destroying ChannelOwners decrease references. Channels are
|
|
// deleted when no references to them are held.
|
|
struct ChannelRef {
|
|
ChannelRef(Channel* channel);
|
|
const std::unique_ptr<Channel> channel;
|
|
Atomic32 ref_count;
|
|
};
|
|
|
|
ChannelRef* channel_ref_;
|
|
};
|
|
|
|
class ChannelManager {
|
|
public:
|
|
ChannelManager(uint32_t instance_id);
|
|
|
|
// Upon construction of an Iterator it will grab a copy of the channel list of
|
|
// the ChannelManager. The iteration will then occur over this state, not the
|
|
// current one of the ChannelManager. As the Iterator holds its own references
|
|
// to the Channels, they will remain valid even if they are removed from the
|
|
// ChannelManager.
|
|
class Iterator {
|
|
public:
|
|
explicit Iterator(ChannelManager* channel_manager);
|
|
|
|
Channel* GetChannel();
|
|
bool IsValid();
|
|
|
|
void Increment();
|
|
|
|
private:
|
|
size_t iterator_pos_;
|
|
std::vector<ChannelOwner> channels_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(Iterator);
|
|
};
|
|
|
|
// CreateChannel will always return a valid ChannelOwner instance.
|
|
ChannelOwner CreateChannel(const VoEBase::ChannelConfig& config);
|
|
|
|
// ChannelOwner.channel() will be NULL if channel_id is invalid or no longer
|
|
// exists. This should be checked with ChannelOwner::IsValid().
|
|
ChannelOwner GetChannel(int32_t channel_id);
|
|
void GetAllChannels(std::vector<ChannelOwner>* channels);
|
|
|
|
void DestroyChannel(int32_t channel_id);
|
|
void DestroyAllChannels();
|
|
|
|
size_t NumOfChannels() const;
|
|
|
|
private:
|
|
uint32_t instance_id_;
|
|
|
|
Atomic32 last_channel_id_;
|
|
|
|
rtc::CriticalSection lock_;
|
|
std::vector<ChannelOwner> channels_;
|
|
|
|
// For generation of random ssrc:s.
|
|
webrtc::Random random_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager);
|
|
};
|
|
} // namespace voe
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
|