generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
59,840 Commits 24 Branches 241 Tags 173 MiB
1171ad647e
Commit Graph

59840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
1171ad647e Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e' 
* commit '42f9132218ca11a8e9a3c82a175b46bca092113e':
  mxf: Do not use int to check the seek position

Conflicts:
	libavformat/mxfdec.c

See: 007989c7a2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 21:37:42 +01:00
Michael Niedermayer
8721dda1c5 Merge commit 'd84bd4650b1bed882e2ac1651b4a86206aa0e363' 
* commit 'd84bd4650b1bed882e2ac1651b4a86206aa0e363':
  mxf: Set AV_FIELD_PROGRESSIVE

See: def01739c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 21:22:14 +01:00
Michael Niedermayer
afbe8c6a84 avcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instead of discarding data 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 21:00:58 +01:00
Michael Niedermayer
2545182c29 avcodec/mpegaudiodec_template/mp3on4: check that all channels have been decoded before returnig a frame 
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f80bf9a259e_5774_id5_1.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 20:56:08 +01:00
Michael Niedermayer
b2ae92110f avcodec/flashsv: check avio_read() return in mov_read_udta_string() 
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f3f90a8606a_3018_Sequence_1-Apple_ProRes_422_LT.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 18:35:14 +01:00
Luca Barbato
42f9132218 mxf: Do not use int to check the seek position 
Overly large files are to be expected.

Reported-by: Jean-Baptiste Kempf <jb@videolan.org>
 2014-01-14 17:29:03 +01:00
Reimar Döffinger
d84bd4650b mxf: Set AV_FIELD_PROGRESSIVE 
Needed for AVC-intra

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-01-14 17:28:48 +01:00
Michael Niedermayer
b821def9f5 avcodec/proresdsp: rename CLIP_AND_BIAS to BANANA 
See: IRC log
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 16:33:16 +01:00
Michael Niedermayer
cb613657ee avcodec/x86/proresdsp_init: x86 prores IDCT is bitexact again 
reenable it for for bitexact mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 15:59:00 +01:00
Michael Niedermayer
4b0cad6596 avcodec/simple_idct_template: fix rounding of the special DC case for 10bit 
MSE doesnt change for the test as the code only triggers
for very sparse matrixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 15:58:59 +01:00
Michael Niedermayer
a7ea733b72 avcodec/simple_idct_template: fix row rounder 
MSE changes from 0.04890000 to 0.02969844

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 15:58:59 +01:00
Michael Niedermayer
cca2772e16 avcodec/simple_idct_template: change the idct coefficients so that they match the x86 code 
no changes in either standard deviation or PSNR is seen in any of the changed fate
cases

MSE changes from 0.05012422 to 0.04890000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 15:58:58 +01:00
Michael Niedermayer
d9e556ebd0 avcodec/proresdsp & idct: move biasing from after the IDCT into the IDCT 
This replaces 64 additions by 8 additions

MSE Changes from 0.04873672 to 0.05012422

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 15:58:57 +01:00
Michael Niedermayer
12bc33d7cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_yadif: Relicense from GPL to LGPL

Conflicts:
	LICENSE
	configure
	libavfilter/vf_yadif.c
	libavfilter/x86/vf_yadif.asm
	libavfilter/x86/vf_yadif_init.c
	libavfilter/yadif.h

See: 194ef56ba7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:59:01 +01:00
Michael Niedermayer
b148a39d55 Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7' 
* commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7':
  x86: Consistently use cpu flag detection macros in places that still miss it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:44:59 +01:00
Michael Niedermayer
7766c7b7a0 Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49' 
* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49':
  arm: Use full filenames as multiple inclusion guards

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:38:10 +01:00
Robert Krüger
194ef56ba7 Change license of yadif from GPL to LGPL 
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:19:15 +01:00
Robert Krüger
6109399366 Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects"" 
This reverts commit 4ef4bb4a20.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:19:15 +01:00
Robert Krüger
99c4abfe88 Revert "Revert "yadif: add parens around macro parameters"" 
This reverts commit ab00800cde.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:19:14 +01:00
Robert Krüger
4a38eeec38 Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c"" 
This reverts commit 975110a85e.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 14:19:14 +01:00
James Almer
0b54bc24db webp: add support for EXIF metadata chunks 
Based on mjpeg code by Thilo Borgmann

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 05:08:22 +01:00
Andrey Myznikov
b79bccba80 avformat/librtmp: Fix memory leak if RTMP_ConnectStream() fails 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 01:59:23 +01:00
Michael Niedermayer
05c78f345b avformat/utils: av_probe_input_buffer2 decrease difference to libav 
This removes the initialization of 2 unused fields
The change was part of c1868e7ee7
but wasnt merged as the fields could still be used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-14 01:59:11 +01:00
Robert Krüger
d8e763fda7 vf_yadif: Relicense from GPL to LGPL 
All copyright holders have agreed to the relicensing.
 2014-01-14 00:04:59 +01:00
Diego Biurrun
46bacb5cc6 x86: Consistently use cpu flag detection macros in places that still miss it 2014-01-14 00:04:58 +01:00
Diego Biurrun
7151c5d04a arm: Use full filenames as multiple inclusion guards 2014-01-14 00:04:52 +01:00
Michael Niedermayer
05886c9d4e avformat/utils/av_probe_input_buffer2: fix buffer passed to ffio_rewind_with_probe_data() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 22:24:30 +01:00
Michael Niedermayer
8c3b026a0e avformat/utils/av_probe_input_buffer2: fix offset check 
The check could fail if avio_read() read less than requested

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 22:23:40 +01:00
Michael Niedermayer
6a2064820b avformat/utils/av_probe_input_buffer2: Fix pd.buf_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 22:14:02 +01:00
Michael Niedermayer
cdce0e8a50 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavf: make av_probe_input_buffer more robust

Conflicts:
	libavformat/utils.c

Not merged as it depends on previous buggy changes

See: e74cd2f470
See: ececbedaa8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 22:12:53 +01:00
Michael Niedermayer
220f0927b8 Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f' 
* commit '8b76362836f3c373c3aadc544522edcbef16dd5f':
  lavf: use a fixed width type

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 21:34:42 +01:00
Michael Niedermayer
ececbedaa8 Merge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50' 
* commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50':
  lavf: simplify handling of offset in av_probe_input_buuffer()

Conflicts:
	libavformat/utils.c

The simplification is broken and does not work at least for ffmpeg,
thus this change is not merged.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 21:23:24 +01:00
Anton Khirnov
2115a35974 lavf: make av_probe_input_buffer more robust 
Always use the actually read size as the offset instead of making
possibly invalid assumptions.

Addresses: CVE-2012-6618
 2014-01-13 15:00:09 +01:00
Anton Khirnov
8b76362836 lavf: use a fixed width type 
It's shorter and more consistent with the rest of the code.
 2014-01-13 15:00:09 +01:00
Anton Khirnov
c1868e7ee7 lavf: simplify handling of offset in av_probe_input_buuffer() 2014-01-13 15:00:09 +01:00
Michael Niedermayer
9ace154186 Merge commit '99e20125232d40ea239a5b54d26bbfe526506114' 
* commit '99e20125232d40ea239a5b54d26bbfe526506114':
  x86/arm: Add clobber tests to libavresample

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 14:36:55 +01:00
Michael Niedermayer
a067445b45 Merge commit '49b9badcaab513b65b79be371b1a9c1012e482ea' 
* commit '49b9badcaab513b65b79be371b1a9c1012e482ea':
  vc1: Enable the interlaced B-frame codepath.

See: 33f2a49423
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 14:27:44 +01:00
Michael Niedermayer
58eb9b9299 Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102' 
* commit '6d98959c8a5a749592a878b9523b31eccea5d102':
  vc1: Add avg_no_rnd_vc1_chroma_mc4_c()

Conflicts:
	libavcodec/vc1dsp.c

See: dd6e291e40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 14:19:15 +01:00
Michael Niedermayer
1df53ff22d Merge commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e' 
* commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e':
  vc1: Factorize out chroma MC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 14:04:58 +01:00
Martin Storsjö
99e2012523 x86/arm: Add clobber tests to libavresample 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-01-13 14:13:27 +02:00
Tim Walker
49b9badcaa vc1: Enable the interlaced B-frame codepath. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-01-13 10:23:01 +01:00
Michael Niedermayer
6d98959c8a vc1: Add avg_no_rnd_vc1_chroma_mc4_c() 
Needed for proper interlaced support.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-01-13 10:22:58 +01:00
Luca Barbato
c798a6fedc vc1: Factorize out chroma MC 2014-01-13 10:21:53 +01:00
Michael Niedermayer
22bfb4be28 avcodec/hevc: Check entry point arrays for malloc failure 
Fixes null pointer dereference
Fixes: signal_sigsegv_e1d3b6_2192_DBLK_F_VIXS_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 05:04:13 +01:00
Luca Barbato
aead772b58 hevc: Bound check slice_qp 
The T-REC-H.265-2013044 page 79 states they have to be into the range
[-s->sps->qp_bd_offset, 51].

Fixes: asan_stack-oob_eae8e3_9522_WP_MAIN10_B_Toshiba_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 05:04:13 +01:00
Luca Barbato
48a5b15543 hevc: Reject impossible dependent tile 
The tile 0 cannot depend on a previous one.
Prevent an out of array bound load in ff_hevc_cabac_init().

Fixes: asan_heap-oob_e3a924_1630_DBLK_A_MAIN10_VIXS_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Reviewed-by: Guillaume Martres <smarter@ubuntu.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 02:51:53 +01:00
Michael Niedermayer
7a8318fbb1 avcodec/huffman: raise the input capability of ff_huff_gen_len_table() from 8 to 14bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 01:30:24 +01:00
Michael Niedermayer
7b41cbac7f avcodec/huffman: extend ff_huff_gen_len_table() to allow >8bit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-13 01:22:43 +01:00
Clément Bœsch
af68bd1c06 vp9/x86: add ff_vp9_loop_filter_[vh]_16_16_ssse3(). 
16662 decicycles in loop_filter_h_16_16_c, 8387355 runs, 1253 skips
17510 decicycles in loop_filter_v_16_16_c, 8387516 runs, 1092 skips

4941 decicycles in ff_vp9_loop_filter_h_16_16_ssse3, 8387887 runs, 721 skips
3899 decicycles in ff_vp9_loop_filter_v_16_16_ssse3, 8387980 runs, 628 skips

Overall decode time goes from:
  ./ffmpeg -v 0 -nostats -threads 1 -i ~/samples/vp9/ped1080p.webm -f null -  8.10s user 0.02s system 99% cpu 8.126 total
to:
  ./ffmpeg -v 0 -nostats -threads 1 -i ~/samples/vp9/ped1080p.webm -f null -  6.15s user 0.04s system 99% cpu 6.199 total

(46 to 61 fps)
 2014-01-12 20:20:24 +01:00
Clément Bœsch
e11ceea68f vp9/x86: factor out some code in VP9_UNPACK_MULSUB_2W_4X. 2014-01-12 20:19:00 +01:00