From 2c8b28d9c65358654376654758905f30539bf3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 1 Dec 2020 13:26:07 -0500
Subject: [PATCH] rtp session: factor input
Change-Id: Ia26580a06bf2e0936bda690003f61b8830038601
---
src/media/audio/audio_rtp_session.h | 3 ---
src/media/rtp_session.h | 3 +++
src/media/video/video_rtp_session.h | 3 ---
src/sip/sdp.h | 3 ---
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/media/audio/audio_rtp_session.h b/src/media/audio/audio_rtp_session.h
index e8364841b9..7514437eab 100644
--- a/src/media/audio/audio_rtp_session.h
+++ b/src/media/audio/audio_rtp_session.h
@@ -48,8 +48,6 @@ public:
void stop() override;
void setMuted(bool isMuted);
- void switchInput(const std::string& resource) { input_ = resource; }
-
void initRecorder(std::shared_ptr<MediaRecorder>& rec) override;
void deinitRecorder(std::shared_ptr<MediaRecorder>& rec) override;
@@ -64,7 +62,6 @@ private:
uint16_t initSeqVal_ = 0;
bool muteState_ = false;
DeviceParams localAudioParams_;
- std::string input_;
};
} // namespace jami
diff --git a/src/media/rtp_session.h b/src/media/rtp_session.h
index 348ae94f0f..cadcf8fa01 100644
--- a/src/media/rtp_session.h
+++ b/src/media/rtp_session.h
@@ -47,6 +47,8 @@ public:
virtual void start(std::unique_ptr<IceSocket> rtp_sock, std::unique_ptr<IceSocket> rtcp_sock) = 0;
virtual void restartSender() = 0;
virtual void stop() = 0;
+ void switchInput(const std::string& resource) { input_ = resource; }
+ const std::string& getInput() const { return input_; }
virtual void updateMedia(const MediaDescription& send, const MediaDescription& receive)
{
@@ -70,6 +72,7 @@ protected:
std::recursive_mutex mutex_;
std::unique_ptr<SocketPair> socketPair_;
const std::string callID_;
+ std::string input_;
MediaDescription send_;
MediaDescription receive_;
diff --git a/src/media/video/video_rtp_session.h b/src/media/video/video_rtp_session.h
index 12865ba565..3bc303bf56 100644
--- a/src/media/video/video_rtp_session.h
+++ b/src/media/video/video_rtp_session.h
@@ -93,8 +93,6 @@ public:
void unbindMixer();
void enterConference(Conference* conference);
void exitConference();
- void switchInput(const std::string& input) { input_ = input; }
- const std::string& getInput() const { return input_; }
void setChangeOrientationCallback(std::function<void(int)> cb);
void initRecorder(std::shared_ptr<MediaRecorder>& rec) override;
@@ -112,7 +110,6 @@ private:
using clock = std::chrono::steady_clock;
using time_point = clock::time_point;
- std::string input_;
DeviceParams localVideoParams_;
std::unique_ptr<VideoSender> sender_;
diff --git a/src/sip/sdp.h b/src/sip/sdp.h
index 5daf2812c7..c00f3b7fc9 100644
--- a/src/sip/sdp.h
+++ b/src/sip/sdp.h
@@ -206,9 +206,6 @@ private:
NON_COPYABLE(Sdp);
- std::string getLineFromSession(const pjmedia_sdp_session* sess,
- const std::string& keyword) const;
- std::string getOutgoingVideoField(const std::string& codec, const char* key) const;
void getProfileLevelID(const pjmedia_sdp_session* session, std::string& dest, int payload) const;
/**
--
GitLab