mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

dvdspu: Don't accidentally lose the colour palette when flushing the SPU

Browse source 
Fixes racy startup on DVDs where it sometimes gets entirely the wrong set
of colours in the menus and subtitles.
This commit is contained in:
Jan Schmidt 2009-05-22 13:07:38 +01:00
parent 707eaf7684
commit a7cd4b03ad
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/dvdspu/gstdvdspu.c
View file

@ -101,10 +101,12 @@ static GstFlowReturn gst_dvd_spu_subpic_chain (GstPad * pad, GstBuffer * buf);
static gboolean gst_dvd_spu_subpic_event (GstPad * pad, GstEvent * event); static gboolean gst_dvd_spu_subpic_event (GstPad * pad, GstEvent * event);
static void gst_dvd_spu_clear (GstDVDSpu * dvdspu); static void gst_dvd_spu_clear (GstDVDSpu * dvdspu);
static void gst_dvd_spu_flush_spu_info (GstDVDSpu * dvdspu); static void gst_dvd_spu_flush_spu_info (GstDVDSpu * dvdspu,
gboolean process_events);
static void gst_dvd_spu_advance_spu (GstDVDSpu * dvdspu, GstClockTime new_ts); static void gst_dvd_spu_advance_spu (GstDVDSpu * dvdspu, GstClockTime new_ts);
static GstFlowReturn static GstFlowReturn
dvdspu_handle_vid_buffer (GstDVDSpu * dvdspu, GstBuffer * buf); dvdspu_handle_vid_buffer (GstDVDSpu * dvdspu, GstBuffer * buf);
static void gst_dvd_spu_handle_dvd_event (GstDVDSpu * dvdspu, GstEvent * event);
static void static void
gst_dvd_spu_base_init (gpointer gclass) gst_dvd_spu_base_init (gpointer gclass)
@ -179,7 +181,8 @@ gst_dvd_spu_init (GstDVDSpu * dvdspu, GstDVDSpuClass * gclass)
static void static void
gst_dvd_spu_clear (GstDVDSpu * dvdspu) gst_dvd_spu_clear (GstDVDSpu * dvdspu)
{ {
gst_dvd_spu_flush_spu_info (dvdspu); gst_dvd_spu_flush_spu_info (dvdspu, FALSE);
gst_segment_init (&dvdspu->subp_seg, GST_FORMAT_UNDEFINED);
gst_buffer_replace (&dvdspu->ref_frame, NULL); gst_buffer_replace (&dvdspu->ref_frame, NULL);
gst_buffer_replace (&dvdspu->pending_frame, NULL); gst_buffer_replace (&dvdspu->pending_frame, NULL);
@ -223,15 +226,13 @@ gst_dvd_spu_finalize (GObject * object)
/* With SPU lock held, clear the queue of SPU packets */ /* With SPU lock held, clear the queue of SPU packets */
static void static void
gst_dvd_spu_flush_spu_info (GstDVDSpu * dvdspu) gst_dvd_spu_flush_spu_info (GstDVDSpu * dvdspu, gboolean process_events)
{ {
SpuPacket *packet; SpuPacket *packet;
SpuState *state = &dvdspu->spu_state; SpuState *state = &dvdspu->spu_state;
GST_INFO_OBJECT (dvdspu, "Flushing SPU information"); GST_INFO_OBJECT (dvdspu, "Flushing SPU information");
gst_segment_init (&dvdspu->subp_seg, GST_FORMAT_UNDEFINED);
if (dvdspu->partial_spu) { if (dvdspu->partial_spu) {
gst_buffer_unref (dvdspu->partial_spu); gst_buffer_unref (dvdspu->partial_spu);
dvdspu->partial_spu = NULL; dvdspu->partial_spu = NULL;
@ -239,10 +240,15 @@ gst_dvd_spu_flush_spu_info (GstDVDSpu * dvdspu)
packet = (SpuPacket *) g_queue_pop_head (dvdspu->pending_spus); packet = (SpuPacket *) g_queue_pop_head (dvdspu->pending_spus);
while (packet != NULL) { while (packet != NULL) {
if (packet->buf) if (packet->buf) {
gst_buffer_unref (packet->buf); gst_buffer_unref (packet->buf);
if (packet->event) g_assert (packet->event == NULL);
} else if (packet->event) {
if (process_events)
gst_dvd_spu_handle_dvd_event (dvdspu, packet->event);
else
gst_event_unref (packet->event); gst_event_unref (packet->event);
}
g_free (packet); g_free (packet);
packet = (SpuPacket *) g_queue_pop_head (dvdspu->pending_spus); packet = (SpuPacket *) g_queue_pop_head (dvdspu->pending_spus);
} }
@ -1386,7 +1392,8 @@ gst_dvd_spu_subpic_event (GstPad * pad, GstEvent * event)
goto done; goto done;
case GST_EVENT_FLUSH_STOP: case GST_EVENT_FLUSH_STOP:
DVD_SPU_LOCK (dvdspu); DVD_SPU_LOCK (dvdspu);
gst_dvd_spu_flush_spu_info (dvdspu); gst_segment_init (&dvdspu->subp_seg, GST_FORMAT_UNDEFINED);
gst_dvd_spu_flush_spu_info (dvdspu, TRUE);
DVD_SPU_UNLOCK (dvdspu); DVD_SPU_UNLOCK (dvdspu);
/* We don't forward flushes on the spu pad */ /* We don't forward flushes on the spu pad */