From patchwork Sun Oct 9 12:24:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 925 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2063665vsd; Sun, 9 Oct 2016 05:25:02 -0700 (PDT) X-Received: by 10.194.113.35 with SMTP id iv3mr22860558wjb.169.1476015902505; Sun, 09 Oct 2016 05:25:02 -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 ct5si31178861wjc.177.2016.10.09.05.25.01; Sun, 09 Oct 2016 05:25:02 -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 22BDF689A54; Sun, 9 Oct 2016 15:24:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f178.google.com (mail-qt0-f178.google.com [209.85.216.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0A66680C7A for ; Sun, 9 Oct 2016 15:24:36 +0300 (EEST) Received: by mail-qt0-f178.google.com with SMTP id s49so38776048qta.0 for ; Sun, 09 Oct 2016 05:24:53 -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=3h4uBnsHx+EgQTIlYu0v0Gn7LqGbUAoEjQ3SknVQ548=; b=lzJ1hczVAzKs0grPwBix0RlbpGKhiLtzkEwqpLFe97oB5gzn+nsfSOjQm3kLdMnOWO ZVnfWApDgrtOjemlY/gNVFC6ZFTrvfX/71XUsPaqSSOrDqan7t8gQcTtopIasUh+FoWl qSKdMMAZsjpFpw+3I1amHEvAOft4WYNWPhMLVSSRwzBWHiLZv5xYFP8RCjVLw44Q5qQB hruFrMGrufQ4+fiABtFD43VL8MFzbVfMjk2xRuxUUv1HHz4ywen5Md6kdl5yQsu3fn4d qO8J0fl9OHxNPMo82SD0JbFxDx0KsrTcCmKhH6DEQCx5UE+IIFlWP0O+feAMQ2V2i7vk nPXg== 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=3h4uBnsHx+EgQTIlYu0v0Gn7LqGbUAoEjQ3SknVQ548=; b=P3dT+KlvFQPeYGq6oxGqjk+enQ7vdZRgh2aiWi05lwWHcbR9+WEDtBmTvckO/HZ080 8pNBfadycVCq0sWK5WN/yDssS18LVMUGrv9IHdp69j83AUNt2L4Ru5ynoTLOxQCaGfE1 grpuDzFeA0ay2H9j0mgXLelmcr3pg2TSKR16NcSXBuZ1ld8LaPDQL/G+hnaxQCwmTGZf WZ1le+fyrxh6Q38EXa5urAmV5CMWU+tVJztYzQBlnJT2NiL8/p09ZDrhmBePCiLIKkO3 MUfHR2eGCrA3qqj5fLvG3PC1+cYr5hB+B79TM/Gd1KBHXXuNCtzgaA1lta5aGxTZc15V nhRQ== X-Gm-Message-State: AA6/9RnJ+K+0Dsjwiwk1wx5YpBPyL6pOhssI9hNHdVep+zWMVUWZdY4PyHi0/6aYP6x2cS3lN6jbEQwwncpaxw== X-Received: by 10.237.50.39 with SMTP id y36mr20971924qtd.150.1476015892157; Sun, 09 Oct 2016 05:24:52 -0700 (PDT) MIME-Version: 1.0 Received: by 10.237.33.198 with HTTP; Sun, 9 Oct 2016 05:24:51 -0700 (PDT) In-Reply-To: References: <20161009110023.GU5270@nb4> <20161009115428.GV5270@nb4> <20161009121911.GA3463605@phare.normalesup.org> From: Steven Liu Date: Sun, 9 Oct 2016 20:24:51 +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" check newline with chrome+gmail 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