Originally committed as revision 10997 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2007/11/11 01:39:54... | ... |
@@ -171,7 +171,7 @@ version 0.4.9-pre1: |
171 | 171 |
- SGI image format, encoding and decoding |
172 | 172 |
- H.264 loop filter support |
173 | 173 |
- H.264 CABAC support |
174 |
-- nicer looking arrows for the motion vector vissualization |
|
174 |
+- nicer looking arrows for the motion vector visualization |
|
175 | 175 |
- improved VCD support |
176 | 176 |
- audio timestamp drift compensation |
177 | 177 |
- MPEG-2 YUV 422/444 support |
... | ... |
@@ -1422,7 +1422,7 @@ static inline void clip_coeffs(MpegEncContext *s, DCTELEM *block, int last_index |
1422 | 1422 |
av_log(s->avctx, AV_LOG_INFO, "warning, clipping %d dct coefficients to %d..%d\n", overflow, minlevel, maxlevel); |
1423 | 1423 |
} |
1424 | 1424 |
|
1425 |
-static void get_vissual_weight(int16_t *weight, uint8_t *ptr, int stride){ |
|
1425 |
+static void get_visual_weight(int16_t *weight, uint8_t *ptr, int stride){ |
|
1426 | 1426 |
int x, y; |
1427 | 1427 |
//FIXME optimize |
1428 | 1428 |
for(y=0; y<8; y++){ |
... | ... |
@@ -1626,15 +1626,15 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x, |
1626 | 1626 |
} |
1627 | 1627 |
|
1628 | 1628 |
if(s->avctx->quantizer_noise_shaping){ |
1629 |
- if(!skip_dct[0]) get_vissual_weight(weight[0], ptr_y , wrap_y); |
|
1630 |
- if(!skip_dct[1]) get_vissual_weight(weight[1], ptr_y + 8, wrap_y); |
|
1631 |
- if(!skip_dct[2]) get_vissual_weight(weight[2], ptr_y + dct_offset , wrap_y); |
|
1632 |
- if(!skip_dct[3]) get_vissual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y); |
|
1633 |
- if(!skip_dct[4]) get_vissual_weight(weight[4], ptr_cb , wrap_c); |
|
1634 |
- if(!skip_dct[5]) get_vissual_weight(weight[5], ptr_cr , wrap_c); |
|
1629 |
+ if(!skip_dct[0]) get_visual_weight(weight[0], ptr_y , wrap_y); |
|
1630 |
+ if(!skip_dct[1]) get_visual_weight(weight[1], ptr_y + 8, wrap_y); |
|
1631 |
+ if(!skip_dct[2]) get_visual_weight(weight[2], ptr_y + dct_offset , wrap_y); |
|
1632 |
+ if(!skip_dct[3]) get_visual_weight(weight[3], ptr_y + dct_offset + 8, wrap_y); |
|
1633 |
+ if(!skip_dct[4]) get_visual_weight(weight[4], ptr_cb , wrap_c); |
|
1634 |
+ if(!skip_dct[5]) get_visual_weight(weight[5], ptr_cr , wrap_c); |
|
1635 | 1635 |
if(!s->chroma_y_shift){ /* 422 */ |
1636 |
- if(!skip_dct[6]) get_vissual_weight(weight[6], ptr_cb + (dct_offset>>1), wrap_c); |
|
1637 |
- if(!skip_dct[7]) get_vissual_weight(weight[7], ptr_cr + (dct_offset>>1), wrap_c); |
|
1636 |
+ if(!skip_dct[6]) get_visual_weight(weight[6], ptr_cb + (dct_offset>>1), wrap_c); |
|
1637 |
+ if(!skip_dct[7]) get_visual_weight(weight[7], ptr_cr + (dct_offset>>1), wrap_c); |
|
1638 | 1638 |
} |
1639 | 1639 |
memcpy(orig[0], s->block[0], sizeof(DCTELEM)*64*mb_block_count); |
1640 | 1640 |
} |
... | ... |
@@ -3895,7 +3895,7 @@ static int ratecontrol_1pass(SnowContext *s, AVFrame *pict) |
3895 | 3895 |
return delta_qlog; |
3896 | 3896 |
} |
3897 | 3897 |
|
3898 |
-static void calculate_vissual_weight(SnowContext *s, Plane *p){ |
|
3898 |
+static void calculate_visual_weight(SnowContext *s, Plane *p){ |
|
3899 | 3899 |
int width = p->width; |
3900 | 3900 |
int height= p->height; |
3901 | 3901 |
int level, orientation, x, y; |
... | ... |
@@ -4338,7 +4338,7 @@ redo_frame: |
4338 | 4338 |
|
4339 | 4339 |
if(s->last_spatial_decomposition_count != s->spatial_decomposition_count){ |
4340 | 4340 |
for(plane_index=0; plane_index<3; plane_index++){ |
4341 |
- calculate_vissual_weight(s, &s->plane[plane_index]); |
|
4341 |
+ calculate_visual_weight(s, &s->plane[plane_index]); |
|
4342 | 4342 |
} |
4343 | 4343 |
} |
4344 | 4344 |
|