generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aspect ratio encoding for mpeg1

Browse Source 
Originally committed as revision 1319 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2002-12-06 16:19:25 +00:00
parent 945f15b740
commit 426b80615b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/mpeg12.c
View File

@ -131,8 +131,12 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
{ {
unsigned int vbv_buffer_size; unsigned int vbv_buffer_size;
unsigned int fps, v; unsigned int fps, v;
int n; int n, i;
UINT64 time_code; UINT64 time_code;
float best_aspect_error= 1E10;
float aspect_ratio= s->avctx->aspect_ratio;
if(aspect_ratio==0.0) aspect_ratio= s->width / (float)s->height; //pixel aspect 1:1 (VGA)
if (s->current_picture.key_frame) { if (s->current_picture.key_frame) {
/* mpeg1 header repeated every gop */ /* mpeg1 header repeated every gop */
@ -154,7 +158,18 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
put_bits(&s->pb, 12, s->width); put_bits(&s->pb, 12, s->width);
put_bits(&s->pb, 12, s->height); put_bits(&s->pb, 12, s->height);
put_bits(&s->pb, 4, 1); /* 1/1 aspect ratio */
for(i=1; i<15; i++){
float error= mpeg1_aspect[i] - s->width/(s->height*aspect_ratio);
error= ABS(error);
if(error < best_aspect_error){
best_aspect_error= error;
s->aspect_ratio_info= i;
}
}
put_bits(&s->pb, 4, s->aspect_ratio_info);
put_bits(&s->pb, 4, s->frame_rate_index); put_bits(&s->pb, 4, s->frame_rate_index);
v = s->bit_rate / 400; v = s->bit_rate / 400;
if (v > 0x3ffff) if (v > 0x3ffff)