mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-26 01:02:33 +00:00
9d89c8b3ac
After much discussion and back-and-forth, we reached the conclusion that matroska uses convergence_duration for subtitle duration because a 32bit value isn't large enough to store the duration if sub-micro-second timebases are used. Matroska may not be the only one that supports these timebases, but it's certainly the only one that ffmpeg attempts to support in this way. The long term solution that we seemed to reach was that if we encounter a matroska file with a sub-micro-second timebase, we should internally scale it up to at least micro-second, and then duration can be used normally. This suggests that on the encode side, we should not allow generation of files with sub-micro-second timebases, but that's a separate issue. That being a non-trivial change, and the subtitle interoperability breakage being very real, I'm re-submitting this small change for consideration. In this diff, we make sure that duration is populated by the matroska demuxer, and that convergence_duration is respected in matroskaenc and srtenc, but that duration is used otherwise. This ends up being a strict improvement - pipelines that use convergence duration are unchanged, and ones that are currently broken due to the duration mismatch will start working - except for the ones with the extreme timebases, but those were already broken. Signed-off-by: Philip Langdale <philipl@overt.org>
102 lines
3.4 KiB
C
102 lines
3.4 KiB
C
/*
|
|
* SubRip subtitle muxer
|
|
* Copyright (c) 2012 Nicolas George <nicolas.george@normalesup.org>
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include "avformat.h"
|
|
#include "internal.h"
|
|
#include "libavutil/log.h"
|
|
|
|
/* TODO: add options for:
|
|
- character encoding;
|
|
- LF / CRLF;
|
|
- byte order mark.
|
|
*/
|
|
|
|
typedef struct SRTContext{
|
|
unsigned index;
|
|
} SRTContext;
|
|
|
|
static int srt_write_header(AVFormatContext *avf)
|
|
{
|
|
if (avf->nb_streams != 1 ||
|
|
avf->streams[0]->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) {
|
|
av_log(avf, AV_LOG_ERROR,
|
|
"SRT supports only a single subtitles stream.\n");
|
|
return AVERROR(EINVAL);
|
|
}
|
|
if (avf->streams[0]->codec->codec_id != AV_CODEC_ID_TEXT &&
|
|
avf->streams[0]->codec->codec_id != AV_CODEC_ID_SUBRIP &&
|
|
avf->streams[0]->codec->codec_id != AV_CODEC_ID_SRT) {
|
|
av_log(avf, AV_LOG_ERROR,
|
|
"Unsupported subtitles codec: %s\n",
|
|
avcodec_get_name(avf->streams[0]->codec->codec_id));
|
|
return AVERROR(EINVAL);
|
|
}
|
|
avpriv_set_pts_info(avf->streams[0], 64, 1, 1000);
|
|
return 0;
|
|
}
|
|
|
|
static int srt_write_packet(AVFormatContext *avf, AVPacket *pkt)
|
|
{
|
|
SRTContext *srt = avf->priv_data;
|
|
int write_ts = avf->streams[0]->codec->codec_id != AV_CODEC_ID_SRT;
|
|
|
|
srt->index++;
|
|
if (write_ts) {
|
|
char buf[64];
|
|
int64_t s = pkt->pts, e, d = pkt->duration;
|
|
int len;
|
|
|
|
if (d <= 0)
|
|
/* For backward compatibility, fallback to convergence_duration. */
|
|
d = pkt->convergence_duration;
|
|
if (s == AV_NOPTS_VALUE || d <= 0) {
|
|
av_log(avf, AV_LOG_ERROR, "Insufficient timestamps.\n");
|
|
return AVERROR(EINVAL);
|
|
}
|
|
e = s + d;
|
|
len = snprintf(buf, sizeof(buf),
|
|
"%d\n%02d:%02d:%02d,%03d --> %02d:%02d:%02d,%03d\n",
|
|
srt->index,
|
|
(int)(s / 3600000), (int)(s / 60000) % 60,
|
|
(int)(s / 1000) % 60, (int)(s % 1000),
|
|
(int)(e / 3600000), (int)(e / 60000) % 60,
|
|
(int)(e / 1000) % 60, (int)(e % 1000));
|
|
avio_write(avf->pb, buf, len);
|
|
}
|
|
avio_write(avf->pb, pkt->data, pkt->size);
|
|
if (write_ts)
|
|
avio_write(avf->pb, "\n\n", 2);
|
|
avio_flush(avf->pb);
|
|
return 0;
|
|
}
|
|
|
|
AVOutputFormat ff_srt_muxer = {
|
|
.name = "srt",
|
|
.long_name = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
|
|
.mime_type = "application/x-subrip",
|
|
.extensions = "srt",
|
|
.priv_data_size = sizeof(SRTContext),
|
|
.write_header = srt_write_header,
|
|
.write_packet = srt_write_packet,
|
|
.flags = AVFMT_VARIABLE_FPS,
|
|
.subtitle_codec = AV_CODEC_ID_TEXT,
|
|
};
|