ffmpeg.git
5 years agoMerge commit '36e3b1f2fd262028834a9d7b1eb533c1218ee6c2'
Michael Niedermayer [Wed, 15 Jan 2014 14:27:07 +0000 (15:27 +0100)]
Merge commit '36e3b1f2fd262028834a9d7b1eb533c1218ee6c2'

* commit '36e3b1f2fd262028834a9d7b1eb533c1218ee6c2':
  aarch64: h264 loop filter NEON optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'
Michael Niedermayer [Wed, 15 Jan 2014 14:20:30 +0000 (15:20 +0100)]
Merge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'

* commit 'c65d67ef50241886b9749e88fd333c52090f70c7':
  aarch64: hpeldsp NEON optimizations

Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd5dd8c7bf0f0d77c581db3236e0d938f06fd5591'
Michael Niedermayer [Wed, 15 Jan 2014 14:13:12 +0000 (15:13 +0100)]
Merge commit 'd5dd8c7bf0f0d77c581db3236e0d938f06fd5591'

* commit 'd5dd8c7bf0f0d77c581db3236e0d938f06fd5591':
  aarch64: h264 qpel NEON optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8438b3f09f6b225d0886cc385117c38eb44ca0c1'
Michael Niedermayer [Wed, 15 Jan 2014 14:06:37 +0000 (15:06 +0100)]
Merge commit '8438b3f09f6b225d0886cc385117c38eb44ca0c1'

* commit '8438b3f09f6b225d0886cc385117c38eb44ca0c1':
  aarch64: h264 idct NEON assembler optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '71617884a2a673908bd5c0f73d4f91fdca3da82a'
Michael Niedermayer [Wed, 15 Jan 2014 13:59:44 +0000 (14:59 +0100)]
Merge commit '71617884a2a673908bd5c0f73d4f91fdca3da82a'

* commit '71617884a2a673908bd5c0f73d4f91fdca3da82a':
  aarch64: h264 chroma motion compensation NEON optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b7b17ed66e199afc7246e642bf3b35c3f8eca217'
Michael Niedermayer [Wed, 15 Jan 2014 13:41:41 +0000 (14:41 +0100)]
Merge commit 'b7b17ed66e199afc7246e642bf3b35c3f8eca217'

* commit 'b7b17ed66e199afc7246e642bf3b35c3f8eca217':
  aarch64: add cpuflags support for NEON and VFP

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1e9265cd8f0821acbeca1db437be1361a3976b85'
Michael Niedermayer [Wed, 15 Jan 2014 13:19:07 +0000 (14:19 +0100)]
Merge commit '1e9265cd8f0821acbeca1db437be1361a3976b85'

* commit '1e9265cd8f0821acbeca1db437be1361a3976b85':
  dct-test: test ff_simple_idct_neon only on ARM for now

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2620df13104ddaa136158eb6bb1195adbf9d7692'
Michael Niedermayer [Wed, 15 Jan 2014 13:11:57 +0000 (14:11 +0100)]
Merge commit '2620df13104ddaa136158eb6bb1195adbf9d7692'

* commit '2620df13104ddaa136158eb6bb1195adbf9d7692':
  mov: Free an earlier allocated array if allocating a new one

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'
Michael Niedermayer [Wed, 15 Jan 2014 12:51:58 +0000 (13:51 +0100)]
Merge commit 'd51f09962d5b4bc999fb70c040f330dd1873212e'

* commit 'd51f09962d5b4bc999fb70c040f330dd1873212e':
  mov: Free intermediate arrays in the normal cleanup function

Conflicts:
libavformat/mov.c

See: a6b3e6d0b49b47c9b874e59b88a8051af338f520
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: add AVX for itxfm and lpf.
Clément Bœsch [Tue, 14 Jan 2014 07:09:48 +0000 (08:09 +0100)]
vp9/x86: add AVX for itxfm and lpf.

4412 decicycles in ff_vp9_loop_filter_h_16_16_ssse3, 4193462 runs, 842 skips
3600 decicycles in ff_vp9_loop_filter_h_16_16_avx, 4193621 runs, 683 skips

3010 decicycles in ff_vp9_loop_filter_v_16_16_ssse3, 4193528 runs, 776 skips
2678 decicycles in ff_vp9_loop_filter_v_16_16_avx, 4193742 runs, 562 skips

23025 decicycles in ff_vp9_idct_idct_32x32_add_ssse3, 2096871 runs, 281 skips
19943 decicycles in ff_vp9_idct_idct_32x32_add_avx, 2096815 runs, 337 skips

4675 decicycles in ff_vp9_idct_idct_16x16_add_ssse3, 4194018 runs, 286 skips
3980 decicycles in ff_vp9_idct_idct_16x16_add_avx, 4194022 runs, 282 skips

967 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 16776972 runs, 244 skips
887 decicycles in ff_vp9_idct_idct_8x8_add_avx, 16777002 runs, 214 skips

5 years agoaarch64: h264 loop filter NEON optimizations
Janne Grunau [Fri, 20 Dec 2013 20:02:43 +0000 (21:02 +0100)]
aarch64: h264 loop filter NEON optimizations

Ported from ARMv7 NEON.

5 years agoaarch64: hpeldsp NEON optimizations
Janne Grunau [Fri, 20 Dec 2013 19:03:58 +0000 (20:03 +0100)]
aarch64: hpeldsp NEON optimizations

Ported from ARMv7 NEON.

5 years agoaarch64: h264 qpel NEON optimizations
Janne Grunau [Wed, 18 Dec 2013 14:56:50 +0000 (15:56 +0100)]
aarch64: h264 qpel NEON optimizations

Ported from ARMv7 NEON.

5 years agoaarch64: h264 idct NEON assembler optimizations
Janne Grunau [Thu, 12 Dec 2013 23:33:48 +0000 (00:33 +0100)]
aarch64: h264 idct NEON assembler optimizations

Ported from ARMv7 NEON.

5 years agoaarch64: h264 chroma motion compensation NEON optimizations
Janne Grunau [Tue, 10 Dec 2013 19:16:08 +0000 (20:16 +0100)]
aarch64: h264 chroma motion compensation NEON optimizations

Since RV40 and VC-1 use almost the same algorithm so optimizations for
those two decoders are easy to do and included.

5 years agoaarch64: add cpuflags support for NEON and VFP
Janne Grunau [Tue, 10 Dec 2013 19:13:32 +0000 (20:13 +0100)]
aarch64: add cpuflags support for NEON and VFP

NEON and VFP are currently mandatory for all ARMv8 profiles. Both are
handled as extensions as far as cpuflags are concerned. This is
consistent with handling x86_64 which always has SSE2, but still
handles it as an extension.

5 years agodct-test: test ff_simple_idct_neon only on ARM for now
Janne Grunau [Mon, 13 Jan 2014 20:32:19 +0000 (21:32 +0100)]
dct-test: test ff_simple_idct_neon only on ARM for now

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agomov: Free an earlier allocated array if allocating a new one
Martin Storsjö [Mon, 13 Jan 2014 12:46:07 +0000 (14:46 +0200)]
mov: Free an earlier allocated array if allocating a new one

It could probably also be considered an error if the pointer isn't
null at this point, but then we might risk rejecting some
slightly broken files that we might have handled so far.

Sample-Id: 00000496-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agomov: Free intermediate arrays in the normal cleanup function
Martin Storsjö [Mon, 13 Jan 2014 12:43:23 +0000 (14:43 +0200)]
mov: Free intermediate arrays in the normal cleanup function

These arrays are normally freed at the end of mov_read_trak,
but make sure they're freed in case mov_read_trak returned
early (due to errors) or in case the atoms that allocate arrays
are encountered at some other point than within a trak (which
we don't have checks against).

Sample-Id: 00000496-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 15 Jan 2014 04:22:41 +0000 (05:22 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aarch64: bswap inline assembly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '032d4da8af353e32ab5c86ee3a210f6065921a4a'
Michael Niedermayer [Wed, 15 Jan 2014 04:16:09 +0000 (05:16 +0100)]
Merge commit '032d4da8af353e32ab5c86ee3a210f6065921a4a'

* commit '032d4da8af353e32ab5c86ee3a210f6065921a4a':
  aarch64: configure: set arch dependent features

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b4119187b62d6932e07aded11d33d3b24e1b42f'
Michael Niedermayer [Wed, 15 Jan 2014 03:59:20 +0000 (04:59 +0100)]
Merge commit '8b4119187b62d6932e07aded11d33d3b24e1b42f'

* commit '8b4119187b62d6932e07aded11d33d3b24e1b42f':
  cabac: remove leftovers from the cabac encoder

Not merged, as we have not removed the cabac test which uses these

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: Override max_dec_pic_buffering when its inconsistent with num_reorde...
Michael Niedermayer [Wed, 15 Jan 2014 03:30:41 +0000 (04:30 +0100)]
avcodec/hevc_ps: Override max_dec_pic_buffering when its inconsistent with num_reorder_pics

Fixes Ticket3304

Alternatively max_dec_pic_buffering could be removed completely as its not used.

Based on a patch by Jose Santiago <santiago@haivision.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowebp: fix capitalization of the word Exif
James Almer [Tue, 14 Jan 2014 06:11:31 +0000 (03:11 -0300)]
webp: fix capitalization of the word Exif

Also remove "webp:" from log messages. Using the AVCodecContext is enough.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/adpcm: fix sample count for stereo SBPRO3
Michael Niedermayer [Wed, 15 Jan 2014 00:28:37 +0000 (01:28 +0100)]
avcodec/adpcm: fix sample count for stereo SBPRO3

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9b9902ed90_7462_new_alaw.voc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 14 Jan 2014 21:51:59 +0000 (22:51 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxf: Fix potential leak in mxf_read_local_tags()

See: fbb39f44f1d37451be7d575b5923e6d5851aaecc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b708f1c6b1baf3b97ed93226bf5dae1a9b13fb7'
Michael Niedermayer [Tue, 14 Jan 2014 21:43:38 +0000 (22:43 +0100)]
Merge commit '8b708f1c6b1baf3b97ed93226bf5dae1a9b13fb7'

* commit '8b708f1c6b1baf3b97ed93226bf5dae1a9b13fb7':
  mxf: Correctly support files from Pinnacle Thunder

See: a61fada3805122acf8f362d563c9cbae00c2c8cf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0d6605c7ef43f97a88950542af09078adef33b6d'
Michael Niedermayer [Tue, 14 Jan 2014 21:29:42 +0000 (22:29 +0100)]
Merge commit '0d6605c7ef43f97a88950542af09078adef33b6d'

* commit '0d6605c7ef43f97a88950542af09078adef33b6d':
  mxf: Fix a possible leak of extradata

Conflicts:
libavformat/mxfdec.c

See: b65570808cb3b518f969f9288fe643bca6361b8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'
Michael Niedermayer [Tue, 14 Jan 2014 21:16:38 +0000 (22:16 +0100)]
Merge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'

* commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf':
  mxf: Use av_malloc_array

Conflicts:
libavformat/mxfdec.c

See: 8ce41721a4a29711211f8dad0c86502caf86f4d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaarch64: bswap inline assembly
Janne Grunau [Mon, 25 Nov 2013 15:58:54 +0000 (16:58 +0100)]
aarch64: bswap inline assembly

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agoaarch64: configure: set arch dependent features
Janne Grunau [Thu, 12 Dec 2013 16:45:32 +0000 (17:45 +0100)]
aarch64: configure: set arch dependent features

Stack is always 16 byte aligned and clz, 64bit operations and unaligned
memory access are fast in aarch64 mode on ARMv8.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agocabac: remove leftovers from the cabac encoder
Janne Grunau [Mon, 13 Jan 2014 20:23:13 +0000 (21:23 +0100)]
cabac: remove leftovers from the cabac encoder

The cabac encoder was only used by the removed cabac test.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agoMerge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'
Michael Niedermayer [Tue, 14 Jan 2014 21:03:32 +0000 (22:03 +0100)]
Merge commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a'

* commit 'f5fbbbc022f723d3ccf99afd5d658a977b51c08a':
  mxf: Drop unnecessary checks

Conflicts:
libavformat/mxfdec.c

See: c5714097eb4c5545f41b5dcb522f7d7470d6f733
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'
Michael Niedermayer [Tue, 14 Jan 2014 20:53:12 +0000 (21:53 +0100)]
Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'

* commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084':
  mxf: Fix off by one error in d10 aes3 decoding

Conflicts:
libavformat/mxfdec.c

See: 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'
Michael Niedermayer [Tue, 14 Jan 2014 20:37:42 +0000 (21:37 +0100)]
Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'

* commit '42f9132218ca11a8e9a3c82a175b46bca092113e':
  mxf: Do not use int to check the seek position

Conflicts:
libavformat/mxfdec.c

See: 007989c7a2215f54aeaf2393ab3aff0c208e862f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd84bd4650b1bed882e2ac1651b4a86206aa0e363'
Michael Niedermayer [Tue, 14 Jan 2014 20:21:40 +0000 (21:21 +0100)]
Merge commit 'd84bd4650b1bed882e2ac1651b4a86206aa0e363'

* commit 'd84bd4650b1bed882e2ac1651b4a86206aa0e363':
  mxf: Set AV_FIELD_PROGRESSIVE

See: def01739c1365a5650b4222d59124132cee4f4fe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instea...
Michael Niedermayer [Tue, 14 Jan 2014 20:00:58 +0000 (21:00 +0100)]
avcodec/mpegaudiodec_template: decode_frame_mp3on4: conceal errors in decoding instead of discarding data

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudiodec_template/mp3on4: check that all channels have been decoded befor...
Michael Niedermayer [Tue, 14 Jan 2014 19:53:42 +0000 (20:53 +0100)]
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>
5 years agoavcodec/flashsv: check avio_read() return in mov_read_udta_string()
Michael Niedermayer [Tue, 14 Jan 2014 17:27:50 +0000 (18:27 +0100)]
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>
5 years agomxf: Fix potential leak in mxf_read_local_tags()
Tomas Härdin [Wed, 24 Oct 2012 14:54:25 +0000 (16:54 +0200)]
mxf: Fix potential leak in mxf_read_local_tags()

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomxf: Correctly support files from Pinnacle Thunder
Tomas Härdin [Wed, 4 Apr 2012 12:24:49 +0000 (14:24 +0200)]
mxf: Correctly support files from Pinnacle Thunder

Such files have IndexTableSegments which when parsed cover EditUnit
ranges like this:

 [0,1)
 [249,250)
 [249,377)
 [0,249)

where each interval is

 [IndexStartPosition, IndexStartPosition + IndexDuration)

This would be reduced to a sparse index like:

 [0,1), [249,250)

instead of the full range:

 [0,249), [249,377)

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomxf: Fix a possible leak of extradata
Michael Niedermayer [Tue, 11 Dec 2012 13:43:47 +0000 (14:43 +0100)]
mxf: Fix a possible leak of extradata

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomxf: Use av_malloc_array
Luca Barbato [Tue, 7 Jan 2014 22:54:09 +0000 (23:54 +0100)]
mxf: Use av_malloc_array

5 years agomxf: Drop unnecessary checks
Luca Barbato [Tue, 7 Jan 2014 20:56:33 +0000 (21:56 +0100)]
mxf: Drop unnecessary checks

av_reallocp_array does the check already.

5 years agomxf: Fix off by one error in d10 aes3 decoding
Marton Balint [Wed, 18 Jul 2012 23:23:20 +0000 (01:23 +0200)]
mxf: Fix off by one error in d10 aes3 decoding

Without this fix the last sample was missing from the packet.

5 years agomxf: Do not use int to check the seek position
Luca Barbato [Tue, 7 Jan 2014 20:26:14 +0000 (21:26 +0100)]
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>
5 years agomxf: Set AV_FIELD_PROGRESSIVE
Reimar Döffinger [Thu, 3 Jan 2013 20:42:35 +0000 (21:42 +0100)]
mxf: Set AV_FIELD_PROGRESSIVE

Needed for AVC-intra

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec/proresdsp: rename CLIP_AND_BIAS to BANANA
Michael Niedermayer [Tue, 14 Jan 2014 15:25:38 +0000 (16:25 +0100)]
avcodec/proresdsp: rename CLIP_AND_BIAS to BANANA

See: IRC log
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/proresdsp_init: x86 prores IDCT is bitexact again
Michael Niedermayer [Sun, 12 Jan 2014 01:28:16 +0000 (02:28 +0100)]
avcodec/x86/proresdsp_init: x86 prores IDCT is bitexact again

reenable it for for bitexact mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/simple_idct_template: fix rounding of the special DC case for 10bit
Michael Niedermayer [Sun, 12 Jan 2014 01:27:00 +0000 (02:27 +0100)]
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>
5 years agoavcodec/simple_idct_template: fix row rounder
Michael Niedermayer [Sun, 12 Jan 2014 01:14:09 +0000 (02:14 +0100)]
avcodec/simple_idct_template: fix row rounder

MSE changes from 0.04890000 to 0.02969844

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/simple_idct_template: change the idct coefficients so that they match the...
Michael Niedermayer [Sun, 12 Jan 2014 00:55:01 +0000 (01:55 +0100)]
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>
5 years agoavcodec/proresdsp & idct: move biasing from after the IDCT into the IDCT
Michael Niedermayer [Sun, 12 Jan 2014 00:23:50 +0000 (01:23 +0100)]
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>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 14 Jan 2014 13:53:53 +0000 (14:53 +0100)]
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: 194ef56ba7e659196fe554782d797b1b45c3915f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7'
Michael Niedermayer [Tue, 14 Jan 2014 13:44:53 +0000 (14:44 +0100)]
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>
5 years agoMerge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'
Michael Niedermayer [Tue, 14 Jan 2014 13:38:05 +0000 (14:38 +0100)]
Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'

* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49':
  arm: Use full filenames as multiple inclusion guards

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChange license of yadif from GPL to LGPL
Robert Krüger [Sat, 4 Jan 2014 13:21:19 +0000 (14:21 +0100)]
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>
5 years agoRevert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals...
Robert Krüger [Sat, 4 Jan 2014 12:50:19 +0000 (13:50 +0100)]
Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects""

This reverts commit 4ef4bb4a203e8f472ab0484396270b9430862037.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "Revert "yadif: add parens around macro parameters""
Robert Krüger [Sat, 4 Jan 2014 12:50:05 +0000 (13:50 +0100)]
Revert "Revert "yadif: add parens around macro parameters""

This reverts commit ab00800cde1af1f252731118062dd5149f1a7ed7.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "Revert "vf_yadif: move x86 init code to x86/yadif.c""
Robert Krüger [Sat, 4 Jan 2014 12:49:38 +0000 (13:49 +0100)]
Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c""

This reverts commit 975110a85ef8e794fdc041455ff41b0ad30bc01e.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowebp: add support for EXIF metadata chunks
James Almer [Mon, 13 Jan 2014 04:37:53 +0000 (01:37 -0300)]
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>
5 years agoavformat/librtmp: Fix memory leak if RTMP_ConnectStream() fails
Andrey Myznikov [Tue, 14 Jan 2014 00:42:42 +0000 (01:42 +0100)]
avformat/librtmp: Fix memory leak if RTMP_ConnectStream() fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: av_probe_input_buffer2 decrease difference to libav
Michael Niedermayer [Mon, 13 Jan 2014 21:37:31 +0000 (22:37 +0100)]
avformat/utils: av_probe_input_buffer2 decrease difference to libav

This removes the initialization of 2 unused fields
The change was part of c1868e7ee7b07b40a0fe15f50df89fe499a01a50
but wasnt merged as the fields could still be used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_yadif: Relicense from GPL to LGPL
Robert Krüger [Sun, 5 Jan 2014 18:53:11 +0000 (19:53 +0100)]
vf_yadif: Relicense from GPL to LGPL

All copyright holders have agreed to the relicensing.

5 years agox86: Consistently use cpu flag detection macros in places that still miss it
Diego Biurrun [Mon, 13 Jan 2014 17:52:32 +0000 (18:52 +0100)]
x86: Consistently use cpu flag detection macros in places that still miss it

5 years agoarm: Use full filenames as multiple inclusion guards
Diego Biurrun [Mon, 13 Jan 2014 14:26:16 +0000 (15:26 +0100)]
arm: Use full filenames as multiple inclusion guards

5 years agoavformat/utils/av_probe_input_buffer2: fix buffer passed to ffio_rewind_with_probe_data()
Michael Niedermayer [Mon, 13 Jan 2014 21:17:12 +0000 (22:17 +0100)]
avformat/utils/av_probe_input_buffer2: fix buffer passed to ffio_rewind_with_probe_data()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils/av_probe_input_buffer2: fix offset check
Michael Niedermayer [Mon, 13 Jan 2014 21:17:12 +0000 (22:17 +0100)]
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>
5 years agoavformat/utils/av_probe_input_buffer2: Fix pd.buf_size
Michael Niedermayer [Mon, 13 Jan 2014 21:14:02 +0000 (22:14 +0100)]
avformat/utils/av_probe_input_buffer2: Fix pd.buf_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 13 Jan 2014 21:12:38 +0000 (22:12 +0100)]
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: e74cd2f4706f71da5e9205003c1d8263b54ed3fb
See: ececbedaa86cddd883f6cdc12cdd1a75a0023550
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'
Michael Niedermayer [Mon, 13 Jan 2014 20:34:42 +0000 (21:34 +0100)]
Merge commit '8b76362836f3c373c3aadc544522edcbef16dd5f'

* commit '8b76362836f3c373c3aadc544522edcbef16dd5f':
  lavf: use a fixed width type

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50'
Michael Niedermayer [Mon, 13 Jan 2014 20:18:39 +0000 (21:18 +0100)]
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>
5 years agolavf: make av_probe_input_buffer more robust
Anton Khirnov [Mon, 13 Jan 2014 12:47:07 +0000 (13:47 +0100)]
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

5 years agolavf: use a fixed width type
Anton Khirnov [Mon, 13 Jan 2014 10:56:59 +0000 (11:56 +0100)]
lavf: use a fixed width type

It's shorter and more consistent with the rest of the code.

5 years agolavf: simplify handling of offset in av_probe_input_buuffer()
Anton Khirnov [Mon, 13 Jan 2014 10:55:18 +0000 (11:55 +0100)]
lavf: simplify handling of offset in av_probe_input_buuffer()

5 years agoMerge commit '99e20125232d40ea239a5b54d26bbfe526506114'
Michael Niedermayer [Mon, 13 Jan 2014 13:36:04 +0000 (14:36 +0100)]
Merge commit '99e20125232d40ea239a5b54d26bbfe526506114'

* commit '99e20125232d40ea239a5b54d26bbfe526506114':
  x86/arm: Add clobber tests to libavresample

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '49b9badcaab513b65b79be371b1a9c1012e482ea'
Michael Niedermayer [Mon, 13 Jan 2014 13:26:33 +0000 (14:26 +0100)]
Merge commit '49b9badcaab513b65b79be371b1a9c1012e482ea'

* commit '49b9badcaab513b65b79be371b1a9c1012e482ea':
  vc1: Enable the interlaced B-frame codepath.

See: 33f2a4942380184f3a28cbf2a36366c8ed105232
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d98959c8a5a749592a878b9523b31eccea5d102'
Michael Niedermayer [Mon, 13 Jan 2014 13:18:03 +0000 (14:18 +0100)]
Merge commit '6d98959c8a5a749592a878b9523b31eccea5d102'

* commit '6d98959c8a5a749592a878b9523b31eccea5d102':
  vc1: Add avg_no_rnd_vc1_chroma_mc4_c()

Conflicts:
libavcodec/vc1dsp.c

See: dd6e291e4083b7af53968c0ae06330841f63405b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e'
Michael Niedermayer [Mon, 13 Jan 2014 13:04:48 +0000 (14:04 +0100)]
Merge commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e'

* commit 'c798a6fedc3dd9ed3ac1fb2d95819af58705a87e':
  vc1: Factorize out chroma MC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/arm: Add clobber tests to libavresample
Martin Storsjö [Sat, 11 Jan 2014 20:43:26 +0000 (22:43 +0200)]
x86/arm: Add clobber tests to libavresample

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agovc1: Enable the interlaced B-frame codepath.
Tim Walker [Sat, 11 Jan 2014 22:58:16 +0000 (23:58 +0100)]
vc1: Enable the interlaced B-frame codepath.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agovc1: Add avg_no_rnd_vc1_chroma_mc4_c()
Michael Niedermayer [Thu, 25 Apr 2013 19:31:18 +0000 (21:31 +0200)]
vc1: Add avg_no_rnd_vc1_chroma_mc4_c()

Needed for proper interlaced support.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agovc1: Factorize out chroma MC
Luca Barbato [Sat, 11 Jan 2014 22:59:54 +0000 (23:59 +0100)]
vc1: Factorize out chroma MC

5 years agoavcodec/hevc: Check entry point arrays for malloc failure
Michael Niedermayer [Mon, 13 Jan 2014 02:51:39 +0000 (03:51 +0100)]
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>
5 years agohevc: Bound check slice_qp
Luca Barbato [Sun, 12 Jan 2014 00:14:12 +0000 (01:14 +0100)]
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>
5 years agohevc: Reject impossible dependent tile
Luca Barbato [Sat, 11 Jan 2014 15:52:43 +0000 (16:52 +0100)]
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>
5 years agoavcodec/huffman: raise the input capability of ff_huff_gen_len_table() from 8 to...
Michael Niedermayer [Mon, 13 Jan 2014 00:04:47 +0000 (01:04 +0100)]
avcodec/huffman: raise the input capability of ff_huff_gen_len_table() from 8 to 14bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffman: extend ff_huff_gen_len_table() to allow >8bit
Michael Niedermayer [Mon, 13 Jan 2014 00:03:54 +0000 (01:03 +0100)]
avcodec/huffman: extend ff_huff_gen_len_table() to allow >8bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: add ff_vp9_loop_filter_[vh]_16_16_ssse3().
Clément Bœsch [Sun, 5 Jan 2014 20:00:40 +0000 (21:00 +0100)]
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)

5 years agovp9/x86: factor out some code in VP9_UNPACK_MULSUB_2W_4X.
Clément Bœsch [Sat, 11 Jan 2014 11:58:08 +0000 (12:58 +0100)]
vp9/x86: factor out some code in VP9_UNPACK_MULSUB_2W_4X.

5 years agovp9/x86: remove reg redundancy in VP9_MULSUB_2W_2X.
Clément Bœsch [Sat, 11 Jan 2014 11:41:21 +0000 (12:41 +0100)]
vp9/x86: remove reg redundancy in VP9_MULSUB_2W_2X.

5 years agovp9/x86: merge IDCT coef macros.
Clément Bœsch [Sat, 11 Jan 2014 11:37:29 +0000 (12:37 +0100)]
vp9/x86: merge IDCT coef macros.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 12 Jan 2014 19:04:35 +0000 (20:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1dsp: K&R formatting cosmetics

Conflicts:
libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: disable ARM code until its build failure with clang/iphone is fixed
Michael Niedermayer [Wed, 8 Jan 2014 16:12:22 +0000 (17:12 +0100)]
swscale: disable ARM code until its build failure with clang/iphone is fixed

See: "19:40 Yu Xiaolei Re: [FFmpeg-devel] [PATCH] fix build with gas-preprocessor.pl"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovc1dsp: K&R formatting cosmetics
Luca Barbato [Sat, 11 Jan 2014 23:59:24 +0000 (00:59 +0100)]
vc1dsp: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoRevert "swscale: disable ARM code until its build failure with clang/iphone is fixed"
Michael Niedermayer [Sun, 12 Jan 2014 17:01:23 +0000 (18:01 +0100)]
Revert "swscale: disable ARM code until its build failure with clang/iphone is fixed"

This reverts commit c8c7736c1025bcf5bb27e104a0d0eae749408739.

5 years agofix build with gas-preprocessor.pl
Yu Xiaolei [Sun, 12 Jan 2014 16:56:26 +0000 (00:56 +0800)]
fix build with gas-preprocessor.pl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegts muxer, DVB subtitles encoder: common DVB subtitles payload
Serhii Marchuk [Sat, 11 Jan 2014 20:54:29 +0000 (22:54 +0200)]
mpegts muxer, DVB subtitles encoder: common DVB subtitles payload

Improved DVB subtitles encoder to generate AVPacket.data in the same
format as generates MPEGTS demuxer + DVB subtitles parser. So now single
format of DVB subtitles data is used across all the components of FFmpeg:
only subtitles payload WITHOUT 0x20 0x00 bytes at the beginning and 0xFF
trailing byte.

Improved MPEGTS muxer to support format of DVB subtitles in
AVPacket.data described above: while muxing we add two bytes 0x20 0x00 to
the beginning of and 0xFF to the end of DVB subtitles payload.

The patch fixes DVB subtitle copy problems: tickets #2989 fully and #2024
partly.

Signed-off-by: Clément Bœsch <u@pkh.me>
5 years agoexamples/muxing: simplify video PTS setting
Stefano Sabatini [Fri, 10 Jan 2014 10:07:42 +0000 (11:07 +0100)]
examples/muxing: simplify video PTS setting

Rely on frame_count. Also more consistent with audio path.

5 years agoavcodec/dct-test: add support for C prores IDCT
Michael Niedermayer [Sun, 12 Jan 2014 03:10:04 +0000 (04:10 +0100)]
avcodec/dct-test: add support for C prores IDCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>