webrtc_m130/webrtc/api/rtpsender.h

179 lines
5.4 KiB
C
Raw Normal View History

/*
* Copyright 2015 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.
*/
// This file contains classes that implement RtpSenderInterface.
// An RtpSender associates a MediaStreamTrackInterface with an underlying
// transport (provided by AudioProviderInterface/VideoProviderInterface)
#ifndef WEBRTC_API_RTPSENDER_H_
#define WEBRTC_API_RTPSENDER_H_
#include <string>
#include "webrtc/api/mediastreamprovider.h"
#include "webrtc/api/rtpsenderinterface.h"
#include "webrtc/api/statscollector.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/criticalsection.h"
#include "webrtc/base/scoped_ptr.h"
Move talk/media to webrtc/media I removed the 'libjingle' target in talk/libjingle.gyp and replaced all users of it with base/base.gyp:rtc_base. It seems the jsoncpp and expat dependencies were not used by it's previous references. The files in talk/media/testdata were uploaded to Google Storage and added .sha1 files in resources/media instead of simply moving them. The previously disabled warnings that were inherited from talk/build/common.gypi are now replaced by target-specific disabling of only the failing warnings. Additional disabling was needed since the stricter compilation warnings that applies to code in webrtc/. License headers will be updated in a follow-up CL in order to not break Git history. Other modifications: * Updated the header guards. * Sorted the includes using chromium/src/tools/sort-headers.py except for these files: talk/app/webrtc/peerconnectionendtoend_unittest.cc talk/app/webrtc/java/jni/androidmediadecoder_jni.cc talk/app/webrtc/java/jni/androidmediaencoder_jni.cc webrtc/media/devices/win32devicemanager.cc. * Unused GYP reference to libjingle_tests_additional_deps was removed. * Removed duplicated GYP entries of webrtc/base/testutils.cc webrtc/base/testutils.h The HAVE_WEBRTC_VIDEO and HAVE_WEBRTC_VOICE defines were used by only talk/media, so they were moved to the media.gyp. I also checked that none of EXPAT_RELATIVE_PATH, FEATURE_ENABLE_VOICEMAIL, GTEST_RELATIVE_PATH, JSONCPP_RELATIVE_PATH, LOGGING=1, SRTP_RELATIVE_PATH, FEATURE_ENABLE_SSL, FEATURE_ENABLE_VOICEMAIL, FEATURE_ENABLE_PSTN, HAVE_SCTP, HAVE_SRTP, are used by the talk/media code. For Chromium, the following changes will need to be applied to the roll CL that updates the DEPS for WebRTC and libjingle: https://codereview.chromium.org/1604303002/ BUG=webrtc:5420 NOPRESUBMIT=True TBR=tommi@webrtc.org Review URL: https://codereview.webrtc.org/1587193006 Cr-Commit-Position: refs/heads/master@{#11495}
2016-02-04 23:52:28 -08:00
#include "webrtc/media/base/audiorenderer.h"
namespace webrtc {
// LocalAudioSinkAdapter receives data callback as a sink to the local
// AudioTrack, and passes the data to the sink of AudioRenderer.
class LocalAudioSinkAdapter : public AudioTrackSinkInterface,
public cricket::AudioRenderer {
public:
LocalAudioSinkAdapter();
virtual ~LocalAudioSinkAdapter();
private:
// AudioSinkInterface implementation.
void OnData(const void* audio_data,
int bits_per_sample,
int sample_rate,
size_t number_of_channels,
size_t number_of_frames) override;
// cricket::AudioRenderer implementation.
void SetSink(cricket::AudioRenderer::Sink* sink) override;
cricket::AudioRenderer::Sink* sink_;
// Critical section protecting |sink_|.
rtc::CriticalSection lock_;
};
class AudioRtpSender : public ObserverInterface,
public rtc::RefCountedObject<RtpSenderInterface> {
public:
// StatsCollector provided so that Add/RemoveLocalAudioTrack can be called
// at the appropriate times.
AudioRtpSender(AudioTrackInterface* track,
const std::string& stream_id,
AudioProviderInterface* provider,
StatsCollector* stats);
// Randomly generates stream_id.
AudioRtpSender(AudioTrackInterface* track,
AudioProviderInterface* provider,
StatsCollector* stats);
// Randomly generates id and stream_id.
AudioRtpSender(AudioProviderInterface* provider, StatsCollector* stats);
virtual ~AudioRtpSender();
// ObserverInterface implementation
void OnChanged() override;
// RtpSenderInterface implementation
bool SetTrack(MediaStreamTrackInterface* track) override;
rtc::scoped_refptr<MediaStreamTrackInterface> track() const override {
return track_.get();
}
void SetSsrc(uint32_t ssrc) override;
uint32_t ssrc() const override { return ssrc_; }
cricket::MediaType media_type() const override {
return cricket::MEDIA_TYPE_AUDIO;
}
std::string id() const override { return id_; }
void set_stream_id(const std::string& stream_id) override {
stream_id_ = stream_id;
}
std::string stream_id() const override { return stream_id_; }
void Stop() override;
private:
bool can_send_track() const { return track_ && ssrc_; }
// Helper function to construct options for
// AudioProviderInterface::SetAudioSend.
void SetAudioSend();
std::string id_;
std::string stream_id_;
Revert of Adding the ability to create an RtpSender without a track. (patchset #3 id:300001 of https://codereview.webrtc.org/1413983004/ ) Reason for revert: Still breaking CallAndModifyStream. Chromium CL intended to fix it (https://codereview.chromium.org/1435713002/) wasn't sufficient, because I forgot to call addStream/removeStream on the second connection. Original issue's description: > Reland of Adding the ability to create an RtpSender without a track. (patchset #1 id:1 of https://codereview.webrtc.org/1426443007/ ) > > Reason for revert: > Relanding, after changing the expectations of WebRtcBrowserTest.CallAndModifyStream. > > Original issue's description: > > Revert of Adding the ability to create an RtpSender without a track. (patchset #8 id:140001 of https://codereview.webrtc.org/1413713003/ ) > > > > Reason for revert: > > Causing a compiler warning, and causing WebRtcBrowserTest.CallAndModifyStream to fail. > > > > Original issue's description: > > > Adding the ability to create an RtpSender without a track. > > > > > > This CL also changes AddStream to immediately create a sender, rather > > > than waiting until the track is seen in SDP. And the PeerConnection now > > > builds the list of "send streams" from the list of senders, rather than > > > the collection of local media streams. > > > > > > Committed: https://crrev.com/ac9d92ccbe2b29590c53f702e11dc625820480d5 > > > Cr-Commit-Position: refs/heads/master@{#10414} > > > > TBR=pthatcher@webrtc.org,pthatcher@chromium.org > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > > > Committed: https://crrev.com/8f46c63f6f764254892f4111b54aa1cc8f32eeeb > > Cr-Commit-Position: refs/heads/master@{#10417} > > TBR=pthatcher@webrtc.org,pthatcher@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Committed: https://crrev.com/6834fa10f142bf5e2275142acb834898911d09ae > Cr-Commit-Position: refs/heads/master@{#10730} TBR=pthatcher@webrtc.org,pthatcher@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1460323002 Cr-Commit-Position: refs/heads/master@{#10732}
2015-11-20 11:43:22 -08:00
AudioProviderInterface* provider_;
StatsCollector* stats_;
rtc::scoped_refptr<AudioTrackInterface> track_;
uint32_t ssrc_ = 0;
bool cached_track_enabled_ = false;
bool stopped_ = false;
// Used to pass the data callback from the |track_| to the other end of
// cricket::AudioRenderer.
rtc::scoped_ptr<LocalAudioSinkAdapter> sink_adapter_;
};
class VideoRtpSender : public ObserverInterface,
public rtc::RefCountedObject<RtpSenderInterface> {
public:
VideoRtpSender(VideoTrackInterface* track,
const std::string& stream_id,
VideoProviderInterface* provider);
// Randomly generates stream_id.
VideoRtpSender(VideoTrackInterface* track, VideoProviderInterface* provider);
// Randomly generates id and stream_id.
explicit VideoRtpSender(VideoProviderInterface* provider);
virtual ~VideoRtpSender();
// ObserverInterface implementation
void OnChanged() override;
// RtpSenderInterface implementation
bool SetTrack(MediaStreamTrackInterface* track) override;
rtc::scoped_refptr<MediaStreamTrackInterface> track() const override {
return track_.get();
}
void SetSsrc(uint32_t ssrc) override;
uint32_t ssrc() const override { return ssrc_; }
cricket::MediaType media_type() const override {
return cricket::MEDIA_TYPE_VIDEO;
}
std::string id() const override { return id_; }
void set_stream_id(const std::string& stream_id) override {
stream_id_ = stream_id;
}
std::string stream_id() const override { return stream_id_; }
void Stop() override;
private:
bool can_send_track() const { return track_ && ssrc_; }
// Helper function to construct options for
// VideoProviderInterface::SetVideoSend.
void SetVideoSend();
std::string id_;
std::string stream_id_;
Revert of Adding the ability to create an RtpSender without a track. (patchset #3 id:300001 of https://codereview.webrtc.org/1413983004/ ) Reason for revert: Still breaking CallAndModifyStream. Chromium CL intended to fix it (https://codereview.chromium.org/1435713002/) wasn't sufficient, because I forgot to call addStream/removeStream on the second connection. Original issue's description: > Reland of Adding the ability to create an RtpSender without a track. (patchset #1 id:1 of https://codereview.webrtc.org/1426443007/ ) > > Reason for revert: > Relanding, after changing the expectations of WebRtcBrowserTest.CallAndModifyStream. > > Original issue's description: > > Revert of Adding the ability to create an RtpSender without a track. (patchset #8 id:140001 of https://codereview.webrtc.org/1413713003/ ) > > > > Reason for revert: > > Causing a compiler warning, and causing WebRtcBrowserTest.CallAndModifyStream to fail. > > > > Original issue's description: > > > Adding the ability to create an RtpSender without a track. > > > > > > This CL also changes AddStream to immediately create a sender, rather > > > than waiting until the track is seen in SDP. And the PeerConnection now > > > builds the list of "send streams" from the list of senders, rather than > > > the collection of local media streams. > > > > > > Committed: https://crrev.com/ac9d92ccbe2b29590c53f702e11dc625820480d5 > > > Cr-Commit-Position: refs/heads/master@{#10414} > > > > TBR=pthatcher@webrtc.org,pthatcher@chromium.org > > NOPRESUBMIT=true > > NOTREECHECKS=true > > NOTRY=true > > > > Committed: https://crrev.com/8f46c63f6f764254892f4111b54aa1cc8f32eeeb > > Cr-Commit-Position: refs/heads/master@{#10417} > > TBR=pthatcher@webrtc.org,pthatcher@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Committed: https://crrev.com/6834fa10f142bf5e2275142acb834898911d09ae > Cr-Commit-Position: refs/heads/master@{#10730} TBR=pthatcher@webrtc.org,pthatcher@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.webrtc.org/1460323002 Cr-Commit-Position: refs/heads/master@{#10732}
2015-11-20 11:43:22 -08:00
VideoProviderInterface* provider_;
rtc::scoped_refptr<VideoTrackInterface> track_;
uint32_t ssrc_ = 0;
bool cached_track_enabled_ = false;
bool stopped_ = false;
};
} // namespace webrtc
#endif // WEBRTC_API_RTPSENDER_H_