1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

23503 Commits

Author SHA1 Message Date
Michael Niedermayer
0594ef0dea Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'
* commit 'b439c992c23f3e0f3832fffd2a34a664b236c525':
  lavfi: switch to an AVOptions-based system.
  dfa: implement missing TDLT coding method

Conflicts:
	libavcodec/dfa.c
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 12:41:06 +02:00
Christophe Gisquet
2383068cbf x86: sbrdsp: implement SSE2 qmf_pre_shuffle
From 253 to 51 cycles on Arrandale and Win64.
44 cycles on SandyBridge.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10 02:42:22 +02:00
Michael Niedermayer
62a1181015 h264: wait for missing slices only on frames
The EC code does not support fields currently thus it makes no
sense to wait for these cases (which also the check doesnt handle
correctly)

Fixes Ticket 2454

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09 23:12:24 +02:00
Clément Bœsch
1043cb8e80 lavc/ass: use bprint API in ff_ass_add_rect(). 2013-04-09 21:43:44 +02:00
Kostya Shishkov
56c1b92576 dfa: implement missing TDLT coding method 2013-04-09 18:32:00 +02:00
Michael Niedermayer
b4eb06d325 msmpeg4: ignore negative DC overflow
Fixes second half of Ticket2414

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09 16:27:49 +02:00
Michael Niedermayer
c03dc44070 msmpeg4: fix asm code in ff_msmpeg4_pred_dc()
Fixes first half of Ticket2414

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09 16:26:52 +02:00
Martin Storsjö
bc0522dffa h264pred: Add a few missing const declarations for ff_cropTbl derived pointers
The pointers that get assigned ff_cropTbl were made const in
9e0f14f1, but other variables that transitively are assigned
based on these variables were missed.

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-08 21:39:15 +03:00
Michael Niedermayer
0138fe5656 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables

Conflicts:
	libavcodec/mathtables.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-08 12:54:18 +02:00
Michael Niedermayer
024a5f72ee Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'
* commit '9e0f14f16cfc9456a691655fda7d01090bffe47e':
  lavc: Make pointers to ff_cropTbl const
  vp3: Embed idct_permutation array directly in VP3DecoderContext

Conflicts:
	libavcodec/bit_depth_template.c
	libavcodec/vp3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-08 12:47:49 +02:00
Michael Niedermayer
5f49e92eb9 Merge commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'
* commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9':
  x86: qpel: Move fullpel and l2 functions to a separate file
  bfin: Make vp3 functions static

Conflicts:
	libavcodec/bfin/vp3_bfin.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-08 12:40:26 +02:00
Michael Niedermayer
1090f69386 Merge commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5'
* commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5':
  bfin: Don't use the vp3 idct functions if bitexact behaviour is expected

Conflicts:
	libavcodec/bfin/vp3_bfin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-08 12:18:29 +02:00
Ronald S. Bultje
d2ec6ea6c6 lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables
These are widely used throughout libavcodec, nothing dsputil-specific.

Change ff_cropTbl to a statically initialized table, to avoid
initializing it with a function call.

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-08 12:38:33 +03:00
Martin Storsjö
9e0f14f16c lavc: Make pointers to ff_cropTbl const
There's no point in these pointers not being const.

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-08 12:38:33 +03:00
Ronald S. Bultje
610b18e2e3 x86: qpel: Move fullpel and l2 functions to a separate file
This way, they can be shared between mpeg4qpel and h264qpel without
requiring either one to be compiled unconditionally.

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-08 12:38:33 +03:00
Ronald S. Bultje
18df366a18 vp3: Embed idct_permutation array directly in VP3DecoderContext
This makes the vp3 decoder less dependent on dsputil, and will aid
in making it (eventually) dsputil-independent.

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-08 12:38:33 +03:00
Martin Storsjö
0f59845708 bfin: Make vp3 functions static
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-08 12:29:40 +03:00
Martin Storsjö
aa8d89536d bfin: Don't use the vp3 idct functions if bitexact behaviour is expected
In the non-bitexact mode, vp3 currently decodes to the same
frame crcs as before 28f9ab702 (and the output visually looks
correct).

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-08 12:28:52 +03:00
Christophe Gisquet
e2946e5c34 x86: sbrdsp: implement SSE qmf_deint_bfly
From 312 to 89/68 (sse/sse2) cycles on Arrandale and Win64.
Sandybridge: 68/47 cycles.

Having a loop counter is a 7 cycle gain.
Unrolling is another 7 cycle gain.
Working in reverse scan is another 6 cycles.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-08 02:26:34 +02:00
Paul B Mahol
1adf54de56 dfa: implement tdlt chunk decoding
Sample & pseudo code provided by Vladimir "VAG" Gneushev.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-07 21:48:22 +00:00
Michael Niedermayer
2f284c0170 dpxdec: Fix decoding of RGBA10
Fixes Ticket2392

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-07 21:39:51 +02:00
Nicolas George
0884d04dc3 lavc: fix recoded subtitles end.
Text subtitles packets are not 0-terminated (and if they are,
it is handled by the recoding process since 0 is a valid
Unicode code point). The terminating 0 would overwrite the
last payload octet.

OTOH, packets must be 0-padded.

Fix a problem reported in trac ticket #2431.
2013-04-07 13:25:24 +02:00
Christophe Gisquet
11774169ae sbrdsp: unroll and use integer operations
This patch can be controversial, by assuming floats are IEEE-754 and
particular behaviour of the FPU will get in the way.
Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference).

sbr_qmf_pre_shuffle_c: 115 to 76
sbr_neg_odd_64_c: 84 to 55
sbr_qmf_post_shuffle_c: 112 to 83

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 15:52:42 +02:00
Christophe Gisquet
f4ac80227b sbrdsp: unroll sbr_autocorrelate_c
1410 cycles to 1148 on Arrandale/Win64.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 15:52:42 +02:00
Michael Niedermayer
32bac65ba0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  x86: sbrdsp: Implement SSE neg_odd_64

Conflicts:
	libavcodec/x86/sbrdsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-06 13:30:19 +02:00
Christophe Gisquet
f4b0d12f5b x86: sbrdsp: Implement SSE neg_odd_64
Timing on Arrandale:
        C   SSE
Win32:  57   44
Win64:  47   38
Unrolling and not storing mask both save some cycles.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-05 22:47:04 +02:00
Michael Niedermayer
37f080f6f6 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h261: Move mvmap table to the only place it is used

Conflicts:
	libavcodec/h261data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 22:09:10 +02:00
Michael Niedermayer
473d129742 Merge commit '0404ec619d43f27b87c424aa1a572a6699fe6a31'
* commit '0404ec619d43f27b87c424aa1a572a6699fe6a31':
  h261: cosmetics: Move functions to avoid forward declarations

Conflicts:
	libavcodec/h261dec.c
	libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 22:00:38 +02:00
Michael Niedermayer
04b0fd7e91 Merge commit 'b78f81c8033904e2e75add0c9a603df6df514a30'
* commit 'b78f81c8033904e2e75add0c9a603df6df514a30':
  h261: K&R formatting and prettyprinting cosmetics

Conflicts:
	libavcodec/h261_parser.c
	libavcodec/h261data.h
	libavcodec/h261dec.c
	libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:53:57 +02:00
Michael Niedermayer
e7c801d9d3 Merge commit '66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780'
* commit '66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780':
  h261: Move function declarations to h261.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:31:14 +02:00
Michael Niedermayer
3d73be071d Merge commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1'
* commit 'ed16c2dbf47cdd7c48825b4da6e7036698e5dde1':
  h261: Remove H.261 loop filter from dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:25:49 +02:00
Michael Niedermayer
fa871b1bde Merge commit 'ae35d91d44c5e676af3d146bf8d05b241c467675'
* commit 'ae35d91d44c5e676af3d146bf8d05b241c467675':
  h261: Move ff_h261_rl_table_store declaration to header file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 21:09:04 +02:00
Christophe Gisquet
37a9708391 x86: sbrdsp: implement SSE neg_odd_64
Timing on Arrandale:
        C   SSE
Win32:  57   44
Win64:  47   38
Unrolling and not storing mask both save some cycles.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 16:42:12 +02:00
Michael Niedermayer
29a4221ad3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames

Conflicts:
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-05 12:52:23 +02:00
Diego Biurrun
52cd84d4d4 h261: Move mvmap table to the only place it is used 2013-04-05 12:25:12 +02:00
Diego Biurrun
0404ec619d h261: cosmetics: Move functions to avoid forward declarations 2013-04-05 12:25:12 +02:00
Diego Biurrun
b78f81c803 h261: K&R formatting and prettyprinting cosmetics 2013-04-05 12:25:12 +02:00
Diego Biurrun
66ac3dbf1e h261: Move function declarations to h261.h 2013-04-05 12:25:12 +02:00
Diego Biurrun
ed16c2dbf4 h261: Remove H.261 loop filter from dsputil
There is no arch-optimized version of the H.261 loop filter and there
likely will never be, so the dsputil overhead does not give any benefit.
2013-04-05 12:24:28 +02:00
Diego Biurrun
ae35d91d44 h261: Move ff_h261_rl_table_store declaration to header file 2013-04-05 12:24:28 +02:00
Paul B Mahol
faf689c7eb xbmenc: remove unused code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 22:43:26 +00:00
Paul B Mahol
08b31a72db xwdenc: remove unused code
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 22:43:25 +00:00
Paul B Mahol
77535bb3c3 bmpenc: get rid of BMPContext as it is unused
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-04 22:43:25 +00:00
Michael Niedermayer
0a512e347f Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
  lavc: use packet duration for subtitles if necessary.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 21:19:45 +02:00
Nicolas Bertrand
28a807e28b libopenjpeg: Add support for XYZ colorspace, found in DCINEMA frames
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-04 19:53:07 +02:00
Michael Niedermayer
740ebe468c dfa: remove redundant check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 14:49:00 +02:00
Michael Niedermayer
208be6b54a Merge commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c'
* commit 'd1016dccdcb10486245e5d7c186cc31af54b2a9c':
  xmv: check audio track parameters validity.
  bmv: check for len being valid in bmv_decode_frame().

Conflicts:
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 14:20:51 +02:00
Nicolas George
83affcde51 lavc: use packet duration for subtitles if necessary.
Fix trac ticket #2397.
2013-04-04 14:04:51 +02:00
Michael Niedermayer
cdafcf838c Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'
* commit '8d617b11cfc87b2c6056fee029ac5bc760af874a':
  id3v2: pad the APIC packets as required by lavc.
  dfa: check for invalid access in decode_wdlt().

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 13:41:01 +02:00
Anton Khirnov
b88f902125 bmv: check for len being valid in bmv_decode_frame().
It can be 0 or -1 for invalid files, which may result in invalid memory
access.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-04-04 07:54:27 +02:00