FFmpeg

Commit Graph

Author	SHA1	Message	Date
Timothy Gu	b9cd3e1add	srtenc: Reindent	9 years ago
Clément Bœsch	55180b3299	Kill timed SRT	10 years ago
Clément Bœsch	8de9bb6e5e	lavf: remove some flushing in write_packet muxers callbacks. Since `4f112a8e3`, this is not necessary anymore. Also, it allows to actually disable the flushing.	12 years ago
Clément Bœsch	6c26fc7704	lavf/srtenc: honor subtitle position side data.	12 years ago
Clément Bœsch	e56b098410	lavf/srtenc: ignore invalid timed packets instead of failing. This way we don't abort in the middle of remuxing, just warn about an event ignored. The index increment is moved to make sure the output numbers still make sense.	12 years ago
Clément Bœsch	3d6a246b4b	lavf/srtenc: add AVFMT_TS_NONSTRICT flag. There is not really a problem in having two events at the same time. Even if it's not perfectly correct, it helps remuxing more files (typically our FATE sample).	12 years ago
Clément Bœsch	5f0105b820	lavf/srtenc: allow zero duration events. This is useful when you want to remux events with zero (or too small) durations.	12 years ago
Clément Bœsch	2ecf9492ff	lavf/srtenc: set codec to subrip by default. We don't have a text encoder yet, so this commit makes automatic encoding working with srt output.	12 years ago
Clément Bœsch	fd090a5d09	lavf/srtenc: simplify timing printing.	12 years ago
Philip Langdale	9d89c8b3ac	matroskadec, matroskadec, srtenc: Read/Write duration for subtitles. 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>	12 years ago
Philip Langdale	6057de19b5	srtenc: Add timing-less "subrip" encoder. Unsurprisingly, if a timing-less subrip decoder is desireable, an encoder is as well. With this in place, we can move on to remove the use of the old encoder/decoder with embedded timing and move all timing handling the (de)muxer where they belong. Signed-off-by: Philip Langdale <philipl@overt.org>	12 years ago
Nicolas George	9e63c30daa	lavf: add a real SRT muxer. This muxer supports CODEC_ID_SRT with the timestamps in the packet data and CODEC_ID_TEXT with the timestamps in the packet fields. Makes -scodec copy work from Matroska.	13 years ago

16 Commits (d283ee085f9aac44b5de1b09e3cab62920fa4a9a)