mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Add PJS subtitles demuxer and decoder.
This commit is contained in:
parent
580ee973d1
commit
7b43402724
@ -51,7 +51,7 @@ version <next>:
|
||||
- pp (postproc) filter ported from MPlayer
|
||||
- NIST Sphere demuxer
|
||||
- av_basename and av_dirname
|
||||
- MPL2, VPlayer, MPlayer and AQTitle subtitles demuxers and decoders
|
||||
- MPL2, VPlayer, MPlayer, AQTitle and PJS subtitles demuxers and decoders
|
||||
|
||||
|
||||
version 1.0:
|
||||
|
@ -928,6 +928,7 @@ performance on systems without hardware floating point support).
|
||||
@item MPL2 @tab @tab X @tab @tab X
|
||||
@item MPsub (MPlayer) @tab @tab X @tab @tab X
|
||||
@item PGS @tab @tab @tab @tab X
|
||||
@item PJS (Phoenix) @tab @tab X @tab @tab X
|
||||
@item RealText @tab @tab X @tab @tab X
|
||||
@item SAMI @tab @tab X @tab @tab X
|
||||
@item SSA/ASS @tab X @tab X @tab X @tab X
|
||||
|
@ -333,6 +333,7 @@ OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o
|
||||
OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o pnm.o
|
||||
OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o
|
||||
OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o
|
||||
OBJS-$(CONFIG_PJS_DECODER) += textdec.o ass.o
|
||||
OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o pngdsp.o
|
||||
OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
|
||||
OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o
|
||||
|
@ -450,6 +450,7 @@ void avcodec_register_all(void)
|
||||
REGISTER_ENCDEC (MOVTEXT, movtext);
|
||||
REGISTER_DECODER(MPL2, mpl2);
|
||||
REGISTER_DECODER(PGSSUB, pgssub);
|
||||
REGISTER_DECODER(PJS, pjs);
|
||||
REGISTER_DECODER(REALTEXT, realtext);
|
||||
REGISTER_DECODER(SAMI, sami);
|
||||
REGISTER_ENCDEC (SRT, srt);
|
||||
|
@ -468,6 +468,7 @@ enum AVCodecID {
|
||||
AV_CODEC_ID_WEBVTT = MKBETAG('W','V','T','T'),
|
||||
AV_CODEC_ID_MPL2 = MKBETAG('M','P','L','2'),
|
||||
AV_CODEC_ID_VPLAYER = MKBETAG('V','P','l','r'),
|
||||
AV_CODEC_ID_PJS = MKBETAG('P','h','J','S'),
|
||||
|
||||
/* other specific kind of codecs (generally used for attachments) */
|
||||
AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs.
|
||||
|
@ -2422,6 +2422,12 @@ static const AVCodecDescriptor codec_descriptors[] = {
|
||||
.name = "jacosub",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle"),
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_PJS,
|
||||
.type = AVMEDIA_TYPE_SUBTITLE,
|
||||
.name = "pjs",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("PJS (Phoenix Japanimation Society) subtitle"),
|
||||
},
|
||||
{
|
||||
.id = AV_CODEC_ID_SAMI,
|
||||
.type = AVMEDIA_TYPE_SUBTITLE,
|
||||
|
@ -128,17 +128,19 @@ AVCodec ff_text_decoder = {
|
||||
};
|
||||
#endif
|
||||
|
||||
#if CONFIG_VPLAYER_DECODER
|
||||
#define vplayer_options options
|
||||
DECLARE_CLASS(vplayer);
|
||||
#if CONFIG_VPLAYER_DECODER || CONFIG_PJS_DECODER
|
||||
|
||||
static int vplayer_init(AVCodecContext *avctx)
|
||||
static int linebreak_init(AVCodecContext *avctx)
|
||||
{
|
||||
TextContext *text = avctx->priv_data;
|
||||
text->linebreaks = "|";
|
||||
return ff_ass_subtitle_header_default(avctx);
|
||||
}
|
||||
|
||||
#if CONFIG_VPLAYER_DECODER
|
||||
#define vplayer_options options
|
||||
DECLARE_CLASS(vplayer);
|
||||
|
||||
AVCodec ff_vplayer_decoder = {
|
||||
.name = "vplayer",
|
||||
.priv_data_size = sizeof(TextContext),
|
||||
@ -146,7 +148,25 @@ AVCodec ff_vplayer_decoder = {
|
||||
.type = AVMEDIA_TYPE_SUBTITLE,
|
||||
.id = AV_CODEC_ID_VPLAYER,
|
||||
.decode = text_decode_frame,
|
||||
.init = vplayer_init,
|
||||
.init = linebreak_init,
|
||||
.priv_class = &vplayer_decoder_class,
|
||||
};
|
||||
#endif
|
||||
|
||||
#if CONFIG_PJS_DECODER
|
||||
#define pjs_options options
|
||||
DECLARE_CLASS(pjs);
|
||||
|
||||
AVCodec ff_pjs_decoder = {
|
||||
.name = "pjs",
|
||||
.priv_data_size = sizeof(TextContext),
|
||||
.long_name = NULL_IF_CONFIG_SMALL("PJS subtitle"),
|
||||
.type = AVMEDIA_TYPE_SUBTITLE,
|
||||
.id = AV_CODEC_ID_PJS,
|
||||
.decode = text_decode_frame,
|
||||
.init = linebreak_init,
|
||||
.priv_class = &pjs_decoder_class,
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif /* text subtitles with '|' line break */
|
||||
|
@ -292,6 +292,7 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += pcmdec.o pcm.o
|
||||
OBJS-$(CONFIG_PCM_U32LE_MUXER) += pcmenc.o rawenc.o
|
||||
OBJS-$(CONFIG_PCM_U8_DEMUXER) += pcmdec.o pcm.o
|
||||
OBJS-$(CONFIG_PCM_U8_MUXER) += pcmenc.o rawenc.o
|
||||
OBJS-$(CONFIG_PJS_DEMUXER) += pjsdec.o
|
||||
OBJS-$(CONFIG_PMP_DEMUXER) += pmpdec.o
|
||||
OBJS-$(CONFIG_PVA_DEMUXER) += pva.o
|
||||
OBJS-$(CONFIG_PVF_DEMUXER) += pvfdec.o pcm.o
|
||||
|
@ -221,6 +221,7 @@ void av_register_all(void)
|
||||
REGISTER_MUXDEMUX(PCM_U16BE, pcm_u16be);
|
||||
REGISTER_MUXDEMUX(PCM_U16LE, pcm_u16le);
|
||||
REGISTER_MUXDEMUX(PCM_U8, pcm_u8);
|
||||
REGISTER_DEMUXER (PJS, pjs);
|
||||
REGISTER_DEMUXER (PMP, pmp);
|
||||
REGISTER_MUXER (PSP, psp);
|
||||
REGISTER_DEMUXER (PVA, pva);
|
||||
|
137
libavformat/pjsdec.c
Normal file
137
libavformat/pjsdec.c
Normal file
@ -0,0 +1,137 @@
|
||||
/*
|
||||
* Copyright (c) 2012 Clément Bœsch
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
* FFmpeg is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* FFmpeg 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with FFmpeg; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file
|
||||
* PJS (Phoenix Japanimation Society) subtitles format demuxer
|
||||
*
|
||||
* @see http://subs.com.ru/page.php?al=pjs
|
||||
*/
|
||||
|
||||
#include "avformat.h"
|
||||
#include "internal.h"
|
||||
#include "subtitles.h"
|
||||
|
||||
typedef struct {
|
||||
FFDemuxSubtitlesQueue q;
|
||||
} PJSContext;
|
||||
|
||||
static int pjs_probe(AVProbeData *p)
|
||||
{
|
||||
char c;
|
||||
int64_t start, end;
|
||||
const unsigned char *ptr = p->buf;
|
||||
|
||||
if (sscanf(ptr, "%"PRId64",%"PRId64",%c", &start, &end, &c) == 3) {
|
||||
size_t q1pos = strcspn(ptr, "\"");
|
||||
size_t q2pos = q1pos + strcspn(ptr + q1pos + 1, "\"") + 1;
|
||||
if (strcspn(ptr, "\r\n") > q2pos)
|
||||
return AVPROBE_SCORE_MAX;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int64_t read_ts(char **line, int *duration)
|
||||
{
|
||||
int64_t start, end;
|
||||
|
||||
if (sscanf(*line, "%"PRId64",%"PRId64, &start, &end) == 2) {
|
||||
*line += strcspn(*line, "\"") + 1;
|
||||
*duration = end - start;
|
||||
return start;
|
||||
}
|
||||
return AV_NOPTS_VALUE;
|
||||
}
|
||||
|
||||
static int pjs_read_header(AVFormatContext *s)
|
||||
{
|
||||
PJSContext *pjs = s->priv_data;
|
||||
AVStream *st = avformat_new_stream(s, NULL);
|
||||
int res = 0;
|
||||
|
||||
if (!st)
|
||||
return AVERROR(ENOMEM);
|
||||
avpriv_set_pts_info(st, 64, 1, 10);
|
||||
st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
|
||||
st->codec->codec_id = AV_CODEC_ID_PJS;
|
||||
|
||||
while (!url_feof(s->pb)) {
|
||||
char line[4096];
|
||||
char *p = line;
|
||||
const int64_t pos = avio_tell(s->pb);
|
||||
int len = ff_get_line(s->pb, line, sizeof(line));
|
||||
int64_t pts_start;
|
||||
int duration;
|
||||
|
||||
if (!len)
|
||||
break;
|
||||
|
||||
line[strcspn(line, "\r\n")] = 0;
|
||||
|
||||
pts_start = read_ts(&p, &duration);
|
||||
if (pts_start != AV_NOPTS_VALUE) {
|
||||
AVPacket *sub;
|
||||
|
||||
p[strcspn(p, "\"")] = 0;
|
||||
sub = ff_subtitles_queue_insert(&pjs->q, p, strlen(p), 0);
|
||||
if (!sub)
|
||||
return AVERROR(ENOMEM);
|
||||
sub->pos = pos;
|
||||
sub->pts = pts_start;
|
||||
sub->duration = duration;
|
||||
}
|
||||
}
|
||||
|
||||
ff_subtitles_queue_finalize(&pjs->q);
|
||||
return res;
|
||||
}
|
||||
|
||||
static int pjs_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||
{
|
||||
PJSContext *pjs = s->priv_data;
|
||||
return ff_subtitles_queue_read_packet(&pjs->q, pkt);
|
||||
}
|
||||
|
||||
static int pjs_read_seek(AVFormatContext *s, int stream_index,
|
||||
int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
|
||||
{
|
||||
PJSContext *pjs = s->priv_data;
|
||||
return ff_subtitles_queue_seek(&pjs->q, s, stream_index,
|
||||
min_ts, ts, max_ts, flags);
|
||||
}
|
||||
|
||||
static int pjs_read_close(AVFormatContext *s)
|
||||
{
|
||||
PJSContext *pjs = s->priv_data;
|
||||
ff_subtitles_queue_clean(&pjs->q);
|
||||
return 0;
|
||||
}
|
||||
|
||||
AVInputFormat ff_pjs_demuxer = {
|
||||
.name = "pjs",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("PJS (Phoenix Japanimation Society) subtitles"),
|
||||
.priv_data_size = sizeof(PJSContext),
|
||||
.read_probe = pjs_probe,
|
||||
.read_header = pjs_read_header,
|
||||
.read_packet = pjs_read_packet,
|
||||
.read_seek2 = pjs_read_seek,
|
||||
.read_close = pjs_read_close,
|
||||
.extensions = "pjs",
|
||||
};
|
@ -30,7 +30,7 @@
|
||||
#include "libavutil/avutil.h"
|
||||
|
||||
#define LIBAVFORMAT_VERSION_MAJOR 54
|
||||
#define LIBAVFORMAT_VERSION_MINOR 54
|
||||
#define LIBAVFORMAT_VERSION_MINOR 55
|
||||
#define LIBAVFORMAT_VERSION_MICRO 100
|
||||
|
||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||
|
@ -22,6 +22,9 @@ fate-sub-mpl2: CMD = md5 -i $(SAMPLES)/sub/MPL2_capability_tester.txt -f ass
|
||||
FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub-frames
|
||||
fate-sub-mpsub-frames: CMD = md5 -i $(SAMPLES)/sub/MPSub_capability_tester_frames.sub -f ass
|
||||
|
||||
FATE_SUBTITLES_ASS-$(call DEMDEC, PJS, PJS) += fate-sub-pjs
|
||||
fate-sub-pjs: CMD = md5 -i $(SAMPLES)/sub/PJS_capability_tester.pjs -f ass
|
||||
|
||||
FATE_SUBTITLES_ASS-$(call DEMDEC, REALTEXT, REALTEXT) += fate-sub-realtext
|
||||
fate-sub-realtext: CMD = md5 -i $(SAMPLES)/sub/RealText_capability_tester.rt -f ass
|
||||
|
||||
|
1
tests/ref/fate/sub-pjs
Normal file
1
tests/ref/fate/sub-pjs
Normal file
@ -0,0 +1 @@
|
||||
d044f6ffdee48e48efff072b33baee0a
|
Loading…
Reference in New Issue
Block a user