July 2014 - ffmpeg-cvslog - lists.ffmpeg.org

MAINTAINERS: update list of releases i maintain
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.3 | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jul 28 06:16:34 2014 +0200| [ea5bb5613f7f64b7c7865265d8760035434ed56e] | committer: Michael Niedermayer MAINTAINERS: update list of releases i maintain Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit 5003b8b9c3bacc4e542c923a7766c2ff46e0b1e8) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea5bb5613f7f64b7c… --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3843772..41f40e7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -528,8 +528,8 @@ x86 Michael Niedermayer Releases ======== +2.3 Michael Niedermayer 2.2 Michael Niedermayer -2.1 Michael Niedermayer 1.2 Michael Niedermayer If you want to maintain an older release, please contact us

1 0

fate: support testing of release branches
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.3 | Janne Grunau <janne-libav(a)jannau.net> | Sat Jul 26 23:29:46 2014 +0200| [6a250c858ebbb9d5111c5b14d8d46d41bd08e218] | committer: Michael Niedermayer fate: support testing of release branches Adding 'branch=release/2.3' to the fate config file will check the release/2.3 branch instead of master. If no branch is specified it will use 'master' so that existing config are still valid. (cherry picked from commit 42eb9154a83e9a7aedb1168b2f1112af765cf2b5) Conflicts: tests/fate.sh > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a250c858ebbb9d51… --- tests/fate.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/fate.sh b/tests/fate.sh index ca3caa3..5a78018 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -19,6 +19,8 @@ test -n "$slot" || die "slot not specified" test -n "$repo" || die "repo not specified" test -d "$samples" || die "samples location not specified" +: ${branch:=master} + lock(){ lock=$1/fate.lock (set -C; exec >$lock) 2>/dev/null || return @@ -28,14 +30,14 @@ lock(){ checkout(){ case "$repo" in file:*|/*) src="${repo#file:}" ;; - git:*) git clone --quiet "$repo" "$src" ;; + git:*) git clone --quiet --branch "$branch" "$repo" "$src" ;; esac } update()( cd ${src} || return case "$repo" in - git:*) git fetch --force && git reset --hard FETCH_HEAD ;; + git:*) git fetch --force && git reset --hard "origin/$branch" ;; esac ) @@ -82,6 +84,7 @@ clean(){ report(){ date=$(date -u +%Y%m%d%H%M%S) echo "fate:0:${date}:${slot}:${version}:$1:$2:${comment}" >report +# echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report cat ${build}/config.fate >>report cat ${build}/tests/data/fate/*.rep >>report || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report ; done test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv

1 0

tests/fate.sh: If cat *.rep fails try it with a for loop.
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.3 | Michael Niedermayer <michaelni(a)gmx.at> | Mon Jul 28 18:27:17 2014 +0200| [5411040802ac5009f42e7cff9f40eba0788ee54f] | committer: Michael Niedermayer tests/fate.sh: If cat *.rep fails try it with a for loop. Fixes fate on haiku, where cat dies due to too many arguments xargs could be used too but we do not use xargs currently so it would be an additional dependency. Also the plain cat is left in place as it is faster than the loop Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> (cherry picked from commit d554d004a67c30e3f38bec51b2c691cfe3af3bb8) Conflicts: tests/fate.sh > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5411040802ac5009f… --- tests/fate.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/fate.sh b/tests/fate.sh index 38458c7..ca3caa3 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -82,7 +82,8 @@ clean(){ report(){ date=$(date -u +%Y%m%d%H%M%S) echo "fate:0:${date}:${slot}:${version}:$1:$2:${comment}" >report - cat ${build}/config.fate ${build}/tests/data/fate/*.rep >>report + cat ${build}/config.fate >>report + cat ${build}/tests/data/fate/*.rep >>report || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report ; done test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv }

1 0

g2meet: allow size changes within original sizes
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.3 | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Tue Jul 15 15:22:11 2014 -0400| [ab1ea597bd69d0d13f655c8934e3fa9c772a0a8d] | committer: Michael Niedermayer g2meet: allow size changes within original sizes (cherry picked from commit 14b4e64eabc84c5a5e57c8ccc56bbeb95380823b) Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab1ea597bd69d0d13… --- libavcodec/g2meet.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 60c48c3..1004e19 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -90,6 +90,7 @@ typedef struct G2MContext { int compression; int width, height, bpp; + int orig_width, orig_height; int tile_width, tile_height; int tiles_x, tiles_y, tile_x, tile_y; @@ -712,8 +713,8 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, } c->width = bytestream2_get_be32(&bc); c->height = bytestream2_get_be32(&bc); - if (c->width < 16 || c->width > avctx->width || - c->height < 16 || c->height > avctx->height) { + if (c->width < 16 || c->width > c->orig_width || + c->height < 16 || c->height > c->orig_height) { av_log(avctx, AV_LOG_ERROR, "Invalid frame dimensions %dx%d\n", c->width, c->height); @@ -882,6 +883,10 @@ static av_cold int g2m_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_RGB24; + // store original sizes and check against those if resize happens + c->orig_width = avctx->width; + c->orig_height = avctx->height; + return 0; }

1 0

Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni(a)gmx.at> | Wed Jul 30 20:35:23 2014 +0200| [3ef8b4322cba2ebf9fd6b1c15d068ee90e9f9f96] | committer: Michael Niedermayer Merge commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea' into release/2.2 * commit 'd396987c303bdc4eea7d1a1ff6776475d9bbd9ea': fate: Add dependencies for dct/fft/mdct/rdft tests Conflicts: libavcodec/fft-test.c tests/fate/fft.mak Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ef8b4322cba2ebf9… ---

1 0

Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni(a)gmx.at> | Wed Jul 30 20:34:13 2014 +0200| [9dc112e277fd67e05044b34ce9fb3177905f2db5] | committer: Michael Niedermayer Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2 * commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf': video4linux2: Avoid a floating point exception Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9dc112e277fd67e05… ---

1 0

Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni(a)gmx.at> | Wed Jul 30 20:33:24 2014 +0200| [75ff0e8c50d12c40170a21479ac07f573952cdf2] | committer: Michael Niedermayer Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2 * commit '01a550bda29eb05fb230576e5223034974aa3396': vf_select: Drop a debug av_log with an unchecked double to enum conversion Conflicts: libavfilter/f_select.c See: 7994c1cd760838ca5b92401caa1994bc035d08b5 Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=75ff0e8c50d12c401… ---

1 0

video4linux2: Avoid a floating point exception
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.2 | Bernhard Übelacker <bernhardu(a)vr-web.de> | Sun Jul 27 08:38:59 2014 -0700| [b20a8ad619ac0e2631391b6311cc000de85d22bf] | committer: Diego Biurrun video4linux2: Avoid a floating point exception This avoids a segfault in avconv_opt.c:opt_target when trying to determine the norm. (cherry picked from commit dc71f1958846bb1d96de43a4603983dc8450cfcc) Signed-off-by: Diego Biurrun <diego(a)biurrun.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b20a8ad619ac0e263… --- avconv_opt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/avconv_opt.c b/avconv_opt.c index d62d11f..73d283a 100644 --- a/avconv_opt.c +++ b/avconv_opt.c @@ -1726,7 +1726,8 @@ static int opt_target(void *optctx, const char *opt, const char *arg) for (j = 0; j < nb_input_files; j++) { for (i = 0; i < input_files[j]->nb_streams; i++) { AVCodecContext *c = input_files[j]->ctx->streams[i]->codec; - if (c->codec_type != AVMEDIA_TYPE_VIDEO) + if (c->codec_type != AVMEDIA_TYPE_VIDEO || + !c->time_base.num) continue; fr = c->time_base.den * 1000 / c->time_base.num; if (fr == 25000) {

1 0

Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni(a)gmx.at> | Wed Jul 30 20:29:30 2014 +0200| [f02221d65143aa9a5719fa83f159daaa1308b6a0] | committer: Michael Niedermayer Merge commit 'f6b3dce952d66f87883a50d90d6e98416ee397df' into release/2.2 * commit 'f6b3dce952d66f87883a50d90d6e98416ee397df': librtmp: Don't free the temp url at the end of rtmp_open Conflicts: libavformat/librtmp.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f02221d65143aa9a5… ---

1 0

fate: Add dependencies for dct/fft/mdct/rdft tests
by git＠videolan.org 30 Jul '14

30 Jul '14

ffmpeg | branch: release/2.2 | Diego Biurrun <diego(a)biurrun.de> | Wed Jun 25 17:09:13 2014 -0700| [d396987c303bdc4eea7d1a1ff6776475d9bbd9ea] | committer: Diego Biurrun fate: Add dependencies for dct/fft/mdct/rdft tests (cherry picked from commit 24f45c16224d4c5d482e928676714766ffdda4fc) Signed-off-by: Diego Biurrun <diego(a)biurrun.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d396987c303bdc4ee… --- libavcodec/fft-test.c | 22 ++++++++++++++++++++++ tests/fate/fft.mak | 32 ++++++++++++++++---------------- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index d0c22d0..142a61d 100644 --- a/libavcodec/fft-test.c +++ b/libavcodec/fft-test.c @@ -113,6 +113,7 @@ static void fft_ref(FFTComplex *tabr, FFTComplex *tab, int nbits) } } +#if CONFIG_MDCT static void imdct_ref(FFTSample *out, FFTSample *in, int nbits) { int n = 1<<nbits; @@ -147,8 +148,10 @@ static void mdct_ref(FFTSample *output, FFTSample *input, int nbits) output[k] = REF_SCALE(s, nbits - 1); } } +#endif /* CONFIG_MDCT */ #if FFT_FLOAT +#if CONFIG_DCT static void idct_ref(float *output, float *input, int nbits) { int n = 1<<nbits; @@ -181,6 +184,7 @@ static void dct_ref(float *output, float *input, int nbits) output[k] = s; } } +#endif /* CONFIG_DCT */ #endif @@ -304,6 +308,7 @@ int main(int argc, char **argv) tab2 = av_malloc(fft_size * sizeof(FFTSample)); switch (transform) { +#if CONFIG_MDCT case TRANSFORM_MDCT: av_log(NULL, AV_LOG_INFO,"Scale factor is set to %f\n", scale); if (do_inverse) @@ -312,6 +317,7 @@ int main(int argc, char **argv) av_log(NULL, AV_LOG_INFO,"MDCT"); ff_mdct_init(m, fft_nbits, do_inverse, scale); break; +#endif /* CONFIG_MDCT */ case TRANSFORM_FFT: if (do_inverse) av_log(NULL, AV_LOG_INFO,"IFFT"); @@ -321,6 +327,7 @@ int main(int argc, char **argv) fft_ref_init(fft_nbits, do_inverse); break; #if FFT_FLOAT +#if CONFIG_RDFT case TRANSFORM_RDFT: if (do_inverse) av_log(NULL, AV_LOG_INFO,"IDFT_C2R"); @@ -329,6 +336,8 @@ int main(int argc, char **argv) ff_rdft_init(r, fft_nbits, do_inverse ? IDFT_C2R : DFT_R2C); fft_ref_init(fft_nbits, do_inverse); break; +#endif /* CONFIG_RDFT */ +#if CONFIG_DCT case TRANSFORM_DCT: if (do_inverse) av_log(NULL, AV_LOG_INFO,"DCT_III"); @@ -336,6 +345,7 @@ int main(int argc, char **argv) av_log(NULL, AV_LOG_INFO,"DCT_II"); ff_dct_init(d, fft_nbits, do_inverse ? DCT_III : DCT_II); break; +#endif /* CONFIG_DCT */ #endif default: av_log(NULL, AV_LOG_ERROR, "Requested transform not supported\n"); @@ -354,6 +364,7 @@ int main(int argc, char **argv) av_log(NULL, AV_LOG_INFO,"Checking...\n"); switch (transform) { +#if CONFIG_MDCT case TRANSFORM_MDCT: if (do_inverse) { imdct_ref((FFTSample *)tab_ref, (FFTSample *)tab1, fft_nbits); @@ -367,6 +378,7 @@ int main(int argc, char **argv) err = check_diff((FFTSample *)tab_ref, tab2, fft_size / 2, scale); } break; +#endif /* CONFIG_MDCT */ case TRANSFORM_FFT: memcpy(tab, tab1, fft_size * sizeof(FFTComplex)); s->fft_permute(s, tab); @@ -376,6 +388,7 @@ int main(int argc, char **argv) err = check_diff((FFTSample *)tab_ref, (FFTSample *)tab, fft_size * 2, 1.0); break; #if FFT_FLOAT +#if CONFIG_RDFT case TRANSFORM_RDFT: fft_size_2 = fft_size >> 1; if (do_inverse) { @@ -407,6 +420,8 @@ int main(int argc, char **argv) err = check_diff((float *)tab_ref, (float *)tab2, fft_size, 1.0); } break; +#endif /* CONFIG_RDFT */ +#if CONFIG_DCT case TRANSFORM_DCT: memcpy(tab, tab1, fft_size * sizeof(FFTComplex)); d->dct_calc(d, tab); @@ -417,6 +432,7 @@ int main(int argc, char **argv) } err = check_diff((float *)tab_ref, (float *)tab, fft_size, 1.0); break; +#endif /* CONFIG_DCT */ #endif } @@ -468,19 +484,25 @@ int main(int argc, char **argv) } switch (transform) { +#if CONFIG_MDCT case TRANSFORM_MDCT: ff_mdct_end(m); break; +#endif /* CONFIG_MDCT */ case TRANSFORM_FFT: ff_fft_end(s); break; #if FFT_FLOAT +#if CONFIG_RDFT case TRANSFORM_RDFT: ff_rdft_end(r); break; +#endif /* CONFIG_RDFT */ +#if CONFIG_DCT case TRANSFORM_DCT: ff_dct_end(d); break; +#endif /* CONFIG_DCT */ #endif } diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak index 20d5638..d2a3904 100644 --- a/tests/fate/fft.mak +++ b/tests/fate/fft.mak @@ -1,8 +1,8 @@ define DEF_FFT -FATE_FFT += fate-fft-$(1) fate-ifft-$(1) \ - fate-mdct-$(1) fate-imdct-$(1) \ - fate-rdft-$(1) fate-irdft-$(1) \ - fate-dct1d-$(1) fate-idct1d-$(1) +FATE_FFT-$(CONFIG_DCT) += fate-dct1d-$(1) fate-idct1d-$(1) +FATE_FFT-$(CONFIG_FFT) += fate-fft-$(1) fate-ifft-$(1) +FATE_FFT-$(CONFIG_MDCT) += fate-mdct-$(1) fate-imdct-$(1) +FATE_FFT-$(CONFIG_RDFT) += fate-rdft-$(1) fate-irdft-$(1) fate-fft-$(N): ARGS = -n$(1) fate-ifft-$(N): ARGS = -n$(1) -i @@ -16,14 +16,14 @@ endef $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT,$(N)))) -fate-fft-test: $(FATE_FFT) -$(FATE_FFT): libavcodec/fft-test$(EXESUF) -$(FATE_FFT): CMD = run libavcodec/fft-test $(CPUFLAGS:%=-c%) $(ARGS) -$(FATE_FFT): REF = /dev/null +fate-fft-float: $(FATE_FFT-yes) +$(FATE_FFT-yes): libavcodec/fft-test$(EXESUF) +$(FATE_FFT-yes): CMD = run libavcodec/fft-test $(CPUFLAGS:%=-c%) $(ARGS) +$(FATE_FFT-yes): REF = /dev/null define DEF_FFT_FIXED -FATE_FFT_FIXED += fate-fft-fixed-$(1) fate-ifft-fixed-$(1) \ - fate-mdct-fixed-$(1) fate-imdct-fixed-$(1) +FATE_FFT_FIXED-$(CONFIG_FFT) += fate-fft-fixed-$(1) fate-ifft-fixed-$(1) +FATE_FFT_FIXED-$(CONFIG_MDCT) += fate-mdct-fixed-$(1) fate-imdct-fixed-$(1) fate-fft-fixed-$(1): ARGS = -n$(1) fate-ifft-fixed-$(1): ARGS = -n$(1) -i @@ -33,10 +33,10 @@ endef $(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED,$(N)))) -fate-fft-fixed-test: $(FATE_FFT_FIXED) -$(FATE_FFT_FIXED): libavcodec/fft-fixed-test$(EXESUF) -$(FATE_FFT_FIXED): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) -$(FATE_FFT_FIXED): REF = /dev/null +fate-fft-fixed: $(FATE_FFT_FIXED-yes) +$(FATE_FFT_FIXED-yes): libavcodec/fft-fixed-test$(EXESUF) +$(FATE_FFT_FIXED-yes): CMD = run libavcodec/fft-fixed-test $(CPUFLAGS:%=-c%) $(ARGS) +$(FATE_FFT_FIXED-yes): REF = /dev/null -FATE-$(call ALLYES, AVCODEC FFT) += $(FATE_FFT) $(FATE_FFT_FIXED) -fate-fft: $(FATE_FFT) $(FATE_FFT_FIXED) +FATE-$(CONFIG_AVCODEC) += $(FATE_FFT-yes) $(FATE_FFT_FIXED-yes) +fate-fft: $(FATE_FFT-yes) $(FATE_FFT_FIXED-yes)

1 0