August 2017 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/mov: prevent duplication of first fragment's ctts_data
by Daniel Glöckner 31 Aug '17

31 Aug '17

ffmpeg | branch: master | Daniel Glöckner <daniel-gl(a)gmx.net> | Sun Aug 6 03:04:53 2017 +0200| [feb1dbc7bd4c395400c48055c563ac23d5251716] | committer: Michael Niedermayer avformat/mov: prevent duplication of first fragment's ctts_data MP4 files with fragments might have the first moof box that is mentioned in a fragment index before the first mdat box. Since it is then already parsed by mov_read_header, we have to make sure that mov_switch_root will not parse it again when seeking by setting the headers_read flag in the index. Parsing it a second time would cause the ctts_data array to receive a second copy of the information from the trun box, leading to wrong PTS values for the second and following fragments in presence of B-frames. Fixes ticket 6560. Signed-off-by: Daniel Glöckner <daniel-gl(a)gmx.net> Reviewed-by: Dale Curtis <dalecurtis(a)chromium.org> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=feb1dbc7bd4c39540… --- libavformat/mov.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 89b2af7597..994e9c6eba 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6363,6 +6363,13 @@ static int mov_read_header(AVFormatContext *s) } ff_configure_buffers_for_index(s, AV_TIME_BASE); + for (i = 0; i < mov->fragment_index_count; i++) { + MOVFragmentIndex *idx = mov->fragment_index_data[i]; + for (j = 0; j < idx->item_count; j++) + if (idx->items[j].moof_offset <= mov->fragment.moof_offset) + idx->items[j].headers_read = 1; + } + return 0; }

1 0

avformat/mov: Bail when invalid sample data is present.
by Dale Curtis 31 Aug '17

31 Aug '17

ffmpeg | branch: master | Dale Curtis <dalecurtis(a)chromium.org> | Mon Jul 31 13:44:22 2017 -0700| [f1e47f87131dd7c3718496b83911e17586e26e80] | committer: Michael Niedermayer avformat/mov: Bail when invalid sample data is present. ctts data in ffmpeg relies on the index entries array to be 1:1 with samples... yet sc->sample_count can be read directly from the 'stsz' box and index entries are only generated if a chunk count has been read from 'stco' box. Ensure that if sc->sample_count > 0, sc->chunk_count is too as a basic sanity check. Additionally we need to check that after the index is built we have the right number of entries, so we also check in mov_read_trun() that sc->sample_count == st->nb_index_entries. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1e47f87131dd7c37… --- libavformat/mov.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 876f48d912..89b2af7597 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3755,8 +3755,9 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) c->trak_index = -1; /* sanity checks */ - if (sc->chunk_count && (!sc->stts_count || !sc->stsc_count || - (!sc->sample_size && !sc->sample_count))) { + if ((sc->chunk_count && (!sc->stts_count || !sc->stsc_count || + (!sc->sample_size && !sc->sample_count))) || + (!sc->chunk_count && sc->sample_count)) { av_log(c->fc, AV_LOG_ERROR, "stream %d, missing mandatory atoms, broken header\n", st->index); return 0; @@ -4284,26 +4285,6 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) entries = avio_rb32(pb); av_log(c->fc, AV_LOG_TRACE, "flags 0x%x entries %u\n", flags, entries); - /* Always assume the presence of composition time offsets. - * Without this assumption, for instance, we cannot deal with a track in fragmented movies that meet the following. - * 1) in the initial movie, there are no samples. - * 2) in the first movie fragment, there is only one sample without composition time offset. - * 3) in the subsequent movie fragments, there are samples with composition time offset. */ - if (!sc->ctts_count && sc->sample_count) - { - /* Complement ctts table if moov atom doesn't have ctts atom. */ - ctts_data = av_fast_realloc(NULL, &sc->ctts_allocated_size, sizeof(*sc->ctts_data) * sc->sample_count); - if (!ctts_data) - return AVERROR(ENOMEM); - /* Don't use a count greater than 1 here since it will leave a gap in - * the ctts index which the code below relies on being sequential. */ - sc->ctts_data = ctts_data; - for (i = 0; i < sc->sample_count; i++) { - sc->ctts_data[sc->ctts_count].count = 1; - sc->ctts_data[sc->ctts_count].duration = 0; - sc->ctts_count++; - } - } if ((uint64_t)entries+sc->ctts_count >= UINT_MAX/sizeof(*sc->ctts_data)) return AVERROR_INVALIDDATA; if (flags & MOV_TRUN_DATA_OFFSET) data_offset = avio_rb32(pb); @@ -4364,13 +4345,19 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) unsigned int size_needed = st->nb_index_entries * sizeof(*sc->ctts_data); unsigned int request_size = size_needed > sc->ctts_allocated_size ? FFMAX(size_needed, 2 * sc->ctts_allocated_size) : size_needed; + unsigned int old_ctts_size = sc->ctts_allocated_size; ctts_data = av_fast_realloc(sc->ctts_data, &sc->ctts_allocated_size, request_size); if (!ctts_data) { av_freep(&sc->ctts_data); return AVERROR(ENOMEM); } - sc->ctts_data = ctts_data; + + // In case there were samples without ctts entries, ensure they get + // zero valued entries. This ensures clips which mix boxes with and + // without ctts entries don't pickup uninitialized data. + memset((uint8_t*)(sc->ctts_data) + old_ctts_size, 0, sc->ctts_allocated_size - old_ctts_size); + if (ctts_index != old_nb_index_entries) { memmove(sc->ctts_data + ctts_index + 1, sc->ctts_data + ctts_index, sizeof(*sc->ctts_data) * (sc->ctts_count - ctts_index));

1 0

avformat/concatdec: add fallback for calculating file duration
by Justin Ruggles 31 Aug '17

31 Aug '17

ffmpeg | branch: master | Justin Ruggles <justin.ruggles(a)gmail.com> | Mon Aug 28 22:45:20 2017 -0400| [1a0d9b503d2e9c4278d6e93d40873dff9d191a25] | committer: Derek Buitenhuis avformat/concatdec: add fallback for calculating file duration If a file does not have a known duration, this leads to the timestamps starting over for the next file, causing non-monotonic timestamps. To prevent this, track the duration during demuxing and use it to determine the current file duration before opening the next file. Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a0d9b503d2e9c427… --- libavformat/concatdec.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index e8b37d6a08..0e189012ad 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -44,6 +44,7 @@ typedef struct { int64_t file_start_time; int64_t file_inpoint; int64_t duration; + int64_t next_dts; ConcatStream *streams; int64_t inpoint; int64_t outpoint; @@ -149,6 +150,7 @@ static int add_file(AVFormatContext *avf, char *filename, ConcatFile **rfile, file->url = url; file->start_time = AV_NOPTS_VALUE; file->duration = AV_NOPTS_VALUE; + file->next_dts = AV_NOPTS_VALUE; file->inpoint = AV_NOPTS_VALUE; file->outpoint = AV_NOPTS_VALUE; @@ -509,8 +511,14 @@ static int open_next_file(AVFormatContext *avf) ConcatContext *cat = avf->priv_data; unsigned fileno = cat->cur_file - cat->files; - if (cat->cur_file->duration == AV_NOPTS_VALUE) - cat->cur_file->duration = cat->avf->duration - (cat->cur_file->file_inpoint - cat->cur_file->file_start_time); + if (cat->cur_file->duration == AV_NOPTS_VALUE) { + if (cat->avf->duration > 0 || cat->cur_file->next_dts == AV_NOPTS_VALUE) { + cat->cur_file->duration = cat->avf->duration; + } else { + cat->cur_file->duration = cat->cur_file->next_dts; + } + cat->cur_file->duration -= (cat->cur_file->file_inpoint - cat->cur_file->file_start_time); + } if (++fileno >= cat->nb_files) { cat->eof = 1; @@ -627,6 +635,14 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) memcpy(metadata, packed_metadata, metadata_len); av_freep(&packed_metadata); } + + if (cat->cur_file->duration == AV_NOPTS_VALUE && st->cur_dts != AV_NOPTS_VALUE) { + int64_t next_dts = av_rescale_q(st->cur_dts, st->time_base, AV_TIME_BASE_Q); + if (cat->cur_file->next_dts == AV_NOPTS_VALUE || next_dts > cat->cur_file->next_dts) { + cat->cur_file->next_dts = next_dts; + } + } + return ret; }

1 0

avcodec/fits: add missing header includes
by James Almer 31 Aug '17

31 Aug '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Thu Aug 31 11:26:36 2017 -0300| [1291a6d0ff9afb61100f5da46c65360418a4a8ef] | committer: James Almer avcodec/fits: add missing header includes Fixes checkheaders. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1291a6d0ff9afb611… --- libavcodec/fits.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/fits.h b/libavcodec/fits.h index 2cf9e7c131..b2f9b4cb39 100644 --- a/libavcodec/fits.h +++ b/libavcodec/fits.h @@ -22,6 +22,10 @@ #ifndef AVCODEC_FITS_H #define AVCODEC_FITS_H +#include <inttypes.h> + +#include <libavutil/dict.h> + typedef enum FITSHeaderState { STATE_SIMPLE, STATE_XTENSION,

1 0

fate: add tests for some video source filters
by Tobias Rapp 31 Aug '17

31 Aug '17

ffmpeg | branch: master | Tobias Rapp <t.rapp(a)noa-archive.com> | Thu Aug 17 14:40:40 2017 +0200| [b7101151b36c85b96da4976fe0c4f817e2ea3cfc] | committer: Tobias Rapp fate: add tests for some video source filters Adds FATE tests for the previously untested allrgb, allyuv, rgbtestsrc, smptebars, smptehdbars and yuvtestsrc filters. Also adds a test for testsrc2 filter with rgb+alpha. Tested-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Tobias Rapp <t.rapp(a)noa-archive.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7101151b36c85b96… --- tests/fate/filter-video.mak | 24 ++++++++++ tests/ref/fate/filter-allrgb | 10 ++++ tests/ref/fate/filter-allyuv | 10 ++++ tests/ref/fate/filter-rgbtestsrc | 10 ++++ tests/ref/fate/filter-smptebars | 10 ++++ tests/ref/fate/filter-smptehdbars | 10 ++++ tests/ref/fate/filter-testsrc2-rgba | 75 ++++++++++++++++++++++++++++++ tests/ref/fate/filter-yuvtestsrc-yuv444p | 10 ++++ tests/ref/fate/filter-yuvtestsrc-yuv444p12 | 10 ++++ 9 files changed, 169 insertions(+) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 670d9ded56..620487872b 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -80,6 +80,30 @@ fate-filter-testsrc2-yuv444p: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt y FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER) += fate-filter-testsrc2-rgb24 fate-filter-testsrc2-rgb24: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt rgb24 +FATE_FILTER-$(call ALLYES, LAVFI_INDEV TESTSRC2_FILTER) += fate-filter-testsrc2-rgba +fate-filter-testsrc2-rgba: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt rgba + +FATE_FILTER-$(call ALLYES, LAVFI_INDEV ALLRGB_FILTER) += fate-filter-allrgb +fate-filter-allrgb: CMD = framecrc -lavfi allrgb=rate=5:duration=1 -pix_fmt rgb24 + +FATE_FILTER-$(call ALLYES, LAVFI_INDEV ALLYUV_FILTER) += fate-filter-allyuv +fate-filter-allyuv: CMD = framecrc -lavfi allyuv=rate=5:duration=1 -pix_fmt yuv444p + +FATE_FILTER-$(call ALLYES, LAVFI_INDEV RGBTESTSRC_FILTER) += fate-filter-rgbtestsrc +fate-filter-rgbtestsrc: CMD = framecrc -lavfi rgbtestsrc=rate=5:duration=1 -pix_fmt rgb24 + +FATE_FILTER-$(call ALLYES, LAVFI_INDEV SMPTEBARS_FILTER) += fate-filter-smptebars +fate-filter-smptebars: CMD = framecrc -lavfi smptebars=rate=5:duration=1 -pix_fmt yuv420p + +FATE_FILTER-$(call ALLYES, LAVFI_INDEV SMPTEHDBARS_FILTER) += fate-filter-smptehdbars +fate-filter-smptehdbars: CMD = framecrc -lavfi smptehdbars=rate=5:duration=1 -pix_fmt yuv444p + +FATE_FILTER-$(call ALLYES, LAVFI_INDEV YUVTESTSRC_FILTER) += fate-filter-yuvtestsrc-yuv444p +fate-filter-yuvtestsrc-yuv444p: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration=1 -pix_fmt yuv444p + +FATE_FILTER-$(call ALLYES, LAVFI_INDEV YUVTESTSRC_FILTER) += fate-filter-yuvtestsrc-yuv444p12 +fate-filter-yuvtestsrc-yuv444p12: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration=1,format=yuv444p12 -pix_fmt yuv444p12le + FATE_FILTER-$(call ALLYES, AVDEVICE TESTSRC_FILTER FORMAT_FILTER CONCAT_FILTER SCALE_FILTER) += fate-filter-lavd-scalenorm fate-filter-lavd-scalenorm: tests/data/filtergraphs/scalenorm fate-filter-lavd-scalenorm: CMD = framecrc -f lavfi -graph_file $(TARGET_PATH)/tests/data/filtergraphs/scalenorm -i dummy diff --git a/tests/ref/fate/filter-allrgb b/tests/ref/fate/filter-allrgb new file mode 100644 index 0000000000..b54efc5504 --- /dev/null +++ b/tests/ref/fate/filter-allrgb @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 4096x4096 +#sar 0: 1/1 +0, 0, 0, 1, 50331648, 0x9cc26aca +0, 1, 1, 1, 50331648, 0x9cc26aca +0, 2, 2, 1, 50331648, 0x9cc26aca +0, 3, 3, 1, 50331648, 0x9cc26aca +0, 4, 4, 1, 50331648, 0x9cc26aca diff --git a/tests/ref/fate/filter-allyuv b/tests/ref/fate/filter-allyuv new file mode 100644 index 0000000000..477992f0ea --- /dev/null +++ b/tests/ref/fate/filter-allyuv @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 4096x4096 +#sar 0: 1/1 +0, 0, 0, 1, 50331648, 0x70b16aca +0, 1, 1, 1, 50331648, 0x70b16aca +0, 2, 2, 1, 50331648, 0x70b16aca +0, 3, 3, 1, 50331648, 0x70b16aca +0, 4, 4, 1, 50331648, 0x70b16aca diff --git a/tests/ref/fate/filter-rgbtestsrc b/tests/ref/fate/filter-rgbtestsrc new file mode 100644 index 0000000000..e18d364fdb --- /dev/null +++ b/tests/ref/fate/filter-rgbtestsrc @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 230400, 0x8c0018bb +0, 1, 1, 1, 230400, 0x8c0018bb +0, 2, 2, 1, 230400, 0x8c0018bb +0, 3, 3, 1, 230400, 0x8c0018bb +0, 4, 4, 1, 230400, 0x8c0018bb diff --git a/tests/ref/fate/filter-smptebars b/tests/ref/fate/filter-smptebars new file mode 100644 index 0000000000..2242aef576 --- /dev/null +++ b/tests/ref/fate/filter-smptebars @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 115200, 0x87d91dc5 +0, 1, 1, 1, 115200, 0x87d91dc5 +0, 2, 2, 1, 115200, 0x87d91dc5 +0, 3, 3, 1, 115200, 0x87d91dc5 +0, 4, 4, 1, 115200, 0x87d91dc5 diff --git a/tests/ref/fate/filter-smptehdbars b/tests/ref/fate/filter-smptehdbars new file mode 100644 index 0000000000..7a105fb69e --- /dev/null +++ b/tests/ref/fate/filter-smptehdbars @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 230400, 0x85f40706 +0, 1, 1, 1, 230400, 0x85f40706 +0, 2, 2, 1, 230400, 0x85f40706 +0, 3, 3, 1, 230400, 0x85f40706 +0, 4, 4, 1, 230400, 0x85f40706 diff --git a/tests/ref/fate/filter-testsrc2-rgba b/tests/ref/fate/filter-testsrc2-rgba new file mode 100644 index 0000000000..42ecfe571d --- /dev/null +++ b/tests/ref/fate/filter-testsrc2-rgba @@ -0,0 +1,75 @@ +#tb 0: 1/7 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 307200, 0xa2e60897 +0, 1, 1, 1, 307200, 0x67f03406 +0, 2, 2, 1, 307200, 0x683843a1 +0, 3, 3, 1, 307200, 0x285a682c +0, 4, 4, 1, 307200, 0x7444a71e +0, 5, 5, 1, 307200, 0xde9e40d7 +0, 6, 6, 1, 307200, 0xc8bbd13d +0, 7, 7, 1, 307200, 0x6f179555 +0, 8, 8, 1, 307200, 0x274254c9 +0, 9, 9, 1, 307200, 0xb3ee50db +0, 10, 10, 1, 307200, 0x0ebe40d8 +0, 11, 11, 1, 307200, 0xa8216930 +0, 12, 12, 1, 307200, 0x467778e2 +0, 13, 13, 1, 307200, 0xe6b02e74 +0, 14, 14, 1, 307200, 0x18a5a923 +0, 15, 15, 1, 307200, 0x3ff2086b +0, 16, 16, 1, 307200, 0x71ebe464 +0, 17, 17, 1, 307200, 0x671cf604 +0, 18, 18, 1, 307200, 0xe55dfee7 +0, 19, 19, 1, 307200, 0xc9c497ea +0, 20, 20, 1, 307200, 0xb263b768 +0, 21, 21, 1, 307200, 0xd24ee5a8 +0, 22, 22, 1, 307200, 0x9b77a2b7 +0, 23, 23, 1, 307200, 0x729c1b08 +0, 24, 24, 1, 307200, 0x725574db +0, 25, 25, 1, 307200, 0x413cf660 +0, 26, 26, 1, 307200, 0xe8db86b0 +0, 27, 27, 1, 307200, 0xf538a378 +0, 28, 28, 1, 307200, 0x89638534 +0, 29, 29, 1, 307200, 0x0858618b +0, 30, 30, 1, 307200, 0x8b5f961c +0, 31, 31, 1, 307200, 0xddbb5e48 +0, 32, 32, 1, 307200, 0x9352a610 +0, 33, 33, 1, 307200, 0xcf466635 +0, 34, 34, 1, 307200, 0xaf69099c +0, 35, 35, 1, 307200, 0x18811110 +0, 36, 36, 1, 307200, 0x7b7dcbd1 +0, 37, 37, 1, 307200, 0x27e2f523 +0, 38, 38, 1, 307200, 0x563debe1 +0, 39, 39, 1, 307200, 0x48c71784 +0, 40, 40, 1, 307200, 0x4b6476b4 +0, 41, 41, 1, 307200, 0xa7a21b13 +0, 42, 42, 1, 307200, 0xd14d86c0 +0, 43, 43, 1, 307200, 0x12b1caef +0, 44, 44, 1, 307200, 0xae58ad7e +0, 45, 45, 1, 307200, 0x908bbb66 +0, 46, 46, 1, 307200, 0xc6d4f77e +0, 47, 47, 1, 307200, 0x08a90cdf +0, 48, 48, 1, 307200, 0x6c344d22 +0, 49, 49, 1, 307200, 0xb351a388 +0, 50, 50, 1, 307200, 0x8209bbff +0, 51, 51, 1, 307200, 0xfa1e34e0 +0, 52, 52, 1, 307200, 0x76dd4c48 +0, 53, 53, 1, 307200, 0xb01ab30f +0, 54, 54, 1, 307200, 0x2e2ec7c5 +0, 55, 55, 1, 307200, 0x6382f929 +0, 56, 56, 1, 307200, 0xa5cfce14 +0, 57, 57, 1, 307200, 0xd9339546 +0, 58, 58, 1, 307200, 0xf5b9a815 +0, 59, 59, 1, 307200, 0x99bbc602 +0, 60, 60, 1, 307200, 0x642242e6 +0, 61, 61, 1, 307200, 0x9626ad04 +0, 62, 62, 1, 307200, 0xba276036 +0, 63, 63, 1, 307200, 0x04bb2e18 +0, 64, 64, 1, 307200, 0x57bf0cc6 +0, 65, 65, 1, 307200, 0xce4c0f05 +0, 66, 66, 1, 307200, 0x9fa71634 +0, 67, 67, 1, 307200, 0xb0525b7f +0, 68, 68, 1, 307200, 0x5a6c7523 +0, 69, 69, 1, 307200, 0x1dfc11fa diff --git a/tests/ref/fate/filter-yuvtestsrc-yuv444p b/tests/ref/fate/filter-yuvtestsrc-yuv444p new file mode 100644 index 0000000000..44fcf08441 --- /dev/null +++ b/tests/ref/fate/filter-yuvtestsrc-yuv444p @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 230400, 0x0e1e2a4f +0, 1, 1, 1, 230400, 0x0e1e2a4f +0, 2, 2, 1, 230400, 0x0e1e2a4f +0, 3, 3, 1, 230400, 0x0e1e2a4f +0, 4, 4, 1, 230400, 0x0e1e2a4f diff --git a/tests/ref/fate/filter-yuvtestsrc-yuv444p12 b/tests/ref/fate/filter-yuvtestsrc-yuv444p12 new file mode 100644 index 0000000000..8abac6f9d9 --- /dev/null +++ b/tests/ref/fate/filter-yuvtestsrc-yuv444p12 @@ -0,0 +1,10 @@ +#tb 0: 1/5 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +0, 0, 0, 1, 460800, 0x3ec49be7 +0, 1, 1, 1, 460800, 0x3ec49be7 +0, 2, 2, 1, 460800, 0x3ec49be7 +0, 3, 3, 1, 460800, 0x3ec49be7 +0, 4, 4, 1, 460800, 0x3ec49be7

1 0

fate/flvenc: set bitexact output format flag explicitly
by James Almer 31 Aug '17

31 Aug '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Aug 30 23:21:41 2017 -0300| [b34c16a38d3e6fa02b5d39ae6ed73acf12dff92c] | committer: James Almer fate/flvenc: set bitexact output format flag explicitly Using the encoder flags to set the muxer in bitexact mode is deprecated. Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b34c16a38d3e6fa02… --- tests/fate/flvenc.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak index 3881bcd105..4fdeeff4c1 100644 --- a/tests/fate/flvenc.mak +++ b/tests/fate/flvenc.mak @@ -1,7 +1,7 @@ tests/data/add_keyframe_index.flv: TAG = GEN tests/data/add_keyframe_index.flv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ - -f lavfi -i "sws_flags=+accurate_rnd+bitexact;testsrc=r=7:n=2:d=20" -sws_flags '+accurate_rnd+bitexact' -metadata "encoder=Lavf" -pix_fmt yuv420p -c:v flv1 -g 7 -f flv -flags +bitexact \ + -f lavfi -i "sws_flags=+accurate_rnd+bitexact;testsrc=r=7:n=2:d=20" -sws_flags '+accurate_rnd+bitexact' -metadata "encoder=Lavf" -pix_fmt yuv420p -c:v flv1 -g 7 -f flv -flags +bitexact -fflags +bitexact \ -flvflags add_keyframe_index -idct simple -dct int -y $(TARGET_PATH)/tests/data/add_keyframe_index.flv 2> /dev/null; FATE_AFILTER-$(call ALLYES, FLV_MUXER FLV_DEMUXER AVDEVICE TESTSRC_FILTER LAVFI_INDEV FLV_ENCODER) += fate-flv-add_keyframe_index

1 0

ffmpeg_opt: add proper deprecation guards to lowres code
by James Almer 31 Aug '17

31 Aug '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Wed Aug 30 22:31:35 2017 -0300| [6e131a7cd970a39bcc8cbfdd32d10a90e3ab51c5] | committer: James Almer ffmpeg_opt: add proper deprecation guards to lowres code Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e131a7cd970a39bc… --- ffmpeg_opt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index f275f711be..100fa76e46 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -791,14 +791,16 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) case AVMEDIA_TYPE_VIDEO: if(!ist->dec) ist->dec = avcodec_find_decoder(par->codec_id); -#if FF_API_EMU_EDGE +#if FF_API_LOWRES if (av_codec_get_lowres(st->codec)) { av_codec_set_lowres(ist->dec_ctx, av_codec_get_lowres(st->codec)); ist->dec_ctx->width = st->codec->width; ist->dec_ctx->height = st->codec->height; ist->dec_ctx->coded_width = st->codec->coded_width; ist->dec_ctx->coded_height = st->codec->coded_height; +#if FF_API_EMU_EDGE ist->dec_ctx->flags |= CODEC_FLAG_EMU_EDGE; +#endif } #endif

1 0

fate/pixlet : add test for rgb
by Martin Vignali 31 Aug '17

31 Aug '17

ffmpeg | branch: master | Martin Vignali <martin.vignali(a)gmail.com> | Sun Apr 2 23:25:33 2017 +0200| [2fcf47e2d175397c44e0d4b9063dc1ad78614d78] | committer: Michael Niedermayer fate/pixlet : add test for rgb Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fcf47e2d175397c4… --- tests/Makefile | 1 + tests/fate/pixlet.mak | 5 +++++ tests/ref/fate/pixlet-rgb | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index 18fe9c5b4a..99f7e1730b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -159,6 +159,7 @@ include $(SRC_PATH)/tests/fate/mpeg4.mak include $(SRC_PATH)/tests/fate/mxf.mak include $(SRC_PATH)/tests/fate/opus.mak include $(SRC_PATH)/tests/fate/pcm.mak +include $(SRC_PATH)/tests/fate/pixlet.mak include $(SRC_PATH)/tests/fate/probe.mak include $(SRC_PATH)/tests/fate/prores.mak include $(SRC_PATH)/tests/fate/qt.mak diff --git a/tests/fate/pixlet.mak b/tests/fate/pixlet.mak new file mode 100644 index 0000000000..c720f32616 --- /dev/null +++ b/tests/fate/pixlet.mak @@ -0,0 +1,5 @@ +FATE_PIXLET += fate-pixlet-rgb +fate-pixlet-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/pixlet/pixlet_rgb.mov -an -pix_fmt yuv420p16le + +FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PIXLET) += $(FATE_PIXLET) +fate-pixlet: $(FATE_PIXLET) diff --git a/tests/ref/fate/pixlet-rgb b/tests/ref/fate/pixlet-rgb new file mode 100644 index 0000000000..a445fddfa7 --- /dev/null +++ b/tests/ref/fate/pixlet-rgb @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 13x9 +#sar 0: 1/1 +0, 0, 0, 1, 374, 0x93f1ba6d

1 0

avfilter/vf_mcdeint: remove usage of deprecated AVCodecContext.me_method
by James Almer 31 Aug '17

31 Aug '17

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Mon Aug 28 13:40:06 2017 -0300| [027c682fa07999820a11cbcbf7a7ba9edbb9ecab] | committer: James Almer avfilter/vf_mcdeint: remove usage of deprecated AVCodecContext.me_method Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=027c682fa07999820… --- libavfilter/vf_mcdeint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index d53322b40d..9cdec6308d 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -134,7 +134,7 @@ static int config_props(AVFilterLink *inlink) case MODE_EXTRA_SLOW: enc_ctx->refs = 3; case MODE_SLOW: - enc_ctx->me_method = ME_ITER; + av_dict_set(&opts, "motion_est", "iter", 0); case MODE_MEDIUM: enc_ctx->flags |= AV_CODEC_FLAG_4MV; enc_ctx->dia_size = 2;

1 0

avfilter/af_adelay: remove requirement that at least one delay should be provided
by Paul B Mahol 30 Aug '17

30 Aug '17

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Aug 30 18:14:10 2017 +0200| [6ccd32c36760ac8b8261d68eb32b07cf5c762e52] | committer: Paul B Mahol avfilter/af_adelay: remove requirement that at least one delay should be provided Such requirement is not necessary and code works without it just fine. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ccd32c36760ac8b8… --- doc/filters.texi | 1 - libavfilter/af_adelay.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 19e13a1346..afcb99d876 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -551,7 +551,6 @@ The filter accepts the following option: @table @option @item delays Set list of delays in milliseconds for each channel separated by '|'. -At least one delay greater than 0 should be provided. Unused delays will be silently ignored. If number of given delays is smaller than number of channels all remaining channels will not be delayed. If you want to delay exact number of samples, append 'S' to number. diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index 187cacf28a..983f089c21 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -171,11 +171,6 @@ static int config_input(AVFilterLink *inlink) s->max_delay = FFMAX(s->max_delay, d->delay); } - if (!s->max_delay) { - av_log(ctx, AV_LOG_ERROR, "At least one delay >0 must be specified.\n"); - return AVERROR(EINVAL); - } - switch (inlink->format) { case AV_SAMPLE_FMT_U8P : s->delay_channel = delay_channel_u8p ; break; case AV_SAMPLE_FMT_S16P: s->delay_channel = delay_channel_s16p; break;

1 0