From 58f3e09ee4cd7fe4b757797f0828fc3549c58535 Mon Sep 17 00:00:00 2001 From: Jordi Ortiz Date: Tue, 26 Jun 2012 19:21:11 +0200 Subject: [PATCH 1/8] tcp: Set AI_PASSIVE when the socket will be used for listening MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/tcp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index badc0ba935..5313195e5c 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -63,6 +63,8 @@ static int tcp_open(URLContext *h, const char *uri, int flags) hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; snprintf(portstr, sizeof(portstr), "%d", port); + if (listen_socket) + hints.ai_flags |= AI_PASSIVE; ret = getaddrinfo(hostname, portstr, &hints, &ai); if (ret) { av_log(h, AV_LOG_ERROR, From ef882e464ab270276f56c1088da646a8080b8460 Mon Sep 17 00:00:00 2001 From: Jordi Ortiz Date: Tue, 26 Jun 2012 19:22:21 +0200 Subject: [PATCH 2/8] tcp: Pass NULL as hostname to getaddrinfo if the string is empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives you the proper v4 or v6 version of the "any address", allowing receiving connections on any address on the machine. Signed-off-by: Martin Storsjö --- libavformat/tcp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 5313195e5c..6a65860b5f 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -65,7 +65,10 @@ static int tcp_open(URLContext *h, const char *uri, int flags) snprintf(portstr, sizeof(portstr), "%d", port); if (listen_socket) hints.ai_flags |= AI_PASSIVE; - ret = getaddrinfo(hostname, portstr, &hints, &ai); + if (!hostname[0]) + ret = getaddrinfo(NULL, portstr, &hints, &ai); + else + ret = getaddrinfo(hostname, portstr, &hints, &ai); if (ret) { av_log(h, AV_LOG_ERROR, "Failed to resolve hostname %s: %s\n", From 46df708b45b34191973ef5181b052ce8e583bb4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 26 Jun 2012 19:22:12 +0300 Subject: [PATCH 3/8] libm: Provide fallback definitions for isnan() and isinf() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- configure | 4 ++++ libavutil/libm.h | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/configure b/configure index 473393a4e8..4a03846163 100755 --- a/configure +++ b/configure @@ -1093,6 +1093,8 @@ HAVE_LIST=" inet_aton inline_asm isatty + isinf + isnan jack_port_get_latency_range ldbrx libdc1394_1 @@ -2922,6 +2924,8 @@ enabled vaapi && require vaapi va/va.h vaInitialize -lva check_mathfunc cbrtf check_mathfunc exp2 check_mathfunc exp2f +check_mathfunc isinf +check_mathfunc isnan check_mathfunc llrint check_mathfunc llrintf check_mathfunc log2 diff --git a/libavutil/libm.h b/libavutil/libm.h index b6d8a94fce..b5821e8267 100644 --- a/libavutil/libm.h +++ b/libavutil/libm.h @@ -27,6 +27,7 @@ #include #include "config.h" #include "attributes.h" +#include "intfloat.h" #if !HAVE_CBRTF static av_always_inline float cbrtf(float x) @@ -45,6 +46,26 @@ static av_always_inline float cbrtf(float x) #define exp2f(x) ((float)exp2(x)) #endif /* HAVE_EXP2F */ +#if !HAVE_ISINF +static av_always_inline av_const int isinf(float x) +{ + uint32_t v = av_float2int(x); + if ((v & 0x7f800000) != 0x7f800000) + return 0; + return !(v & 0x007fffff); +} +#endif /* HAVE_ISINF */ + +#if !HAVE_ISNAN +static av_always_inline av_const int isnan(float x) +{ + uint32_t v = av_float2int(x); + if ((v & 0x7f800000) != 0x7f800000) + return 0; + return v & 0x007fffff; +} +#endif /* HAVE_ISNAN */ + #if !HAVE_LLRINT #undef llrint #define llrint(x) ((long long)rint(x)) From fa84506177f0246b30d4ea6a99ee5d419f3e4550 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 24 Jun 2012 11:17:13 +0100 Subject: [PATCH 4/8] dxva2: include dxva.h if found MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently, some build environments require dxva.h even for dxva2, while others lack this header entirely. Including it conditionally allows building in both cases. Signed-off-by: Martin Storsjö --- configure | 2 ++ libavcodec/dxva2_internal.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/configure b/configure index 4a03846163..6f63780bd5 100755 --- a/configure +++ b/configure @@ -1071,6 +1071,7 @@ HAVE_LIST=" dlfcn_h dlopen dos_paths + dxva_h ebp_available ebx_available exp2 @@ -2870,6 +2871,7 @@ check_func_headers windows.h Sleep check_func_headers windows.h VirtualAlloc check_header dlfcn.h +check_header dxva.h check_header dxva2api.h check_header malloc.h check_header poll.h diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 57fc7bd6f9..e2305b1a24 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -25,7 +25,14 @@ #define _WIN32_WINNT 0x0600 #define COBJMACROS + +#include "config.h" + #include "dxva2.h" +#if HAVE_DXVA_H +#include +#endif + #include "avcodec.h" #include "mpegvideo.h" From 75d339e044f9b87dd9aa4bdaee73b1a8323d4a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Thu, 21 Jun 2012 14:19:56 +0300 Subject: [PATCH 5/8] udp: Support IGMPv3 source specific multicast and source blocking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on an original patch by Stephen D'Angelo . Signed-off-by: Martin Storsjö --- configure | 6 +++ doc/protocols.texi | 8 ++++ libavformat/udp.c | 114 ++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 127 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 6f63780bd5..3619eff52e 100755 --- a/configure +++ b/configure @@ -1136,6 +1136,8 @@ HAVE_LIST=" strptime strtok_r struct_addrinfo + struct_group_source_req + struct_ip_mreq_source struct_ipv6_mreq struct_rusage_ru_maxrss struct_sockaddr_in6 @@ -2811,6 +2813,8 @@ fi if enabled network; then check_type "sys/types.h sys/socket.h" socklen_t check_type netdb.h "struct addrinfo" + check_type netinet/in.h "struct group_source_req" -D_BSD_SOURCE + check_type netinet/in.h "struct ip_mreq_source" -D_BSD_SOURCE check_type netinet/in.h "struct ipv6_mreq" -D_DARWIN_C_SOURCE check_type netinet/in.h "struct sockaddr_in6" check_type "sys/types.h sys/socket.h" "struct sockaddr_storage" @@ -2826,6 +2830,8 @@ if enabled network; then network_extralibs="-lws2_32"; } check_type ws2tcpip.h socklen_t check_type ws2tcpip.h "struct addrinfo" + check_type ws2tcpip.h "struct group_source_req" + check_type ws2tcpip.h "struct ip_mreq_source" check_type ws2tcpip.h "struct ipv6_mreq" check_type ws2tcpip.h "struct sockaddr_in6" check_type ws2tcpip.h "struct sockaddr_storage" diff --git a/doc/protocols.texi b/doc/protocols.texi index e90d1b4a63..e75f10838a 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -536,6 +536,14 @@ and makes writes return with AVERROR(ECONNREFUSED) if "destination unreachable" is received. For receiving, this gives the benefit of only receiving packets from the specified peer address/port. + +@item sources=@var{address}[,@var{address}] +Only receive packets sent to the multicast group from one of the +specified sender IP addresses. + +@item block=@var{address}[,@var{address}] +Ignore packets sent to the multicast group from the specified +sender IP addresses. @end table Some usage examples of the udp protocol with @command{avconv} follow. diff --git a/libavformat/udp.c b/libavformat/udp.c index 71b445b187..e848ecdcc8 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -168,6 +168,79 @@ static struct addrinfo* udp_resolve_host(const char *hostname, int port, return res; } +static int udp_set_multicast_sources(int sockfd, struct sockaddr *addr, + int addr_len, char **sources, + int nb_sources, int include) +{ +#if HAVE_STRUCT_GROUP_SOURCE_REQ && defined(MCAST_BLOCK_SOURCE) && !defined(_WIN32) + /* These ones are available in the microsoft SDK, but don't seem to work + * as on linux, so just prefer the v4-only approach there for now. */ + int i; + for (i = 0; i < nb_sources; i++) { + struct group_source_req mreqs; + int level = addr->sa_family == AF_INET ? IPPROTO_IP : IPPROTO_IPV6; + struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0, + SOCK_DGRAM, AF_UNSPEC, + AI_NUMERICHOST); + if (!sourceaddr) + return AVERROR(ENOENT); + + mreqs.gsr_interface = 0; + memcpy(&mreqs.gsr_group, addr, addr_len); + memcpy(&mreqs.gsr_source, sourceaddr->ai_addr, sourceaddr->ai_addrlen); + freeaddrinfo(sourceaddr); + + if (setsockopt(sockfd, level, + include ? MCAST_JOIN_SOURCE_GROUP : MCAST_BLOCK_SOURCE, + (const void *)&mreqs, sizeof(mreqs)) < 0) { + if (include) + log_net_error(NULL, AV_LOG_ERROR, "setsockopt(MCAST_JOIN_SOURCE_GROUP)"); + else + log_net_error(NULL, AV_LOG_ERROR, "setsockopt(MCAST_BLOCK_SOURCE)"); + return ff_neterrno(); + } + } +#elif HAVE_STRUCT_IP_MREQ_SOURCE && defined(IP_BLOCK_SOURCE) + int i; + if (addr->sa_family != AF_INET) { + av_log(NULL, AV_LOG_ERROR, + "Setting multicast sources only supported for IPv4\n"); + return AVERROR(EINVAL); + } + for (i = 0; i < nb_sources; i++) { + struct ip_mreq_source mreqs; + struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0, + SOCK_DGRAM, AF_UNSPEC, + AI_NUMERICHOST); + if (!sourceaddr) + return AVERROR(ENOENT); + if (sourceaddr->ai_addr->sa_family != AF_INET) { + freeaddrinfo(sourceaddr); + av_log(NULL, AV_LOG_ERROR, "%s is of incorrect protocol family\n", + sources[i]); + return AVERROR(EINVAL); + } + + mreqs.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr; + mreqs.imr_interface.s_addr = INADDR_ANY; + mreqs.imr_sourceaddr.s_addr = ((struct sockaddr_in *)sourceaddr->ai_addr)->sin_addr.s_addr; + freeaddrinfo(sourceaddr); + + if (setsockopt(sockfd, IPPROTO_IP, + include ? IP_ADD_SOURCE_MEMBERSHIP : IP_BLOCK_SOURCE, + (const void *)&mreqs, sizeof(mreqs)) < 0) { + if (include) + log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_SOURCE_MEMBERSHIP)"); + else + log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_BLOCK_SOURCE)"); + return ff_neterrno(); + } + } +#else + return AVERROR(ENOSYS); +#endif + return 0; +} static int udp_set_url(struct sockaddr_storage *addr, const char *hostname, int port) { @@ -318,6 +391,8 @@ static int udp_open(URLContext *h, const char *uri, int flags) struct sockaddr_storage my_addr; int len; int reuse_specified = 0; + int i, include = 0, num_sources = 0; + char *sources[32]; h->is_streamed = 1; h->max_packet_size = 1472; @@ -355,6 +430,25 @@ static int udp_open(URLContext *h, const char *uri, int flags) if (av_find_info_tag(buf, sizeof(buf), "localaddr", p)) { av_strlcpy(localaddr, buf, sizeof(localaddr)); } + if (av_find_info_tag(buf, sizeof(buf), "sources", p)) + include = 1; + if (include || av_find_info_tag(buf, sizeof(buf), "block", p)) { + char *source_start; + + source_start = buf; + while (1) { + char *next = strchr(source_start, ','); + if (next) + *next = '\0'; + sources[num_sources] = av_strdup(source_start); + if (!sources[num_sources]) + goto fail; + source_start = next + 1; + num_sources++; + if (num_sources >= FF_ARRAY_ELEMS(sources) || !next) + break; + } + } } /* fill the dest addr */ @@ -412,8 +506,21 @@ static int udp_open(URLContext *h, const char *uri, int flags) } if (h->flags & AVIO_FLAG_READ) { /* input */ - if (udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr) < 0) + if (num_sources == 0 || !include) { + if (udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr) < 0) + goto fail; + + if (num_sources) { + if (udp_set_multicast_sources(udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, sources, num_sources, 0) < 0) + goto fail; + } + } else if (include && num_sources) { + if (udp_set_multicast_sources(udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, sources, num_sources, 1) < 0) + goto fail; + } else { + av_log(NULL, AV_LOG_ERROR, "invalid udp settings: inclusive multicast but no sources given\n"); goto fail; + } } } @@ -441,11 +548,16 @@ static int udp_open(URLContext *h, const char *uri, int flags) } } + for (i = 0; i < num_sources; i++) + av_free(sources[i]); + s->udp_fd = udp_fd; return 0; fail: if (udp_fd >= 0) closesocket(udp_fd); + for (i = 0; i < num_sources; i++) + av_free(sources[i]); return AVERROR(EIO); } From a5bfa66df516b7be55fd08fc62c2b012fc18e340 Mon Sep 17 00:00:00 2001 From: Christophe Gisquet Date: Tue, 26 Jun 2012 16:10:33 +0200 Subject: [PATCH 6/8] x86: fft: replace call to memcpy by a loop The function call was a mess to handle, and memcpy cannot make the assumptions we do in the new code. Tested on an IMC sample: 430c -> 370c. Signed-off-by: Mans Rullgard --- libavcodec/x86/fft_mmx.asm | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft_mmx.asm index 007f5caf77..1a430b9c2c 100644 --- a/libavcodec/x86/fft_mmx.asm +++ b/libavcodec/x86/fft_mmx.asm @@ -615,8 +615,6 @@ cglobal fft_calc, 2,5,8 .end: REP_RET -cextern_naked memcpy - cglobal fft_permute, 2,7,1 mov r4, [r0 + FFTContext.revtab] mov r5, [r0 + FFTContext.tmpbuf] @@ -637,29 +635,18 @@ cglobal fft_permute, 2,7,1 cmp r0, r2 jl .loop shl r2, 3 -%if ARCH_X86_64 - mov r0, r1 - mov r1, r5 -%endif -%if WIN64 - sub rsp, 8 - call memcpy - add rsp, 8 - RET -%elif ARCH_X86_64 -%ifdef PIC - jmp memcpy wrt ..plt -%else - jmp memcpy -%endif -%else - push r2 - push r5 - push r1 - call memcpy - add esp, 12 - RET -%endif + add r1, r2 + add r5, r2 + neg r2 +; nbits >= 2 (FFT4) and sizeof(FFTComplex)=8 => at least 32B +.loopcopy: + movaps xmm0, [r5 + r2] + movaps xmm1, [r5 + r2 + 16] + movaps [r1 + r2], xmm0 + movaps [r1 + r2 + 16], xmm1 + add r2, 32 + jl .loopcopy + REP_RET cglobal imdct_calc, 3,5,3 mov r3d, [r0 + FFTContext.mdctsize] From 8f5d573a83d16ed26a71be995cbb886fb743a482 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Wed, 27 Jun 2012 10:07:47 +0200 Subject: [PATCH 7/8] mss1: report palette changed when some additional colours were decoded --- libavcodec/mss1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index 952737440b..062cf3a7a5 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -557,7 +557,7 @@ static int decode_pal(MSS1Context *ctx, ArithCoder *acoder) *pal++ = (r << 16) | (g << 8) | b; } - return 0; + return !!ncol; } static int decode_pivot(MSS1Context *ctx, ArithCoder *acoder, int base) From 15358ade152ebc28fcc824e09ad9206597c281df Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Wed, 27 Jun 2012 10:11:19 +0200 Subject: [PATCH 8/8] mss1: validate number of changeable palette entries --- libavcodec/mss1.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index 062cf3a7a5..523a9616bf 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -783,6 +783,12 @@ static av_cold int mss1_decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_DEBUG, "Encoder version %d.%d\n", AV_RB32(avctx->extradata + 4), AV_RB32(avctx->extradata + 8)); c->free_colours = AV_RB32(avctx->extradata + 48); + if ((unsigned)c->free_colours > 256) { + av_log(avctx, AV_LOG_ERROR, + "Incorrect number of changeable palette entries: %d\n", + c->free_colours); + return AVERROR_INVALIDDATA; + } av_log(avctx, AV_LOG_DEBUG, "%d free colour(s)\n", c->free_colours); avctx->coded_width = AV_RB32(avctx->extradata + 20); avctx->coded_height = AV_RB32(avctx->extradata + 24);