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

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

Issue 1428243005: Fix for scenario where m-line is revived after being set to port 0. (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
« talk/app/webrtc/rtpsender.cc ('K') | « talk/app/webrtc/rtpsender.cc ('k') | no next file » | 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"
38 #include "webrtc/base/refcount.h" 39 #include "webrtc/base/refcount.h"
39 #include "webrtc/base/scoped_ref_ptr.h" 40 #include "webrtc/base/scoped_ref_ptr.h"
40 41
41 namespace webrtc { 42 namespace webrtc {
42 43
43 class RtpSenderInterface : public rtc::RefCountInterface { 44 class RtpSenderInterface : public rtc::RefCountInterface {
44 public: 45 public:
45 // Returns true if successful in setting the track. 46 // Returns true if successful in setting the track.
46 // Fails if an audio track is set on a video RtpSender, or vice-versa. 47 // Fails if an audio track is set on a video RtpSender, or vice-versa.
47 virtual bool SetTrack(MediaStreamTrackInterface* track) = 0; 48 virtual bool SetTrack(MediaStreamTrackInterface* track) = 0;
48 virtual rtc::scoped_refptr<MediaStreamTrackInterface> track() const = 0; 49 virtual rtc::scoped_refptr<MediaStreamTrackInterface> track() const = 0;
49 50
51 // Audio or video?
52 virtual cricket::MediaType media_type() const = 0;
53
50 // Not to be confused with "mid", this is a field we can temporarily use 54 // Not to be confused with "mid", this is a field we can temporarily use
51 // to uniquely identify a receiver until we implement Unified Plan SDP. 55 // to uniquely identify a receiver until we implement Unified Plan SDP.
52 virtual std::string id() const = 0; 56 virtual std::string id() const = 0;
53 57
54 virtual void Stop() = 0; 58 virtual void Stop() = 0;
55 59
60 virtual void Reconfigure() = 0;
61
56 protected: 62 protected:
57 virtual ~RtpSenderInterface() {} 63 virtual ~RtpSenderInterface() {}
58 }; 64 };
59 65
60 // Define proxy for RtpSenderInterface. 66 // Define proxy for RtpSenderInterface.
61 BEGIN_PROXY_MAP(RtpSender) 67 BEGIN_PROXY_MAP(RtpSender)
62 PROXY_METHOD1(bool, SetTrack, MediaStreamTrackInterface*) 68 PROXY_METHOD1(bool, SetTrack, MediaStreamTrackInterface*)
63 PROXY_CONSTMETHOD0(rtc::scoped_refptr<MediaStreamTrackInterface>, track) 69 PROXY_CONSTMETHOD0(rtc::scoped_refptr<MediaStreamTrackInterface>, track)
70 PROXY_CONSTMETHOD0(cricket::MediaType, media_type)
64 PROXY_CONSTMETHOD0(std::string, id) 71 PROXY_CONSTMETHOD0(std::string, id)
65 PROXY_METHOD0(void, Stop) 72 PROXY_METHOD0(void, Stop)
73 PROXY_METHOD0(void, Reconfigure)
66 END_PROXY() 74 END_PROXY()
67 75
68 } // namespace webrtc 76 } // namespace webrtc
69 77
70 #endif // TALK_APP_WEBRTC_RTPSENDERINTERFACE_H_ 78 #endif // TALK_APP_WEBRTC_RTPSENDERINTERFACE_H_
OLDNEW
« talk/app/webrtc/rtpsender.cc ('K') | « talk/app/webrtc/rtpsender.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698