Commit Graph

102 Commits

Author SHA1 Message Date
Ivan Kalvachev
d76c5ed574 Almost cosmetics.
Move some assignments after the checks.

Originally committed as revision 17318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 10:14:16 +00:00
Ivan Kalvachev
d2d600b71f Check all critical xvmc struct fields in ff_xvmc_field_start()
and log error if they are not correct. All other functions
are supposedly called after that one, so use assert() for them.

Originally committed as revision 17317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 10:06:23 +00:00
Ivan Kalvachev
afb9342a3e Proper condition in xvmc decode mb.
The old one would try to use mv blocks that are written outside their buffer,
in case of unhandled error.

Originally committed as revision 17315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 09:03:47 +00:00
Ivan Kalvachev
095edd3e61 Rename xvmc_render_state to something with pixfmt in its name.
Originally committed as revision 17314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 08:42:11 +00:00
Ivan Kalvachev
1a90cf3c98 Revert 17308.
The above commit makes ff_xvmc_decode_mb to output one log entry
for each decoded MB, causing massive slowdown.

Originally committed as revision 17312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 07:55:39 +00:00
Ivan Kalvachev
a0723a4d84 Give a little better name to the magic(_id) field in xvmc struct
Originally committed as revision 17310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 02:36:43 +00:00
Diego Biurrun
1333d8fd20 Replace assert in ff_xvmc_field_end() by av_log call at level AV_LOG_ERROR.
Originally committed as revision 17308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 02:27:55 +00:00
Diego Biurrun
967d2ae616 Remove redundant assert(render) in ff_xvmc_init_block(). The immediately
following if condition checks render and does an assert if it fails.

Originally committed as revision 17304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 01:24:09 +00:00
Diego Biurrun
e26f8d76d7 Remove asserts that are immediately followed by a check and error return.
Originally committed as revision 17303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 00:52:16 +00:00
Diego Biurrun
8f38ff007a Doxygen comment/explanation for ff_xvmc_init_block().
Originally committed as revision 17301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 00:16:51 +00:00
Diego Biurrun
0b2eb2e8be Add Doxygen comment similar to ff_xvmc_field_start() to ff_xvmc_field_end().
Originally committed as revision 17296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 23:13:32 +00:00
Diego Biurrun
fe4be5dbd5 whitespace cosmetics: remove stray space
Originally committed as revision 17295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 23:08:43 +00:00
Diego Biurrun
9107f7cd07 Doxygenize ff_xvmc_field_start() comment.
Originally committed as revision 17292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 22:48:59 +00:00
Diego Biurrun
a1bce01171 Clarify ff_xvmc_field_start() comment.
Originally committed as revision 17291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 22:46:40 +00:00
Diego Biurrun
b71bd0ed11 Merge some declarations and initializations.
Originally committed as revision 17288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 22:21:17 +00:00
Ivan Kalvachev
013cebfbe8 Return error instead of triggering assert.
Originally committed as revision 17287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 22:06:00 +00:00
Diego Biurrun
930efaf410 cosmetics: comment wording/grammar
Originally committed as revision 17286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 21:52:44 +00:00
Diego Biurrun
6e4b41f880 cosmetics: Change '8*8' to '64'.
Originally committed as revision 17285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 21:50:46 +00:00
Diego Biurrun
cb18fb6288 cosmetics: K&R style
Originally committed as revision 17284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 21:49:48 +00:00
Ivan Kalvachev
9939841fe2 Give nice message for failed assert.
Originally committed as revision 17283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 21:33:13 +00:00
Diego Biurrun
4440bd0da4 Add xvmc_internal.h that contains all internal xvmc function declarations.
This allows getting rid of a bunch of ugly forward declarations.

Originally committed as revision 17280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 20:37:14 +00:00
Ivan Kalvachev
6e2803405d Cosmetic 64 instead 8*8
Originally committed as revision 17279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 20:35:10 +00:00
Ivan Kalvachev
ae4dde76d3 Clarify some assert usage.
They are not to check application supplied parameters.

Originally committed as revision 17278 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 20:30:13 +00:00
Diego Biurrun
99df0aa59e another (last?) round of K&R whitespace cosmetics
Originally committed as revision 17276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 20:00:22 +00:00
Diego Biurrun
ba585726be whitespace cosmetics: Align some comments.
Originally committed as revision 17275 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:54:59 +00:00
Diego Biurrun
81189e4ff6 whitespace cosmetics: Put some spaces around operators for better readability.
Originally committed as revision 17274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:52:06 +00:00
Diego Biurrun
465ce23e4d Remove a comment that references a non-existing function.
Originally committed as revision 17273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:47:55 +00:00
Diego Biurrun
0439c09d22 Make one comment slightly clearer and more readable.
Originally committed as revision 17272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:42:29 +00:00
Diego Biurrun
63a21bc041 Remove one more commented-out line.
Originally committed as revision 17271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:41:16 +00:00
Diego Biurrun
7e2e870e06 some more K&R whitespace cosmetics
Originally committed as revision 17270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:39:07 +00:00
Diego Biurrun
a1db3b93c0 cosmetics: grammar/spelling/wording fixes in comments
Originally committed as revision 17269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:33:09 +00:00
Diego Biurrun
052f377934 Remove useless comment.
Originally committed as revision 17268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:27:34 +00:00
Diego Biurrun
eba9cecc8b Restore one set of parentheses to avoid the warning:
libavcodec/mpegvideo_xvmc.c: In function ‘ff_xvmc_decode_mb’:
libavcodec/mpegvideo_xvmc.c:269: warning: suggest parentheses around && within ||

Originally committed as revision 17267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:24:37 +00:00
Diego Biurrun
1f7c1d140a whitespace cosmetics: consistently format all comments
Originally committed as revision 17266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:21:00 +00:00
Diego Biurrun
d15876d3bd whitespace cosmetics: Correctly indent all comments.
Originally committed as revision 17265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:14:46 +00:00
Ivan Kalvachev
788aa94a9d Clarify TODO comment
Originally committed as revision 17264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:09:33 +00:00
Diego Biurrun
36c5204d4e Drop two more sets of useless parentheses.
Originally committed as revision 17262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:05:07 +00:00
Ivan Kalvachev
90509ec7bf get rid of the branch prediction
Originally committed as revision 17261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:02:46 +00:00
Diego Biurrun
4ec58e1397 cosmetics: Consistently format all if/else statements in K&R style
and drop braces from if statements where unnecessary.

Originally committed as revision 17260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 19:00:51 +00:00
Diego Biurrun
9f00a41cb3 Remove some useless parentheses.
Originally committed as revision 17259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 18:57:32 +00:00
Ivan Kalvachev
f0a902ad82 remove obsolete comment
Originally committed as revision 17257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 18:47:00 +00:00
Ivan Kalvachev
4742762f5d remove some useless ()
Originally committed as revision 17255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 18:45:44 +00:00
Ivan Kalvachev
78f9a87830 use ff_xvmc for function names instead of XVMC_
Originally committed as revision 17254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 18:25:41 +00:00
Diego Biurrun
ea375af8c9 Give public #defines that are used by MPlayer an AV_ prefix.
Originally committed as revision 17244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:12:25 +00:00
Diego Biurrun
3ae0192839 Replace all (x == NULL) or (x != NULL) in assert and if conditions by !x and x.
Originally committed as revision 17243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 17:04:09 +00:00
Ivan Kalvachev
ef1b5ae2cd remove assertion that use external definitions
Originally committed as revision 17241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 16:53:42 +00:00
Diego Biurrun
4ef690f565 whitespace cosmetics: vertical alignment
Originally committed as revision 17236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 16:23:08 +00:00
Diego Biurrun
2d7d8cc7f4 whitespace cosmetics: another round of formatting consistency fixes
Originally committed as revision 17235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 16:22:11 +00:00
Diego Biurrun
148302e7e4 whitespace cosmetics: consistent (more or less) K&R style
Originally committed as revision 17234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 16:14:26 +00:00
Diego Biurrun
39dba5e8df whitespace cosmetics: Fix indentation depth.
Originally committed as revision 17233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 16:05:36 +00:00
Diego Biurrun
8e5cfb6e82 Remove commented-out code.
Originally committed as revision 17232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 16:01:03 +00:00
Diego Biurrun
9e47796048 Rename xvmc.c --> mpegvideo_xvmc.c as suggested by Ivan.
Originally committed as revision 17228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 15:30:40 +00:00