[FFmpeg-cvslog] fftools/ffmpeg: move subtitle encoding to ffmpeg_enc.c
Anton Khirnov
git at videolan.org
Sun Apr 9 16:50:37 EEST 2023
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Mar 25 05:37:42 2023 +0100| [9de5dc74fd1b0eafafadfeb6e9fefae579f872c8] | committer: Anton Khirnov
fftools/ffmpeg: move subtitle encoding to ffmpeg_enc.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9de5dc74fd1b0eafafadfeb6e9fefae579f872c8
---
fftools/ffmpeg.c | 86 ++--------------------------------------------------
fftools/ffmpeg.h | 3 ++
fftools/ffmpeg_enc.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 85 insertions(+), 84 deletions(-)
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 37578081a3..6bb421b86d 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -669,7 +669,7 @@ static void close_output_stream(OutputStream *ost)
sq_send(of->sq_encode, ost->sq_idx_encode, SQFRAME(NULL));
}
-static int check_recording_time(OutputStream *ost, int64_t ts, AVRational tb)
+int check_recording_time(OutputStream *ost, int64_t ts, AVRational tb)
{
OutputFile *of = output_files[ost->file_index];
@@ -1027,88 +1027,6 @@ static void do_audio_out(OutputFile *of, OutputStream *ost,
exit_program(1);
}
-static void do_subtitle_out(OutputFile *of,
- OutputStream *ost,
- AVSubtitle *sub)
-{
- int subtitle_out_max_size = 1024 * 1024;
- int subtitle_out_size, nb, i, ret;
- AVCodecContext *enc;
- AVPacket *pkt = ost->pkt;
- int64_t pts;
-
- if (sub->pts == AV_NOPTS_VALUE) {
- av_log(ost, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
- if (exit_on_error)
- exit_program(1);
- return;
- }
-
- enc = ost->enc_ctx;
-
- /* Note: DVB subtitle need one packet to draw them and one other
- packet to clear them */
- /* XXX: signal it in the codec context ? */
- if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
- nb = 2;
- else if (enc->codec_id == AV_CODEC_ID_ASS)
- nb = FFMAX(sub->num_rects, 1);
- else
- nb = 1;
-
- /* shift timestamp to honor -ss and make check_recording_time() work with -t */
- pts = sub->pts;
- if (output_files[ost->file_index]->start_time != AV_NOPTS_VALUE)
- pts -= output_files[ost->file_index]->start_time;
- for (i = 0; i < nb; i++) {
- AVSubtitle local_sub = *sub;
-
- if (!check_recording_time(ost, pts, AV_TIME_BASE_Q))
- return;
-
- ret = av_new_packet(pkt, subtitle_out_max_size);
- if (ret < 0)
- report_and_exit(AVERROR(ENOMEM));
-
- local_sub.pts = pts;
- // start_display_time is required to be 0
- local_sub.pts += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q);
- local_sub.end_display_time -= sub->start_display_time;
- local_sub.start_display_time = 0;
-
- if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE && i == 1)
- local_sub.num_rects = 0;
- else if (enc->codec_id == AV_CODEC_ID_ASS && sub->num_rects > 0) {
- local_sub.num_rects = 1;
- local_sub.rects += i;
- }
-
- ost->frames_encoded++;
-
- subtitle_out_size = avcodec_encode_subtitle(enc, pkt->data, pkt->size, &local_sub);
- if (subtitle_out_size < 0) {
- av_log(ost, AV_LOG_FATAL, "Subtitle encoding failed\n");
- exit_program(1);
- }
-
- av_shrink_packet(pkt, subtitle_out_size);
- pkt->time_base = ost->mux_timebase;
- pkt->pts = av_rescale_q(sub->pts, AV_TIME_BASE_Q, pkt->time_base);
- pkt->duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
- if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
- /* XXX: the pts correction is handled here. Maybe handling
- it in the codec would be better */
- if (i == 0)
- pkt->pts += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
- else
- pkt->pts += av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
- }
- pkt->dts = pkt->pts;
-
- of_output_packet(of, pkt, ost, 0);
- }
-}
-
/* Convert frame timestamps to the encoder timebase and decide how many times
* should this (and possibly previous) frame be repeated in order to conform to
* desired target framerate (if any).
@@ -2351,7 +2269,7 @@ static int process_subtitle(InputStream *ist, AVSubtitle *subtitle, int *got_out
|| ost->enc_ctx->codec_type != AVMEDIA_TYPE_SUBTITLE)
continue;
- do_subtitle_out(output_files[ost->file_index], ost, subtitle);
+ enc_subtitle(output_files[ost->file_index], ost, subtitle);
}
out:
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index c1e2bbc300..ffb0ca33ac 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -811,6 +811,9 @@ AVBufferRef *hw_device_for_filter(void);
int hwaccel_decode_init(AVCodecContext *avctx);
int enc_open(OutputStream *ost, AVFrame *frame);
+void enc_subtitle(OutputFile *of, OutputStream *ost, AVSubtitle *sub);
+
+int check_recording_time(OutputStream *ost, int64_t ts, AVRational tb);
/*
* Initialize muxing state for the given stream, should be called
diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index a4660051a2..bcc560b9b7 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -347,3 +347,83 @@ int enc_open(OutputStream *ost, AVFrame *frame)
return 0;
}
+
+void enc_subtitle(OutputFile *of, OutputStream *ost, AVSubtitle *sub)
+{
+ int subtitle_out_max_size = 1024 * 1024;
+ int subtitle_out_size, nb, i, ret;
+ AVCodecContext *enc;
+ AVPacket *pkt = ost->pkt;
+ int64_t pts;
+
+ if (sub->pts == AV_NOPTS_VALUE) {
+ av_log(ost, AV_LOG_ERROR, "Subtitle packets must have a pts\n");
+ if (exit_on_error)
+ exit_program(1);
+ return;
+ }
+
+ enc = ost->enc_ctx;
+
+ /* Note: DVB subtitle need one packet to draw them and one other
+ packet to clear them */
+ /* XXX: signal it in the codec context ? */
+ if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
+ nb = 2;
+ else if (enc->codec_id == AV_CODEC_ID_ASS)
+ nb = FFMAX(sub->num_rects, 1);
+ else
+ nb = 1;
+
+ /* shift timestamp to honor -ss and make check_recording_time() work with -t */
+ pts = sub->pts;
+ if (output_files[ost->file_index]->start_time != AV_NOPTS_VALUE)
+ pts -= output_files[ost->file_index]->start_time;
+ for (i = 0; i < nb; i++) {
+ AVSubtitle local_sub = *sub;
+
+ if (!check_recording_time(ost, pts, AV_TIME_BASE_Q))
+ return;
+
+ ret = av_new_packet(pkt, subtitle_out_max_size);
+ if (ret < 0)
+ report_and_exit(AVERROR(ENOMEM));
+
+ local_sub.pts = pts;
+ // start_display_time is required to be 0
+ local_sub.pts += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q);
+ local_sub.end_display_time -= sub->start_display_time;
+ local_sub.start_display_time = 0;
+
+ if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE && i == 1)
+ local_sub.num_rects = 0;
+ else if (enc->codec_id == AV_CODEC_ID_ASS && sub->num_rects > 0) {
+ local_sub.num_rects = 1;
+ local_sub.rects += i;
+ }
+
+ ost->frames_encoded++;
+
+ subtitle_out_size = avcodec_encode_subtitle(enc, pkt->data, pkt->size, &local_sub);
+ if (subtitle_out_size < 0) {
+ av_log(ost, AV_LOG_FATAL, "Subtitle encoding failed\n");
+ exit_program(1);
+ }
+
+ av_shrink_packet(pkt, subtitle_out_size);
+ pkt->time_base = ost->mux_timebase;
+ pkt->pts = av_rescale_q(sub->pts, AV_TIME_BASE_Q, pkt->time_base);
+ pkt->duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
+ if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
+ /* XXX: the pts correction is handled here. Maybe handling
+ it in the codec would be better */
+ if (i == 0)
+ pkt->pts += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
+ else
+ pkt->pts += av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, pkt->time_base);
+ }
+ pkt->dts = pkt->pts;
+
+ of_output_packet(of, pkt, ost, 0);
+ }
+}
More information about the ffmpeg-cvslog
mailing list