April 2015 - ffmpeg-cvslog - lists.ffmpeg.org

lavf/webm_chunk: Fix a memory leak.
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Vignesh Venkatasubramanian <vigneshv(a)google.com> | Thu Apr 30 12:56:24 2015 -0700| [ccb8f674995ded871ac725833b5efefce0ad63de] | committer: Michael Niedermayer lavf/webm_chunk: Fix a memory leak. Fix a duplicate memory allocation. priv_data should be allocated in line 64 call to avformat_alloc_output_context2 since we pass the correct AVFormat to it. This removes the duplicate allocation. Signed-off-by: Vignesh Venkatasubramanian <vigneshv(a)google.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ccb8f674995ded871… --- libavformat/webm_chunk.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 8e03270..c7cc0b8 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -70,11 +70,6 @@ static int chunk_mux_init(AVFormatContext *s) oc->max_delay = s->max_delay; av_dict_copy(&oc->metadata, s->metadata, 0); - oc->priv_data = av_mallocz(oc->oformat->priv_data_size); - if (!oc->priv_data) { - avio_close(oc->pb); - return AVERROR(ENOMEM); - } *(const AVClass**)oc->priv_data = oc->oformat->priv_class; av_opt_set_defaults(oc->priv_data); av_opt_set_int(oc->priv_data, "dash", 1, 0);

1 0

vp9: fix show-existing-frames for multi-threading.
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Ronald S. Bultje <rsbultje(a)gmail.com> | Thu Apr 30 22:03:10 2015 +0200| [5935513c0ed1563a654b2e40d053f824bae93e6b] | committer: Michael Niedermayer vp9: fix show-existing-frames for multi-threading. This also fixes intra-only MT failures (it was the same bug), see trac 4526 and 4527. Tested-by: James Almer <jamrial(a)gmail.com> Reviewed-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5935513c0ed1563a6… --- libavcodec/vp9.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 1310798..84e2220 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -3767,6 +3767,13 @@ static int vp9_decode_frame(AVCodecContext *ctx, void *frame, return res; ((AVFrame *)frame)->pkt_pts = pkt->pts; ((AVFrame *)frame)->pkt_dts = pkt->dts; + for (i = 0; i < 8; i++) { + if (s->next_refs[i].f->data[0]) + ff_thread_release_buffer(ctx, &s->next_refs[i]); + if (s->refs[i].f->data[0] && + (res = ff_thread_ref_frame(&s->next_refs[i], &s->refs[i])) < 0) + return res; + } *got_frame = 1; return pkt->size; }

1 0

avutil/softfloat_tables: add missing stdint.h include
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Apr 30 17:22:27 2015 -0300| [39fbb27ec3a33438aa450d434fb764848d3162c1] | committer: James Almer avutil/softfloat_tables: add missing stdint.h include Fixes make checkheaders Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39fbb27ec3a33438a… --- libavutil/softfloat_tables.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/softfloat_tables.h b/libavutil/softfloat_tables.h index 9d3c808..461f2b2 100644 --- a/libavutil/softfloat_tables.h +++ b/libavutil/softfloat_tables.h @@ -47,6 +47,8 @@ #ifndef AVUTIL_SOFTFLOAT_TABLES_H #define AVUTIL_SOFTFLOAT_TABLES_H +#include <stdint.h> + static const int32_t av_sqrttbl_sf[512+1] = { /* sqrt(x), 0.5<=x<1 */ 0x2d413ccd,0x2d4c8bb3,0x2d57d7c6,0x2d63210a, 0x2d6e677f,0x2d79ab2a,0x2d84ec0b,0x2d902a23,

1 0

Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Apr 30 22:23:29 2015 +0200| [7ad528cf23da5479c7cbf4676d071a07a709d8b6] | committer: Michael Niedermayer Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e' * commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e': avplay: Do not print a possibly uninitialized value Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ad528cf23da5479c… ---

1 0

avplay: Do not print a possibly uninitialized value
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Apr 28 21:24:27 2015 +0200| [06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e] | committer: Luca Barbato avplay: Do not print a possibly uninitialized value Initialize `diff` to 0. Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06f4b1e37a08f3fd2… --- avplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avplay.c b/avplay.c index 98fd954..5e5518e 100644 --- a/avplay.c +++ b/avplay.c @@ -1033,7 +1033,7 @@ static void stream_pause(VideoState *is) static double compute_target_time(double frame_current_pts, VideoState *is) { - double delay, sync_threshold, diff; + double delay, sync_threshold, diff = 0; /* compute nominal delay */ delay = frame_current_pts - is->frame_last_pts;

1 0

Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641'
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Apr 30 22:15:16 2015 +0200| [f5c5aa968c3c96ff3968bd5b060e5a0f2f278732] | committer: Michael Niedermayer Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641' * commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641': xcbgrab: Validate the capture area Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5c5aa968c3c96ff3… ---

1 0

xcbgrab: Validate the capture area
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Sat Mar 14 12:30:11 2015 +0100| [e8c4db0d4d07738fed716b1d2f20c85aac944641] | committer: Luca Barbato xcbgrab: Validate the capture area And notify why the capture is impossible. Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8c4db0d4d07738fe… --- libavdevice/xcbgrab.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index decb7a7..3de4b00 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -528,8 +528,17 @@ static int create_stream(AVFormatContext *s) gc = xcb_get_geometry(c->conn, c->screen->root); geo = xcb_get_geometry_reply(c->conn, gc, NULL); - c->width = FFMIN(geo->width, c->width); - c->height = FFMIN(geo->height, c->height); + if (c->x + c->width >= geo->width || + c->y + c->height >= geo->height) { + av_log(s, AV_LOG_ERROR, + "Capture area %dx%d at position %d.%d " + "outside the screen size %dx%d\n", + c->width, c->height, + c->x, c->y, + geo->width, geo->height); + return AVERROR(EINVAL); + } + c->time_base = (AVRational){ st->avg_frame_rate.den, st->avg_frame_rate.num }; c->time_frame = av_gettime();

1 0

Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b'
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Thu Apr 30 21:59:56 2015 +0200| [dc83733f2bf2f26433bbf23d42fe92a2c7691df1] | committer: Michael Niedermayer Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b' * commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b': xcbgrab: Do not assume the non shm image data is always available Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dc83733f2bf2f2643… ---

1 0

xcbgrab: Do not assume the non shm image data is always available
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Sat Mar 14 12:30:10 2015 +0100| [82a10225f817b2612fdd2b23af9d4f0a3408df3b] | committer: Luca Barbato xcbgrab: Do not assume the non shm image data is always available Signed-off-by: Luca Barbato <lu_zero(a)gentoo.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82a10225f817b2612… --- libavdevice/xcbgrab.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 13284ec..decb7a7 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -145,13 +145,25 @@ static int xcbgrab_frame(AVFormatContext *s, AVPacket *pkt) xcb_get_image_cookie_t iq; xcb_get_image_reply_t *img; xcb_drawable_t drawable = c->screen->root; + xcb_generic_error_t *e = NULL; uint8_t *data; int length, ret; iq = xcb_get_image(c->conn, XCB_IMAGE_FORMAT_Z_PIXMAP, drawable, c->x, c->y, c->width, c->height, ~0); - img = xcb_get_image_reply(c->conn, iq, NULL); + img = xcb_get_image_reply(c->conn, iq, &e); + + if (e) { + av_log(s, AV_LOG_ERROR, + "Cannot get the image data " + "event_error: response_type:%u error_code:%u " + "sequence:%u resource_id:%u minor_code:%u major_code:%u.\n", + e->response_type, e->error_code, + e->sequence, e->resource_id, e->minor_code, e->major_code); + return AVERROR(EACCES); + } + if (!img) return AVERROR(EAGAIN); @@ -405,7 +417,7 @@ static int xcbgrab_read_packet(AVFormatContext *s, AVPacket *pkt) ret = xcbgrab_frame(s, pkt); #if CONFIG_LIBXCB_XFIXES - if (c->draw_mouse && p->same_screen) + if (ret >= 0 && c->draw_mouse && p->same_screen) xcbgrab_draw_mouse(s, pkt, p, geo); #endif

1 0

lavf/webm_chunk: Use dyn_buf to write chunks
by git＠videolan.org 30 Apr '15

30 Apr '15

ffmpeg | branch: master | Vignesh Venkatasubramanian <vigneshv(a)google.com> | Thu Apr 30 11:34:44 2015 -0700| [e2784a1d96608d5aa661483de9d8e80311deb80e] | committer: Michael Niedermayer lavf/webm_chunk: Use dyn_buf to write chunks Use dyn_duf to write chunks so that we create the actual chunk file only after the entire chunk data is available. This will help not confuse other software looking at the chunk file (e.g. a web server) by seeing a zero length file when ffmpeg is writing into it. Signed-off-by: Vignesh Venkatasubramanian <vigneshv(a)google.com> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2784a1d96608d5aa… --- libavformat/webm_chunk.c | 48 +++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 6d3d5d6..8e03270 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -41,12 +41,13 @@ #include "libavutil/time_internal.h" #include "libavutil/timestamp.h" +#define MAX_FILENAME_SIZE 1024 + typedef struct WebMChunkContext { const AVClass *class; int chunk_start_index; char *header_filename; int chunk_duration; - int chunk_count; int chunk_index; uint64_t duration_written; int prev_pts; @@ -86,18 +87,21 @@ static int chunk_mux_init(AVFormatContext *s) return 0; } -static int set_chunk_filename(AVFormatContext *s, int is_header) +static int get_chunk_filename(AVFormatContext *s, int is_header, char *filename) { WebMChunkContext *wc = s->priv_data; AVFormatContext *oc = wc->avf; + if (!filename) { + return AVERROR(EINVAL); + } if (is_header) { if (!wc->header_filename) { return AVERROR(EINVAL); } - av_strlcpy(oc->filename, wc->header_filename, strlen(wc->header_filename) + 1); + av_strlcpy(filename, wc->header_filename, strlen(wc->header_filename) + 1); } else { - if (av_get_frame_filename(oc->filename, sizeof(oc->filename), - s->filename, wc->chunk_index) < 0) { + if (av_get_frame_filename(filename, MAX_FILENAME_SIZE, + s->filename, wc->chunk_index - 1) < 0) { av_log(oc, AV_LOG_ERROR, "Invalid chunk filename template '%s'\n", s->filename); return AVERROR(EINVAL); } @@ -114,7 +118,6 @@ static int webm_chunk_write_header(AVFormatContext *s) // DASH Streams can only have either one track per file. if (s->nb_streams != 1) { return AVERROR_INVALIDDATA; } - wc->chunk_count = 0; wc->chunk_index = wc->chunk_start_index; wc->oformat = av_guess_format("webm", s->filename, "video/webm"); if (!wc->oformat) @@ -124,8 +127,8 @@ static int webm_chunk_write_header(AVFormatContext *s) if (ret < 0) return ret; oc = wc->avf; - ret = set_chunk_filename(s, 1); - if (ret< 0) + ret = get_chunk_filename(s, 1, oc->filename); + if (ret < 0) return ret; ret = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); @@ -146,15 +149,10 @@ static int chunk_start(AVFormatContext *s) AVFormatContext *oc = wc->avf; int ret; - ret = set_chunk_filename(s, 0); + ret = avio_open_dyn_buf(&oc->pb); if (ret < 0) return ret; wc->chunk_index++; - ret = avio_open2(&oc->pb, oc->filename, AVIO_FLAG_WRITE, - &s->interrupt_callback, NULL); - if (ret < 0) - return ret; - oc->pb->seekable = 0; return 0; } @@ -163,16 +161,30 @@ static int chunk_end(AVFormatContext *s) WebMChunkContext *wc = s->priv_data; AVFormatContext *oc = wc->avf; int ret; + int buffer_size; + uint8_t *buffer; + AVIOContext *pb; + char filename[MAX_FILENAME_SIZE]; if (wc->chunk_start_index == wc->chunk_index) return 0; // Flush the cluster in WebM muxer. oc->oformat->write_packet(oc, NULL); - ret = avio_close(oc->pb); + buffer_size = avio_close_dyn_buf(oc->pb, &buffer); + ret = get_chunk_filename(s, 0, filename); if (ret < 0) - return ret; - wc->chunk_count++; - return 0; + goto fail; + ret = avio_open2(&pb, filename, AVIO_FLAG_WRITE, &s->interrupt_callback, NULL); + if (ret < 0) + goto fail; + avio_write(pb, buffer, buffer_size); + ret = avio_close(pb); + if (ret < 0) + goto fail; + oc->pb = NULL; +fail: + av_free(buffer); + return (ret < 0) ? ret : 0; } static int webm_chunk_write_packet(AVFormatContext *s, AVPacket *pkt)

1 0