November 2015 - ffmpeg-cvslog

Merge commit '2c17fb61ced2059034856a6c6cd303014aed01fe'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:13:24 2015 +0100| [f62fe535d5c08562abcc1b302b0220c95acb307d] | committer: Hendrik Leppkes Merge commit '2c17fb61ced2059034856a6c6cd303014aed01fe' * commit '2c17fb61ced2059034856a6c6cd303014aed01fe': rtsp: Log getaddrinfo failures Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f62fe535d5c08562a… ---

1 0

rtsp: Log getaddrinfo failures
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Nov 24 01:13:00 2015 +0100| [2c17fb61ced2059034856a6c6cd303014aed01fe] | committer: Luca Barbato rtsp: Log getaddrinfo failures And forward the logging contexts when needed. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c17fb61ced205903… --- libavformat/rtsp.c | 25 +++++++++++++++++-------- libavformat/rtsp.h | 3 ++- libavformat/rtspdec.c | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 8a94baf..2c616e8 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -178,12 +178,19 @@ static void rtsp_parse_range_npt(const char *p, int64_t *start, int64_t *end) } } -static int get_sockaddr(const char *buf, struct sockaddr_storage *sock) +static int get_sockaddr(AVFormatContext *s, + const char *buf, struct sockaddr_storage *sock) { struct addrinfo hints = { 0 }, *ai = NULL; + int ret; + hints.ai_flags = AI_NUMERICHOST; - if (getaddrinfo(buf, NULL, &hints, &ai)) + if ((ret = getaddrinfo(buf, NULL, &hints, &ai))) { + av_log(s, AV_LOG_ERROR, "getaddrinfo(%s): %s\n", + buf, + gai_strerror(ret)); return -1; + } memcpy(sock, ai->ai_addr, FFMIN(sizeof(*sock), ai->ai_addrlen)); freeaddrinfo(ai); return 0; @@ -391,7 +398,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, if (strcmp(buf1, "IP4") && strcmp(buf1, "IP6")) return; get_word_sep(buf1, sizeof(buf1), "/", &p); - if (get_sockaddr(buf1, &sdp_ip)) + if (get_sockaddr(s, buf1, &sdp_ip)) return; ttl = 16; if (*p == '/') { @@ -853,7 +860,8 @@ static void rtsp_parse_range(int *min_ptr, int *max_ptr, const char **pp) } /* XXX: only one transport specification is parsed */ -static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p) +static void rtsp_parse_transport(AVFormatContext *s, + RTSPMessageHeader *reply, const char *p) { char transport_protocol[16]; char profile[16]; @@ -945,7 +953,7 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p) if (*p == '=') { p++; get_word_sep(buf, sizeof(buf), ";,", &p); - get_sockaddr(buf, &th->destination); + get_sockaddr(s, buf, &th->destination); } } else if (!strcmp(parameter, "source")) { if (*p == '=') { @@ -1032,7 +1040,8 @@ static void rtsp_parse_rtp_info(RTSPState *rt, const char *p) handle_rtp_info(rt, url, seq, rtptime); } -void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf, +void ff_rtsp_parse_line(AVFormatContext *s, + RTSPMessageHeader *reply, const char *buf, RTSPState *rt, const char *method) { const char *p; @@ -1049,7 +1058,7 @@ void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf, } else if (av_stristart(p, "Content-Length:", &p)) { reply->content_length = strtol(p, NULL, 10); } else if (av_stristart(p, "Transport:", &p)) { - rtsp_parse_transport(reply, p); + rtsp_parse_transport(s, reply, p); } else if (av_stristart(p, "CSeq:", &p)) { reply->seq = strtol(p, NULL, 10); } else if (av_stristart(p, "Range:", &p)) { @@ -1178,7 +1187,7 @@ start: request = 1; } } else { - ff_rtsp_parse_line(reply, p, rt, method); + ff_rtsp_parse_line(s, reply, p, rt, method); av_strlcat(rt->last_reply, p, sizeof(rt->last_reply)); av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply)); } diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 7473336..b9357c1 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -459,7 +459,8 @@ typedef struct RTSPStream { char crypto_params[100]; } RTSPStream; -void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf, +void ff_rtsp_parse_line(AVFormatContext *s, + RTSPMessageHeader *reply, const char *buf, RTSPState *rt, const char *method); /** diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 6c92c69..8ccf147 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -151,7 +151,7 @@ static inline int rtsp_read_request(AVFormatContext *s, return ret; if (rbuflen > 1) { av_log(s, AV_LOG_TRACE, "Parsing[%d]: %s\n", rbuflen, rbuf); - ff_rtsp_parse_line(request, rbuf, rt, method); + ff_rtsp_parse_line(s, request, rbuf, rt, method); } } while (rbuflen > 0); if (request->seq != rt->seq + 1) {

1 0

Merge commit '12b14382861fbf19378afcddaa19cd9a949a86a3'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:12:38 2015 +0100| [a6dac0b41054510eb88210197246f9fc40c5781c] | committer: Hendrik Leppkes Merge commit '12b14382861fbf19378afcddaa19cd9a949a86a3' * commit '12b14382861fbf19378afcddaa19cd9a949a86a3': udp: Provide additional information on getaddrinfo failure Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6dac0b41054510eb… ---

1 0

udp: Provide additional information on getaddrinfo failure
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Nov 24 01:11:56 2015 +0100| [12b14382861fbf19378afcddaa19cd9a949a86a3] | committer: Luca Barbato udp: Provide additional information on getaddrinfo failure > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12b14382861fbf193… --- libavformat/udp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 7fc3843..6af388b 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -192,7 +192,9 @@ static struct addrinfo *udp_resolve_host(URLContext *h, hints.ai_flags = flags; if ((error = getaddrinfo(node, service, &hints, &res))) { res = NULL; - av_log(h, AV_LOG_ERROR, "udp_resolve_host: %s\n", + av_log(h, AV_LOG_ERROR, "getaddrinfo(%s, %s): %s\n", + node ? node : "unknown", + service ? service : "unknown", gai_strerror(error)); }

1 0

Merge commit '34af7813f77e2b5b9dcb34f20bcf53bfcc0ba9c9'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:11:16 2015 +0100| [bf54377001369a4d44db1b2db1c1430582180d82] | committer: Hendrik Leppkes Merge commit '34af7813f77e2b5b9dcb34f20bcf53bfcc0ba9c9' * commit '34af7813f77e2b5b9dcb34f20bcf53bfcc0ba9c9': udp: Use the logging context Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf54377001369a4d4… ---

1 0

udp: Use the logging context
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Nov 24 01:09:33 2015 +0100| [34af7813f77e2b5b9dcb34f20bcf53bfcc0ba9c9] | committer: Luca Barbato udp: Use the logging context > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34af7813f77e2b5b9… --- libavformat/udp.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index 04e60e3..7fc3843 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -171,7 +171,8 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) return 0; } -static struct addrinfo* udp_resolve_host(const char *hostname, int port, +static struct addrinfo *udp_resolve_host(URLContext *h, + const char *hostname, int port, int type, int family, int flags) { struct addrinfo hints = { 0 }, *res = 0; @@ -191,13 +192,15 @@ static struct addrinfo* udp_resolve_host(const char *hostname, int port, hints.ai_flags = flags; if ((error = getaddrinfo(node, service, &hints, &res))) { res = NULL; - av_log(NULL, AV_LOG_ERROR, "udp_resolve_host: %s\n", gai_strerror(error)); + av_log(h, AV_LOG_ERROR, "udp_resolve_host: %s\n", + gai_strerror(error)); } return res; } -static int udp_set_multicast_sources(int sockfd, struct sockaddr *addr, +static int udp_set_multicast_sources(URLContext *h, + int sockfd, struct sockaddr *addr, int addr_len, char **sources, int nb_sources, int include) { @@ -208,7 +211,7 @@ static int udp_set_multicast_sources(int sockfd, struct sockaddr *addr, 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, + struct addrinfo *sourceaddr = udp_resolve_host(h, sources[i], 0, SOCK_DGRAM, AF_UNSPEC, 0); if (!sourceaddr) @@ -238,7 +241,7 @@ static int udp_set_multicast_sources(int sockfd, struct sockaddr *addr, } for (i = 0; i < nb_sources; i++) { struct ip_mreq_source mreqs; - struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0, + struct addrinfo *sourceaddr = udp_resolve_host(h, sources[i], 0, SOCK_DGRAM, AF_UNSPEC, 0); if (!sourceaddr) @@ -270,13 +273,14 @@ static int udp_set_multicast_sources(int sockfd, struct sockaddr *addr, #endif return 0; } -static int udp_set_url(struct sockaddr_storage *addr, +static int udp_set_url(URLContext *h, + struct sockaddr_storage *addr, const char *hostname, int port) { struct addrinfo *res0; int addr_len; - res0 = udp_resolve_host(hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); + res0 = udp_resolve_host(h, hostname, port, SOCK_DGRAM, AF_UNSPEC, 0); if (res0 == 0) return AVERROR(EIO); memcpy(addr, res0->ai_addr, res0->ai_addrlen); addr_len = res0->ai_addrlen; @@ -285,16 +289,18 @@ static int udp_set_url(struct sockaddr_storage *addr, return addr_len; } -static int udp_socket_create(UDPContext *s, struct sockaddr_storage *addr, +static int udp_socket_create(URLContext *h, struct sockaddr_storage *addr, socklen_t *addr_len, const char *localaddr) { + UDPContext *s = h->priv_data; int udp_fd = -1; struct addrinfo *res0 = NULL, *res = NULL; int family = AF_UNSPEC; if (((struct sockaddr *) &s->dest_addr)->sa_family) family = ((struct sockaddr *) &s->dest_addr)->sa_family; - res0 = udp_resolve_host((localaddr && localaddr[0]) ? localaddr : NULL, s->local_port, + res0 = udp_resolve_host(h, (localaddr && localaddr[0]) ? localaddr : NULL, + s->local_port, SOCK_DGRAM, family, AI_PASSIVE); if (res0 == 0) goto fail; @@ -361,7 +367,7 @@ int ff_udp_set_remote_url(URLContext *h, const char *uri) av_url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, NULL, 0, uri); /* set the destination address */ - s->dest_addr_len = udp_set_url(&s->dest_addr, hostname, port); + s->dest_addr_len = udp_set_url(h, &s->dest_addr, hostname, port); if (s->dest_addr_len < 0) { return AVERROR(EIO); } @@ -523,9 +529,9 @@ static int udp_open(URLContext *h, const char *uri, int flags) s->local_port = port; if (localaddr[0]) - udp_fd = udp_socket_create(s, &my_addr, &len, localaddr); + udp_fd = udp_socket_create(h, &my_addr, &len, localaddr); else - udp_fd = udp_socket_create(s, &my_addr, &len, s->localaddr); + udp_fd = udp_socket_create(h, &my_addr, &len, s->localaddr); if (udp_fd < 0) goto fail; @@ -570,14 +576,22 @@ static int udp_open(URLContext *h, const char *uri, int flags) goto fail; } if (num_include_sources) { - if (udp_set_multicast_sources(udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, include_sources, num_include_sources, 1) < 0) + if (udp_set_multicast_sources(h, udp_fd, + (struct sockaddr *)&s->dest_addr, + s->dest_addr_len, + include_sources, + num_include_sources, 1) < 0) goto fail; } else { if (udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr) < 0) goto fail; } if (num_exclude_sources) { - if (udp_set_multicast_sources(udp_fd, (struct sockaddr *)&s->dest_addr, s->dest_addr_len, exclude_sources, num_exclude_sources, 0) < 0) + if (udp_set_multicast_sources(h, udp_fd, + (struct sockaddr *)&s->dest_addr, + s->dest_addr_len, + exclude_sources, + num_exclude_sources, 0) < 0) goto fail; } }

1 0

Merge commit '98063bcf15eb1e9bf9c8758c83c88d51cbb7ace7'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:09:58 2015 +0100| [aaa4abfdb8bb86263f666bc75edee1272076c356] | committer: Hendrik Leppkes Merge commit '98063bcf15eb1e9bf9c8758c83c88d51cbb7ace7' * commit '98063bcf15eb1e9bf9c8758c83c88d51cbb7ace7': rtsp: Do not assume getnameinfo cannot fail Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aaa4abfdb8bb86263… ---

1 0

rtsp: Do not assume getnameinfo cannot fail
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Mon Nov 23 23:57:47 2015 +0100| [98063bcf15eb1e9bf9c8758c83c88d51cbb7ace7] | committer: Luca Barbato rtsp: Do not assume getnameinfo cannot fail And properly report the error when it happens. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98063bcf15eb1e9bf… --- libavformat/rtsp.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index f62e370..8a94baf 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2264,8 +2264,14 @@ static int sdp_read_header(AVFormatContext *s) if (!(rt->rtsp_flags & RTSP_FLAG_CUSTOM_IO)) { AVDictionary *opts = map_to_opts(rt); - getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, sizeof(rtsp_st->sdp_ip), - namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); + err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, + sizeof(rtsp_st->sdp_ip), + namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); + if (err) { + av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err)); + err = AVERROR(EIO); + goto fail; + } ff_url_join(url, sizeof(url), "rtp", NULL, namebuf, rtsp_st->sdp_port, "?localport=%d&ttl=%d&connect=%d&write_to_source=%d",

1 0

Merge commit '5b70fb8fee4af3b13f29a2dc7222fd3c9782f79b'
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 29 16:09:15 2015 +0100| [3b55484c30ad003d27398dedf7045efdb8eb1253] | committer: Hendrik Leppkes Merge commit '5b70fb8fee4af3b13f29a2dc7222fd3c9782f79b' * commit '5b70fb8fee4af3b13f29a2dc7222fd3c9782f79b': movenc-test: Fix integer overflows Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b55484c30ad003d2… ---

1 0

movenc-test: Fix integer overflows
by git＠videolan.org 29 Nov '15

29 Nov '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Nov 23 14:25:41 2015 +0100| [5b70fb8fee4af3b13f29a2dc7222fd3c9782f79b] | committer: Martin Storsjö movenc-test: Fix integer overflows Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b70fb8fee4af3b13… --- libavformat/movenc-test.c | 8 ++++---- tests/ref/fate/movenc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/movenc-test.c b/libavformat/movenc-test.c index 0a1384e..0c40b3a 100644 --- a/libavformat/movenc-test.c +++ b/libavformat/movenc-test.c @@ -60,8 +60,8 @@ AVStream *video_st, *audio_st; int64_t audio_dts, video_dts; int bframes; -int duration; -int audio_duration; +int64_t duration; +int64_t audio_duration; int frames; int gop_size; int64_t next_p_pts; @@ -196,9 +196,9 @@ static void init_fps(int bf, int audio_preroll, int fps) frames = 0; gop_size = 30; duration = video_st->time_base.den / fps; - audio_duration = 1024 * audio_st->time_base.den / audio_st->codec->sample_rate; + audio_duration = 1024LL * audio_st->time_base.den / audio_st->codec->sample_rate; if (audio_preroll) - audio_preroll = 2048 * audio_st->time_base.den / audio_st->codec->sample_rate; + audio_preroll = 2048LL * audio_st->time_base.den / audio_st->codec->sample_rate; bframes = bf; video_dts = bframes ? -duration : 0; diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc index b1196a2..2955233 100644 --- a/tests/ref/fate/movenc +++ b/tests/ref/fate/movenc @@ -1,7 +1,7 @@ 4e7e78793cdda3c9ed28fbf47df39c43 2449 non-empty-moov 5b825dc829f35c9d5b76834c378276d7 2897 non-empty-moov-elst 0fd659671dec7d05cfa533a4579b1d6d 2817 non-empty-moov-no-elst -890ad73874bff5aefbd549bc75a15b8e 9139 ismv +845fdc9226a0e3f14e5f92219ce8f570 3871 ismv aa6f42a0546a27f7047f1cff812a552f 2327 empty-moov 9a439649d13cdcddf6179234fe3d8a8e 2727 empty-moov-no-elst 2451cb44e678845ed26e014e1affe5e8 2559 empty-moov-no-elst-no-adjust

1 0