From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 6693245479 for ; Wed, 1 Mar 2023 15:19:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72D9268AAE5; Wed, 1 Mar 2023 17:19:25 +0200 (EET) Received: from conssluserg-03.nifty.com (conssluserg-03.nifty.com [210.131.2.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4B29689BFC for ; Wed, 1 Mar 2023 17:19:17 +0200 (EET) Received: from [192.168.0.9] (M106073025034.v4.enabler.ne.jp [106.73.25.34]) (authenticated) by conssluserg-03.nifty.com with ESMTP id 321FJ2ph023593 for ; Thu, 2 Mar 2023 00:19:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-03.nifty.com 321FJ2ph023593 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1677683945; bh=t0n3Gr4EysgbxBBYXqB1ds7fUJkNDq1NDialVL5RS/M=; h=Date:Subject:To:References:From:In-Reply-To:From; b=cKTC0DuZS1CM0UEaG9tlEmHfAHw8e53D/KojR1muXJ1VAd29GKC0hva+8kvnbmclc NgvpLd9uTmy5nyM6WtGeWlgOZWrP5knQ7c2TnjNWu1MEXLetgH4FdqUmKFKm26KYLv KbRJEheVE3J66ISRzThecpbBPVLUZDH3pEAm0kbe3vVZDyzy6fJoVbNZey9A/AiUsV xUbL1eBt834fTyuhhpw0bDeYgPHl2nZp7kjrgtazT6+6pLmVZa6NSWLeO0kJT7Gf/S JvWWhyTU34hc+CV8geFLNq8whz2jyXWapeuDXx3KzsRpYI2kdJPkCW85CM/Tpfq8st R/Y61taMxqnyw== X-Nifty-SrcIP: [106.73.25.34] Message-ID: Date: Thu, 2 Mar 2023 00:19:02 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 To: ffmpeg-devel@ffmpeg.org References: <20230221002516.25784-1-rcombs@rcombs.me> <20230221002516.25784-3-rcombs@rcombs.me> Content-Language: en-US From: TADANO Tokumei In-Reply-To: <20230221002516.25784-3-rcombs@rcombs.me> Subject: Re: [FFmpeg-devel] [PATCH 3/3] ffmpeg: respect AV_CODEC_CAP_SINGLE_SUB_RECT X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2023/02/21 9:25, rcombs wrote: > Fixes ASS output when multiple rects are present. > --- > fftools/ffmpeg.c | 28 ++++++++++++++++++---------- > 1 file changed, 18 insertions(+), 10 deletions(-) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index 9884e0c6c6..23eac52438 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -1021,6 +1021,7 @@ static void do_subtitle_out(OutputFile *of, > AVCodecContext *enc; > AVPacket *pkt = ost->pkt; > int64_t pts; > + int single_rect; > > if (sub->pts == AV_NOPTS_VALUE) { > av_log(ost, AV_LOG_ERROR, "Subtitle packets must have a pts\n"); > @@ -1031,11 +1032,15 @@ static void do_subtitle_out(OutputFile *of, > > enc = ost->enc_ctx; > > + single_rect = !!(enc->codec->capabilities & AV_CODEC_CAP_SINGLE_SUB_RECT); > + > /* 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 (single_rect) If the problem exists on assenc only, how about using codec id to be hard-coded? else if (enc->codec_id == AV_CODEC_ID_ASS) It meets your goal without changing framework (but may be dirty solution). The current code already hard-codes AV_CODEC_ID_DVB_SUBTITLE as a special case. > + nb = FFMAX(sub->num_rects, 1); > else > nb = 1; > > @@ -1044,7 +1049,7 @@ static void do_subtitle_out(OutputFile *of, > 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++) { > - unsigned save_num_rects = sub->num_rects; > + AVSubtitle local_sub = *sub; It is better to put it out from "for" loop. It takes costs to copy entire structure on each loop. > > if (!check_recording_time(ost, pts, AV_TIME_BASE_Q)) > return; > @@ -1053,19 +1058,22 @@ static void do_subtitle_out(OutputFile *of, > if (ret < 0) > report_and_exit(AVERROR(ENOMEM)); > > - sub->pts = pts; > + local_sub.pts = pts; > // 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->end_display_time -= sub->start_display_time; > - sub->start_display_time = 0; > - if (i == 1) > - sub->num_rects = 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 (single_rect && 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, sub); > - if (i == 1) > - sub->num_rects = save_num_rects; > + 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); _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".