Commit Graph

283 Commits

Author SHA1 Message Date
Luca Abeni
434f2c18e8 Increase the av_log() levels, and add some documentation for them
Originally committed as revision 7614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 20:47:10 +00:00
Alex Beregszaszi
a3550abd08 add AV_WB/WL for lswriting, similar to AV_RB/RL (also increment version)
Originally committed as revision 7588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:26:10 +00:00
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
Michael Niedermayer
50b4468598 change while loops to do-while as the condition is true the first time and the check just wastes cpu cycles
Originally committed as revision 7576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-18 00:22:24 +00:00
Michael Niedermayer
4497712f09 simpler branch structure in init (16 bytes smaller object file)
Originally committed as revision 7575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 20:14:02 +00:00
Michael Niedermayer
be65b41f90 doxygenize
Originally committed as revision 7574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 20:12:12 +00:00
Michael Niedermayer
3da97cfdfc avoid code duplication
Originally committed as revision 7573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 20:11:23 +00:00
Michael Niedermayer
0726982cdb better to set things to NULL instead of random in case of out of mem
Originally committed as revision 7572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 20:06:38 +00:00
Michael Niedermayer
96e39edc59 simplify av_fifo_realloc()
Originally committed as revision 7571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 20:05:31 +00:00
Michael Niedermayer
765d4f3b4a remove near duplicate function
Originally committed as revision 7570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 19:46:33 +00:00
Michael Niedermayer
870a12d1c2 simplify
Originally committed as revision 7569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 19:30:23 +00:00
Michael Niedermayer
f81b99b82b simplify
Originally committed as revision 7568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 19:19:03 +00:00
Michael Niedermayer
ca2560dff6 10l (aes_crypt -> av_aes_crypt)
Originally committed as revision 7559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-17 00:49:48 +00:00
Michael Niedermayer
97f6d1545e fix CONFIG_SMALL again
Originally committed as revision 7554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 19:50:49 +00:00
Michael Niedermayer
5d1b539348 30byte smaller object file
Originally committed as revision 7553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 19:30:43 +00:00
Michael Niedermayer
519773e3a5 10l typo
Originally committed as revision 7552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 19:18:50 +00:00
Michael Niedermayer
6eb7df5c6d public API
Originally committed as revision 7551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 19:14:27 +00:00
Michael Niedermayer
97e3458c46 cbc support
Originally committed as revision 7550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 19:08:52 +00:00
Michael Niedermayer
2d3475ae6a avoid memcpy()
Originally committed as revision 7549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:58:11 +00:00
Michael Niedermayer
7465619af8 give crypt a src and dst
same speed, 100bytes larger object file

Originally committed as revision 7548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:51:54 +00:00
Michael Niedermayer
b0642c7409 change subshift a little, this reduces the object size a litlle
Originally committed as revision 7546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:40:40 +00:00
Michael Niedermayer
298dd6b7c8 use 2 state arrays so that fewer temporary variables are needed
Originally committed as revision 7545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 17:17:05 +00:00
Michael Niedermayer
cc6b4da83a remove useless parameter
Originally committed as revision 7544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 16:29:01 +00:00
Michael Niedermayer
14bc38498a unused variable
Originally committed as revision 7543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-16 16:24:43 +00:00
Michael Niedermayer
1aa72a703c merge shift into mix
this need -fno-strict-aliasing to work (needs to be fixed of course)

Originally committed as revision 7534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 13:45:48 +00:00
Michael Niedermayer
1f83576b48 make aes_en/decrypt() static until we decided on the public API
Originally committed as revision 7533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 10:37:34 +00:00
Michael Niedermayer
0d80bd2f56 move #include log.h into the selftesting code where it belongs
Originally committed as revision 7529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:33:56 +00:00
Michael Niedermayer
6572e1a4d2 remove dependancy on *malloc()
Originally committed as revision 7528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:32:06 +00:00
Michael Niedermayer
347c27988d check the last? entry written for detecting already initalized tables
Originally committed as revision 7527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:05:40 +00:00
Michael Niedermayer
96b103086e replace / by >> this makes the .o ~150 bytes smaller
Originally committed as revision 7525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 01:01:56 +00:00
Michael Niedermayer
e42244e9df cosmetic
Originally committed as revision 7524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 00:55:51 +00:00
Michael Niedermayer
f32f5122ce av_aes_init()
Originally committed as revision 7521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 00:10:25 +00:00
Michael Niedermayer
6287dc9aae the missing header ...
Originally committed as revision 7520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-15 00:07:39 +00:00
Michael Niedermayer
597e3232ef simplify
Originally committed as revision 7504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:40:21 +00:00
Michael Niedermayer
7200f5d054 simplify multiply table init
Originally committed as revision 7503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:30:54 +00:00
Michael Niedermayer
d65dc0cdc6 simplify selftest
Originally committed as revision 7501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:20:15 +00:00
Michael Niedermayer
f25b650a5b revert simplification (broke 192 bit keys)
Originally committed as revision 7500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:13:14 +00:00
Michael Niedermayer
8d4ae47c3f simplify
Originally committed as revision 7499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 21:03:15 +00:00
Michael Niedermayer
1b10524312 fix 2 warnings
Originally committed as revision 7498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:58:41 +00:00
Michael Niedermayer
034f5fbaf2 seems i didnt copy anything from aes128.c so this should be more correct ?
Originally committed as revision 7497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:51:23 +00:00
Michael Niedermayer
c2fd2b20e5 unneeded
Originally committed as revision 7496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:45:27 +00:00
Michael Niedermayer
a6e923c9db unused think
Originally committed as revision 7495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:41:57 +00:00
Michael Niedermayer
0c5d2819a5 merge encrypt and decrypt so the source is simpler and the compiler can choose with inlining if it wants speed or small size
Originally committed as revision 7494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:39:38 +00:00
Michael Niedermayer
28b5123546 indent
Originally committed as revision 7493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:24:34 +00:00
Michael Niedermayer
954bd264c1 remove duplicate round_key
one context is now either for encoding or decoding (makes more sense in reality too)

Originally committed as revision 7492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:24:06 +00:00
Michael Niedermayer
54b78b2495 make decode look more like encode
Originally committed as revision 7491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:02:59 +00:00
Michael Niedermayer
cc85897055 dont use encode tables for decoding
Originally committed as revision 7490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:01:17 +00:00
Michael Niedermayer
73374bf4d0 remove no longer corret comment
Originally committed as revision 7489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:58:45 +00:00
Michael Niedermayer
179dc91160 unused stuff removial
Originally committed as revision 7488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:51:09 +00:00
Michael Niedermayer
f12cf3d215 merge inv_sbox into inv_mix
Originally committed as revision 7487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:47:01 +00:00
Michael Niedermayer
0458e79074 merge sbox with mix on the encryption side
add one more test vector

yes this needs a cleanup ...

Originally committed as revision 7485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:17:45 +00:00
Michael Niedermayer
2592438dd8 1 test vector
Originally committed as revision 7483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 17:43:45 +00:00
Michael Niedermayer
95d1236bf5 fix CONFIG_SMALL case
Originally committed as revision 7482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 17:19:04 +00:00
Michael Niedermayer
388b5e69ec simplify special round
Originally committed as revision 7481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:49:35 +00:00
Michael Niedermayer
cf5773e95f benchmark
Originally committed as revision 7480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:45:34 +00:00
Michael Niedermayer
ff8f659429 init multbl
code can now decrypt its own encryption correctly
can anyone provide me with a correct test AES key + cyphertext + plaintext?

Originally committed as revision 7479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:43:32 +00:00
Michael Niedermayer
b58ecac647 ascii
Originally committed as revision 7478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:19:51 +00:00
Reimar Döffinger
28221dd0fb 128bit-only AES implementation under development.
Originally committed as revision 7474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 14:08:02 +00:00
Michael Niedermayer
b1e5c29485 cosmetic
Originally committed as revision 7472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:47:15 +00:00
Michael Niedermayer
ba554c025e simplify round_key generation by writing over the end but ensuring that theres some irrelevant stuff afterwards
Originally committed as revision 7471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:46:20 +00:00
Michael Niedermayer
84c72fb129 cosmetics
Originally committed as revision 7470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:38:10 +00:00
Michael Niedermayer
7acc1a27bc memcpy
Originally committed as revision 7469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:37:19 +00:00
Michael Niedermayer
1070eba2a2 seems the larger rcon values are never accessed
Originally committed as revision 7468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:30:37 +00:00
Michael Niedermayer
12d6a1c813 copyright fix
Originally committed as revision 7467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:16:29 +00:00
Michael Niedermayer
cd0968c4ca stealing multbl trick from reimar
Originally committed as revision 7466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:15:26 +00:00
Michael Niedermayer
e8fc93136d stealing reimars XOR_BLOCK
Originally committed as revision 7464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 12:40:32 +00:00
Michael Niedermayer
d43a297579 cosmetic
Originally committed as revision 7463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:27:11 +00:00
Michael Niedermayer
eade86e2f5 memleak
Originally committed as revision 7462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:25:52 +00:00
Michael Niedermayer
2c3427eb2a simplify sbox init
Originally committed as revision 7461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:14:05 +00:00
Michael Niedermayer
3306dfd544 aes support (unfinished)
Originally committed as revision 7460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:06:13 +00:00
Axel Holzinger
411983c1f2 Allow to uninstall a custom log callback
patch by Axel Holzinger % aholzinger A gmx P de %
original thread:
date: Jan 11, 2007 4:54 PM
subject: [Ffmpeg-devel] [PATCH] uninstall custom log callback

Originally committed as revision 7446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 17:10:34 +00:00
Christophe Mutricy
d0b456ba1e Avoid "HAVE_CMOV not defined" warning.
patch by Christophe Mutricy, xtophe nxtelevision com

Originally committed as revision 7443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 04:01:35 +00:00
Michael Niedermayer
6880edab82 fix av_reduce() with things like 1/0 and 0/0
Originally committed as revision 7431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-09 11:58:06 +00:00
Luca Abeni
40628be0ed __attribute__((unused)) works with gcc 2.95 too
Originally committed as revision 7421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 11:11:49 +00:00
Måns Rullgård
849f10351d rename always_inline to av_always_inline and move to common.h
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 00:35:08 +00:00
Måns Rullgård
1845bf1fdf merge #ifdef HAVE_AV_CONFIG_H sections
Originally committed as revision 7254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 20:06:11 +00:00
Måns Rullgård
a77caa4dc9 fix mingw shared build, and get rid of FF_IMPORT_ATTR
Originally committed as revision 7253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 19:27:00 +00:00
Måns Rullgård
8da9266cea use the standard INT64_C() macro for 64-bit constants
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:46:11 +00:00
Måns Rullgård
cd10789691 move more macros to internal.h
Originally committed as revision 7239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:23:20 +00:00
Måns Rullgård
5403f8576b move some __attribute__ macros to internal.h
Originally committed as revision 7238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 21:27:08 +00:00
Måns Rullgård
c48e633b9e remove 'restrict' definition, it is always #defined in config.h
Originally committed as revision 7237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 20:31:39 +00:00
Reimar Döffinger
cf1e119bb2 Move BE_*/LE_*/ST*/LD* macros to a common place. Some further
optimization/cleanup would be desirable (e.g. LE_* and LD*
should be the same on x86).

Originally committed as revision 7218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-03 16:35:30 +00:00
Diego Biurrun
c6c367254f spelling cosmetics: cliped --> clipped
Originally committed as revision 7208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 14:19:49 +00:00
Michael Niedermayer
fc0b041637 doxy
Originally committed as revision 7188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 12:00:29 +00:00
Michael Niedermayer
62b9fc1571 fix overflow and remove wrong comment
Originally committed as revision 7187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 11:43:08 +00:00
Michael Niedermayer
3db1b8b538 return optimal fraction
based on a patch by Uoti Urpala

Originally committed as revision 7186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 01:18:57 +00:00
Reimar Döffinger
40a08c7e9a Correct GET/PUT_UTF8 comment: the get/put functions might be called up
to 7 times, though only up to 4 times for valid utf-8 values.

Originally committed as revision 7124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-19 09:43:26 +00:00
Reimar Döffinger
a99cfb0d0e Fix typo in comment
Originally committed as revision 7123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-19 09:33:50 +00:00
Alex Beregszaszi
20d46c038a Remove alpha channel from RGB555
Originally committed as revision 7106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 20:46:36 +00:00
Baptiste Coudurier
3666f75d33 make option field const
Originally committed as revision 7093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 00:29:15 +00:00
Måns Rullgård
7e5f82dc06 move comment
Originally committed as revision 7072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 21:57:27 +00:00
Måns Rullgård
576a85f7c9 remove workaround for missing inttypes.h
Originally committed as revision 7068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 20:00:55 +00:00
Michael Niedermayer
eaaa48b29e 0.5l
Originally committed as revision 7052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 10:04:09 +00:00
Måns Rullgård
81dc56e76e clean up inttypes.h and int_fastxx_t types detection
Originally committed as revision 7050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 04:02:58 +00:00
Måns Rullgård
f940f7c9d2 merge CONFIG_WINCE sections
Originally committed as revision 7047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 03:37:44 +00:00
Måns Rullgård
635eb0cc3d indentation
Originally committed as revision 7046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 03:35:50 +00:00
Michael Niedermayer
3320687691 improve enumerate so arbitrary ranges can be enumerated quickly
Originally committed as revision 7033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 01:06:15 +00:00
Michael Niedermayer
9eb88fdeba AVL tree
Originally committed as revision 7031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 01:02:30 +00:00
Måns Rullgård
9ddbcae667 rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure
Originally committed as revision 7025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 00:35:21 +00:00
Måns Rullgård
36cd306907 rename inverse -> ff_inverse
Originally committed as revision 6990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 18:49:36 +00:00