[#5168] Fix static/dynamic payload rtp session update

sflphone-common/src/audio/audiortp/AudioRtpSession.cpp

@@ -123,13 +123,20 @@ void AudioRtpSession::setSessionMedia (AudioCodec *audioCodec)
     _debug ("AudioRtpSession: RTP timestamp increment: %d", _timestampIncrement);
 
     // Even if specified as a 16 kHz codec, G722 requires rtp sending rate to be 8 kHz
-    if (payloadType == g722PayloadType) {
-        _debug ("AudioRtpSession: Setting G722 payload format");
-        setPayloadFormat (ost::DynamicPayloadFormat ( (ost::PayloadType) payloadType, g722RtpClockRate));
-    } else if (dynamic) {
+//    if (payloadType == g722PayloadType) {
+//        _debug ("AudioRtpSession: Setting G722 payload format");
+//        setPayloadFormat (ost::DynamicPayloadFormat ( (ost::PayloadType) payloadType, g722RtpClockRate));
+//    } else if (dynamic) {
+//        _debug ("AudioRtpSession: Setting dynamic payload format");
+//        setPayloadFormat (ost::DynamicPayloadFormat ( (ost::PayloadType) payloadType, smplRate));
+//    } else if (dynamic && payloadType != g722PayloadType) {
+//        _debug ("AudioRtpSession: Setting static payload format");
+//        setPayloadFormat (ost::StaticPayloadFormat ( (ost::StaticPayloadType) payloadType));
+//    }
+    if (dynamic) {
         _debug ("AudioRtpSession: Setting dynamic payload format");
         setPayloadFormat (ost::DynamicPayloadFormat ( (ost::PayloadType) payloadType, smplRate));
-    } else if (dynamic && payloadType != g722PayloadType) {
+    } else {
         _debug ("AudioRtpSession: Setting static payload format");
         setPayloadFormat (ost::StaticPayloadFormat ( (ost::StaticPayloadType) payloadType));
     }
@@ -162,13 +169,23 @@ void AudioRtpSession::updateSessionMedia (AudioCodec *audioCodec)
     _debug ("AudioRtpSession: RTP timestamp increment: %d", _timestampIncrement);
 
     // Even if specified as a 16 kHz codec, G722 requires rtp sending rate to be 8 kHz
-    if (payloadType == g722PayloadType) {
-        _debug ("AudioRtpSession: Setting G722 payload format");
-        setPayloadFormat (ost::DynamicPayloadFormat ( (ost::PayloadType) payloadType, g722RtpClockRate));
-    } else if (dynamic) {
+//    if (payloadType == g722PayloadType) {
+//        _debug ("AudioRtpSession: Setting G722 payload format");
+//        setPayloadFormat (ost::DynamicPayloadFormat ( (ost::PayloadType) payloadType, g722RtpClockRate));
+//    } else if (dynamic) {
+//        _debug ("AudioRtpSession: Setting dynamic payload format");
+//        setPayloadFormat (ost::DynamicPayloadFormat ( (ost::PayloadType) payloadType, smplRate));
+//    } else if (dynamic && payloadType != g722PayloadType) {
+//        _debug ("AudioRtpSession: Setting static payload format");
+//        setPayloadFormat (ost::StaticPayloadFormat ( (ost::StaticPayloadType) payloadType));
+//    } else {
+//        _debug ("Did not enter any of above case");
+//    }
+
+    if (dynamic) {
         _debug ("AudioRtpSession: Setting dynamic payload format");
         setPayloadFormat (ost::DynamicPayloadFormat ( (ost::PayloadType) payloadType, smplRate));
-    } else if (dynamic && payloadType != g722PayloadType) {
+    } else {
         _debug ("AudioRtpSession: Setting static payload format");
         setPayloadFormat (ost::StaticPayloadFormat ( (ost::StaticPayloadType) payloadType));
     }