Mercurial > libavformat.hg
diff dv.c @ 288:981b0b3c95dd libavformat
AVRational
sample_aspect_ratio
aspect ratio in JPEG JFIF is SAR not DAR !
removed nonsense SAR guessing code
various related cleanups
bugs?
author | michael |
---|---|
date | Mon, 20 Oct 2003 20:23:46 +0000 |
parents | ef2e313770e0 |
children | 252946de6d3f |
line wrap: on
line diff
--- a/dv.c Mon Oct 20 10:33:13 2003 +0000 +++ b/dv.c Mon Oct 20 20:23:46 2003 +0000 @@ -556,10 +556,12 @@ avctx->height = sys->height; avctx->pix_fmt = sys->pix_fmt; vsc_pack = dv_extract_pack(frame, dv_video_control); + /* MN: someone please fill in the correct SAR for dv, i dont have the standard doc so i cant, allthough its very likely the same as MPEG4 (12:11 10:11 16:11 40:33) */ if (vsc_pack && (vsc_pack[2] & 0x07) == (apt?0x02:0x07)) - avctx->aspect_ratio = 16.0 / 9.0; + avctx->sample_aspect_ratio = (AVRational){16,9}; else - avctx->aspect_ratio = 4.0 / 3.0; + avctx->sample_aspect_ratio = (AVRational){4,3}; + avctx->sample_aspect_ratio = av_div_q(avctx->sample_aspect_ratio, (AVRational){sys->width,sys->height}); size = sys->frame_size; } return size; @@ -660,7 +662,7 @@ c->has_audio = c->has_video = 0; c->start_time = time(NULL); c->aspect = 0; /* 4:3 is the default */ - if ((int)(vst->codec.aspect_ratio * 10) == 17) /* 16:9 */ + if ((int)(av_q2d(vst->codec.sample_aspect_ratio) * vst->codec.width / vst->codec.height * 10) == 17) /* 16:9 */ c->aspect = 0x07; if (fifo_init(&c->audio_data, 100*AVCODEC_MAX_AUDIO_FRAME_SIZE) < 0)