diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2021-04-12 17:54:31 -0400 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2021-04-12 18:37:27 -0400 |
commit | d67dcb222754b991844ada6156f0c0b38cfb3240 (patch) | |
tree | d2aaa118783751030113be4b929c0c1dee324968 /ext/webrtc/gstwebrtcbin.c | |
parent | 474c4bf08fa41201cd1219dd0c3c837dd276a590 (diff) | |
download | gstreamer-plugins-bad-d67dcb222754b991844ada6156f0c0b38cfb3240.tar.gz |
webrtcbin: Simplify answer_caps intersection code a little
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2104>
Diffstat (limited to 'ext/webrtc/gstwebrtcbin.c')
-rw-r--r-- | ext/webrtc/gstwebrtcbin.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/ext/webrtc/gstwebrtcbin.c b/ext/webrtc/gstwebrtcbin.c index 3525d1b85..107d4dce5 100644 --- a/ext/webrtc/gstwebrtcbin.c +++ b/ext/webrtc/gstwebrtcbin.c @@ -3540,25 +3540,19 @@ _create_answer_task (GstWebRTCBin * webrtc, const GstStructure * options, * that we cannot actually support */ if (trans_caps) { answer_caps = gst_caps_intersect (offer_caps, trans_caps); - if (answer_caps && !gst_caps_is_empty (answer_caps)) { - GST_LOG_OBJECT (webrtc, - "found compatible transceiver %" GST_PTR_FORMAT - " for offer media %u", rtp_trans, i); - if (trans_caps) - gst_caps_unref (trans_caps); - break; - } else { - if (answer_caps) { - gst_caps_unref (answer_caps); - answer_caps = NULL; + gst_caps_unref (trans_caps); + if (answer_caps) { + if (!gst_caps_is_empty (answer_caps)) { + GST_LOG_OBJECT (webrtc, + "found compatible transceiver %" GST_PTR_FORMAT + " for offer media %u", rtp_trans, i); + break; } - if (trans_caps) - gst_caps_unref (trans_caps); - rtp_trans = NULL; + gst_caps_unref (answer_caps); + answer_caps = NULL; } - } else { - rtp_trans = NULL; } + rtp_trans = NULL; } } |