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 E5F2B45103 for ; Wed, 8 Mar 2023 21:36:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E178B68B8D3; Wed, 8 Mar 2023 23:36:54 +0200 (EET) Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7621768B8D3 for ; Wed, 8 Mar 2023 23:36:48 +0200 (EET) Received: by mail-il1-f178.google.com with SMTP id t1so7463373iln.8 for ; Wed, 08 Mar 2023 13:36:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; t=1678311407; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=yDZTd1t+WbyierNK4I3EWefdZz5LQQIQ9KBrvCiIOjc=; b=f8P5G2kV/uo7kQvbtiVIOwZqvb5F1zwOLcFeEOJUw/gg0cmMVAf7nXP9C5wS7ie7i0 r8fAjRL7sXV7Qc0aTJtXQLLgWWvKEdZAO2CmkfjRyeeX/4Wy7BBKQwieTinBQWrxJ7BF t59XllxcNsXz2Dh6BMVySc83siWeyd96cDr0s9orFN0cg+sx3Gyzsc5EWnRmx9yRUEUU 2yoVi1bH4ZGOO4fLsdsbpq+7/fNbS5EGaBCKpyZu+7TKh0EGrqLvzcmSnZS43InsGXov D8HV6hEGen1ikmLCWT6agARJlmLxQwSQwmPh59JxZFeiJpXi9YuICHXYR1n9wlleubko X1SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678311407; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yDZTd1t+WbyierNK4I3EWefdZz5LQQIQ9KBrvCiIOjc=; b=UO5pxlk147XJgy2kUtDNNcUMotJCRc1A9ixz1TAz1dozs6fIWG8QJEy/LZ8kilQ9AT wFbjILPZpinYuBiFFozvL0AwSue9kqKqKeam/FReIsz/sfdU3EmXHEiVif+zpl++u1zM d7SrvZIzOx3pyZw2gCyGVaUoFm50Jb24M/Jxzlb9s22cuzhgKD1Hfh/hTqb8JFBLOp74 pkNwIyc2rA/9kZH+jCacMfjj735WAvbPZNFeGpLoErc7piMQdT1+Ko4nTDvVH8k/BdyU 9rJsx8jQWmPpN5XBkS7CPQyy+zHlHxkKGVcl23H3mt5/CPobaNsh/LJIIp/caSPCattM QKxQ== X-Gm-Message-State: AO0yUKUfg0fnWo/QCoT2T1n61CtNm+ZgLRGC/71Lg4YdI5Yb5ZmS1o1w ClxkSGY7DPX6LJOjcqN0Oc7s9uMMMm3TBMkqu416 X-Google-Smtp-Source: AK7set/m1t5OXqLyuiMCIXyXSSpRgKW5x3II6U6ZPNCW13qKcUTZiT84PXAG0M9tX2ViPp5mPxfhxg== X-Received: by 2002:a05:6e02:2182:b0:317:9098:1d with SMTP id j2-20020a056e02218200b003179098001dmr15979796ila.31.1678311406872; Wed, 08 Mar 2023 13:36:46 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:e81a:6c2d:648b:3b7d]) by smtp.gmail.com with ESMTPSA id h21-20020a02c4d5000000b003c4ec576030sm5338263jaj.4.2023.03.08.13.36.46 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 08 Mar 2023 13:36:46 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Mar 2023 15:36:39 -0600 Message-Id: <20230308213640.83444-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] ffmpeg: send only one rect per packet when encoding ASS 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The packet and rect formats are identical, so there's no support for multiple rects per packet. --- fftools/ffmpeg.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d721a5e721..438bee8fef 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1072,6 +1072,8 @@ static void do_subtitle_out(OutputFile *of, /* 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; @@ -1080,7 +1082,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; if (!check_recording_time(ost, pts, AV_TIME_BASE_Q)) return; @@ -1089,19 +1091,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 (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, 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); -- 2.39.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".