February 2016 - ffmpeg-cvslog

lavc/ccaption_dec: do not ignore repeated character commands
by git＠videolan.org 13 Apr '16

13 Apr '16

ffmpeg | branch: master | Aman Gupta <aman(a)tmm1.net> | Sun Feb 14 18:11:53 2016 -0800| [2f26b67d557f56e01f8a3efa199a832ad8ce70b0] | committer: Clément Bœsch lavc/ccaption_dec: do not ignore repeated character commands control codes in a cc stream can be repeated, and must be ignored. however, repeated characters must not be ignored. the code attempted to wipe prev_cmd in handle_char to allow repeated characters to be processed, but prev_cmd would previously get reset _after_ handle_char() i also moved the prev_cmd reset out from handle_char() so it can be re-used for special character sets, which _must_ be ignored when repeated. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f26b67d557f56e01… --- libavcodec/ccaption_dec.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index 790f071..5fb2ec6 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -484,9 +484,6 @@ static void handle_char(CCaptionSubContext *ctx, char hi, char lo, int64_t pts) if (ctx->mode != CCMODE_POPON) ctx->screen_touched = 1; - /* reset prev command since character can repeat */ - ctx->prev_cmd[0] = 0; - ctx->prev_cmd[1] = 0; if (lo) ff_dlog(ctx, "(%c,%c)\n", hi, lo); else @@ -497,8 +494,15 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint { if (hi == ctx->prev_cmd[0] && lo == ctx->prev_cmd[1]) { /* ignore redundant command */ - } else if ( (hi == 0x10 && (lo >= 0x40 && lo <= 0x5f)) || - ( (hi >= 0x11 && hi <= 0x17) && (lo >= 0x40 && lo <= 0x7f) ) ) { + return; + } + + /* set prev command */ + ctx->prev_cmd[0] = hi; + ctx->prev_cmd[1] = lo; + + if ( (hi == 0x10 && (lo >= 0x40 && lo <= 0x5f)) || + ( (hi >= 0x11 && hi <= 0x17) && (lo >= 0x40 && lo <= 0x7f) ) ) { handle_pac(ctx, hi, lo); } else if ( ( hi == 0x11 && lo >= 0x20 && lo <= 0x2f ) || ( hi == 0x17 && lo >= 0x2e && lo <= 0x2f) ) { @@ -559,14 +563,11 @@ static void process_cc608(CCaptionSubContext *ctx, int64_t pts, uint8_t hi, uint } else if (hi >= 0x20) { /* Standard characters (always in pairs) */ handle_char(ctx, hi, lo, pts); + ctx->prev_cmd[0] = ctx->prev_cmd[1] = 0; } else { /* Ignoring all other non data code */ ff_dlog(ctx, "Unknown command 0x%hhx 0x%hhx\n", hi, lo); } - - /* set prev command */ - ctx->prev_cmd[0] = hi; - ctx->prev_cmd[1] = lo; } static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avpkt)

2 1

Merge commit '81306fd4bdeb5c17d4db771e4fec684773b5790f'
by git＠videolan.org 14 Mar '16

14 Mar '16

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Tue Feb 16 16:26:49 2016 +0000| [d0fc5de3a643fe7f974ed14e410c2ac2f4147d7e] | committer: Derek Buitenhuis Merge commit '81306fd4bdeb5c17d4db771e4fec684773b5790f' * commit '81306fd4bdeb5c17d4db771e4fec684773b5790f': hls: eliminate ffurl_* usage Merged-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0fc5de3a643fe7f9… ---

3 2

fate: add libavcodec utils test
by git＠videolan.org 29 Feb '16

29 Feb '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Feb 28 12:49:33 2016 +0100| [380fd32a8ccd908dcd484a35dafd5f3d3b5e22db] | committer: Michael Niedermayer fate: add libavcodec utils test Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=380fd32a8ccd908dc… --- tests/fate/libavcodec.mak | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak index 22c0839..5aba2ee 100644 --- a/tests/fate/libavcodec.mak +++ b/tests/fate/libavcodec.mak @@ -38,6 +38,11 @@ FATE_LIBAVCODEC-$(CONFIG_JPEG2000_ENCODER) += fate-j2k-dwt fate-j2k-dwt: libavcodec/jpeg2000dwt-test$(EXESUF) fate-j2k-dwt: CMD = run libavcodec/jpeg2000dwt-test +FATE_LIBAVCODEC-yes += fate-libavcodec-utils +fate-libavcodec-utils: libavcodec/utils-test$(EXESUF) +fate-libavcodec-utils: CMD = run libavcodec/utils-test +fate-libavcodec-utils: CMP = null +fate-libavcodec-utils: REF = /dev/null FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC-yes) fate-libavcodec: $(FATE_LIBAVCODEC-yes)

1 0

avcodec: Add utils test
by git＠videolan.org 29 Feb '16

29 Feb '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Feb 28 12:35:33 2016 +0100| [0be09f54fb2a8f9070f29918754280154fbbc34d] | committer: Michael Niedermayer avcodec: Add utils test Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0be09f54fb2a8f907… --- libavcodec/Makefile | 1 + libavcodec/utils.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5389725..667e257 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -952,6 +952,7 @@ TESTPROGS = imgconvert \ jpeg2000dwt \ mathops \ options \ + utils \ avfft \ TESTPROGS-$(CONFIG_CABAC) += cabac diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b1ba51e..f435588 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -3679,3 +3679,23 @@ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) return props; } + +#ifdef TEST +int main(void){ + avcodec_register_all(); + AVCodec *codec = NULL; + int ret = 0; + + while (codec = av_codec_next(codec)) { + if (av_codec_is_encoder(codec)) { + if (codec->type == AVMEDIA_TYPE_AUDIO) { + if (!codec->sample_fmts) { + av_log(NULL, AV_LOG_FATAL, "Encoder %s is missing the sample_fmts field\n", codec->name); + ret = 1; + } + } + } + } + return ret; +} +#endif /* TEST */

1 0

hls: Add and use a memebr of AVIOInternal rather than abuse opaque
by git＠videolan.org 29 Feb '16

29 Feb '16

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Mon Feb 29 20:09:32 2016 +0000| [9f9ed79d4cb40e5d9093899f8a79086ff23da844] | committer: Derek Buitenhuis hls: Add and use a memebr of AVIOInternal rather than abuse opaque Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f9ed79d4cb40e5d9… --- libavformat/avio_internal.h | 5 +++++ libavformat/aviobuf.c | 4 ---- libavformat/hls.c | 6 ++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 54bdfa1..1e2a18e 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -24,6 +24,11 @@ #include "libavutil/log.h" +typedef struct AVIOInternal { + URLContext *h; + void *hlsopts; +} AVIOInternal; + extern const AVClass ff_avio_class; int ffio_init_context(AVIOContext *s, diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 6fc8745..e45afd1 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -42,10 +42,6 @@ */ #define SHORT_SEEK_THRESHOLD 4096 -typedef struct AVIOInternal { - URLContext *h; -} AVIOInternal; - static void *ff_avio_child_next(void *obj, void *prev) { AVIOContext *s = obj; diff --git a/libavformat/hls.c b/libavformat/hls.c index aa5d60e..1715445 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -614,7 +614,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, ret = s->io_open(s, pb, url, AVIO_FLAG_READ, &tmp); if (ret >= 0) { // update cookies on http response with setcookies. - void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque; + AVIOInternal *internal = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque; + void *u = internal ? internal->hlsopts : NULL; update_options(&c->cookies, "cookies", u); av_dict_set(&opts, "cookies", c->cookies, 0); } @@ -1496,7 +1497,8 @@ static int nested_io_open(AVFormatContext *s, AVIOContext **pb, const char *url, static int hls_read_header(AVFormatContext *s) { - void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque; + AVIOInternal *internal = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb->opaque; + void *u = internal ? internal->hlsopts : NULL; HLSContext *c = s->priv_data; int ret = 0, i, j, stream_offset = 0;

1 0

fate: fix fate-libavformat target
by git＠videolan.org 29 Feb '16

29 Feb '16

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Feb 29 16:26:37 2016 -0300| [3acbb91d13591944552576b6cfbf9eafc76ebdea] | committer: James Almer fate: fix fate-libavformat target Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3acbb91d135919445… --- tests/fate/libavformat.mak | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak index 965011d..5d9914a 100644 --- a/tests/fate/libavformat.mak +++ b/tests/fate/libavformat.mak @@ -22,5 +22,6 @@ FATE_LIBAVFORMAT-$(CONFIG_MOV_MUXER) += fate-movenc fate-movenc: libavformat/movenc-test$(EXESUF) fate-movenc: CMD = run libavformat/movenc-test -FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes) +FATE_LIBAVFORMAT += $(FATE_LIBAVFORMAT-yes) +FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT) fate-libavformat: $(FATE_LIBAVFORMAT)

1 0

Merge commit 'cae448cfbf31d492cba782bc64fc4eed556ed83d'
by git＠videolan.org 29 Feb '16

29 Feb '16

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Mon Feb 29 18:43:04 2016 +0000| [b9aa4ccff51598553cfc81b619b8c2bef26c1413] | committer: Derek Buitenhuis Merge commit 'cae448cfbf31d492cba782bc64fc4eed556ed83d' * commit 'cae448cfbf31d492cba782bc64fc4eed556ed83d': aviobuf: add a private data struct for avio_open()ed contexts Merged-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9aa4ccff51598553… ---

1 0

aviobuf: add a private data struct for avio_open()ed contexts
by git＠videolan.org 29 Feb '16

29 Feb '16

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri Feb 19 14:29:10 2016 +0100| [cae448cfbf31d492cba782bc64fc4eed556ed83d] | committer: Anton Khirnov aviobuf: add a private data struct for avio_open()ed contexts It will be useful in the following commits. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cae448cfbf31d492c… --- libavformat/aviobuf.c | 82 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index bb575ed..18c3945 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -40,10 +40,15 @@ */ #define SHORT_SEEK_THRESHOLD 4096 +typedef struct AVIOInternal { + URLContext *h; +} AVIOInternal; + static void *ff_avio_child_next(void *obj, void *prev) { AVIOContext *s = obj; - return prev ? NULL : s->opaque; + AVIOInternal *internal = s->opaque; + return prev ? NULL : internal->h; } static const AVClass *ff_avio_child_class_next(const AVClass *prev) @@ -690,9 +695,44 @@ uint64_t ffio_read_varlen(AVIOContext *bc){ return val; } +static int io_read_packet(void *opaque, uint8_t *buf, int buf_size) +{ + AVIOInternal *internal = opaque; + return ffurl_read(internal->h, buf, buf_size); +} + +static int io_write_packet(void *opaque, uint8_t *buf, int buf_size) +{ + AVIOInternal *internal = opaque; + return ffurl_write(internal->h, buf, buf_size); +} + +static int64_t io_seek(void *opaque, int64_t offset, int whence) +{ + AVIOInternal *internal = opaque; + return ffurl_seek(internal->h, offset, whence); +} + +static int io_read_pause(void *opaque, int pause) +{ + AVIOInternal *internal = opaque; + if (!internal->h->prot->url_read_pause) + return AVERROR(ENOSYS); + return internal->h->prot->url_read_pause(internal->h, pause); +} + +static int64_t io_read_seek(void *opaque, int stream_index, int64_t timestamp, int flags) +{ + AVIOInternal *internal = opaque; + if (!internal->h->prot->url_read_seek) + return AVERROR(ENOSYS); + return internal->h->prot->url_read_seek(internal->h, stream_index, timestamp, flags); +} + int ffio_fdopen(AVIOContext **s, URLContext *h) { - uint8_t *buffer; + AVIOInternal *internal = NULL; + uint8_t *buffer = NULL; int buffer_size, max_packet_size; max_packet_size = h->max_packet_size; @@ -705,22 +745,29 @@ int ffio_fdopen(AVIOContext **s, URLContext *h) if (!buffer) return AVERROR(ENOMEM); - *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h, - (int (*)(void *, uint8_t *, int)) ffurl_read, - (int (*)(void *, uint8_t *, int)) ffurl_write, - (int64_t (*)(void *, int64_t, int)) ffurl_seek); - if (!*s) { - av_free(buffer); - return AVERROR(ENOMEM); - } + internal = av_mallocz(sizeof(*internal)); + if (!internal) + goto fail; + + internal->h = h; + + *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, + internal, io_read_packet, io_write_packet, io_seek); + if (!*s) + goto fail; + (*s)->seekable = h->is_streamed ? 0 : AVIO_SEEKABLE_NORMAL; (*s)->max_packet_size = max_packet_size; if(h->prot) { - (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; - (*s)->read_seek = (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek; + (*s)->read_pause = io_read_pause; + (*s)->read_seek = io_read_seek; } (*s)->av_class = &ff_avio_class; return 0; +fail: + av_freep(&internal); + av_freep(&buffer); + return AVERROR(ENOMEM); } int ffio_set_buf_size(AVIOContext *s, int buf_size) @@ -815,13 +862,17 @@ int avio_open2(AVIOContext **s, const char *filename, int flags, int avio_close(AVIOContext *s) { + AVIOInternal *internal; URLContext *h; if (!s) return 0; avio_flush(s); - h = s->opaque; + internal = s->opaque; + h = internal->h; + + av_freep(&s->opaque); av_freep(&s->buffer); av_free(s); return ffurl_close(h); @@ -857,15 +908,14 @@ int avio_pause(AVIOContext *s, int pause) int64_t avio_seek_time(AVIOContext *s, int stream_index, int64_t timestamp, int flags) { - URLContext *h = s->opaque; int64_t ret; if (!s->read_seek) return AVERROR(ENOSYS); - ret = s->read_seek(h, stream_index, timestamp, flags); + ret = s->read_seek(s->opaque, stream_index, timestamp, flags); if (ret >= 0) { int64_t pos; s->buf_ptr = s->buf_end; // Flush buffer - pos = s->seek(h, 0, SEEK_CUR); + pos = s->seek(s->opaque, 0, SEEK_CUR); if (pos >= 0) s->pos = pos; else if (pos != AVERROR(ENOSYS))

1 0

avformat/protocols: Fix ff_urlcontext_child_class_next()
by git＠videolan.org 29 Feb '16

29 Feb '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Feb 29 19:04:54 2016 +0100| [4899c02c385f8ab4b2be14b2e7fa5d6bfdcfa2a1] | committer: Michael Niedermayer avformat/protocols: Fix ff_urlcontext_child_class_next() This fixes -read_ahead_limit Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4899c02c385f8ab4b… --- libavformat/protocols.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index f374970..77cd3a4 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -215,7 +215,7 @@ const AVClass *ff_urlcontext_child_class_next(const AVClass *prev) int i; /* find the protocol that corresponds to prev */ - for (i = 0; url_protocols[i]; i++) { + for (i = 0; prev && url_protocols[i]; i++) { if (url_protocols[i]->priv_data_class == prev) { i++; break;

1 0

avformat/msf: Also check the codec tag in probing
by git＠videolan.org 29 Feb '16

29 Feb '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Feb 29 13:53:13 2016 +0100| [a6cd817a544e4e526f18391bd2c7112dc12d2f94] | committer: Michael Niedermayer avformat/msf: Also check the codec tag in probing Fixes probing failure Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6cd817a544e4e526… --- libavformat/msf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/msf.c b/libavformat/msf.c index 73a5a01..97a6dc6 100644 --- a/libavformat/msf.c +++ b/libavformat/msf.c @@ -34,6 +34,9 @@ static int msf_probe(AVProbeData *p) if (AV_RB32(p->buf+16) <= 0) return 0; + if (AV_RB32(p->buf+4) > 16) + return AVPROBE_SCORE_MAX / 5; //unsupported / unknown codec + return AVPROBE_SCORE_MAX / 3 * 2; }

1 0