From patchwork Tue May 3 16:13:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Traian Coza X-Patchwork-Id: 35568 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp496370pzb; Tue, 3 May 2022 09:14:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzexD5IKtRuc80m+EHKHWXC4ebkWt8LJimuiVNU1D8TZwBV83QG670krfMEurABZg8ZEW06 X-Received: by 2002:a17:906:1186:b0:6f3:e700:75be with SMTP id n6-20020a170906118600b006f3e70075bemr16357304eja.350.1651594462383; Tue, 03 May 2022 09:14:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651594462; cv=none; d=google.com; s=arc-20160816; b=qAnUyGqLoqe6l5xLx4Cxq/lnPuYFseci7dPyTqiNV/jCeMS8Zt/B+Eicv+Vdj3pR2O YWeJrtwMC1azHNuo8693SnOaLgsq9/I8yG2OhcLIBFx+Z3n5F2pXKalSvU/nhVMrb2Io 8Iiuj4Brx9yRssMqMRJf/v2RMXGCuB1jVjL6lMZ+CQwxkmG9ihPgTK320xgOrtZ2ZGkY 7VssygRVJQGhJTy/kVFb9GL4sTNrMG3Bo+8I1h9j236zOXjSgIepIs8EW4S5OrdtdwDK a9Hj8YCBqpXe9JXwwUlJOOYj4EYkH+LVvjiJv5YVgH+rlheRIzgz4nfmay+Sdv2g78wo eT3w== 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=OPHNS2LQzv9oSuHldj9wEn37ZXVr0IHvblqOR99zUh8=; b=XMEZgD9Lod4AWp1n7K8UbBvHY+nrAUfC/d/UknV+/t4t5A031ej2WTDMLsmbzis4Is lseC+1pFu7w8cpztSajCoK4gSMq9VgK/Kl2gHX36ZTm51hhY4a2Q7f7WNQgBL1wjLihN zEz/O3JGmz64+W01ds8OnYryTB7/+TH8tQOqqc37zpvaPus6ZQ031bcaSZmtNRm1rMSt vLmaaMg6gfSXWJGHnPe3lepQTSCeeLq0rHuiA0Ns4Tq3DQyD/u0gmuvk3pDgNsgF7NvX L5+2aOnRmExA+LcxjKEfd5+AbbwgXyPkrHhPVaidXmaXHKp7eNXKzlFHx/XO2jJAUoKa xTVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="A3aP/9lG"; 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 e16-20020a170906315000b006df76385f31si13922317eje.977.2022.05.03.09.14.21; Tue, 03 May 2022 09:14:22 -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="A3aP/9lG"; 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 5488E68B3A0; Tue, 3 May 2022 19:13:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F2E168B394 for ; Tue, 3 May 2022 19:13:52 +0300 (EEST) Received: by mail-qt1-f177.google.com with SMTP id hh4so13875590qtb.10 for ; Tue, 03 May 2022 09:13:52 -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=6PFjBMPY0LcWDjHW8ANF6N3ro/90ICiz03wEyR5aF18=; b=A3aP/9lGl9jEp0Dvmjizmouz3xemj4XT7CHOAnNtPEvgirUn/Pos5Y2oAD40htw7c7 6ZaVygfS144VKxiCLcNsrWOrcpd01RzBEiEQsiSrEF/Hf3PbvtKGXXoH/3CxNkOBEDG2 9zx1W7u+gH+2FYgNsJmFxr0eBq6V5xxb1ceFc7B6fm9ouFRMbJZDpdSChJ+VxWIIILsV 4Fs/m6gOVHFkeGYS/F4PsjvNAv56MXBJaeWZVRieA5EuuA6IgFGymxVxhXvPLRpx8RVU d9+5hl68JYv/nWTHAxFffC8XzLwmZjQqqgdieskT+tLzb/EwJaDfc0/me0/QDS+J04mt MSgQ== 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=6PFjBMPY0LcWDjHW8ANF6N3ro/90ICiz03wEyR5aF18=; b=njOUGgxAgGvodC65PJAIafkb+EeyAPkn4UAMCwikF571TccgQcAxsn9bgOhvQWGvGx aN/pKTvAZJKgclUvgMxC54oD91xb1kPMfH6efuriAohVxdyvX+TnlcMu5CbJpcIPAZWE oY9gjPU2U3P6zQ+ZZwLnSxdNv1ZH+cUMl/TOC+2LzHgzU2eKqZUT9odtjz0zaIXPQ1H4 1KT1Bbisi1OvsTLgJWlVlKfMPDkKG/KaNd23hctwVotqWfx7op5o66VOW2lz8C+1vuc5 uh0TOVLsyjWOqrUVdklqy5CKev9LahX1XvezPKOvY5sM1Y7SJExCDPc7fitgJ3KgPSOb Klnw== X-Gm-Message-State: AOAM533SJLrEEStus42Z9dWyX2HY3B/YtkDGVxmlAtUb8TeY9fTppYh/ bf9HNYL9UGsAcw/NGw51uHsqqeeCarmU X-Received: by 2002:a05:622a:164b:b0:2f3:8701:2859 with SMTP id y11-20020a05622a164b00b002f387012859mr15306703qtj.33.1651594430993; Tue, 03 May 2022 09:13:50 -0700 (PDT) Received: from thinkpad.. ([66.220.203.136]) by smtp.gmail.com with ESMTPSA id fp35-20020a05622a50a300b002f39b99f67asm5812731qtb.20.2022.05.03.09.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 May 2022 09:13:50 -0700 (PDT) From: Traian Coza To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 May 2022 12:13:19 -0400 Message-Id: <20220503161328.842587-4-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 03/12] Retreive width and height from video stream! 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: PanC9i2FKjrd --- fftools/ffmpeg.c | 29 ++++++++++++++++++++++++++--- libavfilter/vf_subtitles.c | 9 ++++----- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index dea2aec2ce..a74800bb68 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2325,7 +2325,7 @@ fail: return err < 0 ? err : ret; } -void render_avsub_ass(InputStream *, AVSubtitle *); +void render_avsub_ass(InputStream *, AVSubtitle *, int, int); static void print_subtitle(AVSubtitle sub) { @@ -2423,7 +2423,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output, ist->frames_decoded++; - int rendered = 0; + int rendered = 0; // Variable for text to bitmap support for (i = 0; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i]; @@ -2431,10 +2431,33 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output, || ost->enc->type != AVMEDIA_TYPE_SUBTITLE) continue; + // 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) if (!rendered) { - render_avsub_ass(ist, &subtitle); + // Try to get a height and width from a video + int width = 0, height = 0; + // Try output streams + for (int j = 0; j < nb_output_streams; j++) + if (output_streams[j]->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO) + { + width = output_streams[j]->enc_ctx->width; + height = output_streams[j]->enc_ctx->height; + break; + } + if (width == 0) + // Try input streams + for (int j = 0; j < nb_input_streams; j++) + if (input_streams[j]->dec_ctx->codec_type == AVMEDIA_TYPE_VIDEO) + { + width = input_streams[j]->dec_ctx->width; + height = input_streams[j]->dec_ctx->height; + break; + } + if (width == 0) { + // TODO Error: Cannot render without a video stream + } + render_avsub_ass(ist, &subtitle, width, height); for (int r = 0; r < subtitle.num_rects; r++) subtitle.rects[r]->type = SUBTITLE_BITMAP; rendered = 1; diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 16f9c3fff6..7226911f6c 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -223,16 +223,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) #define ALPHA_THRESHOLD 0b10000000 -void render_avsub_ass(InputStream *, AVSubtitle *); -void render_avsub_ass(InputStream *ist, AVSubtitle *sub) +void render_avsub_ass(InputStream *, AVSubtitle *, int, int); +void render_avsub_ass(InputStream *ist, AVSubtitle *sub, int frame_width, int frame_height) { ASS_Library *library = ass_library_init(); ass_set_extract_fonts(library, 1); ASS_Renderer *renderer = ass_renderer_init(library); - int w = 1920, h = 1080; - ass_set_frame_size(renderer, w, h); + ass_set_frame_size(renderer, frame_width, frame_height); ass_set_pixel_aspect(renderer, 1); - ass_set_storage_size(renderer, w, h); + ass_set_storage_size(renderer, frame_width, frame_height); ass_set_shaper(renderer, 0); ass_set_fonts(renderer, NULL, NULL, 1, NULL, 1);