Commit fd890ca4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

vmem: pass usual full dimensions as before

There is no way for vmem to know the required padding otherwise.
This partly reverts commit 260a3c10.
parent b4bdda13
...@@ -149,8 +149,8 @@ static int Open(vlc_object_t *object) ...@@ -149,8 +149,8 @@ static int Open(vlc_object_t *object)
memset(sys->pitches, 0, sizeof(sys->pitches)); memset(sys->pitches, 0, sizeof(sys->pitches));
memset(sys->lines, 0, sizeof(sys->lines)); memset(sys->lines, 0, sizeof(sys->lines));
sys->count = setup(&sys->opaque, chroma, &fmt.i_visible_width, sys->count = setup(&sys->opaque, chroma, &fmt.i_width, &fmt.i_height,
&fmt.i_visible_height, sys->pitches, sys->lines); sys->pitches, sys->lines);
if (sys->count == 0) { if (sys->count == 0) {
msg_Err(vd, "video format setup failure (no pictures)"); msg_Err(vd, "video format setup failure (no pictures)");
free(sys); free(sys);
...@@ -163,8 +163,8 @@ static int Open(vlc_object_t *object) ...@@ -163,8 +163,8 @@ static int Open(vlc_object_t *object)
fmt.i_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma); fmt.i_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma);
free(chroma); free(chroma);
fmt.i_visible_width = var_InheritInteger(vd, "vmem-width"); fmt.i_width = var_InheritInteger(vd, "vmem-width");
fmt.i_visible_height = var_InheritInteger(vd, "vmem-height"); fmt.i_height = var_InheritInteger(vd, "vmem-height");
sys->pitches[0] = var_InheritInteger(vd, "vmem-pitch"); sys->pitches[0] = var_InheritInteger(vd, "vmem-pitch");
sys->lines[0] = fmt.i_height; sys->lines[0] = fmt.i_height;
for (size_t i = 1; i < PICTURE_PLANE_MAX; i++) for (size_t i = 1; i < PICTURE_PLANE_MAX; i++)
...@@ -176,8 +176,8 @@ static int Open(vlc_object_t *object) ...@@ -176,8 +176,8 @@ static int Open(vlc_object_t *object)
sys->cleanup = NULL; sys->cleanup = NULL;
} }
fmt.i_x_offset = fmt.i_y_offset = 0; fmt.i_x_offset = fmt.i_y_offset = 0;
fmt.i_width = fmt.i_visible_width; fmt.i_visible_width = fmt.i_width;
fmt.i_height = fmt.i_visible_height; fmt.i_visible_height = fmt.i_height;
if (!fmt.i_chroma) { if (!fmt.i_chroma) {
msg_Err(vd, "vmem-chroma should be 4 characters long"); msg_Err(vd, "vmem-chroma should be 4 characters long");
......
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