diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-21 13:53:41 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-21 13:53:41 +0000 |
| commit | 264e6c23fef6ea156cb9653f911e6ec4e95b4813 (patch) | |
| tree | c68100d66636115da52c2de355ef0c865df8b602 /libmpdemux | |
| parent | 28cf6ea2be72588dba3b35db864bf63182d1b17f (diff) | |
| download | mpv-264e6c23fef6ea156cb9653f911e6ec4e95b4813.tar.bz2 mpv-264e6c23fef6ea156cb9653f911e6ec4e95b4813.tar.xz | |
Parse and use the information from the frame rate extension header for MPEG-2.
-identify still does not show the right values though.
Fixes bug #1636.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30681 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/mpeg_hdr.c | 3 | ||||
| -rw-r--r-- | libmpdemux/mpeg_hdr.h | 2 | ||||
| -rw-r--r-- | libmpdemux/video.c | 10 |
3 files changed, 11 insertions, 4 deletions
diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c index c07cd6bf16..af1b9223dd 100644 --- a/libmpdemux/mpeg_hdr.c +++ b/libmpdemux/mpeg_hdr.c @@ -81,6 +81,9 @@ static int header_process_sequence_extension (mp_mpeg_header_t * picture, return 1; picture->progressive_sequence = (buffer[1] >> 3) & 1; + picture->frame_rate_extension_n = ((buffer[5] >> 5) & 3) + 1; + picture->frame_rate_extension_d = (buffer[5] & 0x1f) + 1; + picture->mpeg1 = 0; return 0; } diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h index d9922767b2..ccd84bcdb0 100644 --- a/libmpdemux/mpeg_hdr.h +++ b/libmpdemux/mpeg_hdr.h @@ -27,6 +27,8 @@ typedef struct { int aspect_ratio_information; int frame_rate_code; float fps; + int frame_rate_extension_n; + int frame_rate_extension_d; int bitrate; // 0x3FFFF==VBR // timing: int picture_structure; diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 603239456b..bc46c983f9 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -433,6 +433,7 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** float frame_time=1; float pts1=d_video->pts; float pts=0; + float fps; int picture_coding_type=0; int in_size=0; video_codec_t video_codec = find_video_codec(sh_video); @@ -469,14 +470,15 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** case 0x100: picture_coding_type=(videobuffer[start+1] >> 3) & 7;break; } } + fps = picture.fps * picture.frame_rate_extension_n / picture.frame_rate_extension_d; *start=videobuffer; in_size=videobuf_len; // get mpeg fps: - if(sh_video->fps!=picture.fps) if(!force_fps && !telecine){ - mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,picture.fps,sh_video->fps-picture.fps,picture.frame_rate_code); - sh_video->fps=picture.fps; - sh_video->frametime=1.0/picture.fps; + if(sh_video->fps!=fps) if(!force_fps && !telecine){ + mp_msg(MSGT_CPLAYER,MSGL_WARN,"Warning! FPS changed %5.3f -> %5.3f (%f) [%d] \n",sh_video->fps,fps,sh_video->fps-fps,picture.frame_rate_code); + sh_video->fps=fps; + sh_video->frametime=1.0/fps; } // fix mpeg2 frametime: |