Commit Graph
100 Commits
Author SHA1 Message Date
Vitor Sessak c8e0861e49 Use the same 8 bit -> 16 bit conversion as QuickTime.
Originally committed as revision 15245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:46:55 +00:00
Vitor Sessak 4ea70242a8 Do not share context variables between channels and do not zero them at
decode_frame(). This makes the output much closer to that of the binary decoder.

Originally committed as revision 15244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:42:57 +00:00
Vitor Sessak b6d544f54e Remove output pointer from context
Originally committed as revision 15243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 09:38:37 +00:00
Vitor Sessak 4fdb41a84b Test a var for overflow just after it is set
Originally committed as revision 15223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 11:46:29 +00:00
Vitor Sessak a90fbeec2a Remove useless parentheses.
Originally committed as revision 15222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 11:45:10 +00:00
Vitor Sessak e10049bef5 Cosmetics: indent after last commit and remove useless braces
Originally committed as revision 15214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 00:01:23 +00:00
Vitor Sessak 1b0dc0120d Simplify: use a for instead of unrolling by hand
Originally committed as revision 15213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 00:00:20 +00:00
Vitor Sessak fb17d9ff54 Functions mace{3,6}_decode_frame() are just wrappers to Exp1to{3,6}(). This commit
moves the code of Exp1to* to the decode functions.

Originally committed as revision 15212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:54:57 +00:00
Vitor Sessak 78df225866 Simplify: use two distinct functions to decode MACE3 and MACE6, since the
previous mace_decode_init() function was almost just a switch statement.

Originally committed as revision 15208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:18:28 +00:00
Vitor Sessak b97c413832 Simplify mace_decode_frame()
Originally committed as revision 15207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:12:20 +00:00
Vitor Sessak 647148c638 Remove useless comments
Originally committed as revision 15205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:02:08 +00:00
Vitor Sessak 251d75f292 Reindent mace.c, its indentation was completly inconsistent with the coding rules.
Originally committed as revision 15204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:00:34 +00:00
Vitor Sessak 82ab49dc41 Cosmetics: s/LPC_type/LPC_TYPE/
Originally committed as revision 15202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 22:17:27 +00:00
Vitor Sessak 1775c7fac6 Multiply table by -1. This avoid doing this calculation (that was introduced
in my last commit) in real time.

Originally committed as revision 15195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 15:04:08 +00:00
Vitor Sessak 1be0fc2909 Avoid duplicating compute_lpc_coefs() function in both the RA288 and AAC decoders.
Originally committed as revision 15193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 11:03:14 +00:00
Vitor Sessak f6a1ca1dad Misc cosmetics in compute_lpc_coefs(): braces removal and empty lines
Originally committed as revision 15093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:39:55 +00:00
Vitor Sessak fc324cd523 Remove useless var in compute_lpc_coefs()
Originally committed as revision 15091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:37:04 +00:00
Vitor Sessak 5d2dd90848 Merge declaration and initialization of a few vars in compute_lpc_coefs()
Originally committed as revision 15088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:31:05 +00:00
Vitor Sessak f991d423d2 Remove useless zeroing of a buffer
Originally committed as revision 15038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 21:12:30 +00:00
Vitor Sessak 9b0d3e0e03 Import more MXF muxer code from the SoC tree
Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 20:28:12 +00:00
Vitor Sessak 6986662b5f Import more ok'ed chunks of the mxf muxer from the soc tree
Originally committed as revision 14938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 05:55:46 +00:00
Vitor Sessak 9b9466b0cd Apply parts of MXF muxer ok'ed by Michael
Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 04:12:52 +00:00
Vitor Sessak b888abe1be Cosmetics: rename loop counters in eval_refl()
Originally committed as revision 14653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 21:19:30 +00:00
Vitor Sessak bdb34c9f5e Simplify eval_refl(): do not store a buffer value in a var when the buffer could be used directly
Originally committed as revision 14652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 21:16:24 +00:00
Vitor Sessak aa425ada54 Simplify eval_refl(): s/b == 0/!b/
Originally committed as revision 14651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 21:04:40 +00:00
Vitor Sessak 40812fdcf1 Simplify range checking in eval_refl(). Before the
condition b == 0 could never be true, because it would
have already been caught in the previous ifs. Also the
condition b == 0x1000 could never be true (it would
triggered the return).

Originally committed as revision 14650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 21:02:56 +00:00
Vitor Sessak d70875c81d Cosmetics: reindent
Originally committed as revision 14649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 20:39:28 +00:00
Vitor Sessak 7e05617a5c Simplify do_output_subblock(): Remove a unneeded memcpy
Originally committed as revision 14648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 20:38:23 +00:00
Vitor Sessak c0f0b34bba Simplify eval_refl(): return directly when needed instead of storing the return value in a variable
Originally committed as revision 14640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 05:24:21 +00:00
Vitor Sessak 2f1cad0e58 Simplify rms(): merge a few operations in the same statement
Originally committed as revision 14639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 05:11:46 +00:00
Vitor Sessak b4d46e8c06 Cosmetical simplification in t_sqrt()
Originally committed as revision 14638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 05:08:48 +00:00
Vitor Sessak 438abdaaeb Check available size before writing in decode_frame()
Originally committed as revision 14637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 05:06:10 +00:00
Vitor Sessak 8089c652a7 Check *data_size in decode_frame()
Originally committed as revision 14636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 03:00:15 +00:00
Vitor Sessak 5991704634 Cosmetics: alignment
Originally committed as revision 14635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 02:49:22 +00:00
Vitor Sessak e3751aa6ec Flip (by making buf[i] -> buf[size-i-1]) two buffers: {sp,gain}_block. This
needs duplicating a few loops, but now the code is clearer.

Originally committed as revision 14634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 02:44:59 +00:00
Vitor Sessak 6888b4fcec Rename prodsum() function to convolve()
Originally committed as revision 14615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 04:52:33 +00:00
Vitor Sessak 4ca7e74c1f Do not declare a counter as unsigned when it is not needed
Originally committed as revision 14469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 18:22:31 +00:00
Vitor Sessak 4e33ed368a Cosmetics: rename loop counter vars to i,j
Originally committed as revision 14468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 18:20:49 +00:00
Vitor Sessak 6c9c8b06b3 Cosmetics: rename loop counter vars to i,j
Originally committed as revision 14467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 18:07:11 +00:00
Vitor Sessak 045e21cc19 Cosmetics: new line
Originally committed as revision 14457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 10:49:44 +00:00
Vitor Sessak e7e4f476c0 Remove the now useless phase variable from context
Originally committed as revision 14456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 10:49:14 +00:00
Vitor Sessak c749f3db98 Cosmetics: make comment match var name
Originally committed as revision 14454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 05:18:39 +00:00
Vitor Sessak 6509507fad Cosmetics: align comments
Originally committed as revision 14453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 05:16:51 +00:00
Vitor Sessak f285e6dd31 Rename two context vars: s/sb/sp_block/, s/lhist/gain_block/
Originally committed as revision 14452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:53:05 +00:00
Vitor Sessak 36826ee0df Declare temporary buffers to be only of the necessary size
Originally committed as revision 14451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:37:58 +00:00
Vitor Sessak 5e707c5905 Remove redundant comments
Originally committed as revision 14450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:25:51 +00:00
Vitor Sessak c6ad13044a Cosmetics: do not align with now removed next instruction
Originally committed as revision 14449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:24:08 +00:00
Vitor Sessak 2c46367163 Cosmetics: remove braces and useless newline
Originally committed as revision 14448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 04:07:18 +00:00
Vitor Sessak 2b356efec2 Change the way the input is passed to do_hybrid_filter(). Before, in[0] was
the oldest input sample passed and in[n-1] was the latest. Now it is the
contrary. This allows making backward_filter() somewhat simpler.

Originally committed as revision 14447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 02:55:47 +00:00
Vitor Sessak aed39f6c02 Remove RA288Context.output buffer. This buffer is just RA288Context.sb
backwards (output[i] == sb[N-i], where N is the buffer length).

This makes the code slower, this will be fixed in my next commit.

Originally committed as revision 14446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-28 02:53:07 +00:00
Vitor Sessak b26d320583 Add a few comments pointing to the G.728 specification
Originally committed as revision 14444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 22:22:51 +00:00
Vitor Sessak 854ce441c3 Remove the history buffer from the context. It can easily be evaluated
from the lhist buffer.

Originally committed as revision 14443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 22:21:41 +00:00
Vitor Sessak 0143ec2a7e Rename two context buffers: pr{1,2} -> {sp,gain}_lpc. Also add a few doxy
comments.

Originally committed as revision 14437 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 20:58:29 +00:00
Vitor Sessak 59da0390dc Remove st1 and st2 temporary buffers in backward_filter() and use instead
RA288Context.pr{1,2}. Note that the pr{1,2} buffers are one unity smaller
than the st{1,2} buffers. My guess is that the original coder decided to
add one to the array sizes "just to be sure".

Originally committed as revision 14435 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 20:55:27 +00:00
Vitor Sessak 3df136d438 Change slightly the meaning of RA288Context.phase. This
allows to remove two intermediary buffers and avoid a few
memcpy's.

Originally committed as revision 14432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 20:35:32 +00:00
Vitor Sessak f42eb5715d Remove st1 and st2 variables from context, since they could be just local vars
Originally committed as revision 14421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 15:14:50 +00:00
Vitor Sessak 272d258ab9 Rename st{1,2}{a,b} context variables to more meaningful names: {sp,gain}_{rec,hist}
Originally committed as revision 14420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 15:10:17 +00:00
Vitor Sessak efa86ebe4c Cosmetics: remove useless parenthesis
Originally committed as revision 14418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 14:38:29 +00:00
Vitor Sessak e07c5ade5e Move colmult() function to the beginning of file to group DSP-related functions.
Originally committed as revision 14417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 14:35:50 +00:00
Vitor Sessak 5af20c207e Remove an useless comment describing colmult()
Originally committed as revision 14416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 14:33:53 +00:00
Vitor Sessak d899014ee2 Remove an useless comment describing prodsum()
Originally committed as revision 14415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 14:33:25 +00:00
Vitor Sessak 952a980d75 Give the context variables of ra288 a better name: s/glob/ractx/
Originally committed as revision 14414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 14:31:47 +00:00
Vitor Sessak 029e1c01b5 Give the context structure of ra288 a better name: s/Real288_internal/RA288Context/
Originally committed as revision 14413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 14:29:39 +00:00
Vitor Sessak a53b545068 Cosmetics: grammar nits
Originally committed as revision 14368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 11:55:01 +00:00
Vitor Sessak 2477d60944 Rename update() function to backward_filter() and add a doxy comment
Originally committed as revision 14364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 04:29:23 +00:00
Vitor Sessak a6755f8d53 Rename and comment bandwidth broadening tables
(s/table1a/syn_bw_tab/, s/table2a/gain_bw_tab/).

Originally committed as revision 14363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 04:15:50 +00:00
Vitor Sessak 5e65f5df0e Follow FFmpeg convention of returning negative values on error in eval_lpc_coeffs()
Originally committed as revision 14362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 04:07:50 +00:00
Vitor Sessak a3896c6377 Rename pred() to eval_lpc_coeffs() and add a doxy comment
Originally committed as revision 14361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 04:05:41 +00:00
Vitor Sessak a0cce1587b Give windowing tables a more descriptive name
(s/table1/syn_window/, s/table2/gain_window/).

Originally committed as revision 14360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 03:50:06 +00:00
Vitor Sessak 475d0e1464 Add comments to do_hybrid_window()
Originally committed as revision 14359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 03:28:42 +00:00
Vitor Sessak 0f72a2b7d3 Give parameters of do_hybrid_window() more meaningful names
Originally committed as revision 14358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 03:28:01 +00:00
Vitor Sessak 427981c7a6 Rename co() function to the much more descriptive name of
do_hybrid_window(). Also change a misleading and wrong comment.

Originally committed as revision 14357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 03:23:51 +00:00
Vitor Sessak 5ab3d66fe5 Simplify co(): write constant in a more readable way
Originally committed as revision 14356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 03:22:19 +00:00
Vitor Sessak bf75ac57b8 Simplify co(), use memcpy/memmove and colmult() when useful.
Originally committed as revision 14355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 03:19:52 +00:00
Vitor Sessak 144b46f21b My commit at r14340 was not the right solution. For a monochromatic
frame, there will be only one centroid and it will be impossible to
find three distinct ones. It is better to just avoid shifting if
there are not three different centroids.

Originally committed as revision 14343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 05:54:34 +00:00
Vitor Sessak 6de727244c Do declaration and initialization separately in elbg.c
to workaround an ICC bug.

Originally committed as revision 14342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 03:56:13 +00:00
Vitor Sessak 6bf8b04764 When picking a "high utility centroid" do not pick one
that has no corresponding points. Not only it is the
worst possible pick, but also the code was written
without this case in mind.

Originally committed as revision 14341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 03:55:37 +00:00
Vitor Sessak 5916af1954 The codebook generator algorithm involves picking three
different codebook centroids ("high utility", "low
utility" and "closest to the low utility one"). This
change avoid the corner case of choosing two times the
same centroid.

Originally committed as revision 14340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 03:54:31 +00:00
Vitor Sessak 9f59e608d2 Cosmetics: alignment
Originally committed as revision 14304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 15:43:34 +00:00
Vitor Sessak 3c617380e7 Simplify co(): do not abuse pointer aritmetics
Originally committed as revision 14303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 15:41:15 +00:00
Vitor Sessak 6bc5714be6 Simplify co(): remove variables that are only used once
Originally committed as revision 14301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 15:32:29 +00:00
Vitor Sessak 34e0d78936 Set avctx->coded_frame in RoQ encoder. At some point in
the SVN history this became mandated. Fix issue 548.

Originally committed as revision 14287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 02:43:23 +00:00
Vitor Sessak 96e8987e5b Simplify: do not overuse pointer aritmetic
Originally committed as revision 14271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 23:48:53 +00:00
Vitor Sessak c52d2da905 Declare parameters of pred() that could be const as such
Originally committed as revision 14270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 23:02:52 +00:00
Vitor Sessak efa85e5e45 Another simplification
Originally committed as revision 14269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 23:01:31 +00:00
Vitor Sessak 4a51e06bfc Simplify
Originally committed as revision 14268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 22:59:53 +00:00
Vitor Sessak 02a1eb9329 Simplify
Originally committed as revision 14267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 22:42:21 +00:00
Vitor Sessak e4265007a6 Declare function parameters as const
Originally committed as revision 14266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 22:39:29 +00:00
Vitor Sessak 0e3510a31f Revert r14218. FFMAX is a macro, so
sum = FFMAX(1, scalar_product(...));
might calculate the scalar product twice, which is slower.

Originally committed as revision 14230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 14:41:01 +00:00
Vitor Sessak b903a9285e Simplify
Originally committed as revision 14218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 20:41:09 +00:00
Vitor Sessak 3819081f75 Another av_clipf() usage
Originally committed as revision 14217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 20:39:55 +00:00
Vitor Sessak aa64ee30d1 Do not declare as double a var that only stores a float
Originally committed as revision 14216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 20:38:42 +00:00
Vitor Sessak 1894db1487 Simplify: use FFMAX
Originally committed as revision 14215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 20:36:32 +00:00
Vitor Sessak 4138ad961c Add av_clipf() function to common.h and use it in ra288.c
Originally committed as revision 14213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 19:59:44 +00:00
Vitor Sessak 5be30c59da Simplify: glob->phase is always == 3
Originally committed as revision 14094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 14:23:30 +00:00
Vitor Sessak f27f0fc374 Cosmetics: reindent tables
Originally committed as revision 14093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 14:16:21 +00:00
Vitor Sessak f803495415 Remove phasep context var, it is just phase*5
Originally committed as revision 14092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 12:03:21 +00:00
Vitor Sessak eb73742d6e Slighly faster operation
Originally committed as revision 14091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 12:01:59 +00:00
Vitor Sessak 0bbab5671d Typo in a comment: s/two avoid/to avoid/
Originally committed as revision 14090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 10:49:28 +00:00
Vitor Sessak 8edfd15175 Cosmetics: remove braces
Originally committed as revision 14089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 10:35:01 +00:00