From patchwork Wed Mar 8 21:36:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 40615 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp767597pzb; Wed, 8 Mar 2023 13:36:58 -0800 (PST) X-Google-Smtp-Source: AK7set/0++J6piSiXxgIMycpVAGdlf2uxS2Zc6tvQ9BKiX6p3lUYeyFXi9RLfIWjRoDu/NdahQDX X-Received: by 2002:a17:907:36e:b0:878:673f:5492 with SMTP id rs14-20020a170907036e00b00878673f5492mr19238702ejb.40.1678311418088; Wed, 08 Mar 2023 13:36:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678311418; cv=none; d=google.com; s=arc-20160816; b=Efnb0LDm1bm2CzxuF+L8q5BZeIY16aLezlWC76NPXhJ8XufHdfC0g340qjCgow20zZ l/dQJDjv0wEDRirG3FdcZh5rHaXMckEUWvY7Z6wAVkGpVDCdqAm26/ZOuVLDIuBODFjX xfOwpSjfQpJBwYvwetDFmTkN4nQuhCcttOPH2YWL5eOc+NCAxgQfuYoCmbtSFwcxlzzL Yn2mpqMtZnqAVZ9QlFmky16socTLwpl1mjxpjFgggRBEKKvsmTJfJ5T34hvedY02MN0R pqWI8hXvBY/DzL5UShcbbcJ5GMnnxWYa9Op7mhigayKhDzxsWISWOKFMkTMWLCLqvx+J FsUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=e76k52/9ehY7YH+lSgxa4mHPdCnAjG/kS2NIgO0G1M8=; b=pBSg3zo8W49KPZ67b9dH8uIGeTuMt2OX8MW01yMIo7Nm0NfVXRM5hHVhe6+PXF5QjW wn5gBC+TxTvlwbm7ihk+cxxyPSfv8Jh4DWSSlQMwBKu65s+2LX+RtSm963nA3UO7AZE2 h0FVV1B4t28oko7Wa+94RVNfTRpGwvgeMLHgbw+6UqDXXpwIIc5HinPZeovhmd9pba8N 2+CIkcIJqEaRddwkpmbBYkpPO8qjXYuuWy+njxfJzgK6/Sis3ctLrcZ8S8NjnoZ9E2kn b7j2MzaWaU9dhTsItkeKc1UxQKaezAAUqpIFLP8/CShVEHK1G4YcqKmZmVr94GmKadUf L13g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=f8P5G2kV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s10-20020a170906454a00b008b26f9a7f8csi5343146ejq.589.2023.03.08.13.36.57; Wed, 08 Mar 2023 13:36:58 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=f8P5G2kV; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F29F68BD12; Wed, 8 Mar 2023 23:36:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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-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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NIxsNzm/fwkm 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); From patchwork Wed Mar 8 21:36:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 40616 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp767664pzb; Wed, 8 Mar 2023 13:37:06 -0800 (PST) X-Google-Smtp-Source: AK7set8EoaxYlntwMvPrf+G63qUZ+wifcWH4L/TxfquzSXUszwPP665LNn2RFGfCiaG3sIkVuZ1V X-Received: by 2002:a17:906:fcb2:b0:8aa:c105:f0bf with SMTP id qw18-20020a170906fcb200b008aac105f0bfmr23149455ejb.17.1678311426529; Wed, 08 Mar 2023 13:37:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678311426; cv=none; d=google.com; s=arc-20160816; b=frHd7U4a08uNiKUEPVWy3HMZJ6EwEgQcUmd+ssYpyy18wYdF+bpSzXz0Z9Ph/IOoyX iXtBhte208yzJSIEerJmRJ3DAu/jfZtISHKzdTnaFAUiGRJOb8sg0nGIYVskD+un2xu1 0fjXr5QVlN1iwa4xSanY1P3K62/G1jKdDW7gG1zAsHCauaj50/EEkppSyB1a9TTbZOe1 vNvEYePaUdcLRUS1e0goJTJUsCVCeEs0tjM1UBsVwo0A9xktDdC2dwLRxg9MrcUOErSE RMvJaBCAcKo8PYaGmdIebT4sHTaJjgLPAVWI3CuSSGlUziVu7wR4qQLX1YevSOdx6cAG I7ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ty97oCLfCBz/iqpkLcN9hpj+WNE4pSUHzdjnMwHpmd8=; b=ymvAq0irHh6urDvFK82KSfhGLcskTPMfr7SLMveI2y/MAXyjmLvQPVMlsqt7dOatVB x2K+Rr3Sf+dFmR4/hinIcTn7AdTK1dIJhkGhsr8yvm+BumHpm0dSJv0pYkOCjySNlMC+ Y7Y9vkFm/f9ONK6zM2JA55qYfKtc5yk7r7XgSTraWjCE+80PK1l2IpXOxn5vtCv1giIx nyFYtqBEGtP7PxvZcIzrIJgd5t6amV1f9hQxTiAyA5dHN/sFBhY1jpB2/7le8Zv0mPQa GmO2wVNT1vm3yVs1rTzG6NxRluX/wv9wnQ8xCnnduQFnNgwhMHUXohRkDlIiIy7uVvZs MITQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=KlylxBGh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ml21-20020a170906cc1500b008dc339ee132si1305969ejb.988.2023.03.08.13.37.06; Wed, 08 Mar 2023 13:37:06 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b=KlylxBGh; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 175A268BD7C; Wed, 8 Mar 2023 23:36:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7C7E68BD24 for ; Wed, 8 Mar 2023 23:36:49 +0200 (EET) Received: by mail-il1-f169.google.com with SMTP id w4so7102564ilv.0 for ; Wed, 08 Mar 2023 13:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; t=1678311408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xi5HTgm6xvwDoccAqf5/xO4RWb8/rDvt1I/hX785J8k=; b=KlylxBGh+Kkn6W58eJJ+BWaSv5tvmOOakZ/0hxa6VSkmkQY54Binm8sVeUJErbp923 9YpIrw4QspUDUhBvcZrfBIzyiarVoku8ghPTnoNxYSRsXTH5b+2j3k24YEl9C+8lua7L bZT/efpvhVSYLgGPo1yZl0e5zsmY9/Fd+OBIiSjgWd584pWAapEXEWyrFbNoi5+ocEBg MMZ9nyGEQxoh4E//eJudOMXNtka5G3Wpa3xQ6TFvv6Cv2kUH+u94iKvBXNTVY/0Xaytk dXeA1n3sTLs0ATXB3IQ+vlYnNbcz7X04oGQqczoknNGcHOizvn9cRkDU7Fd15P+XC9Vg oHKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678311408; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xi5HTgm6xvwDoccAqf5/xO4RWb8/rDvt1I/hX785J8k=; b=1sUGWsQn7/oYr/RI3PVJKJsW5hk9x5WNkgFJn7JkUNAC38Jpm5edVgLsBSxROGfLzP P+ygdTatrKKigvGheWU28AxTdwszIOzlwy5gnORi/huNLy4RrQoX5IoI+anJdP4ih1j7 jORqhE6qOpx2YtDxVqZhNr9MvR9t9mhffmFwQ8jU5bPSdi8dDzsWHu05cK6QUfAXaQBK XPMr4+zE0RBP7unsDAFLYcQk/O60cwHSlBIFubwy8FshiyKiOPZnB0xtygdwi0VK9OY6 Dj5dbgKNvtG9fGrI1mPkLIzwg+yG5f9vBZW10MwGzpfQ4GDgTpuKPnV8GvQ9PYMswnOs xkaA== X-Gm-Message-State: AO0yUKXgvEAfIGLhqV0C0vKVF/J6lYeGK4vVAeoAMP3+4rAfWlVi9qhL Qe1btsjPjsLUGpfek4WSBNdm7GMDgqx5u1705BwU X-Received: by 2002:a05:6e02:12ed:b0:314:f7f:a369 with SMTP id l13-20020a056e0212ed00b003140f7fa369mr522475iln.11.1678311408208; Wed, 08 Mar 2023 13:36:48 -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.47 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 08 Mar 2023 13:36:48 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Mar 2023 15:36:40 -0600 Message-Id: <20230308213640.83444-2-rcombs@rcombs.me> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230308213640.83444-1-rcombs@rcombs.me> References: <20230308213640.83444-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/ass: error if not passed exactly 1 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: B5cZlP8AH8FZ This never produced valid output. --- libavcodec/assenc.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index db6fd25dd7..41332d33fb 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -45,27 +45,26 @@ static int ass_encode_frame(AVCodecContext *avctx, unsigned char *buf, int bufsize, const AVSubtitle *sub) { - int i, len, total_len = 0; + int len; - for (i=0; inum_rects; i++) { - const char *ass = sub->rects[i]->ass; - - if (sub->rects[i]->type != SUBTITLE_ASS) { - av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); - return AVERROR(EINVAL); - } + if (sub->num_rects != 0) { + av_log(avctx, AV_LOG_ERROR, "Only one rect per AVSubtitle is supported in ASS.\n"); + return AVERROR_INVALIDDATA; + } - len = av_strlcpy(buf+total_len, ass, bufsize-total_len); + if (sub->rects[0]->type != SUBTITLE_ASS) { + av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n"); + return AVERROR(EINVAL); + } - if (len > bufsize-total_len-1) { - av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n"); - return AVERROR_BUFFER_TOO_SMALL; - } + len = av_strlcpy(buf, sub->rects[0]->ass, bufsize); - total_len += len; + if (len > bufsize - 1) { + av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n"); + return AVERROR_BUFFER_TOO_SMALL; } - return total_len; + return len; } #if CONFIG_SSA_ENCODER