mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-03 16:09:39 +00:00
bba33533ab
This fixes an issue with SSA/ASS subtitles, where subtitles would fail to appear if there was already a subtitle on screen. This was because `struct _GstAssRender` had a single `GstBuffer *subtitle_pending` member. This meant that the assrender context could only be aware of one subtitle at a time. This patch changes the subtitle_pending member to a linked list of pending subtitles. The `gst_ass_render_chain_text` function no longer needs to care about whether there are already subtitles pending, it simply appends new subtitles to the list. The `gst_ass_render_chain_video` function has been modified to handle the list of pending subtitles. Finally, the `gst_ass_render_pop_text` function has been modified to pop the entire list of pending subtitles. https://bugzilla.gnome.org/show_bug.cgi?id=735944
99 lines
2.8 KiB
C
99 lines
2.8 KiB
C
/*
|
|
* Copyright (c) 2008 Benjamin Schmitz <vortex@wolpzone.de>
|
|
* Copyright (c) 2009 Sebastian Dröge <sebastian.droege@collabora.co.uk>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public License
|
|
* along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
#ifndef __GST_ASS_RENDER_H__
|
|
#define __GST_ASS_RENDER_H__
|
|
|
|
#include <gst/gst.h>
|
|
#include <gst/video/video.h>
|
|
#include <gst/video/video-overlay-composition.h>
|
|
|
|
#include <ass/ass.h>
|
|
#include <ass/ass_types.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00907010
|
|
#define ASS_Library ass_library_t
|
|
#define ASS_Renderer ass_renderer_t
|
|
#define ASS_Track ass_track_t
|
|
#define ASS_Image ass_image_t
|
|
#endif
|
|
|
|
#define GST_TYPE_ASS_RENDER (gst_ass_render_get_type())
|
|
#define GST_ASS_RENDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ASS_RENDER,GstAssRender))
|
|
#define GST_ASS_RENDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ASS_RENDER,GstAssRenderClass))
|
|
#define GST_ASS_RENDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
|
|
GST_TYPE_ASS_RENDER, GstAssRenderClass))
|
|
#define GST_IS_ASS_RENDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ASS_RENDER))
|
|
#define GST_IS_ASS_RENDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ASS_RENDER))
|
|
|
|
typedef struct _GstAssRender GstAssRender;
|
|
typedef struct _GstAssRenderClass GstAssRenderClass;
|
|
|
|
struct _GstAssRender
|
|
{
|
|
GstElement element;
|
|
|
|
GstPad *video_sinkpad, *text_sinkpad, *srcpad;
|
|
|
|
/* properties */
|
|
gboolean enable, embeddedfonts;
|
|
gboolean wait_text;
|
|
|
|
/* <private> */
|
|
GMutex lock;
|
|
GCond cond;
|
|
|
|
GstSegment video_segment;
|
|
gboolean video_flushing;
|
|
gboolean video_eos;
|
|
|
|
GstVideoInfo info;
|
|
|
|
GSList *subtitle_pending;
|
|
gboolean subtitle_flushing;
|
|
gboolean subtitle_eos;
|
|
GstSegment subtitle_segment;
|
|
|
|
GMutex ass_mutex;
|
|
ASS_Library *ass_library;
|
|
ASS_Renderer *ass_renderer;
|
|
ASS_Track *ass_track;
|
|
gint ass_frame_width, ass_frame_height;
|
|
|
|
gboolean renderer_init_ok, track_init_ok;
|
|
gboolean need_process;
|
|
|
|
/* overlay stuff */
|
|
GstVideoOverlayComposition *composition;
|
|
guint window_width, window_height;
|
|
gboolean attach_compo_to_buffer;
|
|
};
|
|
|
|
struct _GstAssRenderClass
|
|
{
|
|
GstElementClass parent_class;
|
|
};
|
|
|
|
GType gst_ass_render_get_type (void);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif
|