November 2019 - ffmpeg-cvslog

avformat/avc: add missing return error value
by James Almer 30 Nov '19

30 Nov '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Nov 30 11:26:17 2019 -0300| [e5db2e96c02da32407c425d7805b9c32808ced3d] | committer: James Almer avformat/avc: add missing return error value Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5db2e96c02da3240… --- libavformat/avc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index 2fb16872c4..e4e82e1864 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -198,8 +198,10 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) if (sps[3] != 66 && sps[3] != 77 && sps[3] != 88) { H264SequenceParameterSet *seq = ff_avc_decode_sps(sps + 3, sps_size - 3); - if (!seq) + if (!seq) { + ret = AVERROR(ENOMEM); goto fail; + } avio_w8(pb, 0xfc | seq->chroma_format_idc); /* 6 bits reserved (111111) + chroma_format_idc */ avio_w8(pb, 0xf8 | (seq->bit_depth_luma - 8)); /* 5 bits reserved (11111) + bit_depth_luma_minus8 */ avio_w8(pb, 0xf8 | (seq->bit_depth_chroma - 8)); /* 5 bits reserved (11111) + bit_depth_chroma_minus8 */

1 0

lavc/extract_extradata: Use bytestream api
by Andriy Gelman 30 Nov '19

30 Nov '19

ffmpeg | branch: master | Andriy Gelman <andriy.gelman(a)gmail.com> | Sat Nov 30 08:30:19 2019 -0500| [99d78e4f424918c6584b358cd98cfc6165c5d158] | committer: James Almer lavc/extract_extradata: Use bytestream api Signed-off-by: Andriy Gelman <andriy.gelman(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99d78e4f424918c65… --- libavcodec/extract_extradata_bsf.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 15ffed6ba0..46b76dfbef 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -27,6 +27,7 @@ #include "av1.h" #include "av1_parse.h" #include "bsf.h" +#include "bytestream.h" #include "h2645_parse.h" #include "h264.h" #include "hevc.h" @@ -86,7 +87,8 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, if (extradata_size && has_seq) { AVBufferRef *filtered_buf = NULL; - uint8_t *extradata, *filtered_data; + PutByteContext pb_filtered_data, pb_extradata; + uint8_t *extradata; if (s->remove) { filtered_buf = av_buffer_alloc(filtered_size + AV_INPUT_BUFFER_PADDING_SIZE); @@ -94,8 +96,6 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, return AVERROR(ENOMEM); } memset(filtered_buf->data + filtered_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - - filtered_data = filtered_buf->data; } extradata = av_malloc(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); @@ -108,15 +108,17 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, *data = extradata; *size = extradata_size; + bytestream2_init_writer(&pb_extradata, extradata, extradata_size); + if (s->remove) + bytestream2_init_writer(&pb_filtered_data, filtered_buf->data, filtered_size); + for (i = 0; i < s->av1_pkt.nb_obus; i++) { AV1OBU *obu = &s->av1_pkt.obus[i]; if (val_in_array(extradata_obu_types, nb_extradata_obu_types, obu->type)) { - memcpy(extradata, obu->raw_data, obu->raw_size); - extradata += obu->raw_size; + bytestream2_put_bufferu(&pb_extradata, obu->raw_data, obu->raw_size); } else if (s->remove) { - memcpy(filtered_data, obu->raw_data, obu->raw_size); - filtered_data += obu->raw_size; + bytestream2_put_bufferu(&pb_filtered_data, obu->raw_data, obu->raw_size); } } @@ -180,7 +182,8 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, ((ctx->par_in->codec_id == AV_CODEC_ID_HEVC && has_sps && has_vps) || (ctx->par_in->codec_id == AV_CODEC_ID_H264 && has_sps))) { AVBufferRef *filtered_buf = NULL; - uint8_t *extradata, *filtered_data; + PutByteContext pb_filtered_data, pb_extradata; + uint8_t *extradata; if (s->remove) { filtered_buf = av_buffer_alloc(filtered_size + AV_INPUT_BUFFER_PADDING_SIZE); @@ -188,8 +191,6 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, return AVERROR(ENOMEM); } memset(filtered_buf->data + filtered_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - - filtered_data = filtered_buf->data; } extradata = av_malloc(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); @@ -202,17 +203,19 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, *data = extradata; *size = extradata_size; + bytestream2_init_writer(&pb_extradata, extradata, extradata_size); + if (s->remove) + bytestream2_init_writer(&pb_filtered_data, filtered_buf->data, filtered_size); + for (i = 0; i < s->h2645_pkt.nb_nals; i++) { H2645NAL *nal = &s->h2645_pkt.nals[i]; if (val_in_array(extradata_nal_types, nb_extradata_nal_types, nal->type)) { - AV_WB24(extradata, 1); // startcode - memcpy(extradata + 3, nal->raw_data, nal->raw_size); - extradata += 3 + nal->raw_size; + bytestream2_put_be24u(&pb_extradata, 1); //startcode + bytestream2_put_bufferu(&pb_extradata, nal->raw_data, nal->raw_size); } else if (s->remove) { - AV_WB24(filtered_data, 1); // startcode - memcpy(filtered_data + 3, nal->raw_data, nal->raw_size); - filtered_data += 3 + nal->raw_size; + bytestream2_put_be24u(&pb_filtered_data, 1); // startcode + bytestream2_put_bufferu(&pb_filtered_data, nal->raw_data, nal->raw_size); } }

1 0

avcodec/extract_extradata_bsf: Don't unref uninitialized buffers
by Andreas Rheinhardt 30 Nov '19

30 Nov '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Sat Nov 30 07:38:10 2019 +0100| [76e0ecec0bfade85796ccfeb9ffdfd55c666612e] | committer: James Almer avcodec/extract_extradata_bsf: Don't unref uninitialized buffers This happens if allocating extradata fails and s->remove is unset. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76e0ecec0bfade857… --- libavcodec/extract_extradata_bsf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index ff111de48c..15ffed6ba0 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -85,7 +85,7 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, } if (extradata_size && has_seq) { - AVBufferRef *filtered_buf; + AVBufferRef *filtered_buf = NULL; uint8_t *extradata, *filtered_data; if (s->remove) { @@ -179,7 +179,7 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, if (extradata_size && ((ctx->par_in->codec_id == AV_CODEC_ID_HEVC && has_sps && has_vps) || (ctx->par_in->codec_id == AV_CODEC_ID_H264 && has_sps))) { - AVBufferRef *filtered_buf; + AVBufferRef *filtered_buf = NULL; uint8_t *extradata, *filtered_data; if (s->remove) {

1 0

avformat/avc: fix sps buffer offset when calling ff_avc_decode_sps()
by James Almer 30 Nov '19

30 Nov '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 29 23:13:36 2019 -0300| [18507b48825da45055f7ba1f933aa64cf90de253] | committer: James Almer avformat/avc: fix sps buffer offset when calling ff_avc_decode_sps() Skip the avcC specific size bytes and the NAL header bits. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18507b48825da4505… --- libavformat/avc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index a3516a2fb7..2fb16872c4 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -197,7 +197,7 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) avio_write(pb, pps, pps_size); if (sps[3] != 66 && sps[3] != 77 && sps[3] != 88) { - H264SequenceParameterSet *seq = ff_avc_decode_sps(sps, sps_size); + H264SequenceParameterSet *seq = ff_avc_decode_sps(sps + 3, sps_size - 3); if (!seq) goto fail; avio_w8(pb, 0xfc | seq->chroma_format_idc); /* 6 bits reserved (111111) + chroma_format_idc */

1 0

fate/demux: add an AV1 Annex B test
by James Almer 29 Nov '19

29 Nov '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Nov 18 10:44:32 2019 -0300| [0d67af34c2b200684aa8264c517e46abf792f292] | committer: James Almer fate/demux: add an AV1 Annex B test Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d67af34c2b200684… --- tests/fate/demux.mak | 3 +++ tests/ref/fate/av1-annexb-demux | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index eb8d8c3655..9f3a6be276 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -10,6 +10,9 @@ fate-adts-id3v2-two-tags-demux: CMD = framecrc -i $(TARGET_SAMPLES)/aac/id3v2_tw FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -c:a copy +FATE_SAMPLES_DEMUX-$(CONFIG_AV1_DEMUXER) += fate-av1-annexb-demux +fate-av1-annexb-demux: CMD = framecrc -i $(TARGET_SAMPLES)/av1/annexb.obu -c:v copy + FATE_SAMPLES_DEMUX-$(CONFIG_AST_DEMUXER) += fate-ast fate-ast: CMD = crc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast -c copy diff --git a/tests/ref/fate/av1-annexb-demux b/tests/ref/fate/av1-annexb-demux new file mode 100644 index 0000000000..139a893ec1 --- /dev/null +++ b/tests/ref/fate/av1-annexb-demux @@ -0,0 +1,16 @@ +#extradata 0: 13, 0x0e4c033a +#tb 0: 1/1200000 +#media_type 0: video +#codec_id 0: av1 +#dimensions 0: 300x300 +#sar 0: 0/1 +0, 0, 0, 48000, 12691, 0xf0adcc79 +0, 48000, 48000, 48000, 4975, 0x1742a45f, F=0x0 +0, 96000, 96000, 48000, 928, 0x7408be1a, F=0x0 +0, 144000, 144000, 48000, 702, 0x1d4464ca, F=0x0 +0, 192000, 192000, 48000, 1372, 0x37999ccf, F=0x0 +0, 240000, 240000, 48000, 1085, 0x06b61548, F=0x0 +0, 288000, 288000, 48000, 1533, 0x5e05dea3, F=0x0 +0, 336000, 336000, 48000, 1416, 0x31d4b906, F=0x0 +0, 384000, 384000, 48000, 108, 0xf52a2c59, F=0x0 +0, 432000, 432000, 48000, 1740, 0x1f065d09, F=0x0

1 0

avcodec/av1_parser: export stream dimensions in avctx
by James Almer 29 Nov '19

29 Nov '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Nov 18 10:43:40 2019 -0300| [378065f08fbcbadf7c17bbd97b07c52692f1b471] | committer: James Almer avcodec/av1_parser: export stream dimensions in avctx This is required to demux annexb samples when a decoder isn't available. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=378065f08fbcbadf7… --- libavcodec/av1_parser.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index 510cad987b..08721c356a 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -23,6 +23,7 @@ #include "av1_parse.h" #include "cbs.h" #include "cbs_av1.h" +#include "internal.h" #include "parser.h" typedef struct AV1ParseContext { @@ -155,6 +156,12 @@ static int av1_parser_parse(AVCodecParserContext *ctx, break; } av_assert2(ctx->format != AV_PIX_FMT_NONE); + + if (ctx->width != avctx->width || ctx->height != avctx->height) { + ret = ff_set_dimensions(avctx, ctx->width, ctx->height); + if (ret < 0) + goto end; + } } if (avctx->framerate.num)

1 0

fate/lavf-container: add an H264 mp4 remux test
by James Almer 29 Nov '19

29 Nov '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 29 18:12:41 2019 -0300| [13ed2435940056a7b1f11b1f83069839a760cdbf] | committer: James Almer fate/lavf-container: add an H264 mp4 remux test This uses a raw h264 bitstream as source, in order to test the avcC generation code. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13ed2435940056a7b… --- tests/fate/lavf-container.mak | 2 ++ tests/ref/lavf-fate/h264.mp4 | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index f86e3ed84c..eb55500990 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -57,6 +57,7 @@ FATE_AVCONV += $(FATE_LAVF_CONTAINER) fate-lavf-container fate-lavf: $(FATE_LAVF_CONTAINER) FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_PARSER MOV_MUXER) += av1.mp4 +FATE_LAVF_CONTAINER_FATE-$(call ALLYES, H264_DEMUXER H264_PARSER MOV_MUXER) += h264.mp4 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += vp3.ogg FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER) += vp8.ogg FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER) += latm @@ -70,6 +71,7 @@ $(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf $(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF) fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" +fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "-c:v copy" fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto" fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" "" "-acodec copy" fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "-acodec copy" diff --git a/tests/ref/lavf-fate/h264.mp4 b/tests/ref/lavf-fate/h264.mp4 new file mode 100644 index 0000000000..bb52f45758 --- /dev/null +++ b/tests/ref/lavf-fate/h264.mp4 @@ -0,0 +1,3 @@ +6d158b25efe7391c803f6f61c7a80aa0 *tests/data/lavf-fate/lavf.h264.mp4 +547908 tests/data/lavf-fate/lavf.h264.mp4 +tests/data/lavf-fate/lavf.h264.mp4 CRC=0x9da2c999

1 0

fate/lavf-container: add an AV1 mp4 remux test
by James Almer 29 Nov '19

29 Nov '19

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Nov 29 18:02:05 2019 -0300| [de557eb19156a4eb744854cfdca8de6460593869] | committer: James Almer fate/lavf-container: add an AV1 mp4 remux test Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de557eb19156a4eb7… --- tests/fate/lavf-container.mak | 2 ++ tests/ref/lavf-fate/av1.mp4 | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 22387d04d8..f86e3ed84c 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -56,6 +56,7 @@ fate-lavf-wtv: CMD = lavf_container "" "-c:a mp2 -threads 1" FATE_AVCONV += $(FATE_LAVF_CONTAINER) fate-lavf-container fate-lavf: $(FATE_LAVF_CONTAINER) +FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER AV1_PARSER MOV_MUXER) += av1.mp4 FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += vp3.ogg FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER) += vp8.ogg FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER) += latm @@ -68,6 +69,7 @@ FATE_LAVF_CONTAINER_FATE = $(FATE_LAVF_CONTAINER_FATE-yes:%=fate-lavf-fate-%) $(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%) $(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF) +fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto" fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" "" "-acodec copy" fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "-acodec copy" diff --git a/tests/ref/lavf-fate/av1.mp4 b/tests/ref/lavf-fate/av1.mp4 new file mode 100644 index 0000000000..38d2a80afe --- /dev/null +++ b/tests/ref/lavf-fate/av1.mp4 @@ -0,0 +1,3 @@ +0388467214421a19ba65d10a74dc35c0 *tests/data/lavf-fate/lavf.av1.mp4 +55936 tests/data/lavf-fate/lavf.av1.mp4 +tests/data/lavf-fate/lavf.av1.mp4 CRC=0x7c27cc15

1 0

libavdevice/lavfi: check avfilter_graph_dump return value
by Zhao Zhili 29 Nov '19

29 Nov '19

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Thu Nov 21 15:08:18 2019 +0800| [19956d01ccf1aca2902e8192c8768903cee3be06] | committer: Michael Niedermayer libavdevice/lavfi: check avfilter_graph_dump return value Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19956d01ccf1aca29… --- libavdevice/lavfi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index ca8f05f3f7..c949ff7e12 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -302,9 +302,13 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) if (lavfi->dump_graph) { char *dump = avfilter_graph_dump(lavfi->graph, lavfi->dump_graph); - fputs(dump, stderr); - fflush(stderr); - av_free(dump); + if (dump != NULL) { + fputs(dump, stderr); + fflush(stderr); + av_free(dump); + } else { + FAIL(AVERROR(ENOMEM)); + } } /* fill each stream with the information in the corresponding sink */

1 0

avformat/avio: Use ffurl_closep
by Andreas Rheinhardt 29 Nov '19

29 Nov '19

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Fri Nov 29 10:42:48 2019 +0100| [2205fb281074a31388e78c615193410cc9c10042] | committer: Michael Niedermayer avformat/avio: Use ffurl_closep Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2205fb281074a3138… --- libavformat/avio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index c1bad312cd..2dd2312296 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -346,8 +346,7 @@ int ffurl_open_whitelist(URLContext **puc, const char *filename, int flags, if (!ret) return 0; fail: - ffurl_close(*puc); - *puc = NULL; + ffurl_closep(puc); return ret; }

1 0