generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,648 Commits 24 Branches 241 Tags
Commit Graph

23481 Commits

Author SHA1 Message Date
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
Anton Khirnov
3623589edc dfa: check for invalid access in decode_wdlt(). 
This can happen when the number of skipped lines is not consistent with
the number of coded lines.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-04-04 07:54:07 +02:00
Peter Meerwald
dfcbe8cbd7 doc: Fix best_nb_channells typo 
Signed-off-by: Peter Meerwald <p.meerwald@bct-electronic.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-04-04 07:51:28 +02:00
Nicolas George
464f94b206 lavc: do not init frame with guessed layout. 
It is breaking support from files with unknown layout.
 2013-04-03 17:44:10 +02:00
Michael Niedermayer
aa7d9809c1 h264pred: fix "warning: initialization discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 03:14:09 +02:00
Michael Niedermayer
c09da45ffb dsputil: Fix "warning: initialization discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 14:52:18 +02:00
Paul B Mahol
1de11a7cab libmp3lame: allow joint stereo to be disabled 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-02 12:14:14 +00:00
Michael Niedermayer
4dd31f88f5 cavs: fix "warning: initialization discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-02 05:12:10 +02:00
Michael Niedermayer
4394528d2d cavsdsp: fix "warning: initialization discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 20:47:48 +02:00
Michael Niedermayer
ac126a98e5 dvdec: fix lowres=3 with yuv 4:1:1 
Fixes Ticket2390

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-31 20:37:49 +02:00
Michael Niedermayer
34ea5f418e h264_refs: check for multiple mismatching long term ref assignments 
Fixes failure of the assert added a few hours ago.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-31 00:18:23 +01:00
Michael Niedermayer
3d68f5e032 h264_direct: assert the validity of the spatial ref 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 21:13:19 +01:00
Michael Niedermayer
285c5f6838 h264: move last_slice_type reset into decode_slice_header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:57:31 +01:00
Michael Niedermayer
11c3381ce3 h264: move the default_ref_list_done check down after its inputs have been written 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Michael Niedermayer
3f2ce24f59 h264_refs: assert that the references are not deallocated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Michael Niedermayer
fbb6741a84 h264_refs: assert that long ref fields have not been inserted multiple times 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Michael Niedermayer
746016598d h264: Move slice_table clean out of frame_start 
Fixes inconsistency ultimately leading to an out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Matt Wolenetz
1d6e618939 vp8: Fix pthread_cond and pthread_mutex leaks 
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-03-30 16:08:50 +01:00
Paul B Mahol
95c7cad70c lavc: remove empty function 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-30 03:23:02 +00:00
Stefano Sabatini
37fce84e27 lavc/libtheoraenc: clarify comment about global_quality to quality conversion 2013-03-30 16:58:40 +01:00
Carl Eugen Hoyos
670bb1c979 Fix compilation with --enable-decoder=webp --disable-decoder=vp8 2013-03-30 08:25:44 +01:00
Matt Wolenetz
65340c976c Fix pthread_cond and pthread_mutex leaks in vp8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-29 21:36:04 +01:00
Paul B Mahol
1c11ab82d6 paf_video: make code independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-29 20:19:10 +00:00