Attachment #204901 for bug #285328

Lines 71-77 Link Here

(-)xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp (-1 / +1 lines)
71	height = pPicture->height;	71	height = pPicture->height;
72	width = pPicture->width;	72	width = pPicture->width;
73		73
74	ass_image_t* img = pOverlay->m_libass->RenderImage(width, height, pts);	74	ASS_Image* img = pOverlay->m_libass->RenderImage(width, height, pts);
75		75
76	while(img)	76	while(img)
77	{	77	{




  CDVDSubtitlesLibass();
  ~CDVDSubtitlesLibass();

  ASS_Image* RenderImage(int imageWidth, int imageHeight, double pts);
  ASS_Event* GetEvents();

  int GetNrOfEvents();


private:
  DllLibass m_dll;
  long m_references;
  ASS_Library* m_library;
  ASS_Track* m_track;
  ASS_Renderer* m_renderer;
};





{
public:
  virtual ~DllLibassInterface() {}
  virtual void ass_set_extract_fonts(ASS_Library* priv, int extract)=0;
  virtual void ass_set_fonts_dir(ASS_Library* priv, const char* fonts_dir)=0;
  virtual ASS_Library* ass_library_init(void)=0;
  virtual ASS_Renderer* ass_renderer_init(ASS_Library* library)=0;
  virtual void ass_set_frame_size(ASS_Renderer* priv, int w, int h)=0;
  virtual void ass_set_margins(ASS_Renderer* priv, int t, int b, int l, int r)=0;
  virtual void ass_set_use_margins(ASS_Renderer* priv, int use)=0;
  virtual void ass_set_font_scale(ASS_Renderer* priv, double font_scale)=0;
  virtual ASS_Image* ass_render_frame(ASS_Renderer *priv, ASS_Track* track, long long now, int* detect_change)=0;
  virtual ASS_Track* ass_new_track(ASS_Library*)=0;
  virtual ASS_Track* ass_read_file(ASS_Library* library, char* fname, char* codepage)=0;
  virtual void ass_free_track(ASS_Track* track)=0;
  virtual void ass_set_fonts(ASS_Renderer *priv, const char *default_font, const char *default_family, int fc, const char *config, int update) = 0;
  virtual void ass_set_style_overrides(ASS_Library* priv, char** list)=0;
  virtual void ass_library_done(ASS_Library* library)=0;
  virtual void ass_renderer_done(ASS_Renderer* renderer)=0;
  virtual void ass_process_chunk(ASS_Track* track, char *data, int size, long long timecode, long long duration)=0;
  virtual void ass_process_codec_private(ASS_Track* track, char *data, int size)=0;
  virtual void ass_set_message_cb(ASS_Library *priv
                                , void (*msg_cb)(int level, const char *fmt, va_list args, void *data)
                                , void *data)=0;
};

{
public:
    virtual ~DllLibass() {}
    virtual void ass_set_extract_fonts(ASS_Library* priv, int extract)
        { return ::ass_set_extract_fonts(priv, extract); }
    virtual void ass_set_fonts_dir(ASS_Library* priv, const char* fonts_dir)
        { return ::ass_set_fonts_dir(priv, fonts_dir); }
    virtual ASS_Library* ass_library_init(void)
        { return ::ass_library_init(); }
    virtual ASS_Renderer* ass_renderer_init(ASS_Library* library)
        { return ::ass_renderer_init(library); }
    virtual void ass_set_frame_size(ASS_Renderer* priv, int w, int h)
        { return ::ass_set_frame_size(priv, w, h); }
    virtual void ass_set_margins(ASS_Renderer* priv, int t, int b, int l, int r)
        { return ::ass_set_margins(priv, t, b, l, r); }
    virtual void ass_set_use_margins(ASS_Renderer* priv, int use)
        { return ::ass_set_use_margins(priv, use); }
    virtual void ass_set_font_scale(ASS_Renderer* priv, double font_scale)
        { return ::ass_set_font_scale(priv, font_scale); }
    virtual ASS_Image* ass_render_frame(ASS_Renderer *priv, ASS_Track* track, long long now, int* detect_change)
        { return ::ass_render_frame(priv, track, now, detect_change); }
    virtual ASS_Track* ass_new_track(ASS_Library* library)
        { return ::ass_new_track(library); }
    virtual ASS_Track* ass_read_file(ASS_Library* library, char* fname, char* codepage)
        { return ::ass_read_file(library, fname, codepage); }
    virtual void ass_free_track(ASS_Track* track)
        { return ::ass_free_track(track); }
    virtual void ass_set_fonts(ASS_Renderer *priv, const char *default_font, const char *default_family, int fc, const char *config, int update)
        { return ::ass_set_fonts(priv, default_font, default_family, fc, config, update); }
    virtual void ass_set_style_overrides(ASS_Library* priv, char** list)
        { return ::ass_set_style_overrides(priv, list); }
    virtual void ass_library_done(ASS_Library* library)
        { return ::ass_library_done(library); }
    virtual void ass_renderer_done(ASS_Renderer* renderer)
        { return ::ass_renderer_done(renderer); }
    virtual void ass_process_chunk(ASS_Track* track, char *data, int size, long long timecode, long long duration)
        { return ::ass_process_chunk(track, data, size, timecode, duration); }
    virtual void ass_process_codec_private(ASS_Track* track, char *data, int size)
        { return ::ass_process_codec_private(track, data, size); }
    virtual void ass_set_message_cb(ASS_Library *priv
                                   , void (*msg_cb)(int level, const char *fmt, va_list args, void *data)
                                   , void *data)
        { return ::ass_set_message_cb(priv, msg_cb, data); }

class DllLibass : public DllDynamic, DllLibassInterface
{
  DECLARE_DLL_WRAPPER(DllLibass, DLL_PATH_LIBASS)
  DEFINE_METHOD2(void, ass_set_extract_fonts, (ASS_Library * p1, int p2))
  DEFINE_METHOD2(void, ass_set_fonts_dir, (ASS_Library * p1, const char * p2))
  DEFINE_METHOD0(ASS_Library *, ass_library_init)
  DEFINE_METHOD1(ASS_Renderer *, ass_renderer_init, (ASS_Library * p1))
  DEFINE_METHOD3(void, ass_set_frame_size, (ASS_Renderer * p1, int p2, int p3))
  DEFINE_METHOD5(void, ass_set_margins, (ASS_Renderer * p1, int p2, int p3, int p4, int p5))
  DEFINE_METHOD2(void, ass_set_use_margins, (ASS_Renderer * p1, int p2))
  DEFINE_METHOD2(void, ass_set_font_scale, (ASS_Renderer * p1, double p2))
  DEFINE_METHOD4(ASS_Image *, ass_render_frame, (ASS_Renderer * p1, ASS_Track * p2, long long p3, int * p4))
  DEFINE_METHOD1(ASS_Track *, ass_new_track, (ASS_Library * p1))
  DEFINE_METHOD3(ASS_Track *, ass_read_file, (ASS_Library * p1, char * p2, char * p3))
  DEFINE_METHOD1(void, ass_free_track, (ASS_Track * p1))
  DEFINE_METHOD6(void, ass_set_fonts, (ASS_Renderer* p1, const char* p2, const char* p3, int p4, const char* p5, int p6))
  DEFINE_METHOD2(void, ass_set_style_overrides, (ASS_Library* p1, char** p2))
  DEFINE_METHOD1(void, ass_library_done, (ASS_Library* p1))
  DEFINE_METHOD1(void, ass_renderer_done, (ASS_Renderer* p1))
  DEFINE_METHOD5(void, ass_process_chunk, (ASS_Track* p1, char* p2, int p3, long long p4, long long p5))
  DEFINE_METHOD3(void, ass_process_codec_private, (ASS_Track* p1, char* p2, int p3))
  DEFINE_METHOD3(void, ass_set_message_cb, (ASS_Library* p1, void (*p2)(int level, const char *fmt, va_list args, void *data), void* p3))
  BEGIN_METHOD_RESOLVE()
    RESOLVE_METHOD(ass_set_extract_fonts)
    RESOLVE_METHOD(ass_set_fonts_dir)

Return to bug 285328

Lines 31-38 Link Here

(-)xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h (-5 / +5 lines)
31	CDVDSubtitlesLibass();	31	CDVDSubtitlesLibass();
32	~CDVDSubtitlesLibass();	32	~CDVDSubtitlesLibass();
33		33
34	ass_image_t* RenderImage(int imageWidth, int imageHeight, double pts);	34	ASS_Image* RenderImage(int imageWidth, int imageHeight, double pts);
35	ass_event_t* GetEvents();	35	ASS_Event* GetEvents();
36		36
37	int GetNrOfEvents();	37	int GetNrOfEvents();
38		38
Lines 47-54 Link Here
47	private:	47	private:
48	DllLibass m_dll;	48	DllLibass m_dll;
49	long m_references;	49	long m_references;
50	ass_library_t* m_library;	50	ASS_Library* m_library;
51	ass_track_t* m_track;	51	ASS_Track* m_track;
52	ass_renderer_t* m_renderer;	52	ASS_Renderer* m_renderer;
53	};	53	};
54		54

Lines 38-62 Link Here

(-)xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h (-57 / +57 lines)
38	{	38	{
39	public:	39	public:
40	virtual ~DllLibassInterface() {}	40	virtual ~DllLibassInterface() {}
41	virtual void ass_set_extract_fonts(ass_library_t* priv, int extract)=0;	41	virtual void ass_set_extract_fonts(ASS_Library* priv, int extract)=0;
42	virtual void ass_set_fonts_dir(ass_library_t* priv, const char* fonts_dir)=0;	42	virtual void ass_set_fonts_dir(ASS_Library* priv, const char* fonts_dir)=0;
43	virtual ass_library_t* ass_library_init(void)=0;	43	virtual ASS_Library* ass_library_init(void)=0;
44	virtual ass_renderer_t* ass_renderer_init(ass_library_t* library)=0;	44	virtual ASS_Renderer* ass_renderer_init(ASS_Library* library)=0;
45	virtual void ass_set_frame_size(ass_renderer_t* priv, int w, int h)=0;	45	virtual void ass_set_frame_size(ASS_Renderer* priv, int w, int h)=0;
46	virtual void ass_set_margins(ass_renderer_t* priv, int t, int b, int l, int r)=0;	46	virtual void ass_set_margins(ASS_Renderer* priv, int t, int b, int l, int r)=0;
47	virtual void ass_set_use_margins(ass_renderer_t* priv, int use)=0;	47	virtual void ass_set_use_margins(ASS_Renderer* priv, int use)=0;
48	virtual void ass_set_font_scale(ass_renderer_t* priv, double font_scale)=0;	48	virtual void ass_set_font_scale(ASS_Renderer* priv, double font_scale)=0;
49	virtual ass_image_t* ass_render_frame(ass_renderer_t priv, ass_track_t track, long long now, int* detect_change)=0;	49	virtual ASS_Image* ass_render_frame(ASS_Renderer priv, ASS_Track track, long long now, int* detect_change)=0;
50	virtual ass_track_t* ass_new_track(ass_library_t*)=0;	50	virtual ASS_Track* ass_new_track(ASS_Library*)=0;
51	virtual ass_track_t* ass_read_file(ass_library_t* library, char* fname, char* codepage)=0;	51	virtual ASS_Track* ass_read_file(ASS_Library* library, char* fname, char* codepage)=0;
52	virtual void ass_free_track(ass_track_t* track)=0;	52	virtual void ass_free_track(ASS_Track* track)=0;
53	virtual void ass_set_fonts(ass_renderer_t priv, const char default_font, const char default_family, int fc, const char config, int update) = 0;	53	virtual void ass_set_fonts(ASS_Renderer priv, const char default_font, const char default_family, int fc, const char config, int update) = 0;
54	virtual void ass_set_style_overrides(ass_library_t* priv, char** list)=0;	54	virtual void ass_set_style_overrides(ASS_Library* priv, char** list)=0;
55	virtual void ass_library_done(ass_library_t* library)=0;	55	virtual void ass_library_done(ASS_Library* library)=0;
56	virtual void ass_renderer_done(ass_renderer_t* renderer)=0;	56	virtual void ass_renderer_done(ASS_Renderer* renderer)=0;
57	virtual void ass_process_chunk(ass_track_t* track, char *data, int size, long long timecode, long long duration)=0;	57	virtual void ass_process_chunk(ASS_Track* track, char *data, int size, long long timecode, long long duration)=0;
58	virtual void ass_process_codec_private(ass_track_t* track, char *data, int size)=0;	58	virtual void ass_process_codec_private(ASS_Track* track, char *data, int size)=0;
59	virtual void ass_set_message_cb(ass_library_t *priv	59	virtual void ass_set_message_cb(ASS_Library *priv
60	, void (msg_cb)(int level, const char fmt, va_list args, void *data)	60	, void (msg_cb)(int level, const char fmt, va_list args, void *data)
61	, void *data)=0;	61	, void *data)=0;
62	};	62	};
Lines 67-109 Link Here
67	{	67	{
68	public:	68	public:
69	virtual ~DllLibass() {}	69	virtual ~DllLibass() {}
70	virtual void ass_set_extract_fonts(ass_library_t* priv, int extract)	70	virtual void ass_set_extract_fonts(ASS_Library* priv, int extract)
71	{ return ::ass_set_extract_fonts(priv, extract); }	71	{ return ::ass_set_extract_fonts(priv, extract); }
72	virtual void ass_set_fonts_dir(ass_library_t* priv, const char* fonts_dir)	72	virtual void ass_set_fonts_dir(ASS_Library* priv, const char* fonts_dir)
73	{ return ::ass_set_fonts_dir(priv, fonts_dir); }	73	{ return ::ass_set_fonts_dir(priv, fonts_dir); }
74	virtual ass_library_t* ass_library_init(void)	74	virtual ASS_Library* ass_library_init(void)
75	{ return ::ass_library_init(); }	75	{ return ::ass_library_init(); }
76	virtual ass_renderer_t* ass_renderer_init(ass_library_t* library)	76	virtual ASS_Renderer* ass_renderer_init(ASS_Library* library)
77	{ return ::ass_renderer_init(library); }	77	{ return ::ass_renderer_init(library); }
78	virtual void ass_set_frame_size(ass_renderer_t* priv, int w, int h)	78	virtual void ass_set_frame_size(ASS_Renderer* priv, int w, int h)
79	{ return ::ass_set_frame_size(priv, w, h); }	79	{ return ::ass_set_frame_size(priv, w, h); }
80	virtual void ass_set_margins(ass_renderer_t* priv, int t, int b, int l, int r)	80	virtual void ass_set_margins(ASS_Renderer* priv, int t, int b, int l, int r)
81	{ return ::ass_set_margins(priv, t, b, l, r); }	81	{ return ::ass_set_margins(priv, t, b, l, r); }
82	virtual void ass_set_use_margins(ass_renderer_t* priv, int use)	82	virtual void ass_set_use_margins(ASS_Renderer* priv, int use)
83	{ return ::ass_set_use_margins(priv, use); }	83	{ return ::ass_set_use_margins(priv, use); }
84	virtual void ass_set_font_scale(ass_renderer_t* priv, double font_scale)	84	virtual void ass_set_font_scale(ASS_Renderer* priv, double font_scale)
85	{ return ::ass_set_font_scale(priv, font_scale); }	85	{ return ::ass_set_font_scale(priv, font_scale); }
86	virtual ass_image_t* ass_render_frame(ass_renderer_t priv, ass_track_t track, long long now, int* detect_change)	86	virtual ASS_Image* ass_render_frame(ASS_Renderer priv, ASS_Track track, long long now, int* detect_change)
87	{ return ::ass_render_frame(priv, track, now, detect_change); }	87	{ return ::ass_render_frame(priv, track, now, detect_change); }
88	virtual ass_track_t* ass_new_track(ass_library_t* library)	88	virtual ASS_Track* ass_new_track(ASS_Library* library)
89	{ return ::ass_new_track(library); }	89	{ return ::ass_new_track(library); }
90	virtual ass_track_t* ass_read_file(ass_library_t* library, char* fname, char* codepage)	90	virtual ASS_Track* ass_read_file(ASS_Library* library, char* fname, char* codepage)
91	{ return ::ass_read_file(library, fname, codepage); }	91	{ return ::ass_read_file(library, fname, codepage); }
92	virtual void ass_free_track(ass_track_t* track)	92	virtual void ass_free_track(ASS_Track* track)
93	{ return ::ass_free_track(track); }	93	{ return ::ass_free_track(track); }
94	virtual void ass_set_fonts(ass_renderer_t priv, const char default_font, const char default_family, int fc, const char config, int update)	94	virtual void ass_set_fonts(ASS_Renderer priv, const char default_font, const char default_family, int fc, const char config, int update)
95	{ return ::ass_set_fonts(priv, default_font, default_family, fc, config, update); }	95	{ return ::ass_set_fonts(priv, default_font, default_family, fc, config, update); }
96	virtual void ass_set_style_overrides(ass_library_t* priv, char** list)	96	virtual void ass_set_style_overrides(ASS_Library* priv, char** list)
97	{ return ::ass_set_style_overrides(priv, list); }	97	{ return ::ass_set_style_overrides(priv, list); }
98	virtual void ass_library_done(ass_library_t* library)	98	virtual void ass_library_done(ASS_Library* library)
99	{ return ::ass_library_done(library); }	99	{ return ::ass_library_done(library); }
100	virtual void ass_renderer_done(ass_renderer_t* renderer)	100	virtual void ass_renderer_done(ASS_Renderer* renderer)
101	{ return ::ass_renderer_done(renderer); }	101	{ return ::ass_renderer_done(renderer); }
102	virtual void ass_process_chunk(ass_track_t* track, char *data, int size, long long timecode, long long duration)	102	virtual void ass_process_chunk(ASS_Track* track, char *data, int size, long long timecode, long long duration)
103	{ return ::ass_process_chunk(track, data, size, timecode, duration); }	103	{ return ::ass_process_chunk(track, data, size, timecode, duration); }
104	virtual void ass_process_codec_private(ass_track_t* track, char *data, int size)	104	virtual void ass_process_codec_private(ASS_Track* track, char *data, int size)
105	{ return ::ass_process_codec_private(track, data, size); }	105	{ return ::ass_process_codec_private(track, data, size); }
106	virtual void ass_set_message_cb(ass_library_t *priv	106	virtual void ass_set_message_cb(ASS_Library *priv
107	, void (msg_cb)(int level, const char fmt, va_list args, void *data)	107	, void (msg_cb)(int level, const char fmt, va_list args, void *data)
108	, void *data)	108	, void *data)
109	{ return ::ass_set_message_cb(priv, msg_cb, data); }	109	{ return ::ass_set_message_cb(priv, msg_cb, data); }
Lines 122-146 Link Here
122	class DllLibass : public DllDynamic, DllLibassInterface	122	class DllLibass : public DllDynamic, DllLibassInterface
123	{	123	{
124	DECLARE_DLL_WRAPPER(DllLibass, DLL_PATH_LIBASS)	124	DECLARE_DLL_WRAPPER(DllLibass, DLL_PATH_LIBASS)
125	DEFINE_METHOD2(void, ass_set_extract_fonts, (ass_library_t * p1, int p2))	125	DEFINE_METHOD2(void, ass_set_extract_fonts, (ASS_Library * p1, int p2))
126	DEFINE_METHOD2(void, ass_set_fonts_dir, (ass_library_t * p1, const char * p2))	126	DEFINE_METHOD2(void, ass_set_fonts_dir, (ASS_Library * p1, const char * p2))
127	DEFINE_METHOD0(ass_library_t *, ass_library_init)	127	DEFINE_METHOD0(ASS_Library *, ass_library_init)
128	DEFINE_METHOD1(ass_renderer_t , ass_renderer_init, (ass_library_t p1))	128	DEFINE_METHOD1(ASS_Renderer , ass_renderer_init, (ASS_Library p1))
129	DEFINE_METHOD3(void, ass_set_frame_size, (ass_renderer_t * p1, int p2, int p3))	129	DEFINE_METHOD3(void, ass_set_frame_size, (ASS_Renderer * p1, int p2, int p3))
130	DEFINE_METHOD5(void, ass_set_margins, (ass_renderer_t * p1, int p2, int p3, int p4, int p5))	130	DEFINE_METHOD5(void, ass_set_margins, (ASS_Renderer * p1, int p2, int p3, int p4, int p5))
131	DEFINE_METHOD2(void, ass_set_use_margins, (ass_renderer_t * p1, int p2))	131	DEFINE_METHOD2(void, ass_set_use_margins, (ASS_Renderer * p1, int p2))
132	DEFINE_METHOD2(void, ass_set_font_scale, (ass_renderer_t * p1, double p2))	132	DEFINE_METHOD2(void, ass_set_font_scale, (ASS_Renderer * p1, double p2))
133	DEFINE_METHOD4(ass_image_t , ass_render_frame, (ass_renderer_t p1, ass_track_t * p2, long long p3, int * p4))	133	DEFINE_METHOD4(ASS_Image , ass_render_frame, (ASS_Renderer p1, ASS_Track * p2, long long p3, int * p4))
134	DEFINE_METHOD1(ass_track_t , ass_new_track, (ass_library_t p1))	134	DEFINE_METHOD1(ASS_Track , ass_new_track, (ASS_Library p1))
135	DEFINE_METHOD3(ass_track_t , ass_read_file, (ass_library_t p1, char * p2, char * p3))	135	DEFINE_METHOD3(ASS_Track , ass_read_file, (ASS_Library p1, char * p2, char * p3))
136	DEFINE_METHOD1(void, ass_free_track, (ass_track_t * p1))	136	DEFINE_METHOD1(void, ass_free_track, (ASS_Track * p1))
137	DEFINE_METHOD6(void, ass_set_fonts, (ass_renderer_t* p1, const char* p2, const char* p3, int p4, const char* p5, int p6))	137	DEFINE_METHOD6(void, ass_set_fonts, (ASS_Renderer* p1, const char* p2, const char* p3, int p4, const char* p5, int p6))
138	DEFINE_METHOD2(void, ass_set_style_overrides, (ass_library_t* p1, char** p2))	138	DEFINE_METHOD2(void, ass_set_style_overrides, (ASS_Library* p1, char** p2))
139	DEFINE_METHOD1(void, ass_library_done, (ass_library_t* p1))	139	DEFINE_METHOD1(void, ass_library_done, (ASS_Library* p1))
140	DEFINE_METHOD1(void, ass_renderer_done, (ass_renderer_t* p1))	140	DEFINE_METHOD1(void, ass_renderer_done, (ASS_Renderer* p1))
141	DEFINE_METHOD5(void, ass_process_chunk, (ass_track_t* p1, char* p2, int p3, long long p4, long long p5))	141	DEFINE_METHOD5(void, ass_process_chunk, (ASS_Track* p1, char* p2, int p3, long long p4, long long p5))
142	DEFINE_METHOD3(void, ass_process_codec_private, (ass_track_t* p1, char* p2, int p3))	142	DEFINE_METHOD3(void, ass_process_codec_private, (ASS_Track* p1, char* p2, int p3))
143	DEFINE_METHOD3(void, ass_set_message_cb, (ass_library_t* p1, void (p2)(int level, const char fmt, va_list args, void data), void p3))	143	DEFINE_METHOD3(void, ass_set_message_cb, (ASS_Library* p1, void (p2)(int level, const char fmt, va_list args, void data), void p3))
144	BEGIN_METHOD_RESOLVE()	144	BEGIN_METHOD_RESOLVE()
145	RESOLVE_METHOD(ass_set_extract_fonts)	145	RESOLVE_METHOD(ass_set_extract_fonts)
146	RESOLVE_METHOD(ass_set_fonts_dir)	146	RESOLVE_METHOD(ass_set_fonts_dir)