RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
63,599 Commits 36 Branches 392 Tags 314 MiB
Commit Graph

28653 Commits

Author SHA1 Message Date
Carl Eugen Hoyos ca2ec98cbe Do not overwrite the sample format with AV_SAMPLE_FMT_NONE in libspeex_decode_init(). 
Fixes a regression since ef48ac65 when decoding speex in f4v, reported
by irc user massdos.
 2014-05-30 07:38:19 +02:00
Michael Niedermayer 772d46d3b3 avcodec/qpeldsp: Restore author attribution 
See: 368f50359e
See:
similarity index 51%
copy from libavcodec/dsputil.c
copy to libavcodec/qpeldsp.c
index 6d41dfc..0beeab8 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/qpeldsp.c
@@ -1,9 +1,5 @@
 /*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP functions
  *
  * This file is part of FFmpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 04:05:40 +02:00
Michael Niedermayer 8c891d90ca avcodec/x86/qpeldsp_init: Restore author attribution 
See: 368f50359e
See: 44eb495128, and many others
See:
similarity index 83%
copy from libavcodec/x86/dsputil_init.c
copy to libavcodec/x86/qpeldsp_init.c
index ebbf97f..8f296a1 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/qpeldsp_init.c
@@ -1,6 +1,5 @@
 /*
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP functions
  *
  * This file is part of FFmpeg.
  *

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 04:05:29 +02:00
Michael Niedermayer b15a3cc575 qpel_template: Restore author attribution 
See: 368f50359e
See: 59fe111e81
See:
similarity index 98%
rename from libavcodec/dsputil_template.c
rename to libavcodec/qpel_template.c
index 95d966e..500c75b 100644
--- a/libavcodec/dsputil_template.c
+++ b/libavcodec/qpel_template.c
@@ -1,9 +1,5 @@
 /*
- * DSP utils
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
- *
- * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
+ * quarterpel DSP function templates
  *
  * This file is part of FFmpeg.
  *

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 04:05:13 +02:00
Michael Niedermayer 98a6806fdd Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a' 
* commit '368f50359eb328b0b9d67451f56fda20b3255f9a':
  dsputil: Split off quarterpel bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/h263dec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/qpeldsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 02:43:34 +02:00
Michael Niedermayer d35899ccce Merge commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b' 
* commit 'cb52a17cb62297802b0a77e5af9850d87c3f925b':
  dsputil: Move Bink-specific add_pixels8 to binkdsp

Conflicts:
	libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 01:23:04 +02:00
Michael Niedermayer 40f3a87c10 Merge commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3' 
* commit '054013a0fc6f2b52c60cee3e051be8cc7f82cef3':
  dsputil: Move APE-specific bits into apedsp

Conflicts:
	libavcodec/arm/int_neon.S
	libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 00:59:15 +02:00
Michael Niedermayer 5c6e94c42b Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b' 
* commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b':
  dsputil: Move mspel_pixels_tab to the only place it is used

Conflicts:
	libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 00:42:36 +02:00
Michael Niedermayer a9a312d299 Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd' 
* commit '3832a6590156e6abc575bed51cbffa78617ee5fd':
  dsputil: Move ff_alternate_*_scan tables to mpegvideo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 00:30:45 +02:00
Michael Niedermayer c814a6c778 avcodec/x86/svq1enc_mmx: Add author attribution 
See: 5900637219
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 00:30:05 +02:00
Michael Niedermayer ea0931fb96 Merge commit '65d5d5865845f057cc6530a8d0f34db952d9009c' 
* commit '65d5d5865845f057cc6530a8d0f34db952d9009c':
  dsputil: Move SVQ1 encoding specific bits into svq1enc

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-30 00:01:45 +02:00
Michael Niedermayer cb8763bda7 Merge commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e' 
* commit '2ea2612df508abdd1f97c6a6ef56275a52c5c41e':
  svq1enc: Rename SVQ1Context to SVQ1EncContext

Conflicts:
	libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 23:50:56 +02:00
James Almer 02a3e327f1 x86/dsputilenc: add missing guards to ff_pix_sum16_xop 
XOP support was added in Yasm 1.0.0 and Nasm 2.06, and we still
support older versions.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 22:31:28 +02:00
Christophe Gisquet 99a319c4e7 x86: huffyuvdsp: port add_bytes to yasm 
C   MMX  SSE2
Cycles: 2972  587  302

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 21:56:00 +02:00
Christophe Gisquet 2267003981 x86: hpeldsp: better factorization 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 21:47:40 +02:00
Michael Niedermayer 7b4c46050e rename add_hfyu_left_prediction_int16 to add_hfyu_left_pred_int16 
This makes the naming more consistent with the 8bit variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 19:50:44 +02:00
Michael Niedermayer 550ae6c02f rename add_hfyu_median_prediction_int16 to add_hfyu_median_pred_int16 
This makes the naming more consistent with the 8bit variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 19:49:29 +02:00
Michael Niedermayer 40a4ab8ba4 rename sub_hfyu_median_prediction_int16 to sub_hfyu_median_pred_int16 
This makes the naming more consistent with the 8bit variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 19:48:23 +02:00
James Almer 05de4d3011 x86/dsputilenc: implement XOP version of pix_sum16 
SSE2: 137 cycles
XOP:   87 cycles
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 18:40:23 +02:00
Michael Niedermayer fba0ac2805 avcodec/dpx_parser: Allow frame size to be too small 
Fixes Ticket3402

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 17:28:06 +02:00
Michael Niedermayer 8df5d9aabf avcodec/dpx_parser: fix flushing end out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 17:22:26 +02:00
Michael Niedermayer f518fb3318 avcodec/dpx_parser: reset index when finding a startcode, not after 
This is simpler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 17:18:47 +02:00
Diego Biurrun 368f50359e dsputil: Split off quarterpel bits into their own context 2014-05-29 06:48:31 -07:00
Diego Biurrun cb52a17cb6 dsputil: Move Bink-specific add_pixels8 to binkdsp 2014-05-29 06:48:08 -07:00
Diego Biurrun 054013a0fc dsputil: Move APE-specific bits into apedsp 2014-05-29 06:41:15 -07:00
Diego Biurrun 256da0770e dsputil: Move mspel_pixels_tab to the only place it is used 2014-05-29 06:41:15 -07:00
Diego Biurrun 3832a65901 dsputil: Move ff_alternate_*_scan tables to mpegvideo 2014-05-29 06:41:15 -07:00
Diego Biurrun 65d5d58658 dsputil: Move SVQ1 encoding specific bits into svq1enc 2014-05-29 06:41:15 -07:00
Diego Biurrun 2ea2612df5 svq1enc: Rename SVQ1Context to SVQ1EncContext 
This allows making it visible without name clashes.
 2014-05-29 06:41:14 -07:00
Christophe Gisquet 25e6310a3e huffyuv: change left prediction access in BGRA 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 14:46:21 +02:00
Christophe Gisquet c609f803e1 huffyuv: avoid duplicated defines 
Move the defines to the dsp header.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 14:08:35 +02:00
Michael Niedermayer b50559fc0b libavcodec/x86/dsputilenc: drop and 0xffff that should have becomei redundant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 00:16:52 +02:00
James Almer 561bfc85eb x86/dsputilenc: implement SSE2 versions of pix_{sum16, norm1} 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 23:29:34 +02:00
Christophe Gisquet 0810608e23 x86: hevc_mc: better register allocation 
The xmm reg count was incorrect, and manual loading of the gprs
furthermore allows to noticeable reduce the number needed.

The modified functions are used in weighted prediction, so only a
few samples like WP_* exhibit a change. For this one and Win64
(some widths removed because of too few occurrences):

WP_A_Toshiba_3.bit, ff_hevc_put_hevc_uni_w
         16    32
before: 2194  3872
after:  2119  3767

WP_B_Toshiba_3.bit, ff_hevc_put_hevc_bi_w
         16    32    64
before: 2819  4960  9396
after:  2617  4788  9150

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 17:39:34 +02:00
Michael Niedermayer ec33f59fed avcodec/mjpegdec: Support pix_fmt_id== 0x42111100 
Fixes: 538782_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 16:36:04 +02:00
Michael Niedermayer 175aeab0b4 Merge commit 'b5aa48551300eed678aaea86ced7086758598a35' 
* commit 'b5aa48551300eed678aaea86ced7086758598a35':
  ppc: Move vec_unaligned_load macro to util_altivec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 14:53:55 +02:00
Michael Niedermayer 40beec6a43 Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0' 
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
  flac: make avpriv_flac_parse_block_header() inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:33:49 +02:00
Diego Biurrun b5aa485513 ppc: Move vec_unaligned_load macro to util_altivec 
This allows reusing it from multiple files.
 2014-05-28 03:29:33 -07:00
Michael Niedermayer ef13967e60 Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362' 
* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362':
  flacdec: do not overwrite a channel layout set by the caller

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 12:20:12 +02:00
Anton Khirnov 5fdaf312c5 flac: make avpriv_flac_parse_block_header() inline 
This avoids all the ABI troubles associated with avpriv_.
Since this function is very small and does not depend on any tables,
making it inline should have no adverse effects.
 2014-05-28 07:48:30 +02:00
Anton Khirnov f13ffb6636 flacdec: do not overwrite a channel layout set by the caller 
The channel layout mask for non-standard layouts is typically stored at
the container level (as a vorbiscomment tag) for FLAC.
 2014-05-28 07:46:04 +02:00
Michael Niedermayer 48a6916308 Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c' 
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
  dsputil: Split off HuffYUV encoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvenc.c
	libavcodec/pngenc.c
	libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-28 00:03:59 +02:00
Michael Niedermayer e2abc0d5ca Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d' 
* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
  dsputil: Split off HuffYUV decoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvdec.c
	libavcodec/lagarith.c
	libavcodec/vble.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 23:16:06 +02:00
Michael Niedermayer 43c57dbe14 Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58' 
* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
  h264_picture: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 22:34:16 +02:00
Michael Niedermayer d84286b1ea Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0' 
* commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0':
  on2avc: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 22:29:11 +02:00
Michael Niedermayer 2870617853 avcodec/vp3: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Michael Niedermayer 0674da997a avcodec/cavs: use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 20:42:50 +02:00
Diego Biurrun 512f3ffe9b dsputil: Split off HuffYUV encoding bits into their own context 
Also shorten HuffYUV context member names to avoid clutter.
 2014-05-27 08:54:53 -07:00
Diego Biurrun 0d439fbede dsputil: Split off HuffYUV decoding bits into their own context 
Also shorten HuffYUV context member names to avoid clutter.
 2014-05-27 08:52:34 -07:00
James Almer 5863207086 x86/dsputilenc: use HADDD in ff_sse16_sse2 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-27 15:12:50 +02:00