Skip to content

V
vlc-2-2
Commit 5d6c8b4b authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* src/video_output/vout_pictures.c: oups, inverted i_visible_lines and i_lines.

parent 56b5483c
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 54 deletions
src/video_output/vout_pictures.c
View file @ 5d6c8b4b
...@@ -653,16 +653,16 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -653,16 +653,16 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
switch( i_chroma ) switch( i_chroma )
{ {
case FOURCC_I411: case FOURCC_I411:
p_pic->p[ Y_PLANE ].i_lines = i_height; p_pic->p[ Y_PLANE ].i_lines = i_height_aligned;
p_pic->p[ Y_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ Y_PLANE ].i_visible_lines = i_height;
p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; p_pic->p[ Y_PLANE ].i_visible_pitch = i_width;
p_pic->p[ U_PLANE ].i_lines = i_height; p_pic->p[ U_PLANE ].i_lines = i_height_aligned;
p_pic->p[ U_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ U_PLANE ].i_visible_lines = i_height;
p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 4; p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 4;
p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 4; p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 4;
p_pic->p[ V_PLANE ].i_lines = i_height; p_pic->p[ V_PLANE ].i_lines = i_height_aligned;
p_pic->p[ V_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ V_PLANE ].i_visible_lines = i_height;
p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 4; p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 4;
p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 4; p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 4;
p_pic->i_planes = 3; p_pic->i_planes = 3;
...@@ -670,16 +670,16 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -670,16 +670,16 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
case FOURCC_I410: case FOURCC_I410:
case FOURCC_YVU9: case FOURCC_YVU9:
p_pic->p[ Y_PLANE ].i_lines = i_height; p_pic->p[ Y_PLANE ].i_lines = i_height_aligned;
p_pic->p[ Y_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ Y_PLANE ].i_visible_lines = i_height;
p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; p_pic->p[ Y_PLANE ].i_visible_pitch = i_width;
p_pic->p[ U_PLANE ].i_lines = i_height / 4; p_pic->p[ U_PLANE ].i_lines = i_height_aligned / 4;
p_pic->p[ U_PLANE ].i_visible_lines = i_height_aligned / 4; p_pic->p[ U_PLANE ].i_visible_lines = i_height / 4;
p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 4; p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 4;
p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 4; p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 4;
p_pic->p[ V_PLANE ].i_lines = i_height / 4; p_pic->p[ V_PLANE ].i_lines = i_height_aligned / 4;
p_pic->p[ V_PLANE ].i_visible_lines = i_height_aligned / 4; p_pic->p[ V_PLANE ].i_visible_lines = i_height / 4;
p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 4; p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 4;
p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 4; p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 4;
p_pic->i_planes = 3; p_pic->i_planes = 3;
...@@ -688,76 +688,76 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -688,76 +688,76 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
case FOURCC_YV12: case FOURCC_YV12:
case FOURCC_I420: case FOURCC_I420:
case FOURCC_IYUV: case FOURCC_IYUV:
p_pic->p[ Y_PLANE ].i_lines = i_height; p_pic->p[ Y_PLANE ].i_lines = i_height_aligned;
p_pic->p[ Y_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ Y_PLANE ].i_visible_lines = i_height;
p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; p_pic->p[ Y_PLANE ].i_visible_pitch = i_width;
p_pic->p[ U_PLANE ].i_lines = i_height / 2; p_pic->p[ U_PLANE ].i_lines = i_height_aligned / 2;
p_pic->p[ U_PLANE ].i_visible_lines = i_height_aligned / 2; p_pic->p[ U_PLANE ].i_visible_lines = i_height / 2;
p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 2; p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 2;
p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 2; p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 2;
p_pic->p[ V_PLANE ].i_lines = i_height / 2; p_pic->p[ V_PLANE ].i_lines = i_height_aligned / 2;
p_pic->p[ V_PLANE ].i_visible_lines = i_height_aligned / 2; p_pic->p[ V_PLANE ].i_visible_lines = i_height / 2;
p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 2; p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 2;
p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 2; p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 2;
p_pic->i_planes = 3; p_pic->i_planes = 3;
break; break;
case FOURCC_I422: case FOURCC_I422:
p_pic->p[ Y_PLANE ].i_lines = i_height; p_pic->p[ Y_PLANE ].i_lines = i_height_aligned;
p_pic->p[ Y_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ Y_PLANE ].i_visible_lines = i_height;
p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; p_pic->p[ Y_PLANE ].i_visible_pitch = i_width;
p_pic->p[ U_PLANE ].i_lines = i_height; p_pic->p[ U_PLANE ].i_lines = i_height_aligned;
p_pic->p[ U_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ U_PLANE ].i_visible_lines = i_height;
p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 2; p_pic->p[ U_PLANE ].i_pitch = i_width_aligned / 2;
p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 2; p_pic->p[ U_PLANE ].i_visible_pitch = i_width / 2;
p_pic->p[ V_PLANE ].i_lines = i_height; p_pic->p[ V_PLANE ].i_lines = i_height_aligned;
p_pic->p[ V_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ V_PLANE ].i_visible_lines = i_height;
p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 2; p_pic->p[ V_PLANE ].i_pitch = i_width_aligned / 2;
p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 2; p_pic->p[ V_PLANE ].i_visible_pitch = i_width / 2;
p_pic->i_planes = 3; p_pic->i_planes = 3;
break; break;
case FOURCC_I444: case FOURCC_I444:
p_pic->p[ Y_PLANE ].i_lines = i_height; p_pic->p[ Y_PLANE ].i_lines = i_height_aligned;
p_pic->p[ Y_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ Y_PLANE ].i_visible_lines = i_height;
p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; p_pic->p[ Y_PLANE ].i_visible_pitch = i_width;
p_pic->p[ U_PLANE ].i_lines = i_height; p_pic->p[ U_PLANE ].i_lines = i_height_aligned;
p_pic->p[ U_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ U_PLANE ].i_visible_lines = i_height;
p_pic->p[ U_PLANE ].i_pitch = i_width_aligned; p_pic->p[ U_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ U_PLANE ].i_visible_pitch = i_width; p_pic->p[ U_PLANE ].i_visible_pitch = i_width;
p_pic->p[ V_PLANE ].i_lines = i_height; p_pic->p[ V_PLANE ].i_lines = i_height_aligned;
p_pic->p[ V_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ V_PLANE ].i_visible_lines = i_height;
p_pic->p[ V_PLANE ].i_pitch = i_width_aligned; p_pic->p[ V_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ V_PLANE ].i_visible_pitch = i_width; p_pic->p[ V_PLANE ].i_visible_pitch = i_width;
p_pic->i_planes = 3; p_pic->i_planes = 3;
break; break;
case FOURCC_YUVA: case FOURCC_YUVA:
p_pic->p[ Y_PLANE ].i_lines = i_height; p_pic->p[ Y_PLANE ].i_lines = i_height_aligned;
p_pic->p[ Y_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ Y_PLANE ].i_visible_lines = i_height;
p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned; p_pic->p[ Y_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ Y_PLANE ].i_visible_pitch = i_width; p_pic->p[ Y_PLANE ].i_visible_pitch = i_width;
p_pic->p[ U_PLANE ].i_lines = i_height; p_pic->p[ U_PLANE ].i_lines = i_height_aligned;
p_pic->p[ U_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ U_PLANE ].i_visible_lines = i_height;
p_pic->p[ U_PLANE ].i_pitch = i_width_aligned; p_pic->p[ U_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ U_PLANE ].i_visible_pitch = i_width; p_pic->p[ U_PLANE ].i_visible_pitch = i_width;
p_pic->p[ V_PLANE ].i_lines = i_height; p_pic->p[ V_PLANE ].i_lines = i_height_aligned;
p_pic->p[ V_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ V_PLANE ].i_visible_lines = i_height;
p_pic->p[ V_PLANE ].i_pitch = i_width_aligned; p_pic->p[ V_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ V_PLANE ].i_visible_pitch = i_width; p_pic->p[ V_PLANE ].i_visible_pitch = i_width;
p_pic->p[ A_PLANE ].i_lines = i_height; p_pic->p[ A_PLANE ].i_lines = i_height_aligned;
p_pic->p[ A_PLANE ].i_visible_lines = i_height_aligned; p_pic->p[ A_PLANE ].i_visible_lines = i_height;
p_pic->p[ A_PLANE ].i_pitch = i_width_aligned; p_pic->p[ A_PLANE ].i_pitch = i_width_aligned;
p_pic->p[ A_PLANE ].i_visible_pitch = i_width; p_pic->p[ A_PLANE ].i_visible_pitch = i_width;
p_pic->i_planes = 4; p_pic->i_planes = 4;
break; break;
case FOURCC_YUVP: case FOURCC_YUVP:
p_pic->p->i_lines = i_height; p_pic->p->i_lines = i_height_aligned;
p_pic->p->i_visible_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height;
p_pic->p->i_pitch = i_width_aligned; p_pic->p->i_pitch = i_width_aligned;
p_pic->p->i_visible_pitch = i_width; p_pic->p->i_visible_pitch = i_width;
p_pic->p->i_pixel_pitch = 8; p_pic->p->i_pixel_pitch = 8;
...@@ -765,8 +765,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -765,8 +765,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
break; break;
case FOURCC_Y211: case FOURCC_Y211:
p_pic->p->i_lines = i_height; p_pic->p->i_lines = i_height_aligned;
p_pic->p->i_visible_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height;
p_pic->p->i_pitch = i_width_aligned; p_pic->p->i_pitch = i_width_aligned;
p_pic->p->i_visible_pitch = i_width; p_pic->p->i_visible_pitch = i_width;
p_pic->p->i_pixel_pitch = 4; p_pic->p->i_pixel_pitch = 4;
...@@ -775,8 +775,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -775,8 +775,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
case FOURCC_UYVY: case FOURCC_UYVY:
case FOURCC_YUY2: case FOURCC_YUY2:
p_pic->p->i_lines = i_height; p_pic->p->i_lines = i_height_aligned;
p_pic->p->i_visible_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height;
p_pic->p->i_pitch = i_width_aligned * 2; p_pic->p->i_pitch = i_width_aligned * 2;
p_pic->p->i_visible_pitch = i_width * 2; p_pic->p->i_visible_pitch = i_width * 2;
p_pic->p->i_pixel_pitch = 4; p_pic->p->i_pixel_pitch = 4;
...@@ -784,8 +784,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -784,8 +784,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
break; break;
case FOURCC_RGB2: case FOURCC_RGB2:
p_pic->p->i_lines = i_height; p_pic->p->i_lines = i_height_aligned;
p_pic->p->i_visible_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height;
p_pic->p->i_pitch = i_width_aligned; p_pic->p->i_pitch = i_width_aligned;
p_pic->p->i_visible_pitch = i_width; p_pic->p->i_visible_pitch = i_width;
p_pic->p->i_pixel_pitch = 1; p_pic->p->i_pixel_pitch = 1;
...@@ -793,8 +793,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -793,8 +793,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
break; break;
case FOURCC_RV15: case FOURCC_RV15:
p_pic->p->i_lines = i_height; p_pic->p->i_lines = i_height_aligned;
p_pic->p->i_visible_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height;
p_pic->p->i_pitch = i_width_aligned * 2; p_pic->p->i_pitch = i_width_aligned * 2;
p_pic->p->i_visible_pitch = i_width * 2; p_pic->p->i_visible_pitch = i_width * 2;
p_pic->p->i_pixel_pitch = 2; p_pic->p->i_pixel_pitch = 2;
...@@ -802,8 +802,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -802,8 +802,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
break; break;
case FOURCC_RV16: case FOURCC_RV16:
p_pic->p->i_lines = i_height; p_pic->p->i_lines = i_height_aligned;
p_pic->p->i_visible_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height;
p_pic->p->i_pitch = i_width_aligned * 2; p_pic->p->i_pitch = i_width_aligned * 2;
p_pic->p->i_visible_pitch = i_width * 2; p_pic->p->i_visible_pitch = i_width * 2;
p_pic->p->i_pixel_pitch = 2; p_pic->p->i_pixel_pitch = 2;
...@@ -811,8 +811,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -811,8 +811,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
break; break;
case FOURCC_RV24: case FOURCC_RV24:
p_pic->p->i_lines = i_height; p_pic->p->i_lines = i_height_aligned;
p_pic->p->i_visible_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height;
p_pic->p->i_pitch = i_width_aligned * 3; p_pic->p->i_pitch = i_width_aligned * 3;
p_pic->p->i_visible_pitch = i_width * 3; p_pic->p->i_visible_pitch = i_width * 3;
p_pic->p->i_pixel_pitch = 3; p_pic->p->i_pixel_pitch = 3;
...@@ -820,8 +820,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic, ...@@ -820,8 +820,8 @@ void vout_InitPicture( vlc_object_t *p_this, picture_t *p_pic,
break; break;
case FOURCC_RV32: case FOURCC_RV32:
p_pic->p->i_lines = i_height; p_pic->p->i_lines = i_height_aligned;
p_pic->p->i_visible_lines = i_height_aligned; p_pic->p->i_visible_lines = i_height;
p_pic->p->i_pitch = i_width_aligned * 4; p_pic->p->i_pitch = i_width_aligned * 4;
p_pic->p->i_visible_pitch = i_width * 4; p_pic->p->i_visible_pitch = i_width * 4;
p_pic->p->i_pixel_pitch = 4; p_pic->p->i_pixel_pitch = 4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment