From patchwork Thu Jun 17 14:58:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lingjiang Fang X-Patchwork-Id: 28570 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp715244iol; Thu, 17 Jun 2021 07:59:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9VuZ002545omSiaUcB+PKMG/keDxMSFpF3jdjJj7GetcM/0S84yxpYJkjfhzSlhh1SOdD X-Received: by 2002:a05:6402:40c4:: with SMTP id z4mr7131386edb.364.1623941945338; Thu, 17 Jun 2021 07:59:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623941945; cv=none; d=google.com; s=arc-20160816; b=ZyRUDev0I9WxCv+fq309GeU9Yk+LDcFciIBmFCeMiR8kbW5ERAThAb6v5CZ28Deh0X qX9QcyvGm8A834APePZPE3He3MqofG7pXdrbq/dFZeVde8ytWEgSnSpt//kUHpu9GYYt mXgzXlgCMIHgz38T+gzeA1ydPavNw+7U2KR/oQcPuZkB0ixG2aOVnOnJ8Z+jLUOKDu/k XAomcI8IEVn8rBPbt7NMlvB/YrvR22WT/T9Kj0mb4RpHq/vFOXw4SifF9iUS4h0+7yhZ 0R0QXebwtEa64+lxhqP96UGM7JN+vKpWLnM6HiKOeRV0Pi0w+AMh1z4zoYAt1TOqp6Jq lI0g== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=BsW7JcKblME+d53+Gqb5Unf2M44gK1iBqO30Y9WBd2Q=; b=H5ysZaqfEI+I4/hiFUH/9TWMGpMPVUEnLN6BnaErZtsCk0vOsHfYz9MuqQZ1hNsRVE 0j345Ni2lJ4rxIMyodDXdjAIRWBw865GQHS0yiPB65dfD6PAbT+U+9rlAO05/L1m3XSe l1Bb2HuDh9IHHX5jczvTkqPvIZUM+CB0lUeeTTUnIsgBRcm57X9cka3BhaLU8Q2M7GeW wi0euI3ijjbvWmk2iW9iVKWLjnmUd4/UorB5n1r24/fJDm94V7RdcbHXczCAHUKyhZmw 3YLJ5FOJQLZpUd4X3wTYbqAVEcEXPYNMHZl6XURlrQGOvU8tO4Zy+34JuYALskULsWtg 5+Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=jFoh890M; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l6si5466226edc.41.2021.06.17.07.59.04; Thu, 17 Jun 2021 07:59:05 -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=@foxmail.com header.s=s201512 header.b=jFoh890M; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E7C46881D4; Thu, 17 Jun 2021 17:59:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-191.mail.qq.com (out203-205-221-191.mail.qq.com [203.205.221.191]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49476687F17 for ; Thu, 17 Jun 2021 17:58:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1623941927; bh=UwnfCyEtlC7bd/YIUh/f7V4/SCdTcW2efC25Rk4TbTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jFoh890MLgIdUmslozNIsEcfawJA3bkJugzG/A20yJ6DwKdECS3OEZACAd5fCgAAM rVolBgtZJlILZt/02eO+sO0UDUC0TrkBHefqiQVGm6/35ql4oZGcdOo9JcmhMncxsV qdYRahHfQ9gt+U2TyWD11IhNS3nlzgmuOx73wc74= Received: from localhost.localdomain ([14.17.22.77]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id EAE0481C; Thu, 17 Jun 2021 22:58:46 +0800 X-QQ-mid: xmsmtpt1623941926t9n7ovjyh Message-ID: X-QQ-XMAILINFO: NYo2CBJ8ZHMGlwRm9tvLt9HVPCpt0X/Li3NXGFIBavhBRekIev6149nEsNIa/h H4uaSNZ5O4ghTyTQBqVAChxRIvUTJxPW5A4x+EZNUK7zRzPoKWf2TjADKCOxo9DaeerP4HL/SrGH ViDUdOXsOygfe9zbxhZwE6phRyIE1uVXjbgvY8uqVZT89buo1vYOSx+Tj3U+xVmBHrS+fMfhar/7 g7eYFYOnYOH288B3X1wMIXSW8wlF/z2+AxYHCR1XoC5oHK5tElom3XRwFEwVKCFeTFnakmRI5mS6 5BOlOH1pFyKGOpNzwgLAfQjAR3GMjwKD47h+AZAj6fKPbIsfZTwlE4nRtYa190db0JEue9ZxUqiu gffIcdszbfqXEY5VrWvtpXlDcVSdiydDE5IsGLKmlFWj4AUtfYMhTNoauhVbiYNhD5nhatsJxVwS bSsrWB0KbxMd9h3QVEM/N2hC+qsLiXKHJMPQyy71KGQE1JR18oOnTQfkIiolQarnbG6RyqYogqcW FCVkn1a5GP62Ht9Rko4CF9EMsp2jABoVEdhlIEWrCPCPOniC4FjNVFMNn3vOZWw+ov57e9Rk93EI J4+jZDbJvv11MuyYrGqPQyuiDkWWN4MMEbY7CsLmJQEr0o7kS5J9dt7TdgJcPCAFe7zozC4YM1z8 E42EWFi6Vk4SE/LP2jIB6blU0Kdjt+xnR1UAQD4cgViZUqC577UYy0LaqzcUMPSYI2PENq/enGIa q82ybi9aDY20HqLzPQuYLMQYqVcRJ/HMq/47cBaHRKqTTS827fbmow0kFZH3guyjapcCGxX1Erhe FhLqrdEE/Q3QGMpeUSMeCaH9ZRU7P1VA8= From: Lingjiang Fang To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Jun 2021 22:58:40 +0800 X-OQ-MSGID: <20210617145840.8826-1-vacingfang@foxmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2] lavf/vf_ocr: add subregion support 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: Lingjiang Fang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vOLEKc6KUg+P fix bugs of previous patch, ping for review --- doc/filters.texi | 7 +++++++ libavfilter/vf_ocr.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index da8f7d7726..a955cf46e0 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -15451,6 +15451,13 @@ Set character whitelist. @item blacklist Set character blacklist. + +@item x, y +Set top point position of subregion, not support expression now + +@item w, h +Set width and height of subregion + @end table The filter exports recognized text as the frame metadata @code{lavfi.ocr.text}. diff --git a/libavfilter/vf_ocr.c b/libavfilter/vf_ocr.c index 6de474025a..e96dce2d87 100644 --- a/libavfilter/vf_ocr.c +++ b/libavfilter/vf_ocr.c @@ -33,6 +33,8 @@ typedef struct OCRContext { char *language; char *whitelist; char *blacklist; + int x, y; + int w, h; TessBaseAPI *tess; } OCRContext; @@ -45,6 +47,10 @@ static const AVOption ocr_options[] = { { "language", "set language", OFFSET(language), AV_OPT_TYPE_STRING, {.str="eng"}, 0, 0, FLAGS }, { "whitelist", "set character whitelist", OFFSET(whitelist), AV_OPT_TYPE_STRING, {.str="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.:;,-+_!?\"'[]{}()<>|/\\=*&%$#@!~ "}, 0, 0, FLAGS }, { "blacklist", "set character blacklist", OFFSET(blacklist), AV_OPT_TYPE_STRING, {.str=""}, 0, 0, FLAGS }, + { "x", "top x of sub region", OFFSET(x), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS }, + { "y", "top y of sub region", OFFSET(y), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS }, + { "w", "width of sub region", OFFSET(w), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS }, + { "h", "height of sub region", OFFSET(h), AV_OPT_TYPE_INT, {.i64=0}, 0, INT_MAX, FLAGS }, { NULL } }; @@ -93,6 +99,21 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, fmts_list); } +static void check_fix(int *x, int *y, int *w, int *h, int pic_w, int pic_h) +{ + // 0 <= x < pic_w + if (*x >= pic_w) + *x = 0; + // 0 <= y < pic_h + if (*y >= pic_h) + *y = 0; + + if (*w == 0 || *w + *x > pic_w) + *w = pic_w - *x; + if (*h == 0 || *h + *y > pic_h) + *h = pic_h - *y; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVDictionary **metadata = &in->metadata; @@ -102,8 +123,20 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) char *result; int *confs; + // TODO: support expression + int x = s->x; + int y = s->y; + int w = s->w; + int h = s->h; + check_fix(&x, &y, &w, &h, in->width, in->height); + if ( x != s->x || y != s->y || + (s->w != 0 && w != s->w) || (s->h != 0 && h != s->h)) { + av_log(s, AV_LOG_WARNING, "config error, subregion changed to x=%d, y=%d, w=%d, h=%d\n", + x, y, w, h); + } + result = TessBaseAPIRect(s->tess, in->data[0], 1, - in->linesize[0], 0, 0, in->width, in->height); + in->linesize[0], x, y, w, h); confs = TessBaseAPIAllWordConfidences(s->tess); av_dict_set(metadata, "lavfi.ocr.text", result, 0); for (int i = 0; confs[i] != -1; i++) {