Mercurial > mplayer.hg

changeset 30862:2a8e5cea0c8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Calculate width and height in mp4_header_process_vop(). Fixes elementary streams with -vc ffodivxvdpau and the native demuxer.
author cehoyos
date Mon, 15 Mar 2010 22:32:11 +0000
parents 1f3b39209b2d
children 978c120b76ce
files libmpdemux/mpeg_hdr.c libmpdemux/video.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/mpeg_hdr.c	Mon Mar 15 22:28:08 2010 +0000
+++ b/libmpdemux/mpeg_hdr.c	Mon Mar 15 22:32:11 2010 +0000
@@ -258,6 +258,13 @@
         picture->fps = (float) picture->timeinc_resolution / (float) picture->timeinc_unit;
     }
 
+    n++; //marker bit
+    picture->display_picture_width = getbits16(buffer, n, 13);
+    n += 13;
+    n++; //marker bit
+    picture->display_picture_height = getbits16(buffer, n, 13);
+    n += 13;
+
     //fprintf(stderr, "ASPECT: %d, PARW=%d, PARH=%d, TIMEINCRESOLUTION: %d, FIXED_TIMEINC: %d (number of bits: %d), FPS: %u\n",
     //	aspect, aspectw, aspecth, picture->timeinc_resolution, picture->timeinc_unit, picture->timeinc_bits, picture->fps);
 
--- a/libmpdemux/video.c	Mon Mar 15 22:28:08 2010 +0000
+++ b/libmpdemux/video.c	Mon Mar 15 22:32:11 2010 +0000
@@ -169,6 +169,8 @@
      return 0;
    }
    mp4_header_process_vop(&picture, &(videobuffer[pos]));
+   sh_video->disp_w = picture.display_picture_width;
+   sh_video->disp_h = picture.display_picture_height;
    units[vop_cnt] = picture.timeinc_unit;
    vop_cnt++;
    //mp_msg(MSGT_DECVIDEO,MSGL_V, "TYPE: %d, unit: %d\n", picture.picture_type, picture.timeinc_unit);