highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetics: grammar/spelling/wording fixes in comments

Browse Source 
Originally committed as revision 17269 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-02-14 19:33:09 +00:00
parent 052f377934
commit a1db3b93c0
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/mpegvideo_xvmc.c
View File

@ -70,7 +70,7 @@ int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx)
render = (struct xvmc_render_state*)s->current_picture.data[2]; render = (struct xvmc_render_state*)s->current_picture.data[2];
assert(render); assert(render);
if (!render || render->magic != AV_XVMC_RENDER_MAGIC) if (!render || render->magic != AV_XVMC_RENDER_MAGIC)
return -1; // make sure that this is render packet return -1; // make sure that this is a render packet
render->picture_structure = s->picture_structure; render->picture_structure = s->picture_structure;
render->flags = s->first_field ? 0 : XVMC_SECOND_FIELD; render->flags = s->first_field ? 0 : XVMC_SECOND_FIELD;
@ -145,7 +145,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
// Anyway, it doesn't hurt. // Anyway, it doesn't hurt.
s->current_picture.qscale_table[mb_xy] = s->qscale; s->current_picture.qscale_table[mb_xy] = s->qscale;
// START OF XVMC specific code // start of XVMC-specific code
render = (struct xvmc_render_state*)s->current_picture.data[2]; render = (struct xvmc_render_state*)s->current_picture.data[2];
assert(render); assert(render);
assert(render->magic==AV_XVMC_RENDER_MAGIC); assert(render->magic==AV_XVMC_RENDER_MAGIC);
@ -230,7 +230,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
mv_block->motion_vertical_field_select |= s->field_select[1][1]<<3; mv_block->motion_vertical_field_select |= s->field_select[1][1]<<3;
} }
} // !intra } // !intra
// time to handle data blocks; // time to handle data blocks
mv_block->index = render->next_free_data_block_num; mv_block->index = render->next_free_data_block_num;
blocks_per_mb = 6; blocks_per_mb = 6;
@ -247,7 +247,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
} }
if (s->flags & CODEC_FLAG_GRAY) { if (s->flags & CODEC_FLAG_GRAY) {
if (s->mb_intra) { // intra frames are always full chroma block if (s->mb_intra) { // intra frames are always full chroma blocks
for (i = 4; i < blocks_per_mb; i++) { for (i = 4; i < blocks_per_mb; i++) {
memset(s->pblocks[i],0,sizeof(short)*8*8); // so we need to clear them memset(s->pblocks[i],0,sizeof(short)*8*8); // so we need to clear them
if (!render->unsigned_intra) if (!render->unsigned_intra)
@ -269,9 +269,10 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
s->pblocks[i][0] -= 1 << 10; s->pblocks[i][0] -= 1 << 10;
if (!render->idct) { if (!render->idct) {
s->dsp.idct(s->pblocks[i]); s->dsp.idct(s->pblocks[i]);
/* It is unclear if MC hardware requires pixel diff values to be in /* It is unclear if MC hardware requires pixel diff values to be
* range [-255;255]. TODO cliping if such hardware is ever found. * in the range [-255;255]. TODO: Clipping if such hardware is
* As of now it would only be unnecessery slowdown. */ * ever found. As of now it would only be an unnecessary
* slowdown. */
} }
// copy blocks only if the codec doesn't support pblocks reordering // copy blocks only if the codec doesn't support pblocks reordering
if (s->avctx->xvmc_acceleration == 1) { if (s->avctx->xvmc_acceleration == 1) {

6
libavcodec/xvmc.h
View File

@ -32,7 +32,7 @@
struct xvmc_render_state { struct xvmc_render_state {
/** set by calling application */ /** set by calling application */
//@{ //@{
int magic; ///< used as check for memory corruption by regular pixel routines int magic; ///< used as a check against memory corruption by regular pixel routines
short* data_blocks; short* data_blocks;
XvMCMacroBlock* mv_blocks; XvMCMacroBlock* mv_blocks;
@ -51,9 +51,9 @@ struct xvmc_render_state {
XvMCSurface* p_past_surface; ///< pointer to the past surface XvMCSurface* p_past_surface; ///< pointer to the past surface
XvMCSurface* p_future_surface; ///< pointer to the future prediction surface XvMCSurface* p_future_surface; ///< pointer to the future prediction surface
unsigned int picture_structure; ///< top/bottom fields or frame! unsigned int picture_structure; ///< top/bottom fields or frame
unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence unsigned int flags; ///< XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
unsigned int display_flags; ///< 1,2 or 1+2 fields for XvMCPutSurface unsigned int display_flags; ///< 1, 2 or 1+2 fields for XvMCPutSurface
//}@ //}@
/** modified by calling application and the decoder */ /** modified by calling application and the decoder */