virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
43,797 Commits 37 Branches 400 Tags 464 MiB
e3f941cb03
Commit Graph

68 Commits

Author SHA1 Message Date
Peter Meerwald
9abc80f1ed libavcodec: Make use of av_clip functions 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-21 00:54:40 +01:00
Claudio Freire
f4d0a63b5b aacenc: Fix target bitrate for twoloop quantiser search 
This fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 12:42:04 +03:00
Diego Biurrun
6f6b0311a3 avcodec: Drop some silly commented-out av_log() invocations 2012-10-01 10:24:28 +02:00
Reimar Döffinger
0f96f0d996 aacenc: Fix issues with huge values of bit_rate. 
Do not pointlessly call ff_alloc_packet multiple times,
and fix an infinite loop by clamping the maximum
number of bits to target in the algorithm that does
not use lambda.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-04-17 10:25:28 -04:00
Diego Biurrun
a92be9b856 Replace memset(0) by zero initializations. 
Also remove one pointless zero initialization in rangecoder.c.
 2012-03-28 09:38:33 +02:00
Nathan Caldwell
80d44277e6 aacenc: Move Q^3/4 calculation to it's own table 
This should be moved to tablegen at some point.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2012-01-23 11:40:46 -08:00
Nathan Caldwell
207bf44d16 aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2012-01-23 11:40:45 -08:00
Mans Rullgard
85770d6e56 Add libavutil/mathematics.h #includes for INFINITY 
This fixes build errors in some environments.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-22 16:36:44 +00:00
Nathan Caldwell
0bc01cc9fe psymodel: Add channels and channel groups to the psymodel. 2011-06-29 14:28:52 -07:00
Alex Converse
8dbaa5bd69 aacenc: Fix codebook trellising for zeroed bands. 
Choose band type (codebook) zero, count its bits, and mark the other
states as unnavigable.
 2011-06-27 21:47:45 -07:00
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Reinhard Tartler
083e715f33 aac: workaround for compilation on cygwin 
On cygwin, math.h needs to be included before float.h because of a bug
in the system headers. Including libavutil/libm.h first works around
this issue.

Longer discussion of the topic:
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/128582
 2011-05-11 14:38:14 +02:00
Alex Converse
d70fa4c423 Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead 
of hardcoding 200 everywhere.
 2011-04-27 12:39:37 -04:00
Michael Niedermayer
30fe971934 aac: add headers needed for log2f() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-04-26 08:33:21 +02:00
Young Han Lee
57cc1ad35f aacenc: reduce the number of loop index variables 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-04-04 09:12:37 +02:00
Young Han Lee
00f0b4b92e aacenc: indentation 2011-03-24 21:13:29 -07:00
Young Han Lee
92efa2bdd9 aacenc: fix the side calculation in search_for_ms 2011-03-24 21:12:23 -07:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Nathan Caldwell
4afedfd8e5 aacenc: cosmetics, indentation, and comment clarification 
Correct bad indentation in aaccoder
Clarify and correct comments in 3GPP psymodel, other cosmetics.
 2011-03-16 23:35:39 -04:00
Young Han Lee
f578854efc aaccoder: Change FFMAX for allzero flag to OR bit operation 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-16 23:12:43 -04:00
Alex Converse
63e1278d88 aacenc: TLS: Save maximum values for each swb in a table. 
This gives an almost 20% speedup.

Originally committed as revision 24484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 17:11:51 +00:00
Alex Converse
031d5cea04 10l: Remove some commented out code that slipped in. 
Originally committed as revision 24483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 17:01:50 +00:00
Alex Converse
fe461767e6 aacenc: TLS: Try to preserve some energy in each non-zero band. 
Reduce scalefactors in non-zero bands that underflow by twice as much as those
in bands that just fail to hit psy targets.

Originally committed as revision 24482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 16:36:01 +00:00
Alex Converse
c226fc5bfb aacenc: Prevent premature termination of the two loop search. 
Originally committed as revision 24476 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 04:23:26 +00:00
Alex Converse
51ffd3a62f aacenc: Favor log2f() and sqrtf() over log2() and sqrt(). 
Originally committed as revision 24473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 02:10:59 +00:00
Alex Converse
04d72abf17 aacenc: Factorize some scalefactor utilities. 
Originally committed as revision 24472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-23 22:37:42 +00:00
Alex Converse
581a96976b aacenc: Convert if () abort() to assert(). 
Originally committed as revision 24336 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 20:53:58 +00:00
Alex Converse
6d9f1b67e8 Cosmetics: Whitespace 
Originally committed as revision 24333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 18:37:45 +00:00
Alex Converse
a2310d1e41 10l: Add a missing const. 
Originally committed as revision 24274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-16 20:28:55 +00:00
Alex Converse
1676b09994 aacenc: Template quantize_and_encode_band_cost(). 
Originally committed as revision 24273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-16 20:02:46 +00:00
Alex Converse
804d489c4a aacenc: Fill in the estimated codebook for the final computed scalefactor in the TLS. 
Originally committed as revision 23869 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 21:42:57 +00:00
Alex Converse
c91dce994d aacenc: Remove an unnecessary division from the TLS. 
Originally committed as revision 23368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-28 21:29:56 +00:00
Alex Converse
911fbc452b Cosmetics: whitespace 
Originally committed as revision 23367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-28 20:45:35 +00:00
Alex Converse
04d6a54e13 aacenc: Remove unnecessary variables and scopes in the TLS. 
Originally committed as revision 23366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-28 20:42:01 +00:00
Alex Converse
9069b7d35f Fix declaration after statement 
Originally committed as revision 23331 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 23:25:29 +00:00
Alex Converse
0ecfa7b7c7 aacenc: Split find_max_val() from find_min_book() to eliminate duplicate searches. 
Originally committed as revision 23322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 18:35:01 +00:00
Alex Converse
af2ee6fc49 Remove useless costly inf checks from the trellis scalefactor search. 
Originally committed as revision 23319 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 18:32:59 +00:00
Alex Converse
acc9f51fe1 aacenc: Trellis over scalefactors using an estimated codebook rather than every codebook. 
The minimal codebook to encode the band without clipping is used (as is done in the TLS).

Originally committed as revision 23318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 18:31:55 +00:00
Alex Converse
144c5e3dd2 aacenc: Only trellis over a column of 61 scalefactors (reduced from 256). 
This still provides plenty of dynamic range, makes every move legal, and greatly reduces the search space.

Originally committed as revision 23317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 18:28:18 +00:00
Alex Converse
05e659ef83 aacenc: Factor out find_min_book so it can be used by multiple coefficient coders. 
Originally committed as revision 23316 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-25 18:24:16 +00:00
Alex Converse
0175d7886f fmaxf -> FFMAX to fix pre-C99 systems 
Originally committed as revision 23138 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-14 19:38:17 +00:00
Alex Converse
759510e6af aacenc: Add a rate only trellis for codebook selection for the TLS. 
Originally committed as revision 23136 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-14 16:49:51 +00:00
Alex Converse
4d986b7172 aacenc: Use exact values when quantizing, not fuzzy values. 
This requires us to code small escapes; we can't avoid it.

Originally committed as revision 23135 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-14 16:49:40 +00:00
Alex Converse
51cbabc792 aacenc: Use an estimated codebook for the TLS (two loop search). 
Originally committed as revision 23134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-14 16:49:30 +00:00
Alex Converse
46174079c9 10l: store the result of clipping added in r23035 
Originally committed as revision 23037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-06 20:38:42 +00:00
Alex Converse
32fa7725d2 Make the faac inspired quantizer search make sense for a slightly narrower definition of "make sense." 
Originally committed as revision 23035 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-06 20:18:36 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Alex Converse
508f092a78 aacenc: Merge quantize_band_cost() with quantize_and_encode_band(). 
If these two functions aren't matched results may be unexpected.

Originally committed as revision 22655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-24 17:09:21 +00:00
Alex Converse
f5e82fec3d aacenc: Use preprocessor constants for trellis states and stages. 
Originally committed as revision 19948 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 04:32:51 +00:00
Alex Converse
9072c29e40 aacenc: Split paths in the scalefactor selection trellis into a 2-D array. 
Originally committed as revision 19947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-21 04:15:12 +00:00