return format;
}
-static void init_aspect_info(MpegEncContext * s){
- double aspect;
-
- emms_c(); //paranoia ;)
-
- if(s->avctx->aspect_ratio==0) aspect= 1.0;
- aspect= s->avctx->aspect_ratio;
+static void float_aspect_to_info(MpegEncContext * s, float aspect){
+ int i;
+
+ aspect*= s->height/(double)s->width;
+//printf("%f\n", aspect);
+ if(aspect==0) aspect= 1.0;
+
ff_float2fraction(&s->aspected_width, &s->aspected_height, aspect, 255);
+
+//printf("%d %d\n", s->aspected_width, s->aspected_height);
+ for(i=1; i<6; i++){
+ if(s->aspected_width == pixel_aspect[i][0] && s->aspected_height== pixel_aspect[i][1]){
+ s->aspect_ratio_info=i;
+ return;
+ }
+ }
- if(s->aspected_width == 4 && s->aspected_height == 3)
- s->aspect_ratio_info= FF_ASPECT_4_3_625;
- else if(s->aspected_width == 16 && s->aspected_height == 9)
- s->aspect_ratio_info= FF_ASPECT_16_9_625;
- else if(s->aspected_width == 1 && s->aspected_height == 1)
- s->aspect_ratio_info= FF_ASPECT_SQUARE;
- else
- s->aspect_ratio_info= FF_ASPECT_EXTENDED;
+ s->aspect_ratio_info= FF_ASPECT_EXTENDED;
}
void h263_encode_picture_header(MpegEncContext * s, int picture_number)
if (format == 7) {
/* Custom Picture Format (CPFMT) */
- init_aspect_info(s);
+ float_aspect_to_info(s, s->avctx->aspect_ratio);
put_bits(&s->pb,4,s->aspect_ratio_info);
put_bits(&s->pb,9,(s->width >> 2) - 1);
put_bits(&s->pb, 4, vo_ver_id); /* is obj layer ver id */
put_bits(&s->pb, 3, 1); /* is obj layer priority */
- init_aspect_info(s);
+ float_aspect_to_info(s, s->avctx->aspect_ratio);
put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */
if (s->aspect_ratio_info == FF_ASPECT_EXTENDED)
/* aspected dimensions */
s->aspected_width = get_bits(&s->gb, 8);
s->aspected_height = get_bits(&s->gb, 8);
+ }else{
+ s->aspected_width = pixel_aspect[s->aspect_ratio_info][0];
+ s->aspected_height= pixel_aspect[s->aspect_ratio_info][1];
}
} else {
width = h263_format[format][0];
if(s->aspect_ratio_info == FF_ASPECT_EXTENDED){
s->aspected_width = get_bits(gb, 8); // par_width
s->aspected_height = get_bits(gb, 8); // par_height
+ }else{
+ s->aspected_width = pixel_aspect[s->aspect_ratio_info][0];
+ s->aspected_height= pixel_aspect[s->aspect_ratio_info][1];
}
if ((s->vol_control_parameters=get_bits1(gb))) { /* vol control parameter */