mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
191bf5c653
This reverts commitf351c3408a. Reason for revert: Breaks chromium import https://ci.chromium.org/p/chromium/builders/luci.chromium.try/linux_chromium_rel_ng/58012 Failin tests: WebRtcRtpBrowserTest.TrackAddedToSecondStream WebRtcRtpBrowserTest.TrackSwitchingStream Original change's description: > Reland "Adds support for multiple or no media stream ids." > > This is a reland of1550292efe> > Original change's description: > > Adds support for multiple or no media stream ids. > > > > With Unified Plan SDP semantics, this adds support for specifying > > either no media stream ids or multiple media stream ids for a > > transceiver/sender/receiver. This includes serializing/deserializing > > SDPs with multiple a=msid lines in a m section, or an "a=msid:- > > <appdata>" line to indicate the no stream case. Note that this does > > not synchronize between multiple streams, this is still just supported > > based upon the first media stream id. > > > > Bug: webrtc:7932, webrtc:7933 > > Change-Id: Ib7433929af7b2925abe2824b485b360cec12f275 > > Reviewed-on: https://webrtc-review.googlesource.com/61341 > > Commit-Queue: Seth Hampson <shampson@webrtc.org> > > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > > Reviewed-by: Steve Anton <steveanton@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22611} > > Bug: webrtc:7932, webrtc:7933 > Change-Id: Ica272ac18088103e65cccf6b96a6d3ecccb178ed > Reviewed-on: https://webrtc-review.googlesource.com/65560 > Commit-Queue: Seth Hampson <shampson@webrtc.org> > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > Reviewed-by: Steve Anton <steveanton@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22687} TBR=steveanton@webrtc.org,deadbeef@webrtc.org,shampson@webrtc.org Change-Id: I1835419f963762bc308a91d81c423d8e7bf65026 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7932, webrtc:7933 Reviewed-on: https://webrtc-review.googlesource.com/65700 Reviewed-by: Tomas Gunnarsson <tommi@chromium.org> Commit-Queue: Tomas Gunnarsson <tommi@chromium.org> Cr-Commit-Position: refs/heads/master@{#22690}
85 lines
3.1 KiB
C++
85 lines
3.1 KiB
C++
/*
|
|
* 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 interfaces for RtpSenders
|
|
// http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface
|
|
|
|
#ifndef API_RTPSENDERINTERFACE_H_
|
|
#define API_RTPSENDERINTERFACE_H_
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/dtmfsenderinterface.h"
|
|
#include "api/mediastreaminterface.h"
|
|
#include "api/mediatypes.h"
|
|
#include "api/proxy.h"
|
|
#include "api/rtcerror.h"
|
|
#include "api/rtpparameters.h"
|
|
#include "rtc_base/refcount.h"
|
|
#include "rtc_base/scoped_ref_ptr.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RtpSenderInterface : public rtc::RefCountInterface {
|
|
public:
|
|
// Returns true if successful in setting the track.
|
|
// Fails if an audio track is set on a video RtpSender, or vice-versa.
|
|
virtual bool SetTrack(MediaStreamTrackInterface* track) = 0;
|
|
virtual rtc::scoped_refptr<MediaStreamTrackInterface> track() const = 0;
|
|
|
|
// Returns primary SSRC used by this sender for sending media.
|
|
// Returns 0 if not yet determined.
|
|
// TODO(deadbeef): Change to rtc::Optional.
|
|
// TODO(deadbeef): Remove? With GetParameters this should be redundant.
|
|
virtual uint32_t ssrc() const = 0;
|
|
|
|
// Audio or video sender?
|
|
virtual cricket::MediaType media_type() const = 0;
|
|
|
|
// Not to be confused with "mid", this is a field we can temporarily use
|
|
// to uniquely identify a receiver until we implement Unified Plan SDP.
|
|
virtual std::string id() const = 0;
|
|
|
|
// Returns a list of streams associated with this sender's track. Although we
|
|
// only support one track per stream, in theory the API allows for multiple.
|
|
virtual std::vector<std::string> stream_ids() const = 0;
|
|
|
|
virtual RtpParameters GetParameters() const = 0;
|
|
// Note that only a subset of the parameters can currently be changed. See
|
|
// rtpparameters.h
|
|
virtual RTCError SetParameters(const RtpParameters& parameters) = 0;
|
|
|
|
// Returns null for a video sender.
|
|
virtual rtc::scoped_refptr<DtmfSenderInterface> GetDtmfSender() const = 0;
|
|
|
|
protected:
|
|
virtual ~RtpSenderInterface() {}
|
|
};
|
|
|
|
// Define proxy for RtpSenderInterface.
|
|
// TODO(deadbeef): Move this to .cc file and out of api/. What threads methods
|
|
// are called on is an implementation detail.
|
|
BEGIN_SIGNALING_PROXY_MAP(RtpSender)
|
|
PROXY_SIGNALING_THREAD_DESTRUCTOR()
|
|
PROXY_METHOD1(bool, SetTrack, MediaStreamTrackInterface*)
|
|
PROXY_CONSTMETHOD0(rtc::scoped_refptr<MediaStreamTrackInterface>, track)
|
|
PROXY_CONSTMETHOD0(uint32_t, ssrc)
|
|
PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
|
|
PROXY_CONSTMETHOD0(std::string, id)
|
|
PROXY_CONSTMETHOD0(std::vector<std::string>, stream_ids)
|
|
PROXY_CONSTMETHOD0(RtpParameters, GetParameters);
|
|
PROXY_METHOD1(RTCError, SetParameters, const RtpParameters&)
|
|
PROXY_CONSTMETHOD0(rtc::scoped_refptr<DtmfSenderInterface>, GetDtmfSender);
|
|
END_PROXY_MAP()
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_RTPSENDERINTERFACE_H_
|