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

Side by Side Diff: talk/app/webrtc/rtpsenderinterface.h

Issue 1426443007: Revert of Adding the ability to create an RtpSender without a track. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « talk/app/webrtc/rtpsender.cc ('k') | talk/app/webrtc/rtpsenderreceiver_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 17 matching lines...) Expand all
28 // This file contains interfaces for RtpSenders 28 // This file contains interfaces for RtpSenders
29 // http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface 29 // http://w3c.github.io/webrtc-pc/#rtcrtpsender-interface
30 30
31 #ifndef TALK_APP_WEBRTC_RTPSENDERINTERFACE_H_ 31 #ifndef TALK_APP_WEBRTC_RTPSENDERINTERFACE_H_
32 #define TALK_APP_WEBRTC_RTPSENDERINTERFACE_H_ 32 #define TALK_APP_WEBRTC_RTPSENDERINTERFACE_H_
33 33
34 #include <string> 34 #include <string>
35 35
36 #include "talk/app/webrtc/proxy.h" 36 #include "talk/app/webrtc/proxy.h"
37 #include "talk/app/webrtc/mediastreaminterface.h" 37 #include "talk/app/webrtc/mediastreaminterface.h"
38 #include "talk/session/media/mediasession.h"
39 #include "webrtc/base/refcount.h" 38 #include "webrtc/base/refcount.h"
40 #include "webrtc/base/scoped_ref_ptr.h" 39 #include "webrtc/base/scoped_ref_ptr.h"
41 40
42 namespace webrtc { 41 namespace webrtc {
43 42
44 class RtpSenderInterface : public rtc::RefCountInterface { 43 class RtpSenderInterface : public rtc::RefCountInterface {
45 public: 44 public:
46 // Returns true if successful in setting the track. 45 // Returns true if successful in setting the track.
47 // Fails if an audio track is set on a video RtpSender, or vice-versa. 46 // Fails if an audio track is set on a video RtpSender, or vice-versa.
48 virtual bool SetTrack(MediaStreamTrackInterface* track) = 0; 47 virtual bool SetTrack(MediaStreamTrackInterface* track) = 0;
49 virtual rtc::scoped_refptr<MediaStreamTrackInterface> track() const = 0; 48 virtual rtc::scoped_refptr<MediaStreamTrackInterface> track() const = 0;
50 49
51 // Used to set the SSRC of the sender, once a local description has been set.
52 // If |ssrc| is 0, this indiates that the sender should disconnect from the
53 // underlying transport (this occurs if the sender isn't seen in a local
54 // description).
55 virtual void SetSsrc(uint32_t ssrc) = 0;
56 virtual uint32_t ssrc() const = 0;
57
58 // Audio or video sender?
59 virtual cricket::MediaType media_type() const = 0;
60
61 // Not to be confused with "mid", this is a field we can temporarily use 50 // Not to be confused with "mid", this is a field we can temporarily use
62 // to uniquely identify a receiver until we implement Unified Plan SDP. 51 // to uniquely identify a receiver until we implement Unified Plan SDP.
63 virtual std::string id() const = 0; 52 virtual std::string id() const = 0;
64 53
65 // TODO(deadbeef): Support one sender having multiple stream ids.
66 virtual void set_stream_id(const std::string& stream_id) = 0;
67 virtual std::string stream_id() const = 0;
68
69 virtual void Stop() = 0; 54 virtual void Stop() = 0;
70 55
71 protected: 56 protected:
72 virtual ~RtpSenderInterface() {} 57 virtual ~RtpSenderInterface() {}
73 }; 58 };
74 59
75 // Define proxy for RtpSenderInterface. 60 // Define proxy for RtpSenderInterface.
76 BEGIN_PROXY_MAP(RtpSender) 61 BEGIN_PROXY_MAP(RtpSender)
77 PROXY_METHOD1(bool, SetTrack, MediaStreamTrackInterface*) 62 PROXY_METHOD1(bool, SetTrack, MediaStreamTrackInterface*)
78 PROXY_CONSTMETHOD0(rtc::scoped_refptr<MediaStreamTrackInterface>, track) 63 PROXY_CONSTMETHOD0(rtc::scoped_refptr<MediaStreamTrackInterface>, track)
79 PROXY_METHOD1(void, SetSsrc, uint32_t)
80 PROXY_CONSTMETHOD0(uint32_t, ssrc)
81 PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
82 PROXY_CONSTMETHOD0(std::string, id) 64 PROXY_CONSTMETHOD0(std::string, id)
83 PROXY_METHOD1(void, set_stream_id, const std::string&)
84 PROXY_CONSTMETHOD0(std::string, stream_id)
85 PROXY_METHOD0(void, Stop) 65 PROXY_METHOD0(void, Stop)
86 END_PROXY() 66 END_PROXY()
87 67
88 } // namespace webrtc 68 } // namespace webrtc
89 69
90 #endif // TALK_APP_WEBRTC_RTPSENDERINTERFACE_H_ 70 #endif // TALK_APP_WEBRTC_RTPSENDERINTERFACE_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/rtpsender.cc ('k') | talk/app/webrtc/rtpsenderreceiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698