generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
65,138 Commits 24 Branches 241 Tags 173 MiB
5bedbc3da2
Commit Graph

29371 Commits

Author SHA1 Message Date
Michael Niedermayer
98227ba5fa Merge commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78' 
* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78':
  ppc: dsputil: Coalesce all init files

Conflicts:
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 21:08:28 +02:00
Diego Biurrun
acf91215c7 x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection 
The remaining dsputil bits are encoding-specific anyway.
 2014-07-13 07:01:05 -07:00
Ben Avison
42c1cc35b7 armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6) 
The previous implementation targeted DTS Coherent Acoustics, which only
requires mdct_bits == 6. This relatively small size lent itself to
unrolling the loops a small number of times, and encoding offsets
calculated at assembly time within the load/store instructions of each
iteration.

In the more general case (codecs such as AAC and AC3) much larger arrays
are used - mdct_bits == [8, 9, 11]. The old method does not scale for
these cases, so more integer registers are used with non-unrolled versions
of the loops (and with some stack spillage). The postrotation filter loop
is still unrolled by a factor of 2 to permit the double-buffering of some
VFP registers to facilitate overlap of neighbouring iterations.

I benchmarked the result by measuring the number of gperftools samples
that hit anywhere in the AAC decoder (starting from aac_decode_frame())
or specifically in ff_imdct_half_c / ff_imdct_half_vfp, for the same
example AAC stream:

                  Before          After
                  Mean   StdDev   Mean   StdDev  Confidence  Change
aac_decode_frame  2368.1 35.8     2117.2 35.3    100.0%      +11.8%
ff_imdct_half_*   457.5  22.4     251.2  16.2    100.0%      +82.1%

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 15:17:04 +02:00
James Almer
276bef5340 x86/hevc_deblock: add ff_hevc_[hv]_loop_filter_luma_{8, 10}_sse2 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 13:48:31 +02:00
Ronald S. Bultje
ebd1c505d2 h264: fix direct temporal mvs for bottom-field-first poc order. 
Fixes http://forum.doom9.org/showthread.php?t=170867.
Fixes: corrupt-1677.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-13 13:26:19 +02:00
Diego Biurrun
a8552ee3eb ppc: dsputil: Coalesce all init files 2014-07-13 04:10:13 -07:00
Andreas Cadhalpun
39a6e02fd4 fix spelling errors 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 22:33:27 +02:00
Michael Niedermayer
1db641cbd2 avcodec/hevc: more clearing to avoid stale pointers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 21:31:37 +02:00
Michael Niedermayer
ccd6911c18 avcodec/hevc_ps: do not loose all reference to pointers still in use 
Fixes leaving a pointer to unreferenced memory
Fixes Ticket 3115

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 21:03:09 +02:00
James Almer
123649dd19 x86/dsputilenc: remove some empty if statements 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 15:04:58 +02:00
Michael Niedermayer
66558fe715 avcodec/hevc_ps: Check layer_id_included_flags count 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 07:46:08 +02:00
Michael Niedermayer
6935ae22ed avcodec/hevc_ps: more complete check for vps_max_dec_pic_buffering 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 07:46:08 +02:00
Michael Niedermayer
5d88e40093 avcodec/hevc: check slice_header_extension data length 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 07:46:07 +02:00
Michael Niedermayer
c79acacd2e avcodec/hevc: fix nb_sh / nb_sps check 
fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 04:39:01 +02:00
Michael Niedermayer
2cebd17e3f avcodec/pgssubdec: Fix input pts 
Fixes part of Ticket2516

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-12 01:09:51 +02:00
Michael Niedermayer
b8cdf04726 Merge commit '1173320249745eab01c901a39054fc0fced33c87' 
* commit '1173320249745eab01c901a39054fc0fced33c87':
  dsputil: Drop unused bit_depth parameter from all init functions

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 20:29:40 +02:00
Diego Biurrun
1173320249 dsputil: Drop unused bit_depth parameter from all init functions 2014-07-11 06:38:26 -07:00
Michael Niedermayer
e1f4397e74 Merge commit '458e7c94830d1522997e33a0b5e87bd709e8a349' 
* commit '458e7c94830d1522997e33a0b5e87bd709e8a349':
  hevc: implement pic_output_flag handling

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_refs.c

See: 2eddf3a6ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 12:21:41 +02:00
Michael Niedermayer
aa56c37c8a Merge commit 'f43789b76e661acd93c21664678f140e53cfa1fa' 
* commit 'f43789b76e661acd93c21664678f140e53cfa1fa':
  hevc: set the keyframe flag on output frames

See: e2760de605
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 12:16:24 +02:00
Gildas Cocherel
458e7c9483 hevc: implement pic_output_flag handling 
Sample-Id: OPFLAG_B_Qualcomm_1.bit, OPFLAG_C_Qualcomm_1.bit
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-11 08:52:54 +00:00
Mickaël Raulet
f43789b76e hevc: set the keyframe flag on output frames 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-11 08:43:01 +00:00
Mickaël Raulet
1493b237bd hevc: Replace nal type chek with equivalent IS_IRAP macro 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-11 08:41:32 +00:00
Anton Khirnov
17e9d52c8c hevc_ps: remove a write-only variable 2014-07-11 08:38:51 +00:00
Michael Niedermayer
9195c26d45 avcodec/rv34: fix crash while seeking on very damaged file 
Fixes null pointer dereference
Fixes Ticket2093

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-11 05:34:13 +02:00
Christophe Gisquet
4576eff05d hevc: derive partial merge list 
The merge list only needs to be derived up to the merge index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 17:27:56 +02:00
Christophe Gisquet
bbeaae96eb hevc: derive partially amvp list 
When the candidate has been found, no need to derive others.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 15:35:15 +02:00
Clément Bœsch
7e7168b82d Fix 2 coeffecient typo 2014-07-10 15:29:54 +02:00
Christophe Gisquet
eca1957c4c hevc: reorder loops 
iterate over memory in a more continuous order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 14:46:49 +02:00
Christophe Gisquet
2e471e4703 hevc: simplify rounding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 14:32:18 +02:00
Carl Eugen Hoyos
a1e3ea475a Fix compilation with --disable-everything. 2014-07-10 08:26:59 +02:00
James Almer
2571e8fe37 alpha/pixblockdsp: move code out of dsputil 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 04:01:03 +02:00
Michael Niedermayer
2d5e9451de Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e' 
* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
  dsputil: Split off pixel block routines into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pixblockdsp_template.c
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 01:22:14 +02:00
Michael Niedermayer
92c29914de avcodec/hevc_sei: factor return 1 out of if/else chain 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 00:19:49 +02:00
Michael Niedermayer
efc66d69bf Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50' 
* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50':
  hevc: parse display orientation SEI message

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 00:19:43 +02:00
Michael Niedermayer
cd0dc88751 Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09' 
* commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09':
  h264: parse display orientation SEI message

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-10 00:07:04 +02:00
Michael Niedermayer
e932ae5940 Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6' 
* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
  adxdec: get rid of an avpriv function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 22:38:13 +02:00
Michael Niedermayer
1b58f13761 Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1' 
* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
  lavc: export DV profile API used by muxer/demuxer as public

Conflicts:
	configure
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/dv_profile.c
	libavcodec/dv_profile.h
	libavcodec/version.h
	libavformat/dvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 22:27:07 +02:00
Michael Niedermayer
76a35f7830 avcodec/roqvideoenc: Print the correct max resolution 
Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:20:31 +02:00
Michael Niedermayer
9af59db6ec avcodec/roqvideoenc: More verbose warning about no power of 2 dimensions 
Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 21:19:55 +02:00
Oliver Fromme
a32dcaaaf8 avcodec/dvdsubenc: Add dvdsub workaround for some players 
The issue affects dvdsub subtitles (a.k.a. VOBSUB).

Some players -- in particular hardware players -- cut off
the lowest row of pixels if the number of rows in the subtitle
is odd.

The patch below implements a work-around for that.  If the
number of rows is odd, it is simply rounded up to an even
number, adding an invisible (i.e. fully transparent) row.
The work-around can be enabled or disabled with a new
option -even_rows_fix.  The default is disabled, so there
is no change of behaviour for users who don't care about it.

The overhead for the fix is low, and in many cases even zero:
For subtitles with an odd number of rows (i.e. in 50% of
cases on average), the size increases by two bytes because
a fully transparent row is encoded as 0x00 0x00.  However,
in the VOBSUB standard, all data packets are padded to 2KB
anyway, so in most cases the additional bytes just use some
part of the padding, so there is no overhead.  Only in the
rare case that the 2KB boundary is hit (0.1% chance), a full
2KB block is added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 20:11:36 +02:00
Michael Niedermayer
e36916a63f avcodec/pthread_frame: fix setting hwaccel with threads and get_format() 
Fixes assertion failure with vdpau and vlc
Fixes Ticket3742

Tested-by: oromit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 19:58:58 +02:00
Diego Biurrun
f46bb608d9 dsputil: Split off pixel block routines into their own context 2014-07-09 08:05:26 -07:00
Vittorio Giovara
0569a7e0bd hevc: parse display orientation SEI message 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-09 10:18:06 -04:00
Vittorio Giovara
18e3d61e9e h264: parse display orientation SEI message 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-09 10:17:42 -04:00
Michael Niedermayer
f32c5d1a8d avcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 16:04:32 +02:00
Anton Khirnov
d5cf5afabb adxdec: get rid of an avpriv function 
The only thing the demuxer needs is the sample rate to set the timebase,
which can be simply read with AV_RB32.
 2014-07-09 13:37:18 +00:00
Anton Khirnov
f6ee61fb05 lavc: export DV profile API used by muxer/demuxer as public 2014-07-09 13:35:07 +00:00
Carl Eugen Hoyos
d6e7881c2e Fix wmv1 encoding if all other msmpeg4-related encoders were disabled. 2014-07-09 08:51:17 +02:00
Carl Eugen Hoyos
e4dfc3f9b8 Fix wmv1 decoding if no other msmpeg4-related decoder was compiled. 2014-07-09 08:27:24 +02:00
Michael Niedermayer
c8b2cf4996 avcodec/mpegvideo: flip motion vector visualization for backward motion vectors 
Also support changing arrow head/tail shape

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-09 03:07:25 +02:00
James Almer
2375b09473 alpha/idctdsp: move idct init code out of dsputil 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 22:19:38 +02:00
Michael Niedermayer
550bda741c avcodec/alpha/dsputil_alpha: fix build 
Disable moved functions to prevent build/test failure,
patch to update and re-enable them is welcome
volunteer to maintain the alpha code is welcome too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 20:15:31 +02:00
Michael Niedermayer
7cb8f7ded4 avcodec/proresenc_anatoliy: check against maximum dimensions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 18:03:11 +02:00
Michael Niedermayer
7c7441b37d avcodec/roqvideoenc: check dimensions against maximum 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 17:33:39 +02:00
Michael Niedermayer
fe4c76b3d0 avcodec/roqvideoenc: fix infinite lambda increasing loop 
The threshold was choosen so that no further size decrease happened with larger lambda
with the test video.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 17:09:56 +02:00
Michael Niedermayer
1f935c3d0b Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6' 
* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 14:44:12 +02:00
Martin Storsjö
79fce1ec8a arm: Avoid using the 'setend' instruction on ARMv7 and newer 
This instruction is deprecated on ARMv8, and it is serializing on
some ARMv7 cores as well [1].

[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-08 12:09:09 +03:00
Michael Niedermayer
14e2406de7 Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3' 
* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/asvenc.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 03:19:06 +02:00
Michael Niedermayer
5c7bf354dc avcodec/crystalhd: Add #if HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 02:51:56 +02:00
Michael Niedermayer
39ea21713c avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 01:55:47 +02:00
Michael Niedermayer
242b3c292a Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d' 
* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 23:16:59 +02:00
Michael Niedermayer
154954c2ac avcodec/vmdvideo: remove unneeded include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:57:36 +02:00
Diego Biurrun
a9aee08d90 dsputil: Split off FDCT bits into their own context 2014-07-07 12:28:45 -07:00
Omer Osman
1e9a93bfca libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream 
For implicit signaling cases (as possible for Spectral Band Replication
and Parametric Stereo Tools), the decoder must decode the first frame to
correctly identify the stream configuration (as called from
avformat_find_stream_info). The mechanism for this is built-in and only
requires adding CODEC_CAP_CHANNEL_CONF to the libfdk-aacdec AVCodec
struct.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-07 22:09:15 +03:00
Michael Niedermayer
06dae71d47 Merge commit '246f869590b8c7313d26e1c2ef56db01f6fd2503' 
* commit '246f869590b8c7313d26e1c2ef56db01f6fd2503':
  vmd: Split audio and video decoder

Conflicts:
	libavcodec/vmdvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 18:06:39 +02:00
Nidhi Makhijani
246f869590 vmd: Split audio and video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-07 07:45:00 -07:00
Michael Niedermayer
5320b34b98 avcodec/cljrdec: remove unneeded include 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 16:31:51 +02:00
Michael Niedermayer
3790801f9c Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b' 
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 16:17:27 +02:00
Michael Niedermayer
020865f557 Merge commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d' 
* commit 'c166148409fe8f0dbccef2fe684286a40ba1e37d':
  dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc.asm
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 15:36:58 +02:00
Michael Niedermayer
462c6cdb8e Merge commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94' 
* commit '8d686ca59db14900ad5c12b547fb8a7afc8b0b94':
  dsputil: Split off *_8x8basis to a separate context

Conflicts:
	libavcodec/dsputil.c
	libavcodec/mpegvideo_enc.c
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 15:08:55 +02:00
Michael Niedermayer
8324bd5186 avcodec/mpegvideo_enc: fix b frame strategy 2 
Fixes Ticket3757

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 14:59:37 +02:00
Clément Bœsch
7ac7e8793d avcodec/mpegvideo: small indent fix in vismv code 2014-07-07 11:26:26 +02:00
Clément Bœsch
5f4dbf3c10 avcodec: make vismv option as flag types 
This allows for example -vismv pf+bf+bb instead of -vismv 7.
 2014-07-07 10:24:18 +02:00
Eric Lasota
586406980f avcodec/roqvideodec: set JPEG output color range 
Signed-off-by: Eric Lasota <ejlasota@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 03:06:00 +02:00
Michael Niedermayer
28c0319517 Merge commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192' 
* commit 'd6902070c52151ec1e8154ce9b22283a1d0bc192':
  dsicin: Split audio and video decoder

Conflicts:
	libavcodec/Makefile
	libavcodec/dsicinvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 00:04:22 +02:00
Diego Biurrun
3c650efb81 dsputil: Move draw_edges() to mpegvideoencdsp 2014-07-06 14:48:50 -07:00
Michael Niedermayer
96761e9306 Merge commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58' 
* commit '2fc85fe96e7e0e5fc433b98eacebf4d3511d2d58':
  bmv: Split audio and video decoder

Conflicts:
	libavcodec/bmvvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 23:43:37 +02:00
Eric Lasota
8be23d424f avcodec/roqvideo: use JPEG color range 
Signed-off-by: ejlasota <ejlasota@gmail.com>

Also update fate test checksums
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 23:34:58 +02:00
Diego Biurrun
c166148409 dsputil: Move pix_sum, pix_norm1, shrink function pointers to mpegvideoenc 2014-07-06 14:26:53 -07:00
Diego Biurrun
8d686ca59d dsputil: Split off *_8x8basis to a separate context 2014-07-06 13:09:24 -07:00
James Almer
195f7bd23d x86/svq1enc: use unaligned mov on SSE2 
Might fix fate failures on some systems

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:27:57 +02:00
Nidhi Makhijani
d6902070c5 dsicin: Split audio and video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-06 11:27:34 -07:00
Michael Niedermayer
0d1994ee3c Merge commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3' 
* commit 'b0633f83f277c05bf1f617a99c7aedd2db8306e3':
  paf: split audio and video decoder

Conflicts:
	libavcodec/pafvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:11:40 +02:00
Michael Niedermayer
225c5cc815 Merge commit '373a6dda5422186bc057297342a9e559a564595e' 
* commit '373a6dda5422186bc057297342a9e559a564595e':
  cljr: split decoder and encoder

Conflicts:
	libavcodec/Makefile
	libavcodec/cljrdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 20:00:59 +02:00
Nidhi Makhijani
2fc85fe96e bmv: Split audio and video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-06 10:58:43 -07:00
Nidhi Makhijani
b0633f83f2 paf: split audio and video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-06 09:36:17 -07:00
Nidhi Makhijani
373a6dda54 cljr: split decoder and encoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-06 09:28:20 -07:00
Michael Niedermayer
02729f7a5a avcodec/mjpegenc_common: Restore removed copyright statements 
These where removed by  libav while spliting the file in adcb8392c9

See: de6d9b6404
See: 723106b279

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 03:39:39 +02:00
Michael Niedermayer
26b9f5bcdb avcodec/Makefile: add libutvideo.h to SKIPHEADERS 
libutvideo.h is not a C header and thus fails building as a C file

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 01:38:55 +02:00
Timothy Gu
baef3ba727 avcodec/old_codec_ids: workaround doxygen inclusion bug 
Currently, http://ffmpeg.org/doxygen/trunk/group__preproc__misc.html is
broken, because of inclusion bug in Doxygen's preprocessing mode. The
now-unincluded header file is included anyway in avcodec.h, the only
place where it is used, so there should be no problem removing it.

One concern is API-compatibility, because old_codec_ids.h is a public
header. However, IMO this is not a problem because currently users
cannot include only this header and not `avcodec.h` anyway, because of
missing AV_CODEC_ID_NONE symbol.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 00:32:29 +02:00
James Almer
dad31083ae x86/svq1enc: port ssd_int8_vs_int16 to yasm 
Also add an SSE2 version

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-05 21:43:40 +02:00
Michael Niedermayer
19b79c1429 Merge commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b' 
* commit 'b0de1c766329dd8c9960ad1722e2f653160abc1b':
  x86: build: Only compile FDCT code if MMX is enabled

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-05 20:12:31 +02:00
Michael Niedermayer
5036c8b17b Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc' 
* commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc':
  x86: Unconditionally compile blockdsp and svq1enc init files

Conflicts:
	libavcodec/x86/Makefile

blockdsp_mmx is renamed to blockdsp_init as we already have a blockdsp file
and _init is how all other such files are called

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-05 19:50:05 +02:00
Michael Niedermayer
6bef3e55bd Merge commit '009331303a6462d07cbe94aef9c446f1a1695519' 
* commit '009331303a6462d07cbe94aef9c446f1a1695519':
  x86: huffyuvdsp: Move inline assembly to init file

Conflicts:
	libavcodec/x86/Makefile
	libavcodec/x86/huffyuvdsp.h
	libavcodec/x86/huffyuvdsp_init.c
	libavcodec/x86/huffyuvdsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-05 19:11:26 +02:00
Diego Biurrun
b0de1c7663 x86: build: Only compile FDCT code if MMX is enabled 
All other files containing purely inline assembly are treated the same way.
 2014-07-05 04:18:34 -07:00
Diego Biurrun
12f129e545 x86: Unconditionally compile blockdsp and svq1enc init files 
This avoids a link failure with MMX disabled as the init functions
are referenced unconditionally.
 2014-07-05 04:18:34 -07:00
Diego Biurrun
009331303a x86: huffyuvdsp: Move inline assembly to init file 
This avoids a link failure with MMX disabled as now code and
initialization are compiled under the same condition.
 2014-07-05 04:18:34 -07:00
Carl Eugen Hoyos
d3e51b4118 Fix standalone compilation of the amv encoder. 2014-07-05 12:55:14 +02:00
Michael Niedermayer
d5818c37f3 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Use os/2 palette even if it contains less than 256 entries.
  Assume that old bmps do not contain transparency information.
  Do not detect jp2 images as mov files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-05 04:12:12 +02:00
Michael Niedermayer
4216a5082b Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b' 
* commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b':
  libfdk-aacdec: Reduce the default decoder delay by one frame

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-05 03:41:35 +02:00
Carl Eugen Hoyos
810294ce3d Use os/2 palette even if it contains less than 256 entries. 
Fixes 11Bios13.bmp.
 2014-07-05 02:11:17 +02:00
Carl Eugen Hoyos
8f6a04a279 Assume that old bmps do not contain transparency information. 
Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.
 2014-07-05 02:11:17 +02:00
Omer Osman
e0bfe34ea8 libfdk-aacdec: Reduce the default decoder delay by one frame 
The default error concealment method if none is set via
aacDecoder_SetParam(AAC_CONCEAL_METHOD) is set in
CConcealment_InitCommonData within the fdk-aac library
and is set to Energy Interpolation. This method requires one frame
delay to the output. To reduce the default decoder output delay and
avoid missing the last frame in file based decoding, use Noise
Substitution as the default concealment method.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-05 00:47:36 +03:00
Michael Niedermayer
2d15554850 avcodec/mlp_parser: check ff_combine_frame() return code 
Fixes CID602338

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 20:29:40 +02:00
Michael Niedermayer
bd8b6ed96d avcodec/bmp: fix integer overflow in checking header sizes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 15:02:08 +02:00
Michael Niedermayer
5c65aed7fd Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8' 
* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
  x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

Conflicts:
	libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 01:17:39 +02:00
Michael Niedermayer
cf8c44fc47 Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced' 
* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
  webpdec: Fix decoding of the huffman group indices.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 01:08:57 +02:00
Oliver Fromme
d73823286d avcodec/dvdsubdec: fix alpha in debuging code 
improve the debugging function for saving subtitles
to PPM files: Actually use the alpha channel.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 00:35:21 +02:00
Oliver Fromme
3f0a3e9e12 avcodec/dvdsubdec: Fix off-by-one error 
Fix an off-by-one error that causes the height of decoded
subtitles to be too small, thus cutting off the lowest row
of pixels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 00:32:43 +02:00
Diego Biurrun
391ecc961c x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase 2014-07-03 13:41:41 -07:00
Justin Ruggles
c6698dfe7c webpdec: Fix decoding of the huffman group indices. 
Per the specification, "The red and green components of a pixel
define the meta Huffman code used in a particular block of the ARGB
image."
 2014-07-03 15:29:01 -04:00
Michael Niedermayer
982920cfaa Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5' 
* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
  hevc: Use the local context variable when needed

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:19:34 +02:00
Luca Barbato
df949b645b hevc: Use the local context variable when needed 2014-07-02 23:30:49 -04:00
Michael Niedermayer
ce6a1ff2a1 avcodec/on2avc: Fix out of array access 
Fixes CID1206648

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 20:22:12 +02:00
Anshul Maheshwari
43d70a776d avcodec: Updated comment for sub param 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 19:47:14 +02:00
Anshul Maheshwari
7d1898ebcc avcodec/dvbsubdec: removed unnecessary null check for subtitle 
In refrence to coverity defect 1224278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 19:47:14 +02:00
Michael Niedermayer
5307fa00a4 avcodec/dvdec: remove redundant null check 
Fixes CID700682 again

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 16:37:38 +02:00
Michael Niedermayer
d266ecff4b avcodec/bitstream: remove trivial assert 
Fixed CID1224273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 16:25:40 +02:00
James Almer
a441a2437b x86: rename dsputil.asm to idctdsp.asm 
Its only function is no longer part of dsputil.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-02 01:08:04 +02:00
Michael Niedermayer
ef7e8425e8 avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 23:28:18 +02:00
Michael Niedermayer
784e1cf76b avcodec/mjpegdec: handle luma upscale detection generically 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 23:26:19 +02:00
Michael Niedermayer
64d98dadc7 avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of hardcoding a list 
Some code is left to handle corner cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 22:54:57 +02:00
Michael Niedermayer
7558e55345 avcodec/mjpegdec: Support pix_fmt_id==0x11222200 
Fixes: 4858286_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 22:12:20 +02:00
Michael Niedermayer
cd417d947e avcodec/mjpegdec: fix width for non chroma in rescaling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 22:09:19 +02:00
Michael Niedermayer
4e09300ffa mjpegdec: Support pix_fmt_id == 0x22112200 
Fixes 4780490_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 21:47:54 +02:00
Diego Biurrun
d0449e7545 vaapi: Update idct_permutation location after dsputil/idctdsp split 2014-07-01 07:36:22 -07:00
Michael Niedermayer
8d0c7031a8 Merge commit '79793f833784121d574454af4871866576c0749d' 
* commit '79793f833784121d574454af4871866576c0749d':
  Update Fiona's name in copyright statements.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 15:43:40 +02:00
Michael Niedermayer
581b5f0b9b Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' 
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context

Conflicts:
	configure
	libavcodec/aic.c
	libavcodec/arm/Makefile
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/asvdec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dvdec.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/intrax8.c
	libavcodec/mdec.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc_common.h
	libavcodec/mpegvideo.c
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 15:22:11 +02:00
Michael Niedermayer
909f53f2b2 Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30' 
* commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30':
  mjpeg: Split off bits shared by MJPEG and LJPEG encoders

Conflicts:
	libavcodec/mjpegenc.c
	libavcodec/mjpegenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 13:33:11 +02:00
Diego Biurrun
79793f8337 Update Fiona's name in copyright statements. 2014-07-01 03:26:51 -07:00
Michael Niedermayer
7faa7d3d42 avcodec/hevc: Use av_malloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 03:50:17 +02:00
Michael Niedermayer
e429d6c197 avcodec/pgssubdec: remove unused variables 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 18:24:37 +02:00
Michael Niedermayer
89bcb77726 avcodec/pgssubdec: Check input buffer size in parse_presentation_segment() 
Might fix overread, no testcase known though.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 18:23:08 +02:00
Michael Niedermayer
ae9a73de2a Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772' 
* commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772':
  pgssubdec: handle more complex PGS scenarios

Conflicts:
	libavcodec/pgssubdec.c

Some of this has been split out and commited in cleanly split patches immedeately
before this merge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 18:05:39 +02:00
John Stebbins
0c911c8fbc avcodec/pgssubdec: fix end display time 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 17:33:53 +02:00
John Stebbins
066a4819cc avcodec/pgssubdec: Bail out of decode_rle() if error and AV_EF_EXPLODE is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 17:31:38 +02:00
John Stebbins
fc7da418ff avcodec/pgssubdec: better error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 17:29:18 +02:00
John Stebbins
5c019ec91d avcodec/pgssubdec: Pass AVSubtitleRect to decode_rle() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 17:25:16 +02:00
John Stebbins
4701f7676c avcodec/pgssubdec: split out flush_cache() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 17:24:47 +02:00
Diego Biurrun
e3fcb14347 dsputil: Split off IDCT bits into their own context 2014-06-30 07:58:46 -07:00
Diego Biurrun
adcb8392c9 mjpeg: Split off bits shared by MJPEG and LJPEG encoders 
This obviates a dependency of the LJPEG encoder on mpegvideo.
 2014-06-30 07:53:40 -07:00
John Stebbins
ca7f2a7372 avcodec/pgssubdec: do not fail when part of the packet is faulty unless AV_EF_EXPLODE is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 16:46:25 +02:00
John Stebbins
376f353e3d avcodec/pgssubdec: rename PICTURE_SEGMENT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 16:39:41 +02:00
John Stebbins
253d0be6a1 pgssubdec: handle more complex PGS scenarios 
Add ability to handle multiple palettes and objects simultaneously.
Each simultaneous object is given its own AVSubtitleRect.
Note that there can be up to 64 currently valid objects, but only
2 at any one time can be "presented".

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-06-30 12:18:58 +02:00
Michael Niedermayer
3f42434600 avcodec/huffyuvencdsp: try to fix misaligned access 
Should fix fate on MIPS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-29 16:26:38 +02:00
Yao Wang
5464916677 avcodec/cavs: improve conformance with rm52j reference decoder 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 19:53:41 +02:00
Michael Niedermayer
f9f8491ddf avcodec/cavs: make cavs_chroma_qp non static 
The table is needed by multiple files

Reverts part of ef07ac1e12

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 19:08:39 +02:00
Michael Niedermayer
504475f38e avcodec/mpegvideo: dont overwrite emu_edge buffer 
Fixes vsynth3 fate failures on mips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 06:28:21 +02:00
Michael Niedermayer
21bfed5b06 avcodec/mpegvideo_enc: reduce space between blocks in emu_edge in encode_mb_internal 2014-06-28 06:27:15 +02:00
Michael Niedermayer
5bca5f87d1 Revert "x86/videodsp: add emulated_edge_mc_mmxext" 
The commit causes minor out of array reads and was mainly intended for
future optimizations which turned out not to be meassurably faster.
Itself it was just 1 cpu cycle faster

Approved-by: jamrial

This reverts commit 057d2704e7.
 2014-06-28 05:39:07 +02:00
Michael Niedermayer
4d1fa38d98 avcodec/mpeg12dec: Limit progressive_seq reinitilaization to where the resolution changes 
Fixes Ticket3743

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 00:16:09 +02:00
Michael Niedermayer
8c22bea574 avcodec/vp8: Fix multiple ff_thread_finish_setup() calls 
Fixes Ticket3725

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 22:45:43 +02:00
Michael Niedermayer
1fd0e9a56d Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28' 
* commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28':
  mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter

Conflicts:
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 19:24:44 +02:00
Michael Niedermayer
3ac5114530 Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353' 
* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353':
  dv: Properly split decoder and encoder initialization

Conflicts:
	libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 19:13:34 +02:00
Anshul Maheshwari
263932c084 avcodec/dvbsubdec: fix ignoring blank frame by updating got_output 
fix ticket 3737

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 14:35:58 +02:00
Diego Biurrun
5dd8c08fd5 mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter 
This will come in handy during dsputil splitting.
 2014-06-27 05:17:11 -07:00
Diego Biurrun
e63b818dbe dv: Properly split decoder and encoder initialization 2014-06-27 05:03:06 -07:00
Michael Niedermayer
b96c9513f3 avcodec/snow: factor ff_snow_get_buffer() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 04:49:09 +02:00
Michael Niedermayer
09a7a4704e Merge commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133' 
* commit 'd2869aea0494d3a20d53d5034cd41dbb488eb133':
  dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 03:05:33 +02:00
Michael Niedermayer
5a636383db Merge commit '24f45c16224d4c5d482e928676714766ffdda4fc' 
* commit '24f45c16224d4c5d482e928676714766ffdda4fc':
  fate: Add dependencies for dct/fft/mdct/rdft tests

Conflicts:
	libavcodec/fft-test.c
	tests/fate/fft.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 02:36:45 +02:00
Michael Niedermayer
357168bcf6 Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179' 
* commit '5ec6d152e26c570c0a16ec72c1f354db95708179':
  indeo4: B-frames decoding

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 02:05:22 +02:00
Diego Biurrun
d2869aea04 dsputil: Move MMX/SSE2-optimized IDCT bits to the x86 subdirectory 2014-06-26 16:15:07 -07:00
Michael Niedermayer
826726b83f Merge commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6' 
* commit '422e14f721c22cf9c19a8e7aae051ba9d559f6b6':
  indeo2: rename stride to pitch for consistency with other Indeo decoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 01:11:59 +02:00
Diego Biurrun
24f45c1622 fate: Add dependencies for dct/fft/mdct/rdft tests 2014-06-26 16:03:21 -07:00
Michael Niedermayer
a9f7972844 Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443' 
* commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443':
  lavc: do not allocate edges in the default get_buffer2()

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 20:56:23 +02:00
Michael Niedermayer
e059ac59ef avcodec/snow: ensure the buffers have allocated edges 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 20:52:06 +02:00
Michael Niedermayer
acc7cf70dc Merge commit '9b60d9197970658e91daf4b586397f450de9af69' 
* commit '9b60d9197970658e91daf4b586397f450de9af69':
  hevc: Allow out of bound values for num_reorder_pics

Conflicts:
	libavcodec/hevc_ps.c

See: bc21260e64
See: ab296c7a9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 19:58:25 +02:00
Dirk Ausserhaus
5ec6d152e2 indeo4: B-frames decoding 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-06-26 19:17:33 +02:00
Kostya Shishkov
422e14f721 indeo2: rename stride to pitch for consistency with other Indeo decoders 2014-06-26 19:16:08 +02:00
James Almer
057d2704e7 x86/videodsp: add emulated_edge_mc_mmxext 
This also changes hfix8_mmx and above to use mmx regs instead of
gprs, and makes emulated_edge_mc_sse and emulated_edge_mc_sse2 use
mmxext hfix and hvar functions instead of mmx where possible.

This is mostly in preparation for an ssse3 version.

Signed-off-by: James Almer <jamrial@gmail.com>

code is about 1 cpu cycle faster approximately

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 17:58:57 +02:00
Anton Khirnov
1b04eb20f7 lavc: do not allocate edges in the default get_buffer2() 2014-06-26 16:02:12 +02:00
Gildas Cocherel
a0e1c3517a hevc: remove unused array min_cb_addr_zs 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-06-26 15:51:54 +02:00
Yao Wang
e18b48c6fd avcodec/cavs: fix B_SUB_DIRECT col-MB is Intra MB case. 
in this case current MB size is forced to 16x16 (AVS standard section 9.9.1)

Signed-off-by: Yao Wang <jiayaowang@gmail.com>
Fixes Ticket 1901

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 14:51:40 +02:00
Kieran Kunhya
9b60d91979 hevc: Allow out of bound values for num_reorder_pics 
This fixes decoding for a sample that cannot be shared

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-06-26 07:14:57 +02:00
Michael Niedermayer
7e8fdf05e0 Merge commit '593d2326ef985cdffe413df629419938f7b07c4c' 
* commit '593d2326ef985cdffe413df629419938f7b07c4c':
  dv: Replace a magic number by sizeof()

Conflicts:
	libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 03:16:53 +02:00
Michael Niedermayer
11ba0c8207 Merge commit '5ab03e41e553452118113d0c224fa32b325e45e5' 
* commit '5ab03e41e553452118113d0c224fa32b325e45e5':
  x86: h264dsp: Fix link failure with optimizations disabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 02:58:59 +02:00
Diego Biurrun
593d2326ef dv: Replace a magic number by sizeof() 2014-06-25 15:32:58 -07:00
Diego Biurrun
5ab03e41e5 x86: h264dsp: Fix link failure with optimizations disabled 
With optimzations disabled compilers have trouble doing dead code
elimination on 'if (foo && 0)' expressions, while 'if (0 && foo)'
still works, so use the latter to avoid problems.

Bug-Id: 707
 2014-06-25 15:24:51 -07:00
Michael Niedermayer
1ace0ca60f avcodec/x86/hevc_idct: fix function name in comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-25 18:22:25 +02:00
plepere
9ba6b17add avcodec/x86/hevc_idct: fix number of sse registers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-25 14:59:23 +02:00
plepere
942e22c651 avcodec/x86/hevc: add avx2 dc idct 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-25 14:49:44 +02:00
Derek Buitenhuis
2deb614272 mjpegdec: Properly set the context colorspace info 
The JPEG spec requires it to be this.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-06-24 20:42:40 +01:00
Derek Buitenhuis
c11043aca7 mjpegdec: Properly set the context colorspace info 
The JPEG spec requires it to be this.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-06-24 20:40:44 +01:00
gcocherel
ba70563d55 hevc/pps: optimized size of min_tb_addr_zs 
reduce computation too
(cherry picked from commit 39c4d45c7788081c45c7fae51b7c5d0bcbaece9d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 13:11:40 +02:00
gcocherel
f7f1f4c7ce avcodec/hevc_ps: remove min_cb_addr_zs 
(cherry picked from commit ff7926d5092f9d4158108963e977e8c992322ba4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 13:06:42 +02:00
Michael Niedermayer
eab2509f8c avcodec/x86/h264_qpel_10bit: locally define pb_0 
somehow old llvm-gcc manages to ignore the alignment from ff_pb_0 causing a crash on freebsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 02:13:43 +02:00
Michael Niedermayer
47048aa30b avcodec/h264: do not leave ret random on minor failures, causing major failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 01:54:39 +02:00
Michael Niedermayer
82e4340f1e Merge commit '772d150a6e82542c06b0c251e73dd299d98d1027' 
* commit '772d150a6e82542c06b0c251e73dd299d98d1027':
  h264: error out from decode_nal_units() when AV_EF_EXPLODE is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 01:46:30 +02:00
Michael Niedermayer
97511bc7cf Merge commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9' 
* commit '10306e9c5fcc28bd9310a9b38f21540e9e1433e9':
  jpeg2000: fix dereferencing invalid pointers during cleanup

Conflicts:
	libavcodec/jpeg2000.c

See: 09927f3eaa
See: 912ce9dd20
See: 9e477a3770
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 01:45:42 +02:00
Vittorio Giovara
772d150a6e h264: error out from decode_nal_units() when AV_EF_EXPLODE is set 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-06-23 18:58:57 -04:00
Vittorio Giovara
10306e9c5f jpeg2000: fix dereferencing invalid pointers during cleanup 
CC: libav-stable@libav.org
Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-06-23 18:58:29 -04:00
Michael Niedermayer
49bf712a89 libavcodec/wmalosslessdec: add missing emms 
prevent failure with mmx2
should fix fate failure on freebsd mmx2 client

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 23:45:20 +02:00
James Almer
476bd3c7e4 x86/dsputil: move put_signed_pixels_clamped out of bswapdsp.asm 
It's still a dsputil function

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 22:11:18 +02:00
Michael Niedermayer
d7463c6813 Merge commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf' 
* commit 'fab9df63a3156ffe1f9490aafaea41e03ef60ddf':
  dsputil: Split off global motion compensation bits into a separate context

Conflicts:
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 21:10:10 +02:00
Michael Niedermayer
32cf26cc6a Merge commit 'f23d26a6864128001b03876b0b92fffe131f2060' 
* commit 'f23d26a6864128001b03876b0b92fffe131f2060':
  h264: avoid using uninitialized memory in NEON chroma mc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 20:35:33 +02:00
Diego Biurrun
fab9df63a3 dsputil: Split off global motion compensation bits into a separate context 2014-06-23 09:58:17 -07:00
Janne Grunau
f23d26a686 h264: avoid using uninitialized memory in NEON chroma mc 
Adapt commit 982b596ea6 for the arm and
aarch64 NEON asm. 5-10% faster on Cortex-A9.
 2014-06-23 16:32:15 +02:00
Michael Niedermayer
b222e0773c Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735' 
* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735':
  indeo45: use is_indeo4 context flag instead of checking codec ID

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 13:56:52 +02:00
Michael Niedermayer
35bb74900b Merge commit 'c67b449bebbe0b35c73b203683e77a0a649bc765' 
* commit 'c67b449bebbe0b35c73b203683e77a0a649bc765':
  dsputil: Split bswap*_buf() off into a separate context

Conflicts:
	configure
	libavcodec/4xm.c
	libavcodec/ac3dec.c
	libavcodec/ac3dec.h
	libavcodec/apedec.c
	libavcodec/eamad.c
	libavcodec/flacenc.c
	libavcodec/fraps.c
	libavcodec/huffyuv.c
	libavcodec/huffyuvdec.c
	libavcodec/motionpixels.c
	libavcodec/truemotion2.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 13:31:26 +02:00
Dirk Ausserhaus
e121ac634b indeo45: use is_indeo4 context flag instead of checking codec ID 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-06-23 09:29:39 +02:00
Michael Niedermayer
56afbe8dbc Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e' 
* commit '7b9ef8d701c319c26f7d0664fe977e176764c74e':
  mpeg: Split error resilience bits off into a separate file

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 03:48:30 +02:00
Michael Niedermayer
ca350378de Merge commit 'f2f2e7627f0c878d13275af5d166ec5932665e28' 
* commit 'f2f2e7627f0c878d13275af5d166ec5932665e28':
  Check mp3 header before calling avpriv_mpegaudio_decode_header().

Conflicts:
	libavformat/mp3enc.c

See: 2dd0da787c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 03:34:13 +02:00
Michael Niedermayer
2bcf34a0ef Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3' 
* commit '44127546b0a81dc9dd6190739a62d48f0044c6f3':
  Check if an mp3 header is using a reserved sample rate.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 03:25:04 +02:00
Diego Biurrun
c67b449beb dsputil: Split bswap*_buf() off into a separate context 2014-06-22 18:22:31 -07:00
Diego Biurrun
7b9ef8d701 mpeg: Split error resilience bits off into a separate file 2014-06-22 17:36:37 -07:00
Justin Ruggles
f2f2e7627f Check mp3 header before calling avpriv_mpegaudio_decode_header(). 
As indicated in the function documentation, the header MUST be
checked prior to calling it because no consistency check is done
there.

CC:libav-stable@libav.org
 2014-06-22 20:31:58 -04:00
Justin Ruggles
44127546b0 Check if an mp3 header is using a reserved sample rate. 
Fixes an invalid read past the end of avpriv_mpa_freq_tab.
Fixes divide-by-zero due to sample_rate being set to 0.

Bug-Id: 705

CC:libav-stable@libav.org
 2014-06-22 20:31:57 -04:00
James Almer
c172683bf4 x86/dsputil: remove redundant global motion compensation code 
The SSE version has been no different than the mmx one since commit a41bf09d

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 02:15:06 +02:00
Michael Niedermayer
42e6fc147b avcodec/apedec: optimize sign combination 
48078630 -> 32533850 dezi cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 02:15:06 +02:00
Michael Niedermayer
49f1b869b6 Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e' 
* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e':
  libx264: Correctly manage constant rate factor params

Conflicts:
	libavcodec/libx264.c

See: 3a1c8951bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 01:21:39 +02:00
Michael Niedermayer
efec730431 Merge commit 'f83896abda1e78ebbbda0f184b682b4fabadc682' 
* commit 'f83896abda1e78ebbbda0f184b682b4fabadc682':
  ape: Replace memset(0) by zero initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 01:03:30 +02:00
Michael Niedermayer
412015694c Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df' 
* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
  mpeg: Mark ff_mpeg_set_erpic() static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 00:57:47 +02:00
Michael Niedermayer
9d91fae8a1 Merge commit 'c54e118722cbbdc04945538d1796d4472a1ff406' 
* commit 'c54e118722cbbdc04945538d1796d4472a1ff406':
  build: Have the eatqi decoder depend on the MPEG-1 decoder

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 00:39:53 +02:00
Michael Niedermayer
738272826f Merge commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9' 
* commit '03391b5432a2b8b8dbc3d2db722a54dfb68737b9':
  build: Add missing object files for Matroska demuxer

Conflicts:
	libavcodec/Makefile
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 00:19:41 +02:00
Anshul Maheshwari
ca2f59e121 avcodec/dvbsubdec: support returning exact end times 
fixess part of ticket #2024

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 21:06:49 +02:00
Luca Barbato
0ef256d515 libx264: Correctly manage constant rate factor params 
By default they are set to -1.
 2014-06-22 21:01:07 +02:00
James Almer
6ec3dc97fc x86/audiodsp: move asm code out of dsputil 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 19:53:09 +02:00
Diego Biurrun
f83896abda ape: Replace memset(0) by zero initialization 2014-06-22 18:43:11 +02:00
Michael Niedermayer
99497b4683 Merge commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2' 
* commit '9a9e2f1c8aa4539a261625145e5c1f46a8106ac2':
  dsputil: Split audio operations off into a separate context

Conflicts:
	configure
	libavcodec/takdec.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-22 17:58:28 +02:00
Diego Biurrun
8d695dc411 mpeg: Mark ff_mpeg_set_erpic() static 
It is not used outside of the file.
 2014-06-22 06:28:46 -07:00
Diego Biurrun
c54e118722 build: Have the eatqi decoder depend on the MPEG-1 decoder 
eatqi uses more than just the shared mpegvideo bits.
 2014-06-22 06:28:46 -07:00
Diego Biurrun
03391b5432 build: Add missing object files for Matroska demuxer 2014-06-22 06:28:46 -07:00
Diego Biurrun
9a9e2f1c8a dsputil: Split audio operations off into a separate context 2014-06-22 06:20:15 -07:00
Michael Niedermayer
5ab51f7535 avcodec/libtwolame: fix encoding lsf with defaults 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-21 17:05:09 +02:00
Michael Niedermayer
a2de7b1bd5 avcodec/bitstream: document the double volatile 
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-21 14:55:32 +02:00
Michael Niedermayer
1caedf629a avcodec/ituh263enc: fix advanced intra coding 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-21 04:05:28 +02:00
Michael Niedermayer
4667116c39 Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf' 
* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
  h264: fix build when error resilience is disabled

Conflicts:
	libavcodec/h264_picture.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 23:18:45 +02:00
Michael Niedermayer
fe43facd65 avcodec/utils: check sar only when width/height are set 
This fixes loosing the perfectly valid SAR when width=height=0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 23:02:52 +02:00
Michael Niedermayer
0dceefc5fa Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2' 
* commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2':
  Add av_image_check_sar() and use it to validate SAR

Conflicts:
	libavcodec/dpx.c
	libavcodec/dvdec.c
	libavcodec/ffv1dec.c
	libavcodec/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 22:20:28 +02:00
Michael Niedermayer
329898aa45 avcodec/bitstream: try to workaround internal compiler bug in gcc 4.2 
gcc 4.2 seems not maintained anymore so theres no option besides
just working around it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 21:54:23 +02:00
Michael Niedermayer
33f83a2157 avcodec/x86/rv40dsp_init: fix () in macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 21:36:43 +02:00
Michael Niedermayer
40cbad9ff7 avcodec/wavpackenc: fix () in macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 21:36:17 +02:00
Vittorio Giovara
ca1e36a8e4 h264: fix build when error resilience is disabled 2014-06-20 12:48:06 -04:00
Michael Niedermayer
0a995311ce Merge commit 'd349afb07bacccb62eb5369c38d6406d2909d792' 
* commit 'd349afb07bacccb62eb5369c38d6406d2909d792':
  dv: cosmetics, reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 18:10:33 +02:00
Michael Niedermayer
b0fdc76600 Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f' 
* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f':
  dv: get rid of global non-const tables

Conflicts:
	libavcodec/dv_profile.h
	libavcodec/dvdec.c
	libavcodec/dvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 18:00:42 +02:00
Michael Niedermayer
c2b1225c16 Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9' 
* commit '778111592bf5f38630858ee6dfcfd097cd6c6da9':
  dvenc: initialize the profile only once, at init

Conflicts:
	libavcodec/dvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 17:15:39 +02:00
Michael Niedermayer
4a99333581 Merge commit '874390e163427c1fe7682ab27924a7843780dbb3' 
* commit '874390e163427c1fe7682ab27924a7843780dbb3':
  lavc: add a convenience function for rescaling timestamps in a packet

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-20 16:40:04 +02:00
Justin Ruggles
9e500efdbe Add av_image_check_sar() and use it to validate SAR 2014-06-20 10:39:33 -04:00
Anton Khirnov
d349afb07b dv: cosmetics, reindent 2014-06-20 14:15:39 +02:00
Anton Khirnov
650dee63c8 dv: get rid of global non-const tables 
Instead, store them in the context and compute on each parameter change.
 2014-06-20 14:15:31 +02:00
Anton Khirnov
778111592b dvenc: initialize the profile only once, at init 
We do not allow the frame parameters to change during encoding, so there
is no need to do this for each frame.
 2014-06-20 14:15:16 +02:00
Anton Khirnov
874390e163 lavc: add a convenience function for rescaling timestamps in a packet 2014-06-20 14:14:11 +02:00
Stefano Sabatini
d381109ce8 lavc/h264_slice: clarify informational message in case of disabled slice multi-threaded decoding 
Also suggest what can be done to workaround the limitation.
 2014-06-20 12:12:46 +02:00
James Almer
05d95c53a7 alpha/blockdsp: move clear_blocks out of dsputil 
The blockdsp split did not cover Alpha optimizations

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 22:39:38 +02:00
Michael Niedermayer
5bf5e6b1c0 avcodec/h264: Use named identifier for single thread fall-back return from ff_h264_decode_slice_header() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 19:49:26 +02:00
James Almer
a5ce608fc7 x86/blockdsp: restore author attribution 
See commits
649c00c96d
5fecfb7d58
73b02e2460

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 18:31:44 +02:00
Michael Niedermayer
47c8d1e174 Merge commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2' 
* commit 'b2290bf10b12b7772f55fcab014a47e18e9fdef2':
  i263: skip dummy frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 15:12:45 +02:00
Michael Niedermayer
08c5859f17 avcodec: add simpleauto idct 
This will pick the "best" simple idct compatible idct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 14:28:01 +02:00
James Almer
454c019cb5 x86/hevc_idct: fix movd parameter size in DC_ADD_INIT 
Fixes compilation with NASM x86_64

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 13:18:13 +02:00
Dirk Ausserhaus
b2290bf10b i263: skip dummy frames 
Intel i263 codec has special 8-byte dummy frames that should not be decoded,
so do not even attempt to decode them and skip them instead.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-06-19 13:13:20 +02:00
James Almer
fe782233aa x86/blockdsp: move asm code out of dsputil 
Also replace INLINE_<opt> with EXTERNAL_<opt> that were wrongly
changed by commit 2b05db4f81

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 13:09:03 +02:00
Christophe Gisquet
e7fc5d53a0 huffyuv: change statistics initialization 
Normally, a Laplace distribution is more typical of the residuals
encoded, but for noisy input, it's both better and simpler to be
safe and use a 1/d^2 distribution. Second hunk could use some
renormalization but it has effectively little impact.

Output size of ffvhuff on various 4:2:0 sequences:
context=0,1/d:    851974   27226   1137281
context=0,1/d²:   619081   25069   1051500
context=0,1/d³:   501983   30454   1290561
context=0,lapl:   500650   31754   1304082

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 06:03:51 +02:00
Michael Niedermayer
042a82ca37 avcodec/x86/lossless_videodsp: Fix size of values read for left/left_top 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 05:53:41 +02:00
Michael Niedermayer
2b05db4f81 Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9' 
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9':
  dsputil: Split clear_block*/fill_block* off into a separate context

Conflicts:
	configure
	libavcodec/asvdec.c
	libavcodec/dnxhddec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.h
	libavcodec/eamad.c
	libavcodec/intrax8.c
	libavcodec/mjpegdec.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/vc1dec.c
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 04:54:38 +02:00
Rong Yan
ab12373956 ppc: Fix the bug of fft for little endian environment on POWER7 and later 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-19 01:01:14 +02:00
Michael Niedermayer
8e2ade43f1 Merge commit '869fc416f7c78ed4e397e0208acd1545771c0502' 
* commit '869fc416f7c78ed4e397e0208acd1545771c0502':
  hevc: Mark num_bins_in_se as unused

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 23:32:55 +02:00
Diego Biurrun
e74433a8e6 dsputil: Split clear_block*/fill_block* off into a separate context 2014-06-18 14:07:23 -07:00
Luca Barbato
869fc416f7 hevc: Mark num_bins_in_se as unused 
Only its size is actually used. Silence a clang warning.
 2014-06-18 22:03:40 +02:00
Clément Bœsch
88514378ba avcodec/ass: move playres parameters below scripttype 
Suggested-by: wm4
 2014-06-18 18:43:36 +02:00
Clément Bœsch
5039aadf68 avcodec/ass: explicit PlayRes[XY] 
This avoids the following libass warning when using the subtitles
filter: "Neither PlayResX nor PlayResY defined. Assuming 384x288"

Subtitles tests change because the output is ASS and the PlayRes[XY]
ends up in the output.
 2014-06-18 18:22:40 +02:00
Michael Niedermayer
5439959ef0 avcodec/huffyuvdec: do not leave alpha values uninitialized 
fixes fate failure under valgrind

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 16:59:05 +02:00
Carl Eugen Hoyos
076ab9f7e3 Fix all VDPAU decoders. 
Fixes ticket #3726.
 2014-06-18 13:55:26 +02:00
Michael Niedermayer
a740cae4a0 avcodec/dcadec: remove unsignedness from constant 
POSIX gurantees >=32bit so it all fits in signed int
Also >=32bit ints are assumed througout the codebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 13:46:51 +02:00
Michael Niedermayer
118d84b7e9 Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912' 
* commit 'f2ce63246f5c934429f9cb857a794e07624d7912':
  dcadec: replace ldexpf with a multiplication by a constant

Conflicts:
	libavcodec/dcadec.c

See: 6da06ef6bb
See: 9ccb5455ca
See: 6b88f22e89
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 13:06:09 +02:00
Niels Möller
f2ce63246f dcadec: replace ldexpf with a multiplication by a constant 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-06-18 08:23:15 +02:00
Michael Niedermayer
c932f12806 avcodec/cavsdec: simplify % 512 operations 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 04:18:40 +02:00
Michael Niedermayer
c89be82c98 avcodec/vp8: fix () in macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 03:13:37 +02:00
Michael Niedermayer
aab23f5ddd avcodec/vp9: fix () in macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 03:13:37 +02:00
Michael Niedermayer
28bf111503 avcodec/wavpack: fix () in macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 03:13:36 +02:00
Michael Niedermayer
9f028b3f3a Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f' 
* commit '49106844929b7b71ac719064d640f8aa56c89b1f':
  tiffenc: fix packet size calculation

Conflicts:
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-18 01:29:19 +02:00
Rafaël Carré
9affa784a0 vp9 encoder: use a decent default speed setting 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-06-17 21:38:43 +02:00
Tristan Matthews
4910684492 tiffenc: fix packet size calculation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-06-17 21:24:12 +02:00
Michael Niedermayer
f9cd317223 Merge commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785' 
* commit 'fe4d5fe9361162f9033ff1bd84bfc1b2091ba785':
  jpeg2000: Mark static data init functions as av_cold

Conflicts:
	libavcodec/jpeg2000.c
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-17 20:42:10 +02:00
Diego Biurrun
fe4d5fe936 jpeg2000: Mark static data init functions as av_cold 2014-06-17 08:44:07 -07:00
plepere
92cccb7bcd avcodec/hevc: new idct + asm 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-17 13:23:36 +02:00
Michael Niedermayer
61df0819d4 avcodec/cavsdec: fix low delay decoding 
Fixes Ticket1095

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-17 02:30:28 +02:00
Michael Niedermayer
e6f9fc4adc avcodec/bitstream: try to make vlc init code inherently thread safe 
also remove spinlock, it doesnt work on AIX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 20:09:21 +02:00
Michael Niedermayer
f7f96cf4bc avcodec/bitstream: fill invalid vlc tables entries as last pass instead of first 
This avoids writing entries twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 19:10:32 +02:00
Michael Niedermayer
600cbf3672 avcodec/bitstream: zero vlc tables on allocation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 19:10:32 +02:00
Michael Niedermayer
7eae8cd870 avcodec/h264: fix frame skip code 
Fixes Ticket3475

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 13:28:52 +02:00
Michael Niedermayer
9025072e6c avcodec/h264_slice: support skipping loop filtering for non key frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 13:18:55 +02:00
Michael Niedermayer
9140d37af2 avcodec/h264: use the correct level for droping non intra frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 13:18:43 +02:00
Michael Niedermayer
b152152df3 Add nointra AVDiscard level 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 04:04:13 +02:00
Michael Niedermayer
20c7baf832 avcodec/huffyuvdec: Fix fill value for truncated bitstreams 
Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 01:07:42 +02:00
Christophe Gisquet
f6577bd9cf huffyuvdec: use unsafe bitstream reader 
The reader reads in chunks of 11 bits at most, and at most 3 times. The unsafe
reader therefore may read 6 chunks instead of 1 in worst case, ie 8 bytes,
which is within the padding tolerance.

The reader ends up being ~10% faster. Cumulative effect of unsafe reading and
code block swapping on 3 sequences is for 1 thread, decoding time goes from
23.3s to 19.0s.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-16 00:52:09 +02:00
Kieran
bc21260e64 hevc: Fix 4K sample video 
Reviewed-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 23:24:11 +02:00
Anshul Maheshwari
fbb59a3bf4 avcodec/dvbsubdec: Split save_subtitle_set() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 20:16:49 +02:00
Anshul Maheshwari
77ade55fe5 avcodec/dvbsubdec: add AVClass to context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 19:59:26 +02:00
Anshul Maheshwari
9a11b33a2d avcodec/dvbsubdec: restructure version check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 19:56:09 +02:00
Christophe Gisquet
29f427c239 huffyuvdec: remove somewhat deprecated code 
The old code was reserving the 0xFFFF entry to represent an inexisting
entry/codeword. These entries are now detected through their length
being <= 0. As this entry is often used for the residuals (-1,-1), which
should be among the most frequent, it is particularly important to not
reserve it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 17:43:47 +02:00
Michael Niedermayer
e9c477059d avcodec/huffyuvdec: assume vlcs can be 32 instead of 31 bits max 
This should avoid a division as well

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 16:20:34 +02:00
Christophe Gisquet
9dc1791977 huffyuvdec: swap code blocks 
The effect is not really deterministic, as it seems to be a combination
on x86_64 of fewer registers used, different jump offsets and, for all
archs, of likely branches.

Speedup is around 15%.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 15:13:28 +02:00
Christophe Gisquet
9107612818 x86util: add and use RSHIFT/LSHIFT macros 
Those macros take a byte number as shift argument, as this argument
differs between MMX and SSE2 instructions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 13:19:27 +02:00
Christophe Gisquet
56a795e34f aandcttab: fix spelling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 12:11:46 +02:00
Michael Niedermayer
73d820ee1e avcodec/xbmdec: remove dependancy on zero padding on input packet 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 03:50:30 +02:00
Michael Niedermayer
103f9c261a avcodec/indeo5: Fix infinite loop in skip_hdr_extension() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-15 03:50:30 +02:00
Michael Niedermayer
b065d0014b avcodec/ppc/idct_altivec: add plain idct() 
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 20:42:28 +02:00
Marton Balint
9236f7b5a2 mpeg12enc: add seq_disp_ext option for deciding when to write a sequence_display_extension 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 19:45:53 +02:00
Marton Balint
66f4891e64 mpeg12enc: add support for PANSCAN side data in sequence_display_extension 
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 19:45:53 +02:00
Michael Niedermayer
759e793823 avcodec/vc1dec: Fix support for small widths/linesizes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-14 16:33:09 +02:00