virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffmpeg: use refcounted packets for encoded subtitles

Browse Source
This commit is contained in:
Anton Khirnov
2022-04-04 12:26:18 +02:00
parent dceccd4aeb
commit 481b27e850
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fftools/ffmpeg.c
View File

@@ -140,8 +140,6 @@ unsigned nb_output_dumped = 0;
static BenchmarkTimeStamps current_time; static BenchmarkTimeStamps current_time;
AVIOContext *progress_avio = NULL; AVIOContext *progress_avio = NULL;
static uint8_t *subtitle_out;
InputStream **input_streams = NULL; InputStream **input_streams = NULL;
int nb_input_streams = 0; int nb_input_streams = 0;
InputFile **input_files = NULL; InputFile **input_files = NULL;
@@ -558,8 +556,6 @@ static void ffmpeg_cleanup(int ret)
} }
av_freep(&filtergraphs); av_freep(&filtergraphs);
av_freep(&subtitle_out);
/* close files */ /* close files */
for (i = 0; i < nb_output_files; i++) for (i = 0; i < nb_output_files; i++)
of_close(&output_files[i]); of_close(&output_files[i]);
@@ -997,7 +993,7 @@ static void do_subtitle_out(OutputFile *of,
AVSubtitle *sub) AVSubtitle *sub)
{ {
int subtitle_out_max_size = 1024 * 1024; int subtitle_out_max_size = 1024 * 1024;
int subtitle_out_size, nb, i; int subtitle_out_size, nb, i, ret;
AVCodecContext *enc; AVCodecContext *enc;
AVPacket *pkt = ost->pkt; AVPacket *pkt = ost->pkt;
int64_t pts; int64_t pts;
@@ -1011,14 +1007,6 @@ static void do_subtitle_out(OutputFile *of,
enc = ost->enc_ctx; enc = ost->enc_ctx;
if (!subtitle_out) {
subtitle_out = av_malloc(subtitle_out_max_size);
if (!subtitle_out) {
av_log(NULL, AV_LOG_FATAL, "Failed to allocate subtitle_out\n");
exit_program(1);
}
}
/* Note: DVB subtitle need one packet to draw them and one other /* Note: DVB subtitle need one packet to draw them and one other
packet to clear them */ packet to clear them */
/* XXX: signal it in the codec context ? */ /* XXX: signal it in the codec context ? */
@@ -1038,6 +1026,12 @@ static void do_subtitle_out(OutputFile *of,
if (!check_recording_time(ost)) if (!check_recording_time(ost))
return; return;
ret = av_new_packet(pkt, subtitle_out_max_size);
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "Failed to allocate subtitle encode buffer\n");
exit_program(1);
}
sub->pts = pts; sub->pts = pts;
// start_display_time is required to be 0 // start_display_time is required to be 0
sub->pts += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q); sub->pts += av_rescale_q(sub->start_display_time, (AVRational){ 1, 1000 }, AV_TIME_BASE_Q);
@@ -1048,8 +1042,7 @@ static void do_subtitle_out(OutputFile *of,
ost->frames_encoded++; ost->frames_encoded++;
subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out, subtitle_out_size = avcodec_encode_subtitle(enc, pkt->data, pkt->size, sub);
subtitle_out_max_size, sub);
if (i == 1) if (i == 1)
sub->num_rects = save_num_rects; sub->num_rects = save_num_rects;
if (subtitle_out_size < 0) { if (subtitle_out_size < 0) {
@@ -1057,8 +1050,6 @@ static void do_subtitle_out(OutputFile *of,
exit_program(1); exit_program(1);
} }
av_packet_unref(pkt);
pkt->data = subtitle_out;
pkt->size = subtitle_out_size; pkt->size = subtitle_out_size;
pkt->pts = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->mux_timebase); pkt->pts = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->mux_timebase);
pkt->duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, ost->mux_timebase); pkt->duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, ost->mux_timebase);