diff options
Diffstat (limited to 'gst/dvdspu')
| -rw-r--r-- | gst/dvdspu/gstspu-pgs.c | 22 | ||||
| -rw-r--r-- | gst/dvdspu/gstspu-vobsub-render.c | 6 |
2 files changed, 19 insertions, 9 deletions
diff --git a/gst/dvdspu/gstspu-pgs.c b/gst/dvdspu/gstspu-pgs.c index d1d4de18..37d80236 100644 --- a/gst/dvdspu/gstspu-pgs.c +++ b/gst/dvdspu/gstspu-pgs.c @@ -134,6 +134,9 @@ dump_rle_data (GstDVDSpu * dvdspu, guint8 * data, guint32 len) pal_id = data[2]; data += 3; break; + default: + run_len = 0; + break; } } @@ -252,6 +255,9 @@ pgs_composition_object_render (PgsCompositionObject * obj, SpuState * state, pal_id = data[2]; data += 3; break; + default: + run_len = 0; + break; } } @@ -430,12 +436,13 @@ parse_presentation_segment (GstDVDSpu * dvdspu, guint8 type, guint8 * payload, if (obj->flags & ~(PGS_COMPOSITION_OBJECT_FLAG_CROPPED | PGS_COMPOSITION_OBJECT_FLAG_FORCED)) - g_warning ("PGS Composition Object has unknown flags: 0x%02x", + GST_ERROR ("PGS Composition Object has unknown flags: 0x%02x", obj->flags); } if (payload != end) { - g_warning ("PGS Composition Object: %ld bytes not consumed", end - payload); + GST_ERROR ("PGS Composition Object: %" G_GSSIZE_FORMAT + " bytes not consumed", (gssize) (end - payload)); dump_bytes (payload, end - payload); } @@ -495,7 +502,8 @@ parse_set_palette (GstDVDSpu * dvdspu, guint8 type, guint8 * payload, #endif if (payload != end) { - g_warning ("PGS Set Palette: %ld bytes not consumed", end - payload); + GST_ERROR ("PGS Set Palette: %" G_GSSIZE_FORMAT " bytes not consumed", + (gssize) (end - payload)); dump_bytes (payload, end - payload); } @@ -529,7 +537,8 @@ parse_set_window (GstDVDSpu * dvdspu, guint8 type, guint8 * payload, state->pgs.win_h); if (payload != end) { - g_warning ("PGS Set Window: %ld bytes not consumed", end - payload); + GST_ERROR ("PGS Set Window: %" G_GSSIZE_FORMAT " bytes not consumed", + (gssize) (end - payload)); dump_bytes (payload, end - payload); } @@ -590,7 +599,8 @@ parse_set_object_data (GstDVDSpu * dvdspu, guint8 type, guint8 * payload, dump_rle_data (dvdspu, obj->rle_data, obj->rle_data_size); if (payload != end) { - g_warning ("PGS Set Object Data: %ld bytes not consumed", end - payload); + GST_ERROR ("PGS Set Object Data: %" G_GSSIZE_FORMAT " bytes not consumed", + (gssize) (end - payload)); dump_bytes (payload, end - payload); } @@ -642,7 +652,7 @@ parse_pgs_packet (GstDVDSpu * dvdspu, guint8 type, guint8 * payload, pgs_state->in_presentation_segment = FALSE; break; default: - g_warning ("Unknown PGS command: type 0x%02x len %u", type, len); + GST_ERROR ("Unknown PGS command: type 0x%02x len %u", type, len); dump_bytes (payload, len); break; } diff --git a/gst/dvdspu/gstspu-vobsub-render.c b/gst/dvdspu/gstspu-vobsub-render.c index 07abff22..3709d82a 100644 --- a/gst/dvdspu/gstspu-vobsub-render.c +++ b/gst/dvdspu/gstspu-vobsub-render.c @@ -343,7 +343,7 @@ gstspu_vobsub_blend_comp_buffers (SpuState * state, guint8 * planes[3]) gstspu_blend_comp_buffers (state, planes); } -void +static void gstspu_vobsub_clear_comp_buffers (SpuState * state) { state->comp_left = state->vobsub.disp_rect.left; @@ -452,7 +452,7 @@ gstspu_vobsub_render (GstDVDSpu * dvdspu, GstBuffer * buf) || state->vobsub.cur_Y > state->vobsub.clip_rect.bottom); /* Reset the compositing buffer */ - gstspu_clear_comp_buffers (state); + gstspu_vobsub_clear_comp_buffers (state); /* Render even line */ state->vobsub.comp_last_x_ptr = state->vobsub.comp_last_x; gstspu_vobsub_render_line (state, planes, &state->vobsub.cur_offsets[0]); @@ -480,7 +480,7 @@ gstspu_vobsub_render (GstDVDSpu * dvdspu, GstBuffer * buf) /* Render a remaining lone last even line. y already has the correct value * after the above loop exited. */ - gstspu_clear_comp_buffers (state); + gstspu_vobsub_clear_comp_buffers (state); state->vobsub.comp_last_x_ptr = state->vobsub.comp_last_x; gstspu_vobsub_render_line (state, planes, &state->vobsub.cur_offsets[0]); gstspu_vobsub_blend_comp_buffers (state, planes); |