Mercurial > mplayer.hg
annotate av_sub.c @ 31624:40c30c70ead0
Fix memory leak for subtitles decoded by libavcodec.
author | reimar |
---|---|
date | Sun, 11 Jul 2010 07:37:02 +0000 |
parents | cafeb7863de8 |
children | f15df2e3081b |
rev | line source |
---|---|
31599 | 1 /* |
2 * This file is part of MPlayer. | |
3 * | |
4 * MPlayer is free software; you can redistribute it and/or modify | |
5 * it under the terms of the GNU General Public License as published by | |
6 * the Free Software Foundation; either version 2 of the License, or | |
7 * (at your option) any later version. | |
8 * | |
9 * MPlayer is distributed in the hope that it will be useful, | |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 * GNU General Public License for more details. | |
13 * | |
14 * You should have received a copy of the GNU General Public License along | |
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., | |
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |
17 */ | |
18 | |
19 #include "libavcodec/avcodec.h" | |
20 #include "libmpdemux/stheader.h" | |
21 #include "libvo/sub.h" | |
22 #include "spudec.h" | |
23 #include "av_sub.h" | |
24 | |
25 void reset_avsub(struct sh_sub *sh) | |
26 { | |
27 if (sh->context) { | |
28 avcodec_close(sh->context); | |
29 av_freep(&sh->context); | |
30 } | |
31 } | |
32 | |
33 /** | |
34 * Decode a subtitle packet via libavcodec. | |
35 * \return < 0 on error, > 0 if further processing is needed | |
36 */ | |
37 int decode_avsub(struct sh_sub *sh, uint8_t **data, int *size, double *pts, double *endpts) | |
38 { | |
39 AVCodecContext *ctx = sh->context; | |
40 int new_type = 0; | |
41 int res; | |
42 int got_sub; | |
43 AVSubtitle sub; | |
44 AVPacket pkt; | |
45 av_init_packet(&pkt); | |
46 pkt.data = *data; | |
47 pkt.size = *size; | |
48 pkt.pts = *pts * 1000; | |
49 if (*pts != MP_NOPTS_VALUE && *endpts != MP_NOPTS_VALUE) | |
50 pkt.convergence_duration = (*endpts - *pts) * 1000; | |
51 if (!ctx) { | |
52 AVCodec *sub_codec; | |
53 avcodec_init(); | |
54 avcodec_register_all(); | |
55 ctx = avcodec_alloc_context(); | |
56 sub_codec = avcodec_find_decoder(CODEC_ID_HDMV_PGS_SUBTITLE); | |
57 if (!ctx || !sub_codec || avcodec_open(ctx, sub_codec) < 0) { | |
58 mp_msg(MSGT_SUBREADER, MSGL_FATAL, "Could not open subtitle decoder\n"); | |
59 av_freep(&ctx); | |
60 return -1; | |
61 } | |
62 sh->context = ctx; | |
63 } | |
64 res = avcodec_decode_subtitle2(ctx, &sub, &got_sub, &pkt); | |
65 if (res < 0) | |
66 return res; | |
67 if (*pts != MP_NOPTS_VALUE) { | |
68 if (sub.end_display_time > sub.start_display_time) | |
69 *endpts = *pts + sub.end_display_time / 1000.0; | |
70 *pts += sub.start_display_time / 1000.0; | |
71 } | |
72 if (got_sub && sub.num_rects > 0) { | |
73 switch (sub.rects[0]->type) { | |
74 case SUBTITLE_BITMAP: | |
75 if (!vo_spudec) | |
76 vo_spudec = spudec_new(NULL); | |
77 spudec_set_paletted(vo_spudec, | |
78 sub.rects[0]->pict.data[0], | |
79 sub.rects[0]->pict.linesize[0], | |
80 sub.rects[0]->pict.data[1], | |
81 sub.rects[0]->x, | |
82 sub.rects[0]->y, | |
83 sub.rects[0]->w, | |
84 sub.rects[0]->h, | |
85 *pts, | |
86 *endpts); | |
87 vo_osd_changed(OSDTYPE_SPU); | |
88 break; | |
89 case SUBTITLE_TEXT: | |
90 *data = strdup(sub.rects[0]->text); | |
91 new_type = 't'; | |
92 break; | |
93 case SUBTITLE_ASS: | |
94 *data = strdup(sub.rects[0]->ass); | |
95 new_type = 'a'; | |
96 break; | |
97 } | |
98 } | |
99 if (got_sub) | |
31624
40c30c70ead0
Fix memory leak for subtitles decoded by libavcodec.
reimar
parents:
31599
diff
changeset
|
100 avsubtitle_free(&sub); |
31599 | 101 return new_type; |
102 } |