Mercurial > mplayer.hg
annotate av_sub.c @ 32078:0dfbb22d68c8
Get rid of MPLAYER_DSP_H hack and #include dsp.h instead.
If dsp.h #inclusion is a prerequisite for window.h/filter.h, the clean solution
is to have those headers #include dsp.h directly instead of relying on the user.
author | diego |
---|---|
date | Sat, 11 Sep 2010 22:11:40 +0000 |
parents | 8d7f15885b64 |
children | 8c29dfec15c2 |
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; | |
31631
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
40 enum CodecID cid = CODEC_ID_NONE; |
31599 | 41 int new_type = 0; |
42 int res; | |
43 int got_sub; | |
44 AVSubtitle sub; | |
45 AVPacket pkt; | |
31631
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
46 |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
47 switch (sh->type) { |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
48 case 'b': |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
49 cid = CODEC_ID_DVB_SUBTITLE; break; |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
50 case 'p': |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
51 cid = CODEC_ID_HDMV_PGS_SUBTITLE; break; |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
52 case 'x': |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
53 cid = CODEC_ID_XSUB; break; |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
54 } |
67f2fb3ff4c7
Try to get subtitle scaling somewhat right with libavcodec decoded
reimar
parents:
31628
diff
changeset
|
55 |
31599 | 56 av_init_packet(&pkt); |
57 pkt.data = *data; | |
58 pkt.size = *size; | |
59 pkt.pts = *pts * 1000; | |
60 if (*pts != MP_NOPTS_VALUE && *endpts != MP_NOPTS_VALUE) | |
61 pkt.convergence_duration = (*endpts - *pts) * 1000; | |
62 if (!ctx) { | |
63 AVCodec *sub_codec; | |
64 avcodec_init(); | |
65 avcodec_register_all(); | |
66 ctx = avcodec_alloc_context(); | |
31628
f15df2e3081b
Add support for DVB and XSUB subtitles, not yet working properly.
reimar
parents:
31624
diff
changeset
|
67 sub_codec = avcodec_find_decoder(cid); |
31599 | 68 if (!ctx || !sub_codec || avcodec_open(ctx, sub_codec) < 0) { |
69 mp_msg(MSGT_SUBREADER, MSGL_FATAL, "Could not open subtitle decoder\n"); | |
70 av_freep(&ctx); | |
71 return -1; | |
72 } | |
73 sh->context = ctx; | |
74 } | |
75 res = avcodec_decode_subtitle2(ctx, &sub, &got_sub, &pkt); | |
76 if (res < 0) | |
77 return res; | |
78 if (*pts != MP_NOPTS_VALUE) { | |
79 if (sub.end_display_time > sub.start_display_time) | |
80 *endpts = *pts + sub.end_display_time / 1000.0; | |
81 *pts += sub.start_display_time / 1000.0; | |
82 } | |
83 if (got_sub && sub.num_rects > 0) { | |
84 switch (sub.rects[0]->type) { | |
85 case SUBTITLE_BITMAP: | |
86 if (!vo_spudec) | |
31924
8d7f15885b64
Pass the video dimensions specified in the subtitle to spudec.
reimar
parents:
31642
diff
changeset
|
87 vo_spudec = spudec_new_scaled(NULL, ctx->width, ctx->height, NULL, 0); |
31599 | 88 spudec_set_paletted(vo_spudec, |
89 sub.rects[0]->pict.data[0], | |
90 sub.rects[0]->pict.linesize[0], | |
91 sub.rects[0]->pict.data[1], | |
92 sub.rects[0]->x, | |
93 sub.rects[0]->y, | |
94 sub.rects[0]->w, | |
95 sub.rects[0]->h, | |
96 *pts, | |
97 *endpts); | |
98 vo_osd_changed(OSDTYPE_SPU); | |
99 break; | |
100 case SUBTITLE_TEXT: | |
101 *data = strdup(sub.rects[0]->text); | |
31642 | 102 *size = strlen(*data); |
31599 | 103 new_type = 't'; |
104 break; | |
105 case SUBTITLE_ASS: | |
106 *data = strdup(sub.rects[0]->ass); | |
31642 | 107 *size = strlen(*data); |
31599 | 108 new_type = 'a'; |
109 break; | |
110 } | |
111 } | |
112 if (got_sub) | |
31624
40c30c70ead0
Fix memory leak for subtitles decoded by libavcodec.
reimar
parents:
31599
diff
changeset
|
113 avsubtitle_free(&sub); |
31599 | 114 return new_type; |
115 } |