| Index: talk/app/webrtc/rtpreceiverinterface.h
|
| diff --git a/talk/app/webrtc/mediacontroller.h b/talk/app/webrtc/rtpreceiverinterface.h
|
| similarity index 66%
|
| copy from talk/app/webrtc/mediacontroller.h
|
| copy to talk/app/webrtc/rtpreceiverinterface.h
|
| index 68798515d00984c586a88fbf8346f75ca96f309b..13e04f1e6288098febd1718c0b0a49446e54b97f 100644
|
| --- a/talk/app/webrtc/mediacontroller.h
|
| +++ b/talk/app/webrtc/rtpreceiverinterface.h
|
| @@ -25,25 +25,34 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_APP_WEBRTC_MEDIACONTROLLER_H_
|
| -#define TALK_APP_WEBRTC_MEDIACONTROLLER_H_
|
| +// This file contains interfaces for RtpReceivers
|
| +// http://w3c.github.io/webrtc-pc/#rtcrtpreceiver-interface
|
|
|
| -#include "webrtc/base/thread.h"
|
| +#ifndef TALK_APP_WEBRTC_RTPRECEIVERINTERFACE_H_
|
| +#define TALK_APP_WEBRTC_RTPRECEIVERINTERFACE_H_
|
| +
|
| +#include <string>
|
| +
|
| +#include "talk/app/webrtc/proxy.h"
|
| +#include "talk/app/webrtc/mediastreaminterface.h"
|
| +#include "webrtc/base/refcount.h"
|
| +#include "webrtc/base/scoped_ref_ptr.h"
|
|
|
| namespace webrtc {
|
| -class Call;
|
| -class VoiceEngine;
|
|
|
| -// The MediaController currently owns shared state between media channels, but
|
| -// in the future will create and own RtpSenders and RtpReceivers.
|
| -class MediaControllerInterface {
|
| +class RtpReceiverInterface : public rtc::RefCountInterface {
|
| public:
|
| - static MediaControllerInterface* Create(rtc::Thread* worker_thread,
|
| - webrtc::VoiceEngine* voice_engine);
|
| + virtual rtc::scoped_refptr<MediaStreamTrackInterface> track() const = 0;
|
|
|
| - virtual ~MediaControllerInterface() {}
|
| - virtual webrtc::Call* call_w() = 0;
|
| + protected:
|
| + virtual ~RtpReceiverInterface() {}
|
| };
|
| +
|
| +// Define proxy for RtpReceiverInterface.
|
| +BEGIN_PROXY_MAP(RtpReceiver)
|
| +PROXY_CONSTMETHOD0(rtc::scoped_refptr<MediaStreamTrackInterface>, track)
|
| +END_PROXY()
|
| +
|
| } // namespace webrtc
|
|
|
| -#endif // TALK_APP_WEBRTC_MEDIACONTROLLER_H_
|
| +#endif // TALK_APP_WEBRTC_RTPRECEIVERINTERFACE_H_
|
|
|