sipcall: fix build without ENABLE_VIDEO, format

Change-Id: I9b2b5ad339407cf80f8839eb2c897fd1a1a2c113

src/sip/sipcall.cpp

@@ -274,15 +274,14 @@ SIPCall::setupVoiceCallback(const std::shared_ptr<RtpSession>& rtpSession)
         runOnMainThread([w, voice] {
             if (auto thisPtr = w.lock()) {
                 // TODO: once we support multiple streams, change this to the right one
-                std::string streamId;
+                std::string streamId = "";
 
+#ifdef ENABLE_VIDEO
                 if (not jami::getVideoDeviceMonitor().getDeviceList().empty()) {
                     // if we have a video device
                     streamId = sip_utils::streamId("", sip_utils::DEFAULT_VIDEO_STREAMID);
-                } else {
-                    // no video
-                    streamId = "";
                 }
+#endif
 
                 // send our local voice activity
                 if (auto conference = thisPtr->conf_.lock()) {
@@ -887,10 +886,7 @@ SIPCall::answer(const std::vector<libjami::MediaMap>& mediaList)
     JAMI_DBG("[call:%s] Answering incoming call with following media:", getCallId().c_str());
     for (size_t idx = 0; idx < mediaAttrList.size(); idx++) {
         auto const& mediaAttr = mediaAttrList.at(idx);
-        JAMI_DEBUG("[call:{:s}] Media @{:d} - {:s}",
-                 getCallId(),
-                 idx,
-                 mediaAttr.toString(true));
+        JAMI_DEBUG("[call:{:s}] Media @{:d} - {:s}", getCallId(), idx, mediaAttr.toString(true));
     }
 
     // Apply the media attributes.
@@ -1130,6 +1126,7 @@ SIPCall::hangup(int reason)
 void
 SIPCall::detachAudioFromConference()
 {
+#ifdef ENABLE_VIDEO
     if (auto conf = getConference()) {
         if (auto mixer = conf->getVideoMixer()) {
             for (auto& stream : getRtpSessionList(MediaType::MEDIA_AUDIO)) {
@@ -1137,6 +1134,7 @@ SIPCall::detachAudioFromConference()
             }
         }
     }
+#endif
 }
 
 void
@@ -2648,7 +2646,9 @@ SIPCall::reportMediaNegotiationStatus()
     // Notify using the parent Id if it's a subcall.
     auto callId = isSubcall() ? parent_->getCallId() : getCallId();
     emitSignal<libjami::CallSignal::MediaNegotiationStatus>(
-        callId, libjami::Media::MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS, currentMediaList());
+        callId,
+        libjami::Media::MediaNegotiationStatusEvents::NEGOTIATION_SUCCESS,
+        currentMediaList());
 }
 
 void
@@ -2772,7 +2772,8 @@ SIPCall::handleMediaChangeRequest(const std::vector<libjami::MediaMap>& remoteMe
     // If the offered media does not differ from the current local media, the
     // request is answered using the current local media.
     if (not checkMediaChangeRequest(remoteMediaList)) {
-        answerMediaChangeRequest(MediaAttribute::mediaAttributesToMediaMaps(getMediaAttributeList()));
+        answerMediaChangeRequest(
+            MediaAttribute::mediaAttributesToMediaMaps(getMediaAttributeList()));
         return;
     }
 
@@ -2981,6 +2982,7 @@ SIPCall::getDetails() const
         if (stream.mediaAttribute_->type_ == MediaType::MEDIA_VIDEO) {
             details.emplace(libjami::Call::Details::VIDEO_SOURCE,
                             stream.mediaAttribute_->sourceUri_);
+#ifdef ENABLE_VIDEO
             if (auto const& rtpSession = stream.rtpSession_) {
                 if (auto codec = rtpSession->getCodec()) {
                     details.emplace(libjami::Call::Details::VIDEO_CODEC,
@@ -2989,17 +2991,16 @@ SIPCall::getDetails() const
                                     std::to_string(codec->systemCodecInfo.minBitrate));
                     details.emplace(libjami::Call::Details::VIDEO_MAX_BITRATE,
                                     std::to_string(codec->systemCodecInfo.maxBitrate));
-                    const auto& curvideoRtpSession
-                        = std::static_pointer_cast<video::VideoRtpSession>(rtpSession);
-                    if (curvideoRtpSession) {
-                        auto curBitrate = curvideoRtpSession->getVideoBitrateInfo()
-                                              .videoBitrateCurrent;
+                    if (const auto& curvideoRtpSession
+                        = std::static_pointer_cast<video::VideoRtpSession>(rtpSession)) {
                         details.emplace(libjami::Call::Details::VIDEO_BITRATE,
-                                        std::to_string(curBitrate));
+                                        std::to_string(curvideoRtpSession->getVideoBitrateInfo()
+                                                           .videoBitrateCurrent));
                     }
                 } else
                     details.emplace(libjami::Call::Details::VIDEO_CODEC, "");
             }
+#endif
         } else if (stream.mediaAttribute_->type_ == MediaType::MEDIA_AUDIO) {
             if (auto const& rtpSession = stream.rtpSession_) {
                 if (auto codec = rtpSession->getCodec()) {