From 37cfbd8c76a457ca6fc882eefde0764cbd10f096 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Fri, 21 Jan 2022 15:23:38 +0100 Subject: RTP: Use VP8 wait-for-keyframe only for GStreamer 1.18+ --- plugins/rtp/CMakeLists.txt | 4 ++++ plugins/rtp/src/codec_util.vala | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'plugins/rtp') diff --git a/plugins/rtp/CMakeLists.txt b/plugins/rtp/CMakeLists.txt index 3a121a13..4c159c1b 100644 --- a/plugins/rtp/CMakeLists.txt +++ b/plugins/rtp/CMakeLists.txt @@ -16,6 +16,10 @@ if(GstRtp_VERSION VERSION_GREATER "1.16") set(RTP_DEFINITIONS GST_1_16) endif() +if(GstRtp_VERSION VERSION_GREATER "1.18") + set(RTP_DEFINITIONS GST_1_18) +endif() + if(Vala_VERSION VERSION_GREATER "0.50") set(RTP_DEFINITIONS VALA_0_50) endif() diff --git a/plugins/rtp/src/codec_util.vala b/plugins/rtp/src/codec_util.vala index 6fb5e7aa..9709025e 100644 --- a/plugins/rtp/src/codec_util.vala +++ b/plugins/rtp/src/codec_util.vala @@ -132,8 +132,8 @@ public class Dino.Plugins.Rtp.CodecUtil { } public static string? get_encode_prefix(string media, string codec, string encode, JingleRtp.PayloadType? payload_type) { - if (encode == "msdkh264enc") return "video/x-raw,format=NV12 ! "; - if (encode == "vaapih264enc") return "video/x-raw,format=NV12 ! "; + if (encode == "msdkh264enc") return "capsfilter caps=video/x-raw,format=NV12 ! "; + if (encode == "vaapih264enc") return "capsfilter caps=video/x-raw,format=NV12 ! "; return null; } @@ -228,7 +228,7 @@ public class Dino.Plugins.Rtp.CodecUtil { } public static string? get_depay_args(string media, string codec, string encode, JingleRtp.PayloadType? payload_type) { -#if GST_1_16 +#if GST_1_18 if (codec == "vp8") return " wait-for-keyframe=true"; #endif return null; -- cgit v1.2.3-54-g00ecf