har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'd349afb07bacccb62eb5369c38d6406d2909d792'

Browse Source 
* commit 'd349afb07bacccb62eb5369c38d6406d2909d792':
  dv: cosmetics, reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-20 18:10:26 +02:00
commit 0a995311ce
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
libavcodec/dv.c
View File

@ -181,53 +181,53 @@ int ff_dv_init_dynamic_tables(DVVideoContext *ctx, const DVprofile *d)
uint32_t *factor1, *factor2; uint32_t *factor1, *factor2;
const int *iweight1, *iweight2; const int *iweight1, *iweight2;
p = i = 0; p = i = 0;
for (c=0; c<d->n_difchan; c++) { for (c = 0; c < d->n_difchan; c++) {
for (s=0; s<d->difseg_size; s++) { for (s = 0; s < d->difseg_size; s++) {
p += 6; p += 6;
for (j=0; j<27; j++) { for (j = 0; j < 27; j++) {
p += !(j%3); p += !(j % 3);
if (!(DV_PROFILE_IS_1080i50(d) && c != 0 && s == 11) && if (!(DV_PROFILE_IS_1080i50(d) && c != 0 && s == 11) &&
!(DV_PROFILE_IS_720p50(d) && s > 9)) { !(DV_PROFILE_IS_720p50(d) && s > 9)) {
dv_calc_mb_coordinates(d, c, s, j, &ctx->work_chunks[i].mb_coordinates[0]); dv_calc_mb_coordinates(d, c, s, j, &ctx->work_chunks[i].mb_coordinates[0]);
ctx->work_chunks[i++].buf_offset = p; ctx->work_chunks[i++].buf_offset = p;
}
p += 5;
} }
p += 5;
} }
} }
}
factor1 = &ctx->idct_factor[0]; factor1 = &ctx->idct_factor[0];
factor2 = &ctx->idct_factor[DV_PROFILE_IS_HD(d) ? 4096 : 2816]; factor2 = &ctx->idct_factor[DV_PROFILE_IS_HD(d) ? 4096 : 2816];
if (d->height == 720) { if (d->height == 720) {
iweight1 = &ff_dv_iweight_720_y[0]; iweight1 = &ff_dv_iweight_720_y[0];
iweight2 = &ff_dv_iweight_720_c[0]; iweight2 = &ff_dv_iweight_720_c[0];
} else { } else {
iweight1 = &ff_dv_iweight_1080_y[0]; iweight1 = &ff_dv_iweight_1080_y[0];
iweight2 = &ff_dv_iweight_1080_c[0]; iweight2 = &ff_dv_iweight_1080_c[0];
} }
if (DV_PROFILE_IS_HD(d)) { if (DV_PROFILE_IS_HD(d)) {
for (c = 0; c < 4; c++) { for (c = 0; c < 4; c++) {
for (s = 0; s < 16; s++) { for (s = 0; s < 16; s++) {
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
*factor1++ = (dv100_qstep[s] << (c + 9)) * iweight1[i]; *factor1++ = (dv100_qstep[s] << (c + 9)) * iweight1[i];
*factor2++ = (dv100_qstep[s] << (c + 9)) * iweight2[i]; *factor2++ = (dv100_qstep[s] << (c + 9)) * iweight2[i];
}
} }
} }
} else { }
iweight1 = &ff_dv_iweight_88[0]; } else {
for (j = 0; j < 2; j++, iweight1 = &ff_dv_iweight_248[0]) { iweight1 = &ff_dv_iweight_88[0];
for (s = 0; s < 22; s++) { for (j = 0; j < 2; j++, iweight1 = &ff_dv_iweight_248[0]) {
for (i = c = 0; c < 4; c++) { for (s = 0; s < 22; s++) {
for (; i < dv_quant_areas[c]; i++) { for (i = c = 0; c < 4; c++) {
*factor1 = iweight1[i] << (ff_dv_quant_shifts[s][c] + 1); for (; i < dv_quant_areas[c]; i++) {
*factor2++ = (*factor1++) << 1; *factor1 = iweight1[i] << (ff_dv_quant_shifts[s][c] + 1);
} *factor2++ = (*factor1++) << 1;
} }
} }
} }
} }
}
return 0; return 0;
} }