mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-02 14:36:41 +00:00
Revert "dvdspu: handle frame size event from upstream"
This reverts commit 46aaaa6c30
.
This commit is contained in:
parent
de568c4896
commit
a31978643c
2 changed files with 2 additions and 10 deletions
|
@ -485,11 +485,6 @@ gstspu_vobsub_handle_dvd_event (GstDVDSpu * dvdspu, GstEvent * event)
|
||||||
if (was_forced != forced_only)
|
if (was_forced != forced_only)
|
||||||
hl_change = TRUE;
|
hl_change = TRUE;
|
||||||
}
|
}
|
||||||
} else if (strcmp (event_type, "dvd-set-frame-size") == 0) {
|
|
||||||
gst_structure_get_int (structure, "width", &state->vobsub.frame_w);
|
|
||||||
gst_structure_get_int (structure, "height", &state->vobsub.frame_h);
|
|
||||||
GST_INFO_OBJECT (dvdspu, "Frame size is now %dx%d",
|
|
||||||
state->vobsub.frame_w, state->vobsub.frame_h);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gst_event_unref (event);
|
gst_event_unref (event);
|
||||||
|
@ -514,12 +509,10 @@ gstspu_vobsub_get_render_geometry (GstDVDSpu * dvdspu,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (display_width)
|
if (display_width)
|
||||||
*display_width = state->vobsub.frame_w > 0 ?
|
*display_width = state->info.width;
|
||||||
state->vobsub.frame_w : state->info.width;
|
|
||||||
|
|
||||||
if (display_height)
|
if (display_height)
|
||||||
*display_height = state->vobsub.frame_h > 0 ?
|
*display_height = state->info.height;
|
||||||
state->vobsub.frame_h : state->info.height;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -56,7 +56,6 @@ struct SpuVobsubState {
|
||||||
|
|
||||||
SpuRect disp_rect;
|
SpuRect disp_rect;
|
||||||
SpuRect hl_rect;
|
SpuRect hl_rect;
|
||||||
gint frame_w, frame_h;
|
|
||||||
|
|
||||||
guint32 current_clut[16]; /* Colour lookup table from incoming events */
|
guint32 current_clut[16]; /* Colour lookup table from incoming events */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue