From patchwork Tue May 3 16:13:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Traian Coza X-Patchwork-Id: 35572 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp496775pzb; Tue, 3 May 2022 09:15:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5ZkktVtI5wecLaiEfr77Z/kr1IHM9zfC82x+XQpqU4/aqsWyZ48xSx2bjKss6m0AS8A3d X-Received: by 2002:a17:906:7f02:b0:6cf:86d8:c31c with SMTP id d2-20020a1709067f0200b006cf86d8c31cmr16919243ejr.518.1651594509986; Tue, 03 May 2022 09:15:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651594509; cv=none; d=google.com; s=arc-20160816; b=mVupz0ZAhp0IDEdtNXR7U+bAE6inyJyrlqePZ8QsXPOLR02X6vx9KM2nC9SSJRq6Nx GyyE5vYd2hKTHU88UR3OVFzsrc8EA4IgXh+M79ksrxtq0o/xGiY7br4eKJBibPbDeIbE YXpMy7eSU4aEf0g8QehukEiDhE6u7JDMHlJSxByhE6qvJckSfdmHMcSx48b22fhVw3hX QuHpLn1cKewtcMoxIZI2gmV9HZGgUhfKHddJnF2kgEgPURgjVbkNpvhtN7bzehySAdAu F4JDsZgjMtKZWCXLj0xMtPoH2eunuMoQeXRHYVZCiMNu8BRNEGBRd1IBdwKOwKPSyrD6 SbSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=tvktJClgfDAug2Sh4U/Z+mQutJWh0FExnA3pb2rtlaY=; b=loO45yqaXwwItFKAuawS8XUUYKYJqaFfvfpoopAzDP0KBKQ1Dx9h/JRKV6T5Gdycej 0UjndCZo/7adFRRHxJQyqmI89LnySszsWXr0su6zHFMEnikwmSK3q3oQ934EMzyF0KK/ QEXEIqY66C+D7hj206G2EA3/Zf+WyFUFminQ79Fy5iHSlVHn80bqlcgFgWp3Y/yZqx94 Np+7X6ua1+p79EXzmryqHfA6fbIWY2a9sdLQ32Ndb8HvxGjP5vqig/GafcjKbfamjhn3 876PXH1ZfbQbX6CoZpi8ACpfeNttiXRTYhPfIH241fs1HJ4l/aqmeyynsf93I+m1/Z87 2GdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=EfC+tJyr; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x18-20020a50f192000000b0041d9354ecacsi14336950edl.222.2022.05.03.09.15.09; Tue, 03 May 2022 09:15:09 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=EfC+tJyr; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 543AE68B37F; Tue, 3 May 2022 19:14:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3613E68B3AB for ; Tue, 3 May 2022 19:13:55 +0300 (EEST) Received: by mail-qt1-f181.google.com with SMTP id hh4so13875729qtb.10 for ; Tue, 03 May 2022 09:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kEV9h0Wn4yluFZi4z6x3hYJkhCw/nvaLORhTvKrbitk=; b=EfC+tJyrV20vYZc4K4m3Zh102bkGXAUeYFH7sb6djTDq2lgVnKltlXvEQbkHis0HVr EVwBjq1+CHVeDGGAGoNWiu5EvLGTF7gS+jaYAOnduoxpo9t2PzYjOrhx1Eyj9Vay1HJg MpdEusDYS+2t9/SHCKu3VbYexmHZ1SBDViQhlvPiy6JbIE/KSahiaeZxFz+00qRpaOUW zec4xueC8CkxHNDJ9s6Pcv95hu9+meD1pTry2/waoAqDXx0SY2lM7sRGHk3eeCsINZyX pj0HGV5SAOHs8DXLi91naL5BFWGHavFrYJj1ree/i995gcEH77wucIAYXX702pr2P1fv eWnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kEV9h0Wn4yluFZi4z6x3hYJkhCw/nvaLORhTvKrbitk=; b=vCamc+cmIGjKbknvrccsLEX2ljljCmq0mGSo3bPc7g7G5OxFQIyuj+/fZn0WFMuKuo oQmHTYKmgmm8s3g+9261O/D4aZwrIMwfEXTj64d9q+nGTsT5hrF/5tSyJzAJTxVYIrC3 yhijnbeiojW+q07knLEbAT+53fOwAsdX7W2852NSdBAY+mzMUaGSWvEKE7zE5+ULswcV Cbyp2qleUpQKyTVZ1Xi2qe0EQtF8AR2uD1xG7qqse6MRD6wlKZAFPp0/vbu9bphLNddJ KAo82NOPtnxwXfd2j8PVYNopU3hyGUG/lQYqL7hRkd1nOpBVxcuSYJzNGwKg3QGMZ0wp zspg== X-Gm-Message-State: AOAM5302Hi+9dDPBtVMTWUpU5THCqK0OvFkXbNz71ZLpTh9q6KBGz5C3 FnziCV5gftJodAjyUE+X1iqYewobEcmW X-Received: by 2002:a05:622a:587:b0:2f3:a51d:9215 with SMTP id c7-20020a05622a058700b002f3a51d9215mr9760846qtb.345.1651594433807; Tue, 03 May 2022 09:13:53 -0700 (PDT) Received: from thinkpad.. ([66.220.203.136]) by smtp.gmail.com with ESMTPSA id fp35-20020a05622a50a300b002f39b99f67asm5812731qtb.20.2022.05.03.09.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 09:13:53 -0700 (PDT) From: Traian Coza To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 12:13:21 -0400 Message-Id: <20220503161328.842587-6-traian.coza@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220503161328.842587-1-traian.coza@gmail.com> References: <20220503161328.842587-1-traian.coza@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/12] Cleaned up 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 Cc: Traian Coza Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Nm1tb0I1Zceh --- fftools/ffmpeg.c | 39 ++----------------------- libavcodec/text_to_bitmap.c | 58 +++++++++++++++++++++++++++++++++++-- libavfilter/vf_subtitles.c | 18 ------------ 3 files changed, 58 insertions(+), 57 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 31acf08a6a..0ff9da7bf4 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2329,43 +2329,6 @@ fail: return err < 0 ? err : ret; } -static void print_subtitle(AVSubtitle sub) -{ - printf("sub.format: %u\n", sub.format); - printf("sub.start_display_time: %u\n", sub.start_display_time); - printf("sub.end_display_time: %u\n", sub.end_display_time); - printf("sub.num_rects: %u\n", sub.num_rects); - printf("sub.pts: %ld\n", sub.pts); - for (int i = 0; i < sub.num_rects; i++) - { - printf("sub.rects[%d]->type: %d\n", i, sub.rects[i]->type); - printf("sub.rects[%d]->nb_colors: %d\n", i, sub.rects[i]->nb_colors); - printf("sub.rects[%d]->(x,y,w,h): (%d,%d,%d,%d)\n", i, sub.rects[i]->x, sub.rects[i]->y, sub.rects[i]->w, sub.rects[i]->h); - printf("sub.rects[%d]->linesize: [%d,%d,%d,%d]\n", i, sub.rects[i]->linesize[0], sub.rects[i]->linesize[1], sub.rects[i]->linesize[1], sub.rects[i]->linesize[1]); - switch (sub.rects[i]->type) - { - case SUBTITLE_TEXT: - printf("sub.rects[%d]->text: %s\n", i, sub.rects[i]->text); - break; - case SUBTITLE_ASS: - printf("sub.rects[%d]->ass: %s\n", i, sub.rects[i]->ass); - break; - case SUBTITLE_BITMAP: - for (int c = 0; c < sub.rects[i]->nb_colors; c++) - printf("color %d: [%u,%u,%u,%u]\n", c, - sub.rects[i]->data[1][c * 4 + 0], - sub.rects[i]->data[1][c * 4 + 1], - sub.rects[i]->data[1][c * 4 + 2], - sub.rects[i]->data[1][c * 4 + 3]); - for (int y = 0; y < sub.rects[i]->h; y++, printf("\n")) - for (int x = 0; x < sub.rects[i]->w; x++) - printf("%d", sub.rects[i]->data[0][y * sub.rects[i]->w + x]); - break; - } - } - printf("\n"); -} - static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output, int *decode_failed) { @@ -2433,6 +2396,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output, || ost->enc->type != AVMEDIA_TYPE_SUBTITLE) continue; +#if CONFIG_LIBASS // Support text to bitmap if (avcodec_descriptor_get(ost->enc_ctx->codec_id)->props & AV_CODEC_PROP_BITMAP_SUB) if (avcodec_descriptor_get(ist->dec_ctx->codec_id)->props & AV_CODEC_PROP_TEXT_SUB) @@ -2442,6 +2406,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output, subtitle.rects[r]->type = SUBTITLE_BITMAP; rendered = 1; } +#endif do_subtitle_out(output_files[ost->file_index], ost, &subtitle); } diff --git a/libavcodec/text_to_bitmap.c b/libavcodec/text_to_bitmap.c index 87c46985d9..50c72afc55 100644 --- a/libavcodec/text_to_bitmap.c +++ b/libavcodec/text_to_bitmap.c @@ -94,7 +94,6 @@ void free_ass_context(ASS_Context *context) { void render_avsub_ass(ASS_Context *context, AVSubtitle *sub) { - printf("render_avsub_ass\n"); for (int r = 0; r < sub->num_rects; r++) { AVSubtitleRect *rect = sub->rects[r]; @@ -167,4 +166,59 @@ void render_avsub_ass(ASS_Context *context, AVSubtitle *sub) } } } -} \ No newline at end of file +} + +static void print_ass_image(const ASS_Image *image) +{ + int index = 0; + for (; image != NULL; image = image->next, index++) + { + printf("index: %d\n", index); + printf("image->(dst_x,dst_y): (%d,%d)\n", image->dst_x, image->dst_y); + printf("image->(w,h): (%d,%d)\n", image->w, image->h); + printf("image->stride: %d\n", image->stride); + printf("image->type: %d\n", image->type); + printf("image->color: [%u,%u,%u,%u]\n", AR(image->color), AG(image->color), AB(image->color), AA(image->color)); + for (int y = 0; y < image->h; y++, printf("\n")) + for (int x = 0; x < image->w; x++) + printf("%02X", image->bitmap[y * image->stride + x]); + printf("\n"); + } +} + +static void print_subtitle(AVSubtitle sub) +{ + printf("sub.format: %u\n", sub.format); + printf("sub.start_display_time: %u\n", sub.start_display_time); + printf("sub.end_display_time: %u\n", sub.end_display_time); + printf("sub.num_rects: %u\n", sub.num_rects); + printf("sub.pts: %ld\n", sub.pts); + for (int i = 0; i < sub.num_rects; i++) + { + printf("sub.rects[%d]->type: %d\n", i, sub.rects[i]->type); + printf("sub.rects[%d]->nb_colors: %d\n", i, sub.rects[i]->nb_colors); + printf("sub.rects[%d]->(x,y,w,h): (%d,%d,%d,%d)\n", i, sub.rects[i]->x, sub.rects[i]->y, sub.rects[i]->w, sub.rects[i]->h); + printf("sub.rects[%d]->linesize: [%d,%d,%d,%d]\n", i, sub.rects[i]->linesize[0], sub.rects[i]->linesize[1], sub.rects[i]->linesize[1], sub.rects[i]->linesize[1]); + switch (sub.rects[i]->type) + { + case SUBTITLE_TEXT: + printf("sub.rects[%d]->text: %s\n", i, sub.rects[i]->text); + break; + case SUBTITLE_ASS: + printf("sub.rects[%d]->ass: %s\n", i, sub.rects[i]->ass); + break; + case SUBTITLE_BITMAP: + for (int c = 0; c < sub.rects[i]->nb_colors; c++) + printf("color %d: [%u,%u,%u,%u]\n", c, + sub.rects[i]->data[1][c * 4 + 0], + sub.rects[i]->data[1][c * 4 + 1], + sub.rects[i]->data[1][c * 4 + 2], + sub.rects[i]->data[1][c * 4 + 3]); + for (int y = 0; y < sub.rects[i]->h; y++, printf("\n")) + for (int x = 0; x < sub.rects[i]->w; x++) + printf("%d", sub.rects[i]->data[0][y * sub.rects[i]->w + x]); + break; + } + } + printf("\n"); +} diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 703dbec37d..82e140e986 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -181,24 +181,6 @@ static void overlay_ass_image(AssContext *ass, AVFrame *picref, } } -static void print_ass_image(const ASS_Image *image) -{ - int index = 0; - for (; image != NULL; image = image->next, index++) - { - printf("index: %d\n", index); - printf("image->(dst_x,dst_y): (%d,%d)\n", image->dst_x, image->dst_y); - printf("image->(w,h): (%d,%d)\n", image->w, image->h); - printf("image->stride: %d\n", image->stride); - printf("image->type: %d\n", image->type); - printf("image->color: [%u,%u,%u,%u]\n", AR(image->color), AG(image->color), AB(image->color), AA(image->color)); - for (int y = 0; y < image->h; y++, printf("\n")) - for (int x = 0; x < image->w; x++) - printf("%02X", image->bitmap[y * image->stride + x]); - printf("\n"); - } -} - static int filter_frame(AVFilterLink *inlink, AVFrame *picref) { AVFilterContext *ctx = inlink->dst;