1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

53475 Commits

Author SHA1 Message Date
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
Clément Bœsch
56cea3294a lavfi/lut3d: faster tetrahedral interpolation.
Increase performance by fetching only the necessary points.

1097 → 917 decicyles.
2013-05-26 18:48:51 +02:00
Clément Bœsch
b6ee25e300 lavfi/lut3d: restore original interpolation speed.
Call NEXT() only once since it got slower due to the overflow condition
introduced in 91b46145.

interp_trilinear:   1462 → 1280 decicycles
interp_tetrahedral: 1188 → 1097 decicycles

Tested on a Core2, GCC 4.8.
2013-05-26 18:48:10 +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
Paul B Mahol
c8e9c9275f lavfi/bbox: export bbox info to frame metadata
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 14:00:10 +00:00
Paul B Mahol
add8c63ce4 lavfi/bbox: timeline support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 14:00:09 +00:00
Paul B Mahol
7aa99a69c7 lavfi/bbox: make min_val user configurable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 14:00:09 +00:00
Paul B Mahol
e9c3851d60 lavfi/bbox: use inlink->frame_count
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 14:00:09 +00:00
Clément Bœsch
477f4efd0f lavf/swf: remove unused assert include. 2013-05-26 15:48:50 +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
4758e32a6c matroska_read_seek: Fix used streams for subtitle index compensation
Might fix Ticket1907 (I have no testcase so i cant test)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 13:14:01 +02:00
Paul B Mahol
40a87a6a69 lavfi/noise: use av_image_copy_plane()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-26 10:52:57 +00: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
d480b36db4 av_d2q: Avoid llrint(), its not correctly implemented in old netbsd
This should fix some fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 03:19:55 +02:00
Timothy Gu
4703a345fb doc/encoders: Add documentation for libmp3lame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 23:56:49 +02:00
Michael Niedermayer
ee5964cc9c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  msvc/icl: Intel Compiler support on Windows

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 21:43:13 +02:00
Michael Niedermayer
efcc334c9d Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'
* commit '9495cd170b5786c3518419e873d94eb5e7ada11a':
  configure: Fix check_exec_crash for ICL support

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 21:38:17 +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
5292dac34c avformat/mov: Rename alt_sample_size so its name matches what it is
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 18:47:36 +02:00
Alex Smith
322e4194dd msvc/icl: Intel Compiler support on Windows
Initial support for the ICL compiler on windows. Requires a new
c99wrap with ICL support (1.0.2+).

Currently not much different speed wise compared to msvc. In the
future with a few changes it can be made to support the inline asm.
This would be the primary reason for using it.

Passed all fate tests, versions tested:
    13.1.1.171 (2013 Update 3) x86 and x64
    12.1.5.344 (2011 Update 11) x86 and x64

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-05-25 17:52:44 +02:00
Giorgio Vazzana
7e03886bbb avutil/md5: reindent after previous commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 16:11:08 +02:00
Michael Niedermayer
64eacb839e av_d2q: fix rounding for negative values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 16:04:08 +02:00
Michael Niedermayer
de7d290631 av_d2q: Fix infinity check
The old check would fail on huge but not infinite values
and the later code could then fail to handle them correctly in
some cases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 16:03:50 +02:00
Paul B Mahol
8caf2da320 lavfi/afade: add timeline support
For correct precision one may need to use asetnsamples.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-25 13:20:27 +00:00
Laurent
9495cd170b configure: Fix check_exec_crash for ICL support
Change the check_exec_crash test to use a function pointer instead of
simply calling the function. The EBP availability test will crash when
compiled with ICL likely due to compiler optimization shenanigans.

Originally the check_exec_crash code was moved out of main to fix a
problem with gcc's treatment of non-leaf main on x86_32. Libav already
moved the code out of main but the addition of the function pointer will
prevent any inlining which fixes the remaining problem.

A function pointer is used since it is compiler agnostic (as opposed to
say __attribute__ ((noinline)) which would only work with gcc compatible
compilers).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-05-25 12:07:56 +02:00
Michael Niedermayer
760a9754ca img2dec: support seeking with ts_from_file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 12:06:14 +02:00
Michael Niedermayer
a753776ff5 img2dec: dont set start_time/duration to invalid values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 12:05:32 +02:00
Andrey Utkin
70fbfd75c3 img2dec: Add ts_from_file option
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-25 11:42:28 +02:00
Paul B Mahol
2c2e69b3a2 lavfi/blend: support slice threading
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-24 21:41:28 +00:00
Michael Niedermayer
e0f2e0fcf0 vf_fade: remove unused function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 20:50:15 +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
0cbfbdef4a vf_fade: Support slice threaded alpha
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 20:21:40 +02:00
Michael Niedermayer
a3d62f3377 vf_fade: Fix alpha flag integration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-24 20:21:40 +02:00
Paul B Mahol
af12573938 lavfi/blend: fix SW/SH calculation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-24 17:34:22 +00:00