[FFmpeg-devel] [PATCH 5/8] tools/crypto_bench: add AES-CBC modes

2015-10-28 Thread Rodger Combs
--- tools/crypto_bench.c | 140 +-- 1 file changed, 137 insertions(+), 3 deletions(-) diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c index ad20f95..15bb5f1 100644 --- a/tools/crypto_bench.c +++ b/tools/crypto_bench.c @@ -52,6 +52,7 @@ stat

[FFmpeg-devel] [PATCH 6/8] tools/crypto_bench: switch to OpenSSL's faster AES API

2015-10-28 Thread Rodger Combs
--- tools/crypto_bench.c | 85 +--- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c index 15bb5f1..8a468ba 100644 --- a/tools/crypto_bench.c +++ b/tools/crypto_bench.c @@ -244,6 +244,7 @@ st

[FFmpeg-devel] [PATCH 7/8] tools/crypto_bench: add support for multiple lavu versions by cpuflag

2015-10-28 Thread Rodger Combs
--- tools/crypto_bench.c | 50 ++ 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c index 8a468ba..b513c55 100644 --- a/tools/crypto_bench.c +++ b/tools/crypto_bench.c @@ -32,6 +32,7 @@ #inclu

[FFmpeg-devel] [PATCH 8/8] FATE: add crypto protocol test

2015-10-28 Thread Rodger Combs
--- tests/Makefile | 5 + tests/fate/avformat.mak | 1 + tests/lavf-regression.sh | 9 + tests/ref/lavf/crypto| 3 +++ 4 files changed, 18 insertions(+) create mode 100644 tests/ref/lavf/crypto diff --git a/tests/Makefile b/tests/Makefile index 7ee4a46..c501813 100644

Re: [FFmpeg-devel] [PATCH 5/8] tools/crypto_bench: add AES-CBC modes

2015-10-29 Thread Rodger Combs
Take a look at some results; CBC is significantly slower than CTR in both libcrypto's and our AES code. There's some hardware limitation it hits. > On Oct 29, 2015, at 06:13, Nicolas George wrote: > > Le septidi 7 brumaire, an CCXXIV, Rodger Combs a écrit : >> --- >

[FFmpeg-devel] [PATCH 1/3] tools/crypto_bench: switch to OpenSSL's faster AES API

2015-10-30 Thread Rodger Combs
Before: crypto AES-128-CBC size: 1048576 runs: 1024 time: 16.224 +- 2.347 After: crypto AES-128-CBC size: 1048576 runs: 1024 time: 3.056 +- 0.366 --- tools/crypto_bench.c | 85 +--- 1 file changed, 47 insertions(+), 38 deletions(-) diff --gi

[FFmpeg-devel] [PATCH 2/3] tools/crypto_bench: macro-ize additional algorithms

2015-10-30 Thread Rodger Combs
This also moves additional libcrypto ciphers to the new (faster) EVP API --- tools/crypto_bench.c | 544 +++ 1 file changed, 110 insertions(+), 434 deletions(-) diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c index 8a468ba..80d5f66 100644 -

[FFmpeg-devel] [PATCH 3/3] tools/crypto_bench: add support for multiple lavu versions by cpuflag

2015-10-30 Thread Rodger Combs
--- tools/crypto_bench.c | 49 + 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/tools/crypto_bench.c b/tools/crypto_bench.c index 80d5f66..ce61af1 100644 --- a/tools/crypto_bench.c +++ b/tools/crypto_bench.c @@ -32,6 +32,7 @@ #includ

[FFmpeg-devel] [PATCH] ffmpeg: fix -copy_prior_start 0 with -copyts and input -ss

2015-11-01 Thread Rodger Combs
Also rearranged the relevant check to reduce code duplication --- ffmpeg.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index dbb2520..526f094 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1760,7 +1760,6 @@ static void do_streamcopy(InputStream

[FFmpeg-devel] [PATCH] configure: don't let check_inline_asm override explicitly-disabled options

2015-11-10 Thread Rodger Combs
--- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index f770534..6063281 100755 --- a/configure +++ b/configure @@ -900,8 +900,7 @@ check_inline_asm(){ name="$1" code="$2" shift 2 -disable $name -check_cc "$@"

[FFmpeg-devel] [PATCH] configure: don't let check_inline_asm override explicitly-disabled options

2015-11-10 Thread Rodger Combs
This also prevents check_inline_asm from explicitly disabling failed tests, since otherwise you couldn't chain multiple tests with ||. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index f770534..8361b33 100755 --- a/configure +++ b/configu

[FFmpeg-devel] [PATCH] lavf/mov: fix parsing QuickTime meta after the first track

2015-11-10 Thread Rodger Combs
I'm not entirely sure why found_hdlr_mdta existed to begin with, so cc-ing Tinglin Liu (who originally wrote the patch) and Derek Buitenhuis (who signed off on it) hoping for some background. If these checks actually do have a purpose, then the `type == MKTAG('m','d','t','a')` check should be moved

[FFmpeg-devel] [PATCH 1/2] lavu/utils: add av_parse_iso8601_tz; use it in time parsing functions

2015-11-10 Thread Rodger Combs
--- libavformat/utils.c| 20 libavutil/parseutils.c | 43 +-- libavutil/parseutils.h | 18 +++--- 3 files changed, 68 insertions(+), 13 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 5c4d452..f

[FFmpeg-devel] [PATCH 2/2] lavf/mov: strip com.apple.quicktime prefix in meta; parse creation date

2015-11-10 Thread Rodger Combs
--- libavformat/mov.c | 16 1 file changed, 16 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 8fa0189..f4eabce 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -41,6 +41,7 @@ #include "libavutil/aes.h" #include "libavutil/sha.h" #include "libav

[FFmpeg-devel] [PATCH 1/6] lavf: add API to apply a list of bsfs to a packet

2015-11-18 Thread Rodger Combs
--- libavformat/avformat.h | 8 libavformat/utils.c| 49 + 2 files changed, 57 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 5283085..96d3cfd 100644 --- a/libavformat/avformat.h +++ b/libavformat/avfo

[FFmpeg-devel] [PATCH 3/6] lavf/tee: use lavf API for applying bitstream filters

2015-11-18 Thread Rodger Combs
--- libavformat/tee.c | 43 ++- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index af52a49..c527854 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -405,45 +405,6 @@ fail: return ret; }

[FFmpeg-devel] [PATCH 2/6] ffmpeg: use lavf API for applying bitstream filters

2015-11-18 Thread Rodger Combs
--- ffmpeg.c | 46 -- ffmpeg.h | 1 - ffmpeg_opt.c | 6 +- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index c4e9280..cae680d 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -683,47 +683,10 @@ static void wri

[FFmpeg-devel] [PATCH 4/6] lavf: add automatic bitstream filtering

2015-11-18 Thread Rodger Combs
This solves the problem discussed in https://ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179238.html by allowing AVCodec::write_header to be delayed until after packets have been run through required bitstream filters in order to generate global extradata. It also provides a mechanism by whi

[FFmpeg-devel] [PATCH 5/6] lavf: add API to append a bsf to a stream's list

2015-11-18 Thread Rodger Combs
--- libavformat/avformat.h | 9 + libavformat/utils.c| 20 2 files changed, 29 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6e9ffe2..cedcb8f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2776,6 +2776,15 @

[FFmpeg-devel] [PATCH 6/6] lavf/matroska: add automatic bitstream filtering

2015-11-18 Thread Rodger Combs
--- libavformat/matroskaenc.c | 43 +++ 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 10cf0a0..41aa8e0 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -845

[FFmpeg-devel] [PATCH] lavc/ac3_parser: avoid zeroing codec parameters if we haven't parsed a frame

2015-11-24 Thread Rodger Combs
This caused issues when seeking in some unusual MPEGTS files --- libavcodec/aac_ac3_parser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 2f7d568..b01d5a5 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavc

[FFmpeg-devel] [PATCH 1/2] lavc/ac3_parser: avoid zeroing codec parameters if we haven't parsed a frame

2015-11-25 Thread Rodger Combs
This caused issues when seeking in some unusual MPEGTS files --- libavcodec/aac_ac3_parser.c | 4 1 file changed, 4 insertions(+) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 2f7d568..6a76eb8 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_pa

[FFmpeg-devel] [PATCH 1/2] lavc/aac_ac3_parser: avoid zeroing codec parameters if we haven't read a frame

2015-11-25 Thread Rodger Combs
This caused issues when seeking in some unusual MPEGTS files --- libavcodec/aac_ac3_parser.c | 4 1 file changed, 4 insertions(+) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 2f7d568..6a76eb8 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_pa

[FFmpeg-devel] [PATCH 2/2] lavc/aac_ac3_parser: reindent

2015-11-25 Thread Rodger Combs
--- libavcodec/aac_ac3_parser.c | 45 +++-- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 6a76eb8..c9ba6bf 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_par

[FFmpeg-devel] [PATCH 1/6] lavf: add API to apply a list of bsfs to a packet

2015-11-25 Thread Rodger Combs
--- libavformat/avformat.h | 11 +++ libavformat/utils.c| 49 + 2 files changed, 60 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 36f9d02..d94191e 100644 --- a/libavformat/avformat.h +++ b/libavformat/a

[FFmpeg-devel] [PATCH 2/6] ffmpeg: use lavf API for applying bitstream filters

2015-11-25 Thread Rodger Combs
--- ffmpeg.c | 46 -- ffmpeg.h | 1 - ffmpeg_opt.c | 6 +- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index bf5e983..c24c8ed 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -683,47 +683,10 @@ static void wri

[FFmpeg-devel] [PATCH 3/6] lavf/tee: use lavf API for applying bitstream filters

2015-11-25 Thread Rodger Combs
--- libavformat/tee.c | 44 +++- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index af52a49..8c54d32 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -405,45 +405,6 @@ fail: return ret; }

[FFmpeg-devel] [PATCH 4/6] lavf: add automatic bitstream filtering

2015-11-25 Thread Rodger Combs
This solves the problem discussed in https://ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179238.html by allowing AVCodec::write_header to be delayed until after packets have been run through required bitstream filters in order to generate global extradata. It also provides a mechanism by whi

[FFmpeg-devel] [PATCH 5/6] lavf: add API to append a bsf to a stream's list

2015-11-25 Thread Rodger Combs
--- libavformat/avformat.h | 12 libavformat/utils.c| 20 2 files changed, 32 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index bb3a674..33f6d28 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2799,6 +2799,1

[FFmpeg-devel] [PATCH 6/6] lavf/matroska: add automatic bitstream filtering

2015-11-25 Thread Rodger Combs
--- libavformat/matroskaenc.c | 43 +++ 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 10cf0a0..41aa8e0 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -845

[FFmpeg-devel] [PATCH 1/7] lavf: add API to apply a list of bsfs to a packet

2015-11-30 Thread Rodger Combs
--- libavformat/avformat.h | 11 +++ libavformat/utils.c| 49 + 2 files changed, 60 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 36f9d02..d94191e 100644 --- a/libavformat/avformat.h +++ b/libavformat/a

[FFmpeg-devel] [PATCH 2/7] ffmpeg: use lavf API for applying bitstream filters

2015-11-30 Thread Rodger Combs
--- ffmpeg.c | 46 -- ffmpeg.h | 1 - ffmpeg_opt.c | 6 +- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index bf5e983..c24c8ed 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -683,47 +683,10 @@ static void wri

[FFmpeg-devel] [PATCH 3/7] lavf/tee: use lavf API for applying bitstream filters

2015-11-30 Thread Rodger Combs
--- libavformat/tee.c | 44 +++- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index af52a49..8c54d32 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -405,45 +405,6 @@ fail: return ret; }

[FFmpeg-devel] [PATCH 4/7] lavf: add automatic bitstream filtering

2015-11-30 Thread Rodger Combs
This solves the problem discussed in https://ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179238.html by allowing AVCodec::write_header to be delayed until after packets have been run through required bitstream filters in order to generate global extradata. It also provides a mechanism by whi

[FFmpeg-devel] [PATCH 5/7] lavf: add API to append a bsf to a stream's list

2015-11-30 Thread Rodger Combs
--- libavformat/internal.h | 11 +++ libavformat/utils.c| 19 +++ 2 files changed, 30 insertions(+) diff --git a/libavformat/internal.h b/libavformat/internal.h index 5ed548e..dcd2971 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -467,6 +467,17 @@

[FFmpeg-devel] [PATCH 6/7] lavf/matroskaenc: add automatic bitstream filtering

2015-11-30 Thread Rodger Combs
--- libavformat/matroskaenc.c | 43 +++ 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 10cf0a0..85e5d82 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -845

[FFmpeg-devel] [PATCH 7/7] lavf/mpegtsenc: add automatic bitstream filtering

2015-11-30 Thread Rodger Combs
--- libavformat/mpegtsenc.c | 65 ++--- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 468bad4..a8fb3a2 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -698,7

[FFmpeg-devel] [PATCH 1/7] lavf: add API to apply a list of bsfs to a packet

2015-12-04 Thread Rodger Combs
--- libavformat/avformat.h | 11 +++ libavformat/utils.c| 49 + 2 files changed, 60 insertions(+) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 36f9d02..d94191e 100644 --- a/libavformat/avformat.h +++ b/libavformat/a

[FFmpeg-devel] [PATCH 2/7] ffmpeg: use lavf API for applying bitstream filters

2015-12-04 Thread Rodger Combs
--- ffmpeg.c | 46 -- ffmpeg.h | 1 - ffmpeg_opt.c | 6 +- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index bf5e983..c24c8ed 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -683,47 +683,10 @@ static void wri

[FFmpeg-devel] [PATCH 3/7] lavf/tee: use lavf API for applying bitstream filters

2015-12-04 Thread Rodger Combs
--- libavformat/tee.c | 44 +++- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index af52a49..8c54d32 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -405,45 +405,6 @@ fail: return ret; }

[FFmpeg-devel] [PATCH 4/7] lavf: add automatic bitstream filtering; bump version

2015-12-04 Thread Rodger Combs
This solves the problem discussed in https://ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179238.html by allowing AVCodec::write_header to be delayed until after packets have been run through required bitstream filters in order to generate global extradata. It also provides a mechanism by whi

[FFmpeg-devel] [PATCH 5/7] lavf: add internal API to append a bsf to a stream's list

2015-12-04 Thread Rodger Combs
--- libavformat/internal.h | 11 +++ libavformat/utils.c| 22 ++ 2 files changed, 33 insertions(+) diff --git a/libavformat/internal.h b/libavformat/internal.h index 5ed548e..dcd2971 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -467,6 +467,17

[FFmpeg-devel] [PATCH 6/7] lavf/matroskaenc: add automatic bitstream filtering

2015-12-04 Thread Rodger Combs
--- libavformat/matroskaenc.c | 43 +++ 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 10cf0a0..85e5d82 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -845

[FFmpeg-devel] [PATCH 7/7] lavf/mpegtsenc: add automatic bitstream filtering

2015-12-04 Thread Rodger Combs
--- libavformat/mpegtsenc.c | 65 ++--- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 468bad4..a8fb3a2 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -698,7

[FFmpeg-devel] [PATCH] ass_split: fix handling of streams with no [Events] or Format: line

2015-12-04 Thread Rodger Combs
--- libavcodec/ass_split.c | 66 -- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 9bc7b9d..493a8fd 100644 --- a/libavcodec/ass_split.c +++ b/libavcodec/ass_split.c @@ -229,7 +229

[FFmpeg-devel] [PATCH] lavf: add automatic bitstream filtering; bump version

2015-12-04 Thread Rodger Combs
This solves the problem discussed in https://ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179238.html by allowing AVCodec::write_header to be delayed until after packets have been run through required bitstream filters in order to generate global extradata. It also provides a mechanism by whi

[FFmpeg-devel] [PATCH] probe TrueHD in MPEGTS

2015-12-05 Thread Rodger Combs
--- libavformat/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 251b2c6..ae9ae5b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -284,6 +284,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,

[FFmpeg-devel] [PATCH] lavf/segment: add option to write empty filler segments as needed

2015-12-07 Thread Rodger Combs
--- libavformat/segment.c | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 8432d0f..acd266b 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -113,6 +113,7 @@ typedef struct SegmentContex

Re: [FFmpeg-devel] [PATCH] avcodec/srtdec: Keep exact end times

2015-12-28 Thread Rodger Combs
> On Dec 3, 2015, at 03:30, Eelco Lempsink wrote: > > When converting SRT to SRT (to normalize) or WebVTT the end timestamps were > modified compared to the original. > > Fixes trac 4783. > > NOTE: The FATE test 'sub-srt' fails after this patch, because the end times of > the Dialogue lines ch

[FFmpeg-devel] [PATCH] lavf/mov: export chapter streams as private data

2016-01-07 Thread Rodger Combs
This prevents consumers from showing chapters as if they were regular subtitle streams. --- libavformat/mov.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 78081ce..77a4a71 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4418,6 +4418,

[FFmpeg-devel] [PATCH 1/3] lavf: add AV_DISPOSITION_TIMED_THUMBNAILS

2016-01-07 Thread Rodger Combs
--- ffprobe.c | 1 + libavformat/avformat.h | 12 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index c352b44..20af969 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -2326,6 +2326,7 @@ static int show_stream(WriterContext *w, AVFormatCo

[FFmpeg-devel] [PATCH 3/3] lavf/mov: reindent

2016-01-07 Thread Rodger Combs
--- libavformat/mov.c | 156 +++--- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index cde4140..a3ca394 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4421,94 +4421,94 @@ static voi

[FFmpeg-devel] [PATCH 2/3] lavf/mov: improve `tref/chap` chapter handling

2016-01-07 Thread Rodger Combs
3 parts: - Supports multiple chapter streams - Exports regular text chapter streams as opaque data. This prevents consumers from showing chapters as if they were regular subtitle streams. - Exports video chapter streams as thumbnails, and provides the first one as an attached_pic. --- libavfor

[FFmpeg-devel] [PATCH 1/3] lavf: add AV_DISPOSITION_TIMED_THUMBNAILS

2016-01-08 Thread Rodger Combs
--- ffprobe.c | 1 + libavformat/avformat.h | 12 +--- tests/ref/fate/concat-demuxer-extended-lavf-mxf | 2 +- tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 | 2 +- tests/ref/fate/concat-demuxer-simple1-lav

[FFmpeg-devel] [PATCH 2/3] lavf/mov: improve `tref/chap` chapter handling

2016-01-08 Thread Rodger Combs
3 parts: - Supports multiple chapter streams - Exports regular text chapter streams as opaque data. This prevents consumers from showing chapters as if they were regular subtitle streams. - Exports video chapter streams as thumbnails, and provides the first one as an attached_pic. --- libavfor

[FFmpeg-devel] [PATCH 3/3] lavf/mov: reindent

2016-01-08 Thread Rodger Combs
--- libavformat/mov.c | 156 +++--- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 4040cf7..42a232f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4428,94 +4428,94 @@ static voi

Re: [FFmpeg-devel] [PATCH 1/3] lavf: add AV_DISPOSITION_TIMED_THUMBNAILS

2016-01-08 Thread Rodger Combs
> On Jan 8, 2016, at 18:30, Marton Balint wrote: > > On Fri, 8 Jan 2016, Rodger Combs wrote: > > [...] >> diff --git a/libavformat/avformat.h b/libavformat/avformat.h >> index 95a645b..eaf6270 100644 >> --- a/libavformat/avformat.h >> +++ b/libav

[FFmpeg-devel] [PATCH 1/2] lavc/ass: don't reset end_display_time if it's already set

2016-01-11 Thread Rodger Combs
--- libavcodec/ass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/ass.c b/libavcodec/ass.c index 336c308..797b1c1 100644 --- a/libavcodec/ass.c +++ b/libavcodec/ass.c @@ -159,7 +159,8 @@ int ff_ass_add_rect(AVSubtitle *sub, const char *dialog, if (!rects)

[FFmpeg-devel] [PATCH 2/2] lavc/srtdec: fix rounding errors in end times

2016-01-11 Thread Rodger Combs
--- libavcodec/srtdec.c | 4 +++ tests/ref/fate/sub-textenc | 66 ++-- tests/ref/fate/sub-webvttenc | 66 ++-- 3 files changed, 70 insertions(+), 66 deletions(-) diff --git a/libavcodec/srtdec.c b/libavcod

[FFmpeg-devel] [PATCH] lavf/avi: pull stream durations from index, when available

2016-01-11 Thread Rodger Combs
This fixes files that have an incorrect nb_frames but a valid index --- libavformat/avidec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 3859810..0b14860 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1602,6 +1602,7 @@ sta

[FFmpeg-devel] [PATCH] lavc/mlpdec: report presence of Atmos substreams as a profile

2016-01-12 Thread Rodger Combs
--- libavcodec/avcodec.h| 2 ++ libavcodec/mlp_parser.c | 5 + libavcodec/mlpdec.c | 2 ++ libavcodec/profiles.c | 6 ++ libavcodec/profiles.h | 1 + 5 files changed, 16 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f365775..81f1e9a 100644 --- a/

[FFmpeg-devel] [PATCH] lavc/mlpdec: report presence of Atmos substreams as a profile

2016-01-13 Thread Rodger Combs
--- libavcodec/avcodec.h| 2 ++ libavcodec/codec_desc.c | 1 + libavcodec/mlp_parser.c | 5 + libavcodec/mlpdec.c | 2 ++ libavcodec/profiles.c | 6 ++ libavcodec/profiles.h | 1 + 6 files changed, 17 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index

Re: [FFmpeg-devel] [PATCH] lavf: add automatic bitstream filtering

2016-01-14 Thread Rodger Combs
1 file changed, 13 insertions(+), 9 deletions(-) > > In the spirit of commits 1b5bd4051d1e394f0429cbf6cf6c137f55857478 and > b287d7ea17f404a51eb3fdca80fa8a8b1fb7dd8b, where Rodger Combs applied > his new mechanism of automatic bitstream filter insertion to > lavf/mpegtsenc and lavf/m

[FFmpeg-devel] [PATCH] configure: prefer to use -liconv when possible

2016-01-25 Thread Rodger Combs
OSX's ld sometimes does and sometimes doesn't need -liconv. For instance, -Wl,-dead_strip in LDFLAGS will make the iconv conf check pass without -liconv, but linking ffmpeg_g will fail. There are likely other awkward interactions that could cause that sort of issue. Thus, we'll try to use the -lico

[FFmpeg-devel] [PATCH] configure: make sure check_func_headers tests work with dead code stripping

2016-01-28 Thread Rodger Combs
OSX's ld's -Wl,-dead_strip is applied before symbols are resolved, so if the check functions aren't called, they're stripped out and the test is useless. This calls the functions, so they won't be stripped. --- configure | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conf

[FFmpeg-devel] [PATCH] lavf/matroskadec: Fully parse and repack MP3 packets

2015-08-16 Thread Rodger Combs
Fixes https://trac.ffmpeg.org/ticket/4776 --- libavformat/matroskadec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b546798..f97ae16 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -206

[FFmpeg-devel] [PATCH] lavf/matroskadec: work around additional broken index cases

2015-08-23 Thread Rodger Combs
--- libavformat/matroskadec.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index f97ae16..7f4a52b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1520,8 +1520,10 @@ static void matroska_a

[FFmpeg-devel] [PATCH] lavf/mov: add support for sidx fragment indexes

2015-09-09 Thread Rodger Combs
The logic in mov_seek_fragment for matching track_ids to AVStream ids is almost certainly wrong, and should be corrected (by someone who knows more about the relevant structures) before this is merged. Fixes trac #3842 --- libavformat/isom.h | 1 + libavformat/mov.c | 181 +

[FFmpeg-devel] [PATCH 1/6] lavc/ass_split: Fix parser bugs

2015-09-10 Thread Rodger Combs
Specifically: - Skip writing drawings as text - Parse \h correctly - Handle comments and unknown tags correctly --- libavcodec/ass_split.c | 29 + 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/libavcodec/ass_split.c b/libavcodec/ass_split.c index 9bc7b

[FFmpeg-devel] [PATCH 2/6] lavu/avstring: switch AV_ESCAPE_FLAGs to shift-based formatting

2015-09-10 Thread Rodger Combs
--- libavutil/avstring.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/avstring.h b/libavutil/avstring.h index 466edaf..234c030 100644 --- a/libavutil/avstring.h +++ b/libavutil/avstring.h @@ -300,14 +300,14 @@ enum AVEscapeMode { * characters lists, except it

[FFmpeg-devel] [PATCH 4/6] ffprobe: switch xml_escape_str to use av_bprint_escape; cleanup a bit

2015-09-10 Thread Rodger Combs
--- ffprobe.c | 25 ++--- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/ffprobe.c b/ffprobe.c index 4328b61..3c097bb 100644 --- a/ffprobe.c +++ b/ffprobe.c @@ -1543,21 +1543,10 @@ static av_cold int xml_init(WriterContext *wctx) return 0; } -static cons

[FFmpeg-devel] [PATCH 3/6] lavu/bprint: add XML escaping

2015-09-10 Thread Rodger Combs
--- libavutil/avstring.h | 28 libavutil/bprint.c | 43 +++ 2 files changed, 71 insertions(+) diff --git a/libavutil/avstring.h b/libavutil/avstring.h index 234c030..71a3179 100644 --- a/libavutil/avstring.h +++ b/libavutil/av

[FFmpeg-devel] [PATCH 5/6] lavc/webvttenc: XML-escape text output

2015-09-10 Thread Rodger Combs
--- libavcodec/webvttenc.c | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c index 9f67a2e..555e7c7 100644 --- a/libavcodec/webvttenc.c +++ b/libavcodec/webvttenc.c @@ -112,7 +112,12 @@ static void webvtt_style_apply(WebVTTCon

[FFmpeg-devel] [PATCH 6/6] FATE: fix tests modified by ass_split and XML escaping changes

2015-09-10 Thread Rodger Combs
--- tests/ref/fate/ffprobe_xml | 2 +- tests/ref/fate/sub-webvttenc | 22 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml index 2fdd81b..443cc12 100644 --- a/tests/ref/fate/ffprobe_xml +++ b/tests/re

[FFmpeg-devel] [PATCH] lavf/mov: add support for sidx fragment indexes

2015-09-10 Thread Rodger Combs
The logic in mov_seek_fragment for matching track_ids to AVStream ids is almost certainly wrong, and should be corrected (by someone who knows more about the relevant structures) before this is merged. Fixes trac #3842 --- libavformat/isom.h | 1 + libavformat/mov.c | 182 +

[FFmpeg-devel] [PATCH] ADPCM: Bump THP channel limit to 14

2015-09-11 Thread Rodger Combs
--- libavcodec/adpcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 52d0d44..ba38041 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -84,7 +84,7 @@ static const int swf_index_tables[4][16] = { /* end of tables

[FFmpeg-devel] [PATCH] lavf/matroska: ignore ChapCountry ID for now

2015-09-20 Thread Rodger Combs
--- libavformat/matroska.h| 1 + libavformat/matroskadec.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 344b2c3..a654e0c 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -218,6 +218,7 @@ #def

[FFmpeg-devel] [PATCH 1/3] tests/checkasm: make randomize_buffers a function for easier debugging

2015-09-20 Thread Rodger Combs
--- tests/checkasm/vp9dsp.c | 107 +--- 1 file changed, 56 insertions(+), 51 deletions(-) diff --git a/tests/checkasm/vp9dsp.c b/tests/checkasm/vp9dsp.c index 146a71f..34014ed 100644 --- a/tests/checkasm/vp9dsp.c +++ b/tests/checkasm/vp9dsp.c @@ -104,58

[FFmpeg-devel] [PATCH 2/3] tests/checkasm: fix stack smash in check_loopfilter

2015-09-20 Thread Rodger Combs
--- tests/checkasm/vp9dsp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/checkasm/vp9dsp.c b/tests/checkasm/vp9dsp.c index 34014ed..968eae5 100644 --- a/tests/checkasm/vp9dsp.c +++ b/tests/checkasm/vp9dsp.c @@ -202,6 +202,9 @@ static void check_loopfilter() midoff = (d

[FFmpeg-devel] [PATCH 3/3] lavf/utils: avoid giving up probing early with long subtitle events

2015-09-20 Thread Rodger Combs
--- libavformat/utils.c | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 199e80b..0256894 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3343,7 +3343,12 @@ int avformat_find_stream_info(AVFormatContext *ic, A

[FFmpeg-devel] [PATCH 1/3] tests/checkasm: make randomize_buffers a function for easier debugging

2015-09-20 Thread Rodger Combs
--- tests/checkasm/vp9dsp.c | 108 +--- 1 file changed, 57 insertions(+), 51 deletions(-) diff --git a/tests/checkasm/vp9dsp.c b/tests/checkasm/vp9dsp.c index 6c335e9..d1e7167 100644 --- a/tests/checkasm/vp9dsp.c +++ b/tests/checkasm/vp9dsp.c @@ -104,58

[FFmpeg-devel] [PATCH 2/3] lavf/hls: don't copy empty options; silences HTTP CRLF warnings

2015-09-20 Thread Rodger Combs
--- libavformat/hls.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index c16c770..a5073ff 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1317,10 +1317,14 @@ static int save_avio_options(AVFormatContext *s)

[FFmpeg-devel] [PATCH 3/3] lavf/hls: allow subtitles to be read despite incomplete handling

2015-09-20 Thread Rodger Combs
This will give incorrect results in some cases due to not parsing segments separately, but it works well enough in general that it seems worth enabling. --- libavformat/hls.c | 4 1 file changed, 4 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index a5073ff..74af300 100644

Re: [FFmpeg-devel] [PATCH 2/3] lavf/hls: don't copy empty options; silences HTTP CRLF warnings

2015-09-21 Thread Rodger Combs
> On Sep 21, 2015, at 02:39, wm4 wrote: > > On Sun, 20 Sep 2015 21:55:34 -0500 > Rodger Combs mailto:rodger.co...@gmail.com>> wrote: > >> --- >> libavformat/hls.c | 12 >> 1 file changed, 8 insertions(+), 4 deletions(-) >> >>

[FFmpeg-devel] [PATCH 2/4] lavu/opt: add flag to return NULL when applicable in av_opt_get

2015-09-21 Thread Rodger Combs
--- libavutil/opt.c | 12 ++-- libavutil/opt.h | 10 ++ libavutil/version.h | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index ce80de0..4e6425d 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -666,12 +666,2

[FFmpeg-devel] [PATCH 1/4] lavu/opt: switch AV_OPT flags to shift-based formatting

2015-09-21 Thread Rodger Combs
--- libavutil/opt.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/opt.h b/libavutil/opt.h index d6d8df3..ef90e9c 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -553,22 +553,22 @@ int av_opt_eval_q (void *obj, const AVOption *o, const char *val, A

[FFmpeg-devel] [PATCH 4/4] lavf/hls: allow subtitles to be read despite incomplete handling

2015-09-21 Thread Rodger Combs
This will give incorrect results in some cases due to not parsing segments separately, so it currently requires -strict experimental. --- libavformat/hls.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index aa0e214..1ce53b3 100644

[FFmpeg-devel] [PATCH 3/4] lavf/hls: don't convert NULL options to empty strings; fixes HTTP CRLF warnings

2015-09-21 Thread Rodger Combs
--- libavformat/hls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index c16c770..aa0e214 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1316,7 +1316,8 @@ static int save_avio_options(AVFormatContext *s) int ret = 0;

Re: [FFmpeg-devel] [PATCH 1/4] lavu/opt: switch AV_OPT flags to shift-based formatting

2015-09-21 Thread Rodger Combs
> On Sep 21, 2015, at 05:49, Nicolas George wrote: > > Le jour de la Récompense, an CCXXIII, Rodger Combs a écrit : >> --- >> libavutil/opt.h | 8 >> 1 file changed, 4 insertions(+), 4 deletions(-) > > What is the benefit? I am a bit afraid it wou

Re: [FFmpeg-devel] [PATCH 2/4] lavu/opt: add flag to return NULL when applicable in av_opt_get

2015-09-21 Thread Rodger Combs
> On Sep 21, 2015, at 05:53, Nicolas George wrote: > > Le jour de la Récompense, an CCXXIII, Rodger Combs a écrit : >> --- >> libavutil/opt.c | 12 ++-- >> libavutil/opt.h | 10 ++ >> libavutil/version.h | 2 +- >> 3 files changed,

[FFmpeg-devel] [PATCH 1/2] lavu/opt: add flag to return NULL when applicable in av_opt_get

2015-09-21 Thread Rodger Combs
--- libavutil/opt.c | 12 ++-- libavutil/opt.h | 10 ++ libavutil/version.h | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index ce80de0..03160c7 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -666,12 +666,2

[FFmpeg-devel] [PATCH 2/2] lavf/hls: don't convert NULL options to empty strings; fixes HTTP CRLF warnings

2015-09-21 Thread Rodger Combs
--- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index c16c770..93ebf6a 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1316,7 +1316,7 @@ static int save_avio_options(AVFormatContext *s) int ret = 0;

[FFmpeg-devel] [PATCH 2/4] lavc/aac_ac3_parser: style tweaks

2015-09-21 Thread Rodger Combs
--- libavcodec/aac_ac3_parser.c | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 2f7d568..dfa951e 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -36,

[FFmpeg-devel] [PATCH 1/4] lavc/aacdec: handle case where extradata is set between init and first packet

2015-09-21 Thread Rodger Combs
--- libavcodec/aacdec_template.c | 8 1 file changed, 8 insertions(+) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index c2d7d05..a999013 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3118,6 +3118,14 @@ static int aac_decode_

[FFmpeg-devel] [PATCH 4/4] lavc: deprecate aac_adtstoasc BSF; remove warnings referencing it

2015-09-21 Thread Rodger Combs
--- doc/bitstream_filters.texi | 11 --- libavcodec/aac_adtstoasc_bsf.c | 74 ++ libavformat/flvenc.c | 6 libavformat/movenc.c | 6 4 files changed, 2 insertions(+), 95 deletions(-) diff --git a/doc/bitstream_filters

[FFmpeg-devel] [PATCH 3/4] lavc/aac_ac3_parser: convert ADTS AAC to ASC format

2015-09-21 Thread Rodger Combs
--- libavcodec/aac_ac3_parser.c | 65 ++--- tests/ref/fate/adts-demux | 2 +- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index dfa951e..a7e9278 100644 --- a/libavcodec/aac_ac3_

[FFmpeg-devel] [PATCH 1/4] lavc/aacdec: handle case where extradata is set between init and first packet

2015-09-21 Thread Rodger Combs
--- libavcodec/aacdec_template.c | 8 1 file changed, 8 insertions(+) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index c2d7d05..48717c7 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3118,6 +3118,14 @@ static int aac_decode_

[FFmpeg-devel] [PATCH 3/4] lavc/aac_ac3_parser: convert ADTS AAC to ASC format

2015-09-21 Thread Rodger Combs
--- libavcodec/aac_ac3_parser.c | 65 ++--- tests/ref/fate/adts-demux | 2 +- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index dfa951e..a7e9278 100644 --- a/libavcodec/aac_ac3_

[FFmpeg-devel] [PATCH 4/4] lavc: deprecate aac_adtstoasc BSF; remove warnings referencing it

2015-09-21 Thread Rodger Combs
--- Changelog | 1 + doc/bitstream_filters.texi | 11 --- libavcodec/aac_adtstoasc_bsf.c | 73 ++ libavformat/flvenc.c | 6 libavformat/movenc.c | 6 5 files changed, 3 insertions(+), 94 deletions

[FFmpeg-devel] [PATCH 2/4] lavc/aac_ac3_parser: style tweaks

2015-09-21 Thread Rodger Combs
--- libavcodec/aac_ac3_parser.c | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 2f7d568..dfa951e 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -36,

<    2   3   4   5   6   7   8   >