From patchwork Sun Oct 9 11:18:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 924 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2051737vsd; Sun, 9 Oct 2016 04:18:58 -0700 (PDT) X-Received: by 10.194.115.135 with SMTP id jo7mr3412358wjb.21.1476011938354; Sun, 09 Oct 2016 04:18:58 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ul2si4007569wjb.158.2016.10.09.04.18.57; Sun, 09 Oct 2016 04:18:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DE24689AE2; Sun, 9 Oct 2016 14:18:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A043689A91 for ; Sun, 9 Oct 2016 14:18:33 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id v138so3787481qka.2 for ; Sun, 09 Oct 2016 04:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=jeV715wf6udI8jT/MGyCpSE3onRs1u7KdPibPSpcgKs=; b=KQRf5Mr+axhQ6Tsbj1KBpUirOS4ws+2Z9Y26atkRywVwZNbW9lqd/6HFgIXQ8baduY v3Rq/3vQ0wwnpIfnZhNcWK3FmQXrmL8ErnO7HKntPRM5LzmRFhdm4Ko1Loh83x57HOwR 65BDGqYQcvLtf7xKIvJifc6EPFmOXlOGJakzDq/6ijWLc8uGAZAzLkVgTxgsB994pB02 FxYpa3KwUCqQb6lSqUCOryZFdz9nym2aKo8db8xVHmGIA/wVnQP9XWYd5pP5alr52COX C6AenFQpDxPLwGc4i4i52Ws/kKQ9PacWr4rzjuKKS429PWUInTipNoU8VTdRZprObLX/ My9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=jeV715wf6udI8jT/MGyCpSE3onRs1u7KdPibPSpcgKs=; b=WnfbVHBkKUDFP5zHzElvQoxozdmtfr3k/r4Itvg1hFexSzIbFxbNG/FfGVuoitJVV2 3EaEdRb/LamYygwhcXHjdxBr1UA8+tnfgdoSd6MYLr4mYC0/DFopa9+avA9G6SMHeHAC jkBgzPlaEKpl2dhCI9RWIQ7yhC6kNrpX1toKYupGy6hpJuuZCLu2OriGRerQBejMPViw bQHxNFHlfMLoBHQy3vpp3zW2D6Y+U0hznJElO21fgJGctDkh3XiU67se65bS5k12Auuk 76uG1bkE+wEKz7oTKVzDcImXQifLz9s/1XEH8OUoVKSs84v4rZcKXSFamQ/Oq+x53WfM A/4A== X-Gm-Message-State: AA6/9RkD8hPER5AqMFvqz0avEFxYmS0jHeqyAGFi6h3zktwEaV+BLHSyViD1LB3SO232OseQW/fZcn62hXyZBw== X-Received: by 10.55.23.90 with SMTP id i87mr25903945qkh.226.1476011928574; Sun, 09 Oct 2016 04:18:48 -0700 (PDT) MIME-Version: 1.0 Received: by 10.237.33.198 with HTTP; Sun, 9 Oct 2016 04:18:48 -0700 (PDT) In-Reply-To: <20161009110023.GU5270@nb4> References: <20161009110023.GU5270@nb4> From: Steven Liu Date: Sun, 9 Oct 2016 19:18:48 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH] avformat/udp: deprecate local_port option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2016-10-09 19:00 GMT+08:00 Michael Niedermayer : > On Sat, Oct 08, 2016 at 03:35:02PM +0800, Steven Liu wrote: > > > > > udp.c | 19 ++++++++++++++++++- > > version.h | 3 +++ > > 2 files changed, 21 insertions(+), 1 deletion(-) > > bf9c64b4a0fd9a1d998c11376c5c5c2a90389caf 0001-avformat-udp-deprecate- > local_port-option.patch > > From 16a41c1e76fef082bf2a7238f940968238f573d5 Mon Sep 17 00:00:00 2001 > > From: Steven Liu > > Date: Sat, 8 Oct 2016 15:31:25 +0800 > > Subject: [PATCH] avformat/udp: deprecate local_port option > > patchwork fails to pick up your recent patches > see: https://patchwork.ffmpeg.org/project/ffmpeg/list/? > submitter=23&state=%2A&archive=both > > probably because "Type: application/octet-stream" > (this is the wrong mime type for patches) > > [...] > > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Rewriting code that is poorly written but fully understood is good. > Rewriting code that one doesnt understand is a sign that one is less smart > then the original author, trying to rewrite it will not make it better. > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > paste patch context to test patchwork pick up. Signed-off-by: Steven Liu --- libavformat/udp.c | 19 ++++++++++++++++++- libavformat/version.h | 3 +++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 3835f98..fd400c6 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -86,6 +86,9 @@ typedef struct UDPContext { int pkt_size; int is_multicast; int is_broadcast; +#if FF_API_UDP_LOCAL_PORT + int local_port_deprecated; +#endif int local_port; int reuse_socket; int overrun_nonfatal; @@ -123,7 +126,9 @@ static const AVOption options[] = { { "bitrate", "Bits to send per second", OFFSET(bitrate), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, .flags = E }, { "burst_bits", "Max length of bursts in bits (when using bitrate)", OFFSET(burst_bits), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, INT64_MAX, .flags = E }, { "localport", "Local port", OFFSET(local_port), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, D|E }, - { "local_port", "Local port", OFFSET(local_port), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, +#if FF_API_UDP_LOCAL_PORT + { "local_port", "Local port", OFFSET(local_port_deprecated), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, .flags = D|E }, +#endif { "localaddr", "Local address", OFFSET(localaddr), AV_OPT_TYPE_STRING, { .str = NULL }, .flags = D|E }, { "udplite_coverage", "choose UDPLite head size which should be validated by checksum", OFFSET(udplite_coverage), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, D|E }, { "pkt_size", "Maximum UDP packet size", OFFSET(pkt_size), AV_OPT_TYPE_INT, { .i64 = 1472 }, -1, INT_MAX, .flags = D|E }, @@ -377,6 +382,12 @@ static int udp_socket_create(URLContext *h, struct sockaddr_storage *addr, if (((struct sockaddr *) &s->dest_addr)->sa_family) family = ((struct sockaddr *) &s->dest_addr)->sa_family; +#if FF_API_UDP_LOCAL_PORT + if (s->local_port_deprecated >= 0) { + av_log(s, AV_LOG_WARNING, "the local_port option is deprecated, please use localport option\n"); + s->local_port = s->local_port_deprecated; + } +#endif res0 = udp_resolve_host(h, (localaddr && localaddr[0]) ? localaddr : NULL, s->local_port, SOCK_DGRAM, family, AI_PASSIVE); @@ -481,6 +492,12 @@ int ff_udp_set_remote_url(URLContext *h, const char *uri) int ff_udp_get_local_port(URLContext *h) { UDPContext *s = h->priv_data; +#if FF_API_UDP_LOCAL_PORT + if (s->local_port_deprecated >= 0) { + av_log(s, AV_LOG_WARNING, "the local_port option is deprecated, please use localport option\n"); + s->local_port = s->local_port_deprecated; + } +#endif return s->local_port; } diff --git a/libavformat/version.h b/libavformat/version.h index 92801b4..35cfc3b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -85,6 +85,9 @@ #ifndef FF_API_HTTP_USER_AGENT #define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 58) #endif +#ifndef FF_API_UDP_LOCAL_PORT +#define FF_API_UDP_LOCAL_PORT (LIBAVFORMAT_VERSION_MAJOR < 58) +#endif #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1