ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 23:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,670 Commits 36 Branches 398 Tags 538 MiB
c3272674c9
Commit Graph

61670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
c3272674c9 avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit 
This avoids a hypothetical integer overflow with very high resolution video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-21 18:12:58 +01:00
Michael Niedermayer
db55365d0f configure: Try to fix detection of ARM Compiler 5.04 
Fixes Ticket 3364

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-21 17:51:16 +01:00
Michael Niedermayer
9dca02ee54 ffmpeg: dont call exit_program() from a signal hander 
This is unsafe and can deadlock amongth other things

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-21 17:09:56 +01:00
Anshul Maheshwari
6d25e90262 doc/examples/avcodec: information regarding gop_size ignored if frame->pic-type is AV_PICTURE_TYPE_I 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-21 15:21:15 +01:00
Michael Niedermayer
1cd107f637 avcodec/x86/snowdsp: add missing clobbers to inner_add_yblock_bw_8_obmc_16_bh_even_sse2() and inner_add_yblock_bw_16_obmc_32_sse2() 
Note, these functions are currently disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-21 03:38:48 +01:00
Michael Niedermayer
45ad7bc423 avcodec/snowdec: provide information about the wavelet with -debug 1 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-21 02:44:54 +01:00
Michael Niedermayer
19139d8516 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame

Conflicts:
	libavcodec/vaapi.c
	libavcodec/vaapi_internal.h

See: 377cfc28a2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 23:08:58 +01:00
Michael Niedermayer
1ec295a5c5 Merge commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0' 
* commit '1b1094a19d9e41baf3253c83841f9e5343cecbd0':
  vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame

Conflicts:
	libavcodec/vdpau_internal.h
	libavcodec/vdpau_vc1.c

See: 2a37e560dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 22:48:58 +01:00
Michael Niedermayer
4d216420be Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303' 
* commit '7948a51b5c3d08e1a1173442a7ff72b220def303':
  vdpau: don't assume Picture and H264Picture are the same

Conflicts:
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 22:39:54 +01:00
Michael Niedermayer
e98bac82e5 Merge commit '82bb3048013201c0095d2853d4623633d912252f' 
* commit '82bb3048013201c0095d2853d4623633d912252f':
  dsputil: Use correct type in me_cmp_func function pointer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 22:36:40 +01:00
Michael Niedermayer
011d83de48 Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18' 
* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18':
  build: Group general components separate from de/encoders in arch Makefiles

Conflicts:
	libavcodec/arm/Makefile
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 22:26:31 +01:00
Michael Niedermayer
3775224b2f Merge commit '54a6e08a650a71fd375551585b0ea40a3a06d228' 
* commit '54a6e08a650a71fd375551585b0ea40a3a06d228':
  dsputil: Conditionally compile dsputil code on all architectures

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 22:12:11 +01:00
Michael Niedermayer
ba85bfabf3 Merge commit '5169e688956be3378adb3b16a93962fe0048f1c9' 
* commit '5169e688956be3378adb3b16a93962fe0048f1c9':
  dsputil: Propagate bit depth information to all (sub)init functions

Conflicts:
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv5te.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/arm/dsputil_init_neon.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/x86/dsputil_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 22:06:01 +01:00
Michael Niedermayer
a87188ebdb Merge commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e' 
* commit 'cf7a2167570e6ccb9dfbd62e9d8ba8f4f065b17e':
  arm: dsputil: K&R formatting cosmetics

Conflicts:
	libavcodec/arm/dsputil_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:58:16 +01:00
Michael Niedermayer
b20b772474 Merge commit '1675975216ecbea8e4826235f204dc0f4234383f' 
* commit '1675975216ecbea8e4826235f204dc0f4234383f':
  ppc: dsputil: Drop trailing semicolon from macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:51:17 +01:00
Michael Niedermayer
ba91ac5c0e Merge commit 'b7d24fd4b2213104c001ed504074495568600b9c' 
* commit 'b7d24fd4b2213104c001ed504074495568600b9c':
  ppc: dsputil: Merge some declarations and initializations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:50:35 +01:00
Michael Niedermayer
eb680f2ab0 Merge commit 'b045283f2126637477a597f184638ebef09bf898' 
* commit 'b045283f2126637477a597f184638ebef09bf898':
  ppc: dsputil: Simplify some ifdeffed function definitions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:44:59 +01:00
Michael Niedermayer
d648ffe446 Merge commit '8bd6f88266740068415f7da0628117f1b802efb9' 
* commit '8bd6f88266740068415f7da0628117f1b802efb9':
  ppc: dsputil: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:44:39 +01:00
Michael Niedermayer
adf82fe4f7 Merge commit '022184a646896c6b27c6cca387039b030685266e' 
* commit '022184a646896c6b27c6cca387039b030685266e':
  ppc: dsputil: more K&R formatting cosmetics

Conflicts:
	libavcodec/ppc/gmc_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:30:21 +01:00
Michael Niedermayer
13405ecdfe Merge commit '30f3f959879eee7890973e8cc9ce076450ced111' 
* commit '30f3f959879eee7890973e8cc9ce076450ced111':
  ppc: dsputil: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:29:37 +01:00
Michael Niedermayer
047cf46e97 Merge commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1' 
* commit '82ee14d2cedd7867920529b408ed6c7ec2f13ff1':
  ppc: dsputil: comment formatting and wording/grammar improvements

Conflicts:
	libavcodec/ppc/gmc_altivec.c
	libavcodec/ppc/idct_altivec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:09:57 +01:00
Michael Niedermayer
75cc29a8a8 Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e' 
* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e':
  hpeldsp_template: Merge some declarations and initializations

Conflicts:
	libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 21:08:30 +01:00
Michael Niedermayer
76d7676fcc Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9' 
* commit '2539cf1c814190a017cb8986b41aa2f949e37fd9':
  hpeldsp_template: K&R formatting cosmetics

Conflicts:
	libavcodec/hpeldsp_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 20:52:19 +01:00
Michael Niedermayer
8b66b43128 Merge commit '2972087e398454122a82a970ed07924185175c6d' 
* commit '2972087e398454122a82a970ed07924185175c6d':
  hpel_template: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 20:50:04 +01:00
Michael Niedermayer
da760a64d1 Merge commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224' 
* commit 'e8eace32765da4b42ac3c575fdb2c70cce8aa224':
  hpel_template: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 20:32:27 +01:00
wm4
8b6136d3d1 vaapi: switch ff_vaapi_get_surface_id from Picture to AVFrame 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-03-20 17:01:59 +01:00
wm4
1b1094a19d vdpau: switch ff_vdpau_get_surface_id from Picture to AVFrame 
This gets rid of aliasing completely unrelated structs to Picture.

Fixes the remaining compilation warnings in the vdpau code.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-03-20 17:00:39 +01:00
wm4
7948a51b5c vdpau: don't assume Picture and H264Picture are the same 
The code passed H264Picture* and Picture*, and assumed the
hwaccel_picture_private field was in the same place in both
structs. Somehow this happened to work in Libav, but broke in
FFmpeg (and probably subtly breaks in Libav too).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-03-20 16:59:46 +01:00
Michael Niedermayer
d3ed8a4d2b ffmpeg: try to avoid calling av_log() from sigterm_handler() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 16:24:17 +01:00
Michael Niedermayer
9d60527a13 configure: fix direct symbol ref support detection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 13:14:33 +01:00
Diego Biurrun
82bb304801 dsputil: Use correct type in me_cmp_func function pointer 2014-03-20 05:03:23 -07:00
Diego Biurrun
0e083d7e43 build: Group general components separate from de/encoders in arch Makefiles 
This is in line with how the top-level libavcodec Makefile is structured.
 2014-03-20 05:03:23 -07:00
Diego Biurrun
54a6e08a65 dsputil: Conditionally compile dsputil code on all architectures 2014-03-20 05:03:23 -07:00
Diego Biurrun
5169e68895 dsputil: Propagate bit depth information to all (sub)init functions 
This avoids recalculating the value over and over again.
 2014-03-20 05:03:23 -07:00
Diego Biurrun
cf7a216757 arm: dsputil: K&R formatting cosmetics 2014-03-20 05:03:23 -07:00
Diego Biurrun
1675975216 ppc: dsputil: Drop trailing semicolon from macros 
This allows for a more natural macro usage.
 2014-03-20 05:03:22 -07:00
Diego Biurrun
b7d24fd4b2 ppc: dsputil: Merge some declarations and initializations 2014-03-20 05:03:22 -07:00
Diego Biurrun
b045283f21 ppc: dsputil: Simplify some ifdeffed function definitions 2014-03-20 05:03:22 -07:00
Diego Biurrun
8bd6f88266 ppc: dsputil: Drop some unnecessary parentheses 2014-03-20 05:03:22 -07:00
Diego Biurrun
022184a646 ppc: dsputil: more K&R formatting cosmetics 2014-03-20 05:03:22 -07:00
Diego Biurrun
30f3f95987 ppc: dsputil: K&R formatting cosmetics 2014-03-20 05:03:22 -07:00
Diego Biurrun
82ee14d2ce ppc: dsputil: comment formatting and wording/grammar improvements 2014-03-20 05:03:22 -07:00
Diego Biurrun
cce791b17b hpeldsp_template: Merge some declarations and initializations 2014-03-20 05:03:22 -07:00
Diego Biurrun
2539cf1c81 hpeldsp_template: K&R formatting cosmetics 2014-03-20 05:03:22 -07:00
Diego Biurrun
2972087e39 hpel_template: Drop some unnecessary parentheses 2014-03-20 05:03:22 -07:00
Diego Biurrun
e8eace3276 hpel_template: K&R formatting cosmetics 2014-03-20 05:03:22 -07:00
Michael Niedermayer
3d04b1aab1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  float-dsp-test: do not use C99's predefined  __func__

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 12:53:41 +01:00
Janne Grunau
6a74ebc34d float-dsp-test: do not use C99's predefined __func__ 
It is not supported by all compilers on FATE. Fixes "some test were
skipped" errors.
 2014-03-20 11:16:06 +01:00
James Almer
32291ba6ea swresample: add swri_resample_float_sse 
At least two times faster than the C version.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-20 06:01:06 +01:00
Ben Avison
e555e1bc39 truehd: tune VLC decoding for ARM. 
Profiling on a Raspberry Pi revealed the best performance to correspond
with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function
in particular are as follows:

              Before          After
              Mean   StdDev   Mean   StdDev  Confidence  Change
6:2 total     348.8  20.1     339.6  15.1    88.8%       +2.7%  (insignificant)
6:2 function  38.1   8.1      26.4   4.1     100.0%      +44.5%
8:2 total     339.1  15.4     324.5  15.5    99.4%       +4.5%
8:2 function  33.8   7.0      27.3   5.6     99.7%       +23.6%
6:6 total     604.6  20.8     572.8  20.6    100.0%      +5.6%
6:6 function  95.8   8.4      68.9   8.2     100.0%      +39.1%
8:8 total     766.4  17.6     741.5  21.2    100.0%      +3.4%
8:8 function  106.0  11.4     86.1   9.9     100.0%      +23.1%

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-19 22:24:32 +01:00