RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
53,642 Commits 36 Branches 398 Tags 242 MiB
Commit Graph

53642 Commits

Author SHA1 Message Date
Martin Storsjö 4a27a52a1f fate: Don't use files from SRC_PATH in the actual tests 
If building out of tree, make sure the filter scripts are copied
into the build tree before running tests. This makes sure that
SRC_PATH doesn't need to exist on the remote system (or doesn't
need to exist at the same path).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-28 17:14:18 +03: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
Paul B Mahol ced0307ea9 tta: make probing more robust 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-28 11:46:10 +00: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
Paul B Mahol 269fc8e049 lavf/wvenc: remove hacks since wavpack demuxer & decoder hacks have been fixed 2013-05-28 10:46:57 +00: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
Carl Eugen Hoyos c0957f49c7 configure: Fix jack auto-detection, broken since 3fc8500 2013-05-28 10:28:16 +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 f6beb36115 Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2' 
* commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2':
  lavf: preserve side data when parsing packets.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 09:51:19 +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
Kostya Shishkov 851bc1d6be smacker: assign video frame PTS 2013-05-28 09:03:41 +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
Michael Niedermayer 2ad28840b3 Merge commit '538bf767373f176b6487e30181155e74b37cced6' 
* commit '538bf767373f176b6487e30181155e74b37cced6':
  avconv: make -aspect work with streamcopy

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 08:52:03 +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
Michael Niedermayer 91db8ff203 Merge commit '564b7e0c0095768cd20001b28154d69462be54e7' 
* commit '564b7e0c0095768cd20001b28154d69462be54e7':
  matroskadec: silently skip CodecState element.
  smacker: fix off-by-one error in palette expanding code

Conflicts:
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 08:04:02 +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
Anton Khirnov c330eba84c lavf: preserve side data when parsing packets. 2013-05-28 08:00:07 +02:00
Michael Niedermayer 97f7586cd6 Merge commit '5f30c6c8ed1f006c1b3a547dfe388f3a4a080e4d' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-28 07:49:38 +02:00