Mercurial > libavcodec.hg
comparison mpegvideo_xvmc.c @ 8876:ae637f4c4e55 libavcodec
whitespace cosmetics: Align some comments.
| author | diego |
|---|---|
| date | Sat, 14 Feb 2009 19:54:59 +0000 |
| parents | 266bd7d64985 |
| children | 4044a647cb2a |
comparison
equal
deleted
inserted
replaced
| 8875:266bd7d64985 | 8876:ae637f4c4e55 |
|---|---|
| 196 break; | 196 break; |
| 197 case MV_TYPE_DMV: | 197 case MV_TYPE_DMV: |
| 198 mv_block->motion_type = XVMC_PREDICTION_DUAL_PRIME; | 198 mv_block->motion_type = XVMC_PREDICTION_DUAL_PRIME; |
| 199 if (s->picture_structure == PICT_FRAME) { | 199 if (s->picture_structure == PICT_FRAME) { |
| 200 | 200 |
| 201 mv_block->PMV[0][0][0] = s->mv[0][0][0]; // top from top | 201 mv_block->PMV[0][0][0] = s->mv[0][0][0]; // top from top |
| 202 mv_block->PMV[0][0][1] = s->mv[0][0][1] << 1; | 202 mv_block->PMV[0][0][1] = s->mv[0][0][1] << 1; |
| 203 | 203 |
| 204 mv_block->PMV[0][1][0] = s->mv[0][0][0]; // bottom from bottom | 204 mv_block->PMV[0][1][0] = s->mv[0][0][0]; // bottom from bottom |
| 205 mv_block->PMV[0][1][1] = s->mv[0][0][1] << 1; | 205 mv_block->PMV[0][1][1] = s->mv[0][0][1] << 1; |
| 206 | 206 |
| 207 mv_block->PMV[1][0][0] = s->mv[0][2][0]; // dmv00, top from bottom | 207 mv_block->PMV[1][0][0] = s->mv[0][2][0]; // dmv00, top from bottom |
| 208 mv_block->PMV[1][0][1] = s->mv[0][2][1] << 1; // dmv01 | 208 mv_block->PMV[1][0][1] = s->mv[0][2][1] << 1; // dmv01 |
| 209 | 209 |
| 210 mv_block->PMV[1][1][0] = s->mv[0][3][0]; // dmv10, bottom from top | 210 mv_block->PMV[1][1][0] = s->mv[0][3][0]; // dmv10, bottom from top |
| 211 mv_block->PMV[1][1][1] = s->mv[0][3][1] << 1; // dmv11 | 211 mv_block->PMV[1][1][1] = s->mv[0][3][1] << 1; // dmv11 |
| 212 | 212 |
| 213 } else { | 213 } else { |
| 214 mv_block->PMV[0][1][0] = s->mv[0][2][0]; // dmv00 | 214 mv_block->PMV[0][1][0] = s->mv[0][2][0]; // dmv00 |
| 215 mv_block->PMV[0][1][1] = s->mv[0][2][1]; // dmv01 | 215 mv_block->PMV[0][1][1] = s->mv[0][2][1]; // dmv01 |
| 216 } | 216 } |
| 217 break; | 217 break; |
| 218 default: | 218 default: |
| 219 assert(0); | 219 assert(0); |
| 220 } | 220 } |
| 244 if (s->block_last_index[i] >= 0) | 244 if (s->block_last_index[i] >= 0) |
| 245 cbp++; | 245 cbp++; |
| 246 } | 246 } |
| 247 | 247 |
| 248 if (s->flags & CODEC_FLAG_GRAY) { | 248 if (s->flags & CODEC_FLAG_GRAY) { |
| 249 if (s->mb_intra) { // intra frames are always full chroma blocks | 249 if (s->mb_intra) { // intra frames are always full chroma blocks |
| 250 for (i = 4; i < blocks_per_mb; i++) { | 250 for (i = 4; i < blocks_per_mb; i++) { |
| 251 memset(s->pblocks[i], 0, sizeof(short)*8*8); // so we need to clear them | 251 memset(s->pblocks[i], 0, sizeof(short)*8*8); // so we need to clear them |
| 252 if (!render->unsigned_intra) | 252 if (!render->unsigned_intra) |
| 253 s->pblocks[i][0] = 1 << 10; | 253 s->pblocks[i][0] = 1 << 10; |
| 254 } | 254 } |
| 255 } else { | 255 } else { |
| 256 cbp &= 0xf << (blocks_per_mb - 4); | 256 cbp &= 0xf << (blocks_per_mb - 4); |
| 257 blocks_per_mb = 4; // luminance blocks only | 257 blocks_per_mb = 4; // luminance blocks only |
| 258 } | 258 } |
| 259 } | 259 } |
| 260 mv_block->coded_block_pattern = cbp; | 260 mv_block->coded_block_pattern = cbp; |
| 261 if (cbp == 0) | 261 if (cbp == 0) |
| 262 mv_block->macroblock_type &= ~XVMC_MB_TYPE_PATTERN; | 262 mv_block->macroblock_type &= ~XVMC_MB_TYPE_PATTERN; |