ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-01 10:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,318 Commits 37 Branches 400 Tags 494 MiB
f4aa8085f2
Commit Graph

24534 Commits

Author SHA1 Message Date
Michael Niedermayer
b26bcd08e6 jpeg2000dec: Check that theres a SOT before SOD 
Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 10:51:07 +02:00
Michael Niedermayer
c51654fbc0 jpeg2000dec: Support 4 tile parts 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 03:10:42 +02:00
Paul B Mahol
a28f4fd1ea flacdec: don't call allocate_buffers() in init_thread_copy() when s->max_blocksize is 0 
This is normal, and happens when no extradata was available at decoder
initialization.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-06 01:06:45 +00:00
Michael Niedermayer
c59ce1c98e get_qcc: Check compno 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-06 02:26:22 +02:00
Paul B Mahol
b28851a1d6 alac: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:32 +00:00
Paul B Mahol
9684d7f1a2 wavpack: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:32 +00:00
Paul B Mahol
495db0e3b0 ttadec: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:32 +00:00
Paul B Mahol
9300de0409 flacdec: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:31 +00:00
Paul B Mahol
d97044640c takdec: frame multi-threading support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:31 +00:00
Paul B Mahol
d5f7f1fef1 audio frame multi-threaded decoding 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-05 22:35:31 +00:00
Michael Niedermayer
bbc19010ed jpeg2000dec: return error for invalid cdxy values 
Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 23:31:19 +02:00
Michael Niedermayer
2c2a8f70f5 jpeg2000: Make nreslevel fields int 
This prevents potential integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 18:34:07 +02:00
Michael Niedermayer
66c4d54413 jpeg2000dec: Propagate error code from get_cox() correctly 
Without this the context state could become inconsistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 18:34:07 +02:00
Michael Niedermayer
6e9bfc19bd jpeg2000: check that nreslevels2decode has been initialized before use 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-05 18:34:07 +02:00
Michael Niedermayer
3b58ab4c5f pngdec: dont treat mpng like png with key and non keyframes 
Fixes Ticket2618

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 20:40:07 +02:00
Paul B Mahol
f5d5bc3493 tak: simplify ff_tak_check_crc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-04 17:25:32 +00:00
Michael Niedermayer
fca435fee1 vc1dec: Disable dead code 
Fixes CID732197/6

A assert is added to check that the disabled code wont
be needed in the future.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-04 02:43:20 +02:00
Paul B Mahol
b4d4ef5529 flacdec: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 19:24:15 +00:00
Michael Niedermayer
e4bf3a97de Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec 
* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
  vda_h264_dec: remove check_format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 20:21:01 +02:00
Michael Niedermayer
bbae652113 tiff: fix memleak 
Fixes CID1026764
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:59:52 +02:00
Michael Niedermayer
bbf43c70dd jpeg2000dec: assert that curtileno is valid when used 
Fixes CID1026755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:59:52 +02:00
Michael Niedermayer
234f76ae7d jpeg2000: Fix unintended sign extension in malloc arguments of prec 
Fixes: CID1026772/3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:59:40 +02:00
Michael Niedermayer
d8c10324ed jpeg2000: Fix Unintended sign extension in malloc arguments of cblk. 
Fixes CID1026770
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:16:19 +02:00
Michael Niedermayer
6952e2f82a h264_ps: fix memleak in ff_h264_decode_picture_parameter_set() 
Fixes: CID1026763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:09:12 +02:00
Michael Niedermayer
7e99d528f9 ffv1enc: Check return value of av_frame_ref() 
Fixes CID1026740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 14:06:25 +02:00
Michael Niedermayer
8a266aaaac avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 int IDWT 
Tha fate tests change because the edge mirroring was wrong before this commit

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 13:24:20 +02:00
Michael Niedermayer
96b71a6ec5 avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 float IDWT 
10% faster

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 13:18:40 +02:00
Michael Niedermayer
6507d86f07 jpeg2000dec; optimize output sample convert a bit 
67935 -> 29984 kcycles

Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 13:00:50 +02:00
Michael Niedermayer
e5cdf9c03b Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c' 
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c':
  Go2Webinar decoder

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 12:47:26 +02:00
Michael Niedermayer
5c43f3ddea Merge commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31' 
* commit '31980b6abdd8ffb6953472a7a6b59f3aa5762c31':
  vmd: decode videos with no LZ buffer size provided - they might not need it

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 12:33:00 +02:00
Michael Niedermayer
c3660c3618 Merge commit '0aed0bfc62b273a780a2bfba3be56039fccd7423' 
* commit '0aed0bfc62b273a780a2bfba3be56039fccd7423':
  vmd: fix mode 3 decoding

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 12:21:25 +02:00
Michael Niedermayer
7cb5467a52 Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee' 
* commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee':
  tiff: K&R formatting cosmetics

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 11:44:11 +02:00
Kostya Shishkov
2d66a58ccd Go2Webinar decoder 2013-06-03 09:24:55 +02:00
Paul B Mahol
d2021f74ed jpeg2000dec: remove redundant error log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 00:20:08 +00:00
Paul B Mahol
a44d39ae42 wavpack: remove redundant error log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-03 00:20:04 +00:00
Paul B Mahol
0f740fea85 tta: use interger instead of pointer to iterate output samples for 24-bit case 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 22:43:31 +00:00
Paul B Mahol
e2f89f7804 tta: move GetBitContext out of private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 22:38:16 +00:00
Kostya Shishkov
31980b6abd vmd: decode videos with no LZ buffer size provided - they might not need it 
The buffer is used for an additional pass of frame compression, so videos
can be coded without ever using it (and some are coded so indeed, e.g. in
Woodruff and the Schnibble of Azimuth game).
 2013-06-02 19:08:09 +02:00
Kostya Shishkov
0aed0bfc62 vmd: fix mode 3 decoding 2013-06-02 19:07:31 +02:00
Diego Biurrun
46ce9ded96 tiff: K&R formatting cosmetics 2013-06-02 17:59:34 +02:00
Paul B Mahol
514cb9bb92 tta encoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 15:16:52 +00:00
Paul B Mahol
2e67dde954 tta: move code that will be shared with encoder to separate file 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 14:53:14 +00:00
Carl Eugen Hoyos
a4b5863eea Fix compilation of libavcodec/tiff.c 2013-06-02 16:50:39 +02:00
Paul B Mahol
379ad9788b tiff: planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-02 14:22:40 +00:00
Michael Niedermayer
a40370661d use Kostyas full name in copyrights 
This fixes 2 files that where not part of the original change
See: de421b2085

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 11:25:56 +02:00
Michael Niedermayer
4d4f5911d3 Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f' 
* commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f':
  network: factor out bind-listening code
  use my full first name instead of short one in copyrights

Conflicts:
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-02 10:30:35 +02:00
Paul B Mahol
58b36959dd tta: use get_unary() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-06-01 23:06:04 +00:00
Clément Bœsch
534f1a2821 lavc/avcodec: decodimg → decoding. 2013-06-01 19:16:45 +02:00
Matthew Heaney
8f75ba9926 lavf/webvttdec: save cue id and settings as side data 
Currently the WebVTT demuxer parses the cues but throws away
the cue id (the optional first line of the cue) and cue
settings (the optional rendering instructions that follow
the timestamp).

However, in order to write inband text tracks (to WebM
files), the entire cue payload from the WebVTT source must
be preserved.

This commit makes no change to the data part of the output
buffer packet (where the actual cue text is stored), but
does add the cue id and settings as a side data items, if
they're present in the cue. Existing code that cares only
about the data part of the packet can continue to ignore the
side data.

There are two new packet data type flags,
AV_PKT_DATA_WEBVTT_IDENTIFIER and
AV_PKT_DATA_WEBVTT_SETTINGS.
 2013-06-01 15:12:49 +02:00
Clément Bœsch
151b4947e5 lavc/avpacket: fill padding area on side data split. 
The padding data is assumed to be 0 in several places, notably in
subtitles. This problem was not detected with fate-sub-srt test because
the first element of the side data (x1) is 0 in the test, so the
trailing side data present in the packet wasn't read by the decoder. The
issue can be observed with a large enough x1.

It is also noted in FF_INPUT_BUFFER_PADDING_SIZE doxy that MPEG
bitstreams require that padding with 0, so it might fix other issues.
 2013-06-01 15:12:49 +02:00
Michael Niedermayer
9054e72529 jpeg2000: make sure s->numXtiles / s->numYtiles are reset when tile is deallocated 
This keeps the structure fields more consistent after cleanup

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-01 14:41:46 +02:00
Xidorn Quan
4a023d5b53 vda_h264_dec: remove check_format 
Since this function cannot work anymore, this patch simply removes it.
 2013-06-01 12:02:11 +00:00
Kostya Shishkov
de421b2085 use my full first name instead of short one in copyrights 2013-06-01 13:38:50 +02:00
Michael Niedermayer
35cf069aea Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix compilation with --disable-everything --enable-encoder=jpeg2000

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-01 11:49:48 +02:00
Michael Niedermayer
dc60061bb6 jpeg2000dec: optimize dequantization_int() 
4400->2800 cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-01 11:48:13 +02:00
Michael Niedermayer
6cbd0241f2 jpeg2000dec: optimize dequantization_float() 
4700 -> 2700 cycles (sandybridge  i7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-01 11:48:09 +02:00
Carl Eugen Hoyos
f1c8413dc7 Fix compilation with --disable-everything --enable-encoder=jpeg2000 
The JPEG2000 encoder depends on the discrete wavelet transform.
 2013-06-01 11:15:31 +02:00
Michael Niedermayer
0c2f673ed2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  indeo4: expand allowed quantiser range
  configure: icl: Merge -Qdiag-error parameters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-01 10:27:47 +02:00
Kostya Shishkov
33f64fd5d5 indeo4: expand allowed quantiser range 
Indeo 4 has quantiser range 0-31 instead of 0-23 for Indeo 5, and clipping
quantiser leads to incorrect quantisation and DC prediction on low-quality
videos.

This fixes bug 259.
 2013-06-01 06:36:47 +02:00
Paul B Mahol
710940bec1 tta: stop checking header checksum in extradata 
It's redundant now as check in done in demuxer instead.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-31 21:11:55 +00:00
Michael Niedermayer
f77467a11d jpeg2000dec: fix indention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 13:33:13 +02:00
Michael Niedermayer
c1415cfefb jpeg2000dec: print more detailed cdx/y debug info 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 13:32:33 +02:00
Michael Niedermayer
f0b9bd807b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  proresenc: alpha coding support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 11:32:58 +02:00
Michael Niedermayer
9d56ccf5af j2k/jpeg2000dec: merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 03:10:08 +02:00
Michael Niedermayer
fd7e119037 jpeg2000dec: merge simplification of jpeg2000_decode_packets() from j2k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 03:10:08 +02:00
Michael Niedermayer
192050d7a7 jpeg2000dec: merge sgnd fix from j2k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 03:10:07 +02:00
Michael Niedermayer
5dbbb762e5 jpeg2000dec: merge struct field types from j2k 
Fixes AVOption type mismatch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 03:10:07 +02:00
Michael Niedermayer
89f472b3ee j2kdec: merge JPEG2000_PGOD_CPRL code from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 03:10:07 +02:00
Michael Niedermayer
45c0e338fc j2kdec: merge picture handling from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 03:10:07 +02:00
Michael Niedermayer
f471b5fa30 j2k: restructure bitstream decoding 
This is based on jpeg2000 but differs because of
problems with the design from jpeg2000 with currently
supported files

More files can be decoded after this commit, though they
show heavy artifacts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 03:09:32 +02:00
Michael Niedermayer
cdb86136f7 j2k/jpeg2000: merge some of the tilepart related code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 02:22:11 +02:00
Michael Niedermayer
a5203d86b3 j2kdec: merge length==0 check from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 02:22:11 +02:00
Michael Niedermayer
f67f2681da jpeg2000deci/j2kdec: fix sizeof types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 02:22:10 +02:00
Michael Niedermayer
20a2d5ec11 jpeg2000dec: fix ff_mqc_initdec() and data setup order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 02:22:10 +02:00
Michael Niedermayer
7a2b634220 jpeg2000dec: simplify init_tile() / merge from j2k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-31 02:22:10 +02:00
Paul B Mahol
c4e0e31424 tta: remove pointless code 
Checking seek table crc in decoder is pointless, as seek table is not used in
decoder anyway, so also stop storing seek table into extradata.
 2013-05-30 20:17:27 +00:00
Michael Niedermayer
826b3a75cd h264_cavlc: fix reading skip run 
Fixes Ticket2606

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 18:38:04 +02:00
Michael Niedermayer
3f714d1ffd jpeg2000/j2k: merge non functional changes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 18:38:04 +02:00
Michael Niedermayer
941a8efae2 j2k:decode_tile() pass picture as argument 
Reduce diff to jpeg2000dec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 18:38:04 +02:00
Michael Niedermayer
9ccc9f30f7 jpeg2000: drop red-blue swap 
This should no longer be needed as the pix fmt was updated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 18:37:56 +02:00
Michael Niedermayer
7836583934 j2kdec: s/j2k_/jpeg2000_/ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 18:31:25 +02:00
Michael Niedermayer
310f9dd698 j2k/jpeg2000: merge pix_fmt setting code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 16:45:30 +02:00
Michael Niedermayer
6f7de3d5c8 mpegvideo_enc: allow mpeg_quant to be set in mpeg2video 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 16:07:07 +02:00
Michael Niedermayer
62d00aa22f jpeg2000/j2k: merge j2k/jpeg2000.c/h 
Now only j2kdec / jpeg2000dec.c remain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:57:58 +02:00
Michael Niedermayer
c2ac389bba jpeg2000: remove unneeded casts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:43:09 +02:00
Michael Niedermayer
09e03a8467 jpeg2000: merges quantization fixes from j2k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:43:09 +02:00
Michael Niedermayer
efc2df2e27 jpeg2000: remove unneeded variable initialization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:43:09 +02:00
Michael Niedermayer
84a6bc2357 jpeg2000: tag_tree_size: replace check by assert 
This function is never called with values large enough for the
error condition to occur

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:43:09 +02:00
Michael Niedermayer
8bedbb82ce j2k/jpeg2000: split data pointer in int & float. 
This fixes a TODO item and unifies both decoders structures
It also fixes undefined behavior due to aliasing violations

I choose 2 fields instead of a union because mistakely using the
wrong type with a union will lead to hard to debug "wrong output"
while with 2 fields mistakely using the wrong type will crash
with a null pointer derefernce which is much easier to debug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 14:18:53 +02:00
Michael Niedermayer
1a7ae6be2a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Include hpeldsp_neon.o if h264qpel is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 11:21:45 +02:00
Michael Niedermayer
e119d1b345 Merge commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74' 
* commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74':
  arm: Don't unconditionally build dsputil files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 11:02:21 +02:00
Michael Niedermayer
0b539da4c7 Merge commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304' 
* commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304':
  arm: Only build the FFT init files if FFT is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 10:57:14 +02:00
Michael Niedermayer
3a0e21f037 Merge commit '186599ffe0a94d587434e5e46e190e038357ed99' 
* commit '186599ffe0a94d587434e5e46e190e038357ed99':
  build: cosmetics: Place unconditional before conditional OBJS lines

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 10:49:43 +02:00
Michael Niedermayer
1bbbbb0a32 Merge commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa' 
* commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa':
  build: arm: cosmetics: Place all OBJS declarations in alphabetical order

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 10:37:52 +02:00
Michael Niedermayer
103ffde5a3 Merge commit '701966730ce10290fd49c5ccedd73f505680f764' 
* commit '701966730ce10290fd49c5ccedd73f505680f764':
  vmd: drop incomplete chunks and spurious samples

Conflicts:
	libavcodec/vmdav.c

2 of the changes are replaced by assert0s, as they should
be impossible.
The actual bug is likely caused by a invalid block_align
which is checked for and thus impossible in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 10:36:52 +02:00
Michael Niedermayer
ab78e21ea2 Merge commit '676da248cad49debc40720baa13214f0b94dcc71' 
* commit '676da248cad49debc40720baa13214f0b94dcc71':
  vmd: refactor the inner decode loop

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 09:44:57 +02:00
Michael Niedermayer
8ef89833d0 Merge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9' 
* commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9':
  vmd: return meaningful errors

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 09:37:14 +02:00
Kostya Shishkov
0b0953baec proresenc: alpha coding support 2013-05-30 09:23:26 +02:00
Michael Niedermayer
455ae871a8 libavcodec/smvjpegdec: pass flags / idct algo into jpeg avctx 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-30 03:30:01 +02:00
Martin Storsjö
86113667c0 arm: Include hpeldsp_neon.o if h264qpel is enabled 
A few of the h264qpel neon functions are shared with other
hpeldsp functions in this file.

This fixes standalone compilation of the h264 decoder on arm.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-30 02:17:37 +03:00
Martin Storsjö
efb7968cfe arm: Don't unconditionally build dsputil files 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-30 02:17:35 +03:00
Martin Storsjö
36a7df8cf1 arm: Only build the FFT init files if FFT is enabled 
This fixes build errors in cases where FFT is disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-30 02:17:33 +03:00
Diego Biurrun
186599ffe0 build: cosmetics: Place unconditional before conditional OBJS lines 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-30 02:17:31 +03:00
Diego Biurrun
9b9b2e9f30 build: arm: cosmetics: Place all OBJS declarations in alphabetical order 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-30 02:17:27 +03:00
Reimar Döffinger
dccaad3bcd wamenc: handle failure to encode. 
This is necessary since the switch to floating point
input means there is no longer sufficient input data
validation.
There is a good chance that other encoders are affected
by similar issues.
This problem can be triggered by trying to encode
extremely large values and probably also with Inf and
possibly also NaNs.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-05-29 22:31:16 +02:00
Luca Barbato
701966730c vmd: drop incomplete chunks and spurious samples 
Odd chunk size makes no sense for stereo and incomplete chunks are
not supported.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-29 21:30:21 +02:00
Michael Niedermayer
ac025d6eca j2kdec: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 19:57:03 +02:00
Michael Niedermayer
0abe923d20 mpegvideo: fix forgotten lowres op_index limits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 19:55:27 +02:00
Michael Niedermayer
c2625c26c5 mpegvideo: implement ff_put_h264_chroma_mc1 & ff_avg_h264_chroma_mc2 
These are needed for lowres 3

This may fix Ticket2538

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 19:48:03 +02:00
Paul B Mahol
7984ed87c1 tiff: support inverted fill_order for packbits compression 
Fixes #1995.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 13:43:03 +00:00
Paul B Mahol
30d7dcce4c tiff: add helper function for fill_order case 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 13:42:55 +00:00
Paul B Mahol
b257d9a01f alac: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 12:37:33 +00:00
Paul B Mahol
7469be099e lavc/tta: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-29 12:30:07 +00:00
Luca Barbato
676da248ca vmd: refactor the inner decode loop 
Simplify a little, assume empty frames are acceptable and
do not pointlessly reinit the bytestream2 contexts using
possibly wrong size values.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-05-29 12:11:47 +02:00
Luca Barbato
c8f3cb9119 vmd: return meaningful errors 
CC: libav-stable@libav.org
 2013-05-29 12:11:47 +02:00
Luca Barbato
91a6944e56 vmd: use the PALETTE_COUNT constant uniformly 
While at it drop useless parentheses.
 2013-05-29 12:11:47 +02:00
Michael Niedermayer
200ef1e3c3 Merge commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b' 
* commit '9f30fb5a773d59298d8d45c741b3fd971d84c97b':
  configure: Don't pass -mthumb or -march= to MSVC
  mpeg12: skip frames consistently

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 11:06:26 +02:00
Michael Niedermayer
7a2edcf1c8 Merge commit '89806691b1c39181c63d95e0fddc30f11e2a7b04' 
* commit '89806691b1c39181c63d95e0fddc30f11e2a7b04':
  wavpack: check that all the channels were coded.
  wavpack: check that there aren't too many blocks per packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 05:01:35 +02:00
Michael Niedermayer
4d2825a317 Merge commit '7d039e70a5ff23a7deaa866684d2e8872acc5169' 
* commit '7d039e70a5ff23a7deaa866684d2e8872acc5169':
  wavpack: extract channel information from the bitstream

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 04:37:58 +02:00
Michael Niedermayer
8543575cc4 Merge commit '78f75b6fa421dd39a715588e9487579f1ce5bada' 
* commit '78f75b6fa421dd39a715588e9487579f1ce5bada':
  wavpack: extract sample rate from the bitstream
  configure: support gcc-4.8 instrumentation

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 04:33:27 +02:00
Michael Niedermayer
e755c8ac46 Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade' 
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade':
  fate: Don't use files from SRC_PATH in the actual tests
  indeo4: reuse context block VLC for band instead of defaulting

Conflicts:
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 04:02:23 +02:00
Michael Niedermayer
ca90ca8ce3 Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531' 
* commit '6647aa0426e73839b9b1d1c9d86188f469167531':
  indeo4: add missing Haar and slanted transforms
  dxtory v2 support

Conflicts:
	libavcodec/indeo4.c
	libavcodec/ivi_dsp.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 03:52:16 +02:00
Michael Niedermayer
a58e10e5d1 Merge commit '728214992e3698305550c1762f973d2ac567f016' 
* commit '728214992e3698305550c1762f973d2ac567f016':
  vc1dec: Remove interlaced warning
  vc1dec: Fix mixed field/frame intensity compensation
  vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4
  vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if needed
  vc1dec: Fix doxy for vc1_mc_4mv_chroma4()
  vc1dec: Drop old use_ic code from vc1_b_mc
  vc1: Use shuffled use_ic instead of equally shuffled mv_mode
  vc1dec: Implement intensity compensation for vc1_interp_mc()

Conflicts:
	Changelog
	libavcodec/vc1dec.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 03:28:18 +02:00
Michael Niedermayer
28923f1923 Merge commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71' 
* commit '28243b0d35b47bbf9abbd454fc444a6e0a9e7b71':
  vc1dec: Redesign the intensity compensation

Conflicts:
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 03:00:04 +02:00
Michael Niedermayer
83fd377c94 j2k/jpeg2000: merge float DWT and related code 
the float conditions are largely changed to check the DWT
instead of the bitexact flag, which previously was wrong
(DWT53 is always int)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-29 00:29:25 +02:00
Michael Niedermayer
a510abd5d1 j2kdec:merge mct_decode from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 23:49:11 +02:00
Michael Niedermayer
c37d735c1c jpeg2000dec: mct_decode: remove unused return 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 23:49:11 +02:00
Michael Niedermayer
fe7136ef82 j2k/jpeg2000: split stepsize in float & int variables 
This is more clear and less prone to mistakes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 22:16:14 +02:00
Michael Niedermayer
aa0d11ed0b jpeg2000dec: remove unneeded returns 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 22:16:14 +02:00
Michael Niedermayer
f7129ab928 j2k/jpeg2000: fix typo in lut_gain index 
no testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 22:16:14 +02:00
Janne Grunau
bf20cdbd86 mpeg12: skip frames consistently 
The decoder did not start predicted frames with missing references but
called the end of frame handling on them anyway. This caused an
assertion in the VA API HW accelorator since it tried to render a
picture with uninitialized buffers.
 2013-05-28 19:18:10 +02:00
Michael Niedermayer
32475f56f3 j2kdec/jpeg2000dec: partially merge quantization code 
The quantization code needs more work, not so much work
merging but more work investigating what is correct.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 19:02:00 +02:00
Michael Niedermayer
f0a2c8285a j2kdec: Try to fix 8bps output case 
Ive no test samples for which this makes a difference but it
matches the 16bit implementation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 18:58:46 +02:00
Anton Khirnov
89806691b1 wavpack: check that all the channels were coded. 2013-05-28 17:47:24 +02:00
Anton Khirnov
eae1b8451a wavpack: check that there aren't too many blocks per packet 2013-05-28 17:47:17 +02:00
Anton Khirnov
7d039e70a5 wavpack: extract channel information from the bitstream 
This way we don't require the caller to parse the block header. It also
allows the channel configuration to change mid-stream.
 2013-05-28 17:47:04 +02:00
Anton Khirnov
78f75b6fa4 wavpack: extract sample rate from the bitstream 
This way we don't require the caller to parse the block header. It also
allows the sample rate to change mid-stream.
 2013-05-28 17:46:03 +02:00
Kostya Shishkov
2cf5d29110 indeo4: reuse context block VLC for band instead of defaulting 
Currently if no custom block VLC is specified for band, a default block VLC
will be used, while the global block VLC stored in the context should be used
instead.

This fixes decoding of one sample I have.
 2013-05-28 14:10:58 +02:00
Kostya Shishkov
6647aa0426 indeo4: add missing Haar and slanted transforms 
That involves fixing INV_HAAR4() macro and changing it to work with different
input and output like INV_HAAR8() instead of in-place transform.
 2013-05-28 14:08:09 +02:00
Kostya Shishkov
3b03d7e251 dxtory v2 support 2013-05-28 13:35:09 +02:00
Michael Niedermayer
728214992e vc1dec: Remove interlaced warning 
Also add a note about the feature in the changelog.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:56:29 +03:00
Michael Niedermayer
d8b9dbe776 vc1dec: Fix mixed field/frame intensity compensation 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:56:24 +03:00
Michael Niedermayer
17410faa22 vc1dec: Match addressing between compensation and MC in vc1_mc_4mv_chroma4 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:56:20 +03:00
Michael Niedermayer
1be175f929 vc1dec: Handle top and bottom blocks in vc1_mc_4mv_chroma4() differently if needed 
Now it can use different references for those blocks and even use
averaging.

This fixes several chroma artifacts in several videos.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:56:15 +03:00
Michael Niedermayer
c69765a2cc vc1dec: Fix doxy for vc1_mc_4mv_chroma4() 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:56:12 +03:00
Michael Niedermayer
b412f705b5 vc1dec: Drop old use_ic code from vc1_b_mc 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:56:08 +03:00
Michael Niedermayer
5053a9a1ff vc1: Use shuffled use_ic instead of equally shuffled mv_mode 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:56:04 +03:00
Michael Niedermayer
3ced06f283 vc1dec: Implement intensity compensation for vc1_interp_mc() 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:55:59 +03:00
Michael Niedermayer
28243b0d35 vc1dec: Redesign the intensity compensation 
Use the intensity-compensated reference frame for subsequent
fields/B-frames.

Since we currently don't change the reference frame we have to
maintain lookup tables for intensity compensation in the following
dependent frames.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:55:55 +03:00
Michael Niedermayer
93b1281264 vc1dec: Shuffle field MVs after decoding, not before 
This simplifies the code since copying MVs to the reference is not needed
anymore (and maybe something about fixing artifacts).

Also remove the unused mv_f_last.

Fixes a small number of artifacts in black_screen_VC-1.mkv
and several more artifacts in other videos.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 13:55:46 +03:00
Dave Yeo
35e683e457 avcodec/vp8: Cosmetics, maintain alphabetical order in threading headers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 12:49:21 +02:00
Dave Yeo
e615a77799 os2threads: move from lavc to compat/ 
For useage in other places besides lavc. Needed after commit
90f9a5830b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 12:49:20 +02:00
Michael Niedermayer
3ed3aaab32 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  smacker: assign video frame PTS
  matroskadec: export full wavpack blocks.

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:58:46 +02:00
Michael Niedermayer
8012f93ed8 Merge commit '5074f4545c439420daebe4c2f28ed216440b6ec7' 
* commit '5074f4545c439420daebe4c2f28ed216440b6ec7':
  wavpack demuxer: export full wavpack blocks.

Conflicts:
	libavformat/wv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:49:30 +02:00
Michael Niedermayer
aa6cf4c1b0 Merge commit '72dee5f40b236c5eb9e68df39df80c68392269e3' 
* commit '72dee5f40b236c5eb9e68df39df80c68392269e3':
  wavpack: don't set sample format in init.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:41:38 +02:00
Michael Niedermayer
288e3fdfd3 Merge commit '35596bd4f4d3c39eed838cf3a2613817d62dda99' 
* commit '35596bd4f4d3c39eed838cf3a2613817d62dda99':
  wavpack: remove a useless parameter from wavpack_decode_block().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:36:26 +02:00
Michael Niedermayer
f5dfc35157 Merge commit 'd1bec4be2207738669874e02605e879ea9620974' 
* commit 'd1bec4be2207738669874e02605e879ea9620974':
  wavpack: return an error on 0-sized blocks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:28:22 +02:00
Michael Niedermayer
2ba0953ee4 Merge commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8' 
* commit '1d177200ce1ffd8902729e3a4d647b04fc4b35f8':
  wavpack: remove a useless check.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:13:14 +02:00
Michael Niedermayer
8d4e934df9 Merge commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840' 
* commit '0f3a0b24dd6f595feaa4526e52ffa7d05c3d7840':
  wavpack: add an error message to a failure.
  wavpack: return 0 instead of samples count from decoding functions

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:08:24 +02:00
Michael Niedermayer
107e9e4432 wavpack: Properly check channel index, dont write out of arrays 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:02:37 +02:00
Michael Niedermayer
a803ca54e5 Merge commit '528daa399018af74d52192eb1861d2b59d256111' 
* commit '528daa399018af74d52192eb1861d2b59d256111':
  wavpack: switch to planar output

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 11:02:27 +02:00
Michael Niedermayer
84051d57f5 Merge commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601' 
* commit 'a7ec3a9a4eea4e374afcd6e05828b103e6fcb601':
  wavpack: drop redundant if/else blocks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 10:03:04 +02:00
Michael Niedermayer
be72853f8a Merge commit '7b44c9918086c6aeacf7ef9f902af38b97f43170' 
* commit '7b44c9918086c6aeacf7ef9f902af38b97f43170':
  wavpack: remove the subframes codec cap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 09:57:44 +02:00
Michael Niedermayer
197e219c92 jpeg2000dwt: add float based 9/7 dwt 
Untested as theres no code yet using it in the encoder.
Code based on mixed float/int dwt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 09:42:19 +02:00
Michael Niedermayer
cf05fe8a7e jpeg2000dwt: remove floats from mixed float/int 9/7 dwt 
This should fix some fate failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 09:35:49 +02:00
Michael Niedermayer
3fc8500483 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  smacker: add a clarification notice about audio decoding
  configure: make jack depend on pthreads

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 08:59:07 +02:00
Anton Khirnov
9b6f47c448 matroskadec: export full wavpack blocks. 
This allows us to get rid of demuxer-specific hacks in the decoder and
will allow streamcopy from matroska once we have a wavpack muxer.
 2013-05-28 08:14:35 +02:00
Anton Khirnov
5074f4545c wavpack demuxer: export full wavpack blocks. 
Currently the demuxer shaves the blocks and exports only the
information that is useful to the decoder.

Exporting the blocks just as they are stored is simpler to understand
and will make remuxing wavpack easier.
 2013-05-28 08:14:05 +02:00
Anton Khirnov
72dee5f40b wavpack: don't set sample format in init. 
We don't know whether it will be float until we look at the data.
 2013-05-28 08:04:07 +02:00
Anton Khirnov
35596bd4f4 wavpack: remove a useless parameter from wavpack_decode_block(). 
The decoder always returns output if an error does not occur.
 2013-05-28 08:03:57 +02:00
Anton Khirnov
d1bec4be22 wavpack: return an error on 0-sized blocks 
Such blocks are not valid.
 2013-05-28 08:03:37 +02:00
Anton Khirnov
1d177200ce wavpack: remove a useless check. 
Number of samples in the first block is checked to be strictly positive
earlier in wavpack_decode_frame() and number of samples in all the other
blocks is checked to be equal to the first one.
 2013-05-28 08:03:24 +02:00
Anton Khirnov
0f3a0b24dd wavpack: add an error message to a failure. 2013-05-28 08:03:13 +02:00
Anton Khirnov
474fb0c9d9 wavpack: return 0 instead of samples count from decoding functions 
The caller never cares about the number of decoded samples, so this only
confuses the reader.
 2013-05-28 08:03:02 +02:00
Anton Khirnov
528daa3990 wavpack: switch to planar output 
This simplifies the code and makes it faster.
 2013-05-28 08:01:30 +02:00
Anton Khirnov
a7ec3a9a4e wavpack: drop redundant if/else blocks 2013-05-28 08:01:16 +02:00
Anton Khirnov
7b44c99180 wavpack: remove the subframes codec cap 
The decoder always consumes full packets.
 2013-05-28 08:01:08 +02:00
Michael Niedermayer
97f7586cd6 Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 07:49:38 +02:00
Kostya Shishkov
268bb88544 smacker: add a clarification notice about audio decoding 2013-05-28 06:17:08 +02:00
Michael Niedermayer
9c66da517f j2kenc: Zero DWT struct on allocation 
Should fix fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 02:47:25 +02:00
Michael Niedermayer
05fa3f6802 j2kdec: random non functional changed from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 01:46:59 +02:00
Michael Niedermayer
d66de3801e j2kdec: merge get_tlm() from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 01:11:30 +02:00
Michael Niedermayer
8cf57efdd7 j2k/jpeg2000: merge lowres code 
This also fixes lowres use with ffplay

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 00:30:06 +02:00
Michael Niedermayer
f82e7330af jpeg2000: merge mant type from j2k 
mant fits in 16bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 22:25:03 +02:00
Michael Niedermayer
d4a4661342 j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 21:54:07 +02:00
Michael Niedermayer
1bbb46ff71 j2k_dwt: fix scaling of 9/7 dwt 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 19:57:42 +02:00
Michael Niedermayer
ee189701a6 j2kenc: Allow encoding with the 9/7 wavelet 
Also add a fate test that tests 9/7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 18:50:18 +02:00
Kostya Shishkov
5f30c6c8ed Revert "smackaud: clip output samples" 
Smacker audio uses overflows instead of clipping.

This reverts commit 375ca0aca8.
 2013-05-27 18:19:01 +02:00
Michael Niedermayer
243cc38d94 j2k: change fixed point of stepsize to 16.16 
This seems more natural and matches jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 17:58:06 +02:00
Michael Niedermayer
1b5cb6c00a j2k/jpeg2000: Partially merge quantization code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 17:50:54 +02:00
Michael Niedermayer
9a18395b92 j2k/jpeg2000: merge a few whitespaces 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 16:10:36 +02:00
Michael Niedermayer
c2e942099a j2k: drop cblknx/y from Jpeg2000Band 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:55:29 +02:00
Michael Niedermayer
8c2e201c4f j2k/jpeg2000: drop xi/yi0/1 from Jpeg2000Prec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:53:42 +02:00
Michael Niedermayer
a05db52c12 j2k: remove cblk from band 
cblk is now in the same place as in jpeg2000, which will simplify
merging the 2 decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:51 +02:00
Michael Niedermayer
81ccc31f75 j2kdec: merge decode_tile cblk handling from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
2c5a5c5a62 j2kdec: cdxy != 1 does not work, print an error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
14652c080d j2k/jpeg2000: restructure cblk coord 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
5161c62595 j2k: fix band coord 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
369422db0c j2kdec: merge cblk restructuring from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
cbaa0871c2 j2kenc: switch to cblk in prec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
9fd23baa74 j2k: merge precinct init code from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
3300b5f6ce j2k/jpeg2000 headers: Cblk/Prec cleanup & merge 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 15:13:18 +02:00
Michael Niedermayer
1c711b6ecd Merge remote-tracking branch 'dilaroga/master' 
* dilaroga/master:
  avcodec/vda_h264_dec: fix a memory leak
  avcodec/vda_h264: use av_buffer to manage buffers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 09:32:22 +02:00
Xidorn Quan
499b82f604 avcodec/vda_h264_dec: fix a memory leak 
Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>
 2013-05-27 09:07:48 +02:00
Xidorn Quan
ffd7fd7944 avcodec/vda_h264: use av_buffer to manage buffers 
This patch fixes a leak of buffer when seeking occurs.
It adds a flag in struct vda_context for compatibility with apps which
currently use it. If the flag is not set, the hwaccel will behave like
before.

Signed-off-by: Sebastien Zwickert <dilaroga@gmail.com>
 2013-05-27 09:05:55 +02:00
Michael Niedermayer
b7c6d1ed90 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: Only output eabi attributes if building for ELF
  fix scalarproduct_and_madd_int16_altivec() for orders > 16

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 08:55:24 +02:00
Michael Niedermayer
53ec1c811e j2k: merge cosmetics and non functional changes from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-27 02:27:56 +02:00
Paul B Mahol
e5c7bafb44 libtwolame: add forgotten calls 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-26 21:57:28 +00:00
Michael Niedermayer
bd89b2b22a j2k/jpeg2000: log2_prec size cleanup 
This also changes the cblk size storage method to what jpeg2000 uses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 22:29:11 +02:00
Michael Niedermayer
cb39dfb870 j2k/jpeg2000: check cblk size 
This is based on j2k FCD which is ambigous thus the limit
might be tighter.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
9ea242962c j2k: ff_j2k_tag_tree_init: check for integer overflow in alloc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
b01e61a47d jpeg2000: cosmetics & restructuring from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
228ce33606 j2k: add #includes from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
874a06bd1f j2k: cosmetics from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
6e16321d66 j2kdec: add AVClass 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
df3e6e5e22 j2kdec: cosmetics from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
277691a130 j2kdec: merge copyright header with jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
a2daf929ed j2kdec: profile code from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
726eac1df9 j2kdec: cosmetics from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
88d2dd00fe avcodec/j2kdec: drop disabled debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
de90bd6c3f j2k/jpeg2000: merge cosmetics and whitespace 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
bcf59b5d8f j2kdec: merge jpeg2000_init_static_data() from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
5d67dfd71c j2kdec: move avctx init to decode_frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 20:15:50 +02:00
Michael Niedermayer
b4013899e2 j2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/g 
Also add a related comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:22:16 +02:00
Michael Niedermayer
ac325f0613 j2k.h: whitespace cosmetics 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:22:16 +02:00
Michael Niedermayer
5b4cad4a64 j2k.h: remove disabled debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:49 +02:00
Michael Niedermayer
ad194874ee j2k.h: Merges various cosmetics & unused defines 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer
da90661718 j2k/jpeg2000: merge copyright 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer
e708c7fa21 j2k: drop disabled debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer
e66faf71eb j2k: merge ff_j2k_init_tier1_luts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer
b67fe48f34 jpeg2000/j2k: merge getsigctxno() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer
69b9773980 j2k: s/getnbctxno/getsigctxno/g 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Michael Niedermayer
5157ec89ef j2k: redesign vert_causal_ctx_csty implementation 
The old implementation was incomplete and could not have worked
This also fixes some warnings
New code is untested as i dont seem to have a sample file that uses this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 18:07:48 +02:00
Kostya Shishkov
0418cbf081 fix scalarproduct_and_madd_int16_altivec() for orders > 16 
the second and third sources were incremented only by half of the needed size
 2013-05-26 16:10:47 +02:00
Michael Niedermayer
438c45c08a j2kdec: fix used bytestream function 
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 15:00:23 +02:00
Michael Niedermayer
d42106c3ac j2k: rename a few inline functions and data tables to match jpeg2000 
also inlcudes some other cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 14:02:44 +02:00
Michael Niedermayer
c78f3e5571 j2kdec: prog_order reading from jpeg2000dec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 13:57:56 +02:00
Michael Niedermayer
81be0965e3 j2k: merge Jpeg2000CodingStyle from jpeg2000 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 13:57:56 +02:00
Michael Niedermayer
4cf7b87551 av_cpu_count: factorize "detected %d logical cores" message 
Also print the message just once

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-26 03:19:55 +02:00
Michael Niedermayer
5f44f47b72 mpegvideo_enc: do not unreference frames before the code is done with them 
Fixes Ticket2592

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-25 20:30:50 +02:00
Michael Niedermayer
42bb3e4db6 avcodec: remove ff_get_logical_cpus() 
This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 20:25:53 +02:00
Michael Niedermayer
fe40a9f98f Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675' 
* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
  Move get_logical_cpus() from lavc/pthread to lavu/cpu.

Conflicts:
	doc/APIchanges
	libavcodec/pthread.c
	libavutil/cpu.c
	libavutil/cpu.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 13:24:28 +02:00
Michael Niedermayer
a4d3757b29 Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
  w32pthreads: move from lavc to compat/

Conflicts:
	libavcodec/Makefile
	libavcodec/pthread.c
	libavcodec/vp8.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 13:01:41 +02:00
Michael Niedermayer
029353e427 Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68' 
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
	libavcodec/h264_parser.c
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 12:15:56 +02:00
Michael Niedermayer
0c25c398da Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1' 
* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
  avcodec: Add picture structure information to AVCodecParserContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-24 11:51:58 +02:00
Anton Khirnov
2a6eaeaa85 Move get_logical_cpus() from lavc/pthread to lavu/cpu. 
It will be useful in lavfi, and could conceivably be useful to the user
applications as well.
 2013-05-24 09:28:00 +02:00
Anton Khirnov
90f9a5830b w32pthreads: move from lavc to compat/ 
It will be used in other places than lavc.
 2013-05-24 09:26:54 +02:00
Yusuke Nakamura
3f1a7ceb2c h264_parser: Set field_order and picture_structure. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-24 08:45:05 +02:00
Yusuke Nakamura
b493847df4 avcodec: Add picture structure information to AVCodecParserContext. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-24 08:43:14 +02:00
Paul B Mahol
102848e3b6 s302menc: unbreak compilation 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-23 20:38:53 +00:00