From a617ed7e36d24866d93f600160f7aa5c871e74fe Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Tue, 10 Jul 2018 14:41:31 -0400
Subject: [PATCH] change startRecorder to initRecorder
It better explains what the method does, as the recorder is not started
at that moment).
Change-Id: Ib536600b663e9ee188257b3b166f497f5a2b2c1e
Reviewed-by: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
---
src/media/audio/audio_rtp_session.cpp | 18 +++++++++---------
src/media/audio/audio_rtp_session.h | 2 +-
src/media/media_decoder.cpp | 2 +-
src/media/media_decoder.h | 2 +-
src/media/media_encoder.cpp | 2 +-
src/media/media_encoder.h | 2 +-
src/media/rtp_session.h | 2 +-
src/media/video/video_input.cpp | 4 ++--
src/media/video/video_input.h | 2 +-
src/media/video/video_receive_thread.cpp | 4 ++--
src/media/video/video_receive_thread.h | 2 +-
src/media/video/video_rtp_session.cpp | 6 +++---
src/media/video/video_rtp_session.h | 2 +-
src/sip/sipcall.cpp | 4 ++--
14 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/media/audio/audio_rtp_session.cpp b/src/media/audio/audio_rtp_session.cpp
index 5454afe826..fb98bb2da6 100644
--- a/src/media/audio/audio_rtp_session.cpp
+++ b/src/media/audio/audio_rtp_session.cpp
@@ -59,7 +59,7 @@ class AudioSender {
void setMuted(bool isMuted);
uint16_t getLastSeqValue();
- void startRecorder(std::shared_ptr<MediaRecorder>& rec);
+ void initRecorder(std::shared_ptr<MediaRecorder>& rec);
private:
NON_COPYABLE(AudioSender);
@@ -203,10 +203,10 @@ AudioSender::getLastSeqValue()
}
void
-AudioSender::startRecorder(std::shared_ptr<MediaRecorder>& rec)
+AudioSender::initRecorder(std::shared_ptr<MediaRecorder>& rec)
{
if (audioEncoder_)
- audioEncoder_->startRecorder(rec);
+ audioEncoder_->initRecorder(rec);
}
class AudioReceiveThread
@@ -220,7 +220,7 @@ class AudioReceiveThread
void addIOContext(SocketPair &socketPair);
void startLoop();
- void startRecorder(std::shared_ptr<MediaRecorder>& rec);
+ void initRecorder(std::shared_ptr<MediaRecorder>& rec);
private:
NON_COPYABLE(AudioReceiveThread);
@@ -382,10 +382,10 @@ AudioReceiveThread::startLoop()
}
void
-AudioReceiveThread::startRecorder(std::shared_ptr<MediaRecorder>& rec)
+AudioReceiveThread::initRecorder(std::shared_ptr<MediaRecorder>& rec)
{
if (audioDecoder_)
- audioDecoder_->startRecorder(rec);
+ audioDecoder_->initRecorder(rec);
}
AudioRtpSession::AudioRtpSession(const std::string& id)
@@ -517,12 +517,12 @@ AudioRtpSession::setMuted(bool isMuted)
}
void
-AudioRtpSession::startRecorder(std::shared_ptr<MediaRecorder>& rec)
+AudioRtpSession::initRecorder(std::shared_ptr<MediaRecorder>& rec)
{
if (receiveThread_)
- receiveThread_->startRecorder(rec);
+ receiveThread_->initRecorder(rec);
if (sender_)
- sender_->startRecorder(rec);
+ sender_->initRecorder(rec);
}
} // namespace ring
diff --git a/src/media/audio/audio_rtp_session.h b/src/media/audio/audio_rtp_session.h
index eb0bbe7bd3..870120cf59 100644
--- a/src/media/audio/audio_rtp_session.h
+++ b/src/media/audio/audio_rtp_session.h
@@ -49,7 +49,7 @@ class AudioRtpSession : public RtpSession {
void setMuted(bool isMuted);
- void startRecorder(std::shared_ptr<MediaRecorder>& rec) override;
+ void initRecorder(std::shared_ptr<MediaRecorder>& rec) override;
private:
void startSender();
diff --git a/src/media/media_decoder.cpp b/src/media/media_decoder.cpp
index b450b6def3..00f4fc5a86 100644
--- a/src/media/media_decoder.cpp
+++ b/src/media/media_decoder.cpp
@@ -526,7 +526,7 @@ MediaDecoder::correctPixFmt(int input_pix_fmt) {
}
void
-MediaDecoder::startRecorder(std::shared_ptr<MediaRecorder>& rec)
+MediaDecoder::initRecorder(std::shared_ptr<MediaRecorder>& rec)
{
// recording will start once we can send an AVPacket to the recorder
recordingStarted_ = false;
diff --git a/src/media/media_decoder.h b/src/media/media_decoder.h
index 3a1e658d3c..56ab9c3f4a 100644
--- a/src/media/media_decoder.h
+++ b/src/media/media_decoder.h
@@ -100,7 +100,7 @@ class MediaDecoder {
void enableAccel(bool enableAccel);
#endif
- void startRecorder(std::shared_ptr<MediaRecorder>& rec);
+ void initRecorder(std::shared_ptr<MediaRecorder>& rec);
private:
NON_COPYABLE(MediaDecoder);
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index 44034e5b89..f90221288c 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -716,7 +716,7 @@ MediaEncoder::getStreamCount() const
}
void
-MediaEncoder::startRecorder(std::shared_ptr<MediaRecorder>& rec)
+MediaEncoder::initRecorder(std::shared_ptr<MediaRecorder>& rec)
{
// recording will start once we can send an AVPacket to the recorder
recordingStarted_ = false;
diff --git a/src/media/media_encoder.h b/src/media/media_encoder.h
index 035c18febd..1ccc784070 100644
--- a/src/media/media_encoder.h
+++ b/src/media/media_encoder.h
@@ -98,7 +98,7 @@ public:
unsigned getStreamCount() const;
- void startRecorder(std::shared_ptr<MediaRecorder>& rec);
+ void initRecorder(std::shared_ptr<MediaRecorder>& rec);
private:
NON_COPYABLE(MediaEncoder);
diff --git a/src/media/rtp_session.h b/src/media/rtp_session.h
index ef9175ae12..6c85997efe 100644
--- a/src/media/rtp_session.h
+++ b/src/media/rtp_session.h
@@ -55,7 +55,7 @@ public:
void setMtu(uint16_t mtu) { mtu_ = mtu; }
- virtual void startRecorder(std::shared_ptr<MediaRecorder>& rec) = 0;
+ virtual void initRecorder(std::shared_ptr<MediaRecorder>& rec) = 0;
protected:
std::recursive_mutex mutex_;
diff --git a/src/media/video/video_input.cpp b/src/media/video/video_input.cpp
index 367c1c6984..b8570340c2 100644
--- a/src/media/video/video_input.cpp
+++ b/src/media/video/video_input.cpp
@@ -588,10 +588,10 @@ VideoInput::foundDecOpts(const DeviceParams& params)
}
void
-VideoInput::startRecorder(std::shared_ptr<MediaRecorder>& rec)
+VideoInput::initRecorder(std::shared_ptr<MediaRecorder>& rec)
{
if (decoder_)
- decoder_->startRecorder(rec);
+ decoder_->initRecorder(rec);
}
}} // namespace ring::video
diff --git a/src/media/video/video_input.h b/src/media/video/video_input.h
index 4ddcc81ade..4561b4e83b 100644
--- a/src/media/video/video_input.h
+++ b/src/media/video/video_input.h
@@ -89,7 +89,7 @@ public:
void releaseFrame(void *frame);
#endif
- void startRecorder(std::shared_ptr<MediaRecorder>& rec);
+ void initRecorder(std::shared_ptr<MediaRecorder>& rec);
private:
NON_COPYABLE(VideoInput);
diff --git a/src/media/video/video_receive_thread.cpp b/src/media/video/video_receive_thread.cpp
index e118bd4e75..e7a83c4358 100644
--- a/src/media/video/video_receive_thread.cpp
+++ b/src/media/video/video_receive_thread.cpp
@@ -239,10 +239,10 @@ VideoReceiveThread::triggerKeyFrameRequest()
}
void
-VideoReceiveThread::startRecorder(std::shared_ptr<ring::MediaRecorder>& rec)
+VideoReceiveThread::initRecorder(std::shared_ptr<ring::MediaRecorder>& rec)
{
if (videoDecoder_)
- videoDecoder_->startRecorder(rec);
+ videoDecoder_->initRecorder(rec);
}
}} // namespace ring::video
diff --git a/src/media/video/video_receive_thread.h b/src/media/video/video_receive_thread.h
index 7cd3e44c37..2c884d067b 100644
--- a/src/media/video/video_receive_thread.h
+++ b/src/media/video/video_receive_thread.h
@@ -62,7 +62,7 @@ public:
int getPixelFormat() const;
void triggerKeyFrameRequest();
- void startRecorder(std::shared_ptr<ring::MediaRecorder>& rec);
+ void initRecorder(std::shared_ptr<ring::MediaRecorder>& rec);
private:
NON_COPYABLE(VideoReceiveThread);
diff --git a/src/media/video/video_rtp_session.cpp b/src/media/video/video_rtp_session.cpp
index 50d7f8a245..64d5d2787b 100644
--- a/src/media/video/video_rtp_session.cpp
+++ b/src/media/video/video_rtp_session.cpp
@@ -565,14 +565,14 @@ VideoRtpSession::processPacketLoss()
}
void
-VideoRtpSession::startRecorder(std::shared_ptr<MediaRecorder>& rec)
+VideoRtpSession::initRecorder(std::shared_ptr<MediaRecorder>& rec)
{
// video recording needs to start with keyframes
const constexpr int keyframes = 3;
if (receiveThread_)
- receiveThread_->startRecorder(rec);
+ receiveThread_->initRecorder(rec);
if (auto vidInput = std::static_pointer_cast<VideoInput>(videoLocal_))
- vidInput->startRecorder(rec);
+ vidInput->initRecorder(rec);
for (int i = 0; i < keyframes; ++i)
if (receiveThread_)
receiveThread_->triggerKeyFrameRequest();
diff --git a/src/media/video/video_rtp_session.h b/src/media/video/video_rtp_session.h
index 670ff75ec7..bb1bade19f 100644
--- a/src/media/video/video_rtp_session.h
+++ b/src/media/video/video_rtp_session.h
@@ -80,7 +80,7 @@ public:
bool useCodec(const AccountVideoCodecInfo* codec) const;
- void startRecorder(std::shared_ptr<MediaRecorder>& rec) override;
+ void initRecorder(std::shared_ptr<MediaRecorder>& rec) override;
private:
void setupConferenceVideoPipeline(Conference& conference);
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index 06c973f19b..c81c4ddcdd 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -1159,10 +1159,10 @@ SIPCall::toggleRecording()
<< getSIPAccount().getUserUri() << " and " << peerUri_;
recorder_->setMetadata(ss.str(), ""); // use default description
if (avformatrtp_)
- avformatrtp_->startRecorder(recorder_);
+ avformatrtp_->initRecorder(recorder_);
#ifdef RING_VIDEO
if (!isAudioOnly_ && videortp_)
- videortp_->startRecorder(recorder_);
+ videortp_->initRecorder(recorder_);
#endif
}
return startRecording;
--
GitLab