From patchwork Sun Jul 12 06:03:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 20972 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 694834496EE for ; Sun, 12 Jul 2020 09:03:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4492E687F68; Sun, 12 Jul 2020 09:03:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BB76687F68 for ; Sun, 12 Jul 2020 09:03:07 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id 22so10107268wmg.1 for ; Sat, 11 Jul 2020 23:03:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0qEE7YAK862XxF3joWz5d0sBqipsoMWLjbN+26I9N4Q=; b=Fmw9IxsbWQsKbNAn1cfXdB+d56xg2z+6/yQz4msCzncqwqYDkGUx8RTsIuTd7JROff mQlGz7cZHOBzPHO15z/kgjNevTx9BU2e/jfTTm9Ut6Clzjrvy1b0Awg6I0em7JY0qdu9 GHTIrQ6mmZ1/xEhslt+hQohd7Tpt8ubntT/mWYNjTOAjCCFpxDOWiWjCoIRCEKpbKZ/8 SXiTl4ulayMA8w7UtnlnXypcJOR7GdXtEuMrjpzDzcrQb3aDB2IHLq1VmWqZ5P74wFiM 4IBH+x1GvbkzSotBMUWFE1GAcBq4L95LGa3CI2gEWsUAs7pL4fzAmAnXd7+SuWBgxJ0y q64g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0qEE7YAK862XxF3joWz5d0sBqipsoMWLjbN+26I9N4Q=; b=oLF6X50csmC6gF9TJR6FoGBgEZeG3fZYOmS9hra90dtf8Cafdhui4DiaD5lGLceY/a UjjPgHLzaZclu7r+MKfcxqVTyYzNlFAODiqNYzCrN4FMXLAcEgrF7MQfVUTN16nQHodt e+FGWIRIzI6PTKHdzhHExe3uKqNDb7q8/JNFiGWZ+owOutLxWyGgOznlPbRv8275TEHC aWSV8Q1myvi/7NG2NmtRyh/y6KyAhLCXLaAlfiWBLOyZO77HSWZX2Pj/1NR3X2lEtHwc a2c2JDnUnt9RcZKJlx9tLodSHQhfItFutbUfZfDtWf4U/uHTkXxEGjZHFLydqQbe6/rH OAmA== X-Gm-Message-State: AOAM531mIhmUa/sO7PQaw9UCuvB19MjbTMqi71/LJ2FvanVs7dAC6W+5 MGPMgybuUlum3mUtHXbLjGZ4iRn/ X-Google-Smtp-Source: ABdhPJxgdSoMnngtEbiQ3V6X1kbiRb5TZWzPzXiJunM/ssqb2bNMagqj1DBL3CcO4uzwGtJUY7I75A== X-Received: by 2002:a1c:4143:: with SMTP id o64mr12869402wma.11.1594533786339; Sat, 11 Jul 2020 23:03:06 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id r28sm17071751wrr.20.2020.07.11.23.03.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jul 2020 23:03:05 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jul 2020 14:03:03 +0800 Message-Id: <1594533783-28695-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] lavf/srt: fix build fail when used the libsrt 1.4.1 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao libsrt 1.4.1 changed the: SRTO_SMOOTHER -> SRTO_CONGESTION SRTO_STRICTENC -> SRTO_ENFORCEDENCRYPTION SRTO_TSBPDDELAY -> SRTO_LATENCY and removed the front of deprecated option, it's lead to build fail fix #8760 Signed-off-by: Jun Zhao --- libavformat/libsrt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/libsrt.c b/libavformat/libsrt.c index 4de575b..4719ce0 100644 --- a/libavformat/libsrt.c +++ b/libavformat/libsrt.c @@ -313,8 +313,12 @@ static int libsrt_set_options_pre(URLContext *h, int fd) (s->pbkeylen >= 0 && libsrt_setsockopt(h, fd, SRTO_PBKEYLEN, "SRTO_PBKEYLEN", &s->pbkeylen, sizeof(s->pbkeylen)) < 0) || (s->passphrase && libsrt_setsockopt(h, fd, SRTO_PASSPHRASE, "SRTO_PASSPHRASE", s->passphrase, strlen(s->passphrase)) < 0) || #if SRT_VERSION_VALUE >= 0x010302 +#if SRT_VERSION_VALUE >= 0x010401 + (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_ENFORCEDENCRYPTION, "SRTO_ENFORCEDENCRYPTION", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) || +#else /* SRTO_STRICTENC == SRTO_ENFORCEDENCRYPTION (53), but for compatibility, we used SRTO_STRICTENC */ (s->enforced_encryption >= 0 && libsrt_setsockopt(h, fd, SRTO_STRICTENC, "SRTO_STRICTENC", &s->enforced_encryption, sizeof(s->enforced_encryption)) < 0) || +#endif (s->kmrefreshrate >= 0 && libsrt_setsockopt(h, fd, SRTO_KMREFRESHRATE, "SRTO_KMREFRESHRATE", &s->kmrefreshrate, sizeof(s->kmrefreshrate)) < 0) || (s->kmpreannounce >= 0 && libsrt_setsockopt(h, fd, SRTO_KMPREANNOUNCE, "SRTO_KMPREANNOUNCE", &s->kmpreannounce, sizeof(s->kmpreannounce)) < 0) || #endif @@ -333,7 +337,11 @@ static int libsrt_set_options_pre(URLContext *h, int fd) (s->lossmaxttl >= 0 && libsrt_setsockopt(h, fd, SRTO_LOSSMAXTTL, "SRTO_LOSSMAXTTL", &s->lossmaxttl, sizeof(s->lossmaxttl)) < 0) || (s->minversion >= 0 && libsrt_setsockopt(h, fd, SRTO_MINVERSION, "SRTO_MINVERSION", &s->minversion, sizeof(s->minversion)) < 0) || (s->streamid && libsrt_setsockopt(h, fd, SRTO_STREAMID, "SRTO_STREAMID", s->streamid, strlen(s->streamid)) < 0) || +#if SRT_VERSION_VALUE >= 0x010401 + (s->smoother && libsrt_setsockopt(h, fd, SRTO_CONGESTION, "SRTO_CONGESTION", s->smoother, strlen(s->smoother)) < 0) || +#else (s->smoother && libsrt_setsockopt(h, fd, SRTO_SMOOTHER, "SRTO_SMOOTHER", s->smoother, strlen(s->smoother)) < 0) || +#endif (s->messageapi >= 0 && libsrt_setsockopt(h, fd, SRTO_MESSAGEAPI, "SRTO_MESSAGEAPI", &s->messageapi, sizeof(s->messageapi)) < 0) || (s->payload_size >= 0 && libsrt_setsockopt(h, fd, SRTO_PAYLOADSIZE, "SRTO_PAYLOADSIZE", &s->payload_size, sizeof(s->payload_size)) < 0) || ((h->flags & AVIO_FLAG_WRITE) && libsrt_setsockopt(h, fd, SRTO_SENDER, "SRTO_SENDER", &yes, sizeof(yes)) < 0)) {