From patchwork Sun Mar 10 13:16:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 12280 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6EBF7448B7E for ; Sun, 10 Mar 2019 15:17:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59DCD6882FF; Sun, 10 Mar 2019 15:17:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCEFD6806B1 for ; Sun, 10 Mar 2019 15:16:55 +0200 (EET) Received: by mail-pg1-f182.google.com with SMTP id e9so674478pgf.11 for ; Sun, 10 Mar 2019 06:16:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=t7EhJNUg0BjnwSGODK6yPYsZoYprC8EphbB6jalbmZA=; b=hMco9i/oj0Elm4tjlhkVC3wreW1MxhprwUNbBuxqPuB0g5xONusPpGAhXLhKV01GFm O4WLMe9IXrlCLbLZFRFgF3WrAVpWBNgNzy4gRYox7eCe3od9bxyZ0qOzYmHjPxRBtXQ7 wxF0qdJoRT/KoIYvlYmK/13HjzHfQ4losb/2LvBJ0vfGcBbzCwsbhGK8weJD9oERBse+ uuixFCbZYGxrtP1vYCbt2CgbsDHLwRuOIT/t0/60gBXn9VYwwIMvlZ77QmyjKO2NLBUG LC1LY8tBUHUKXdgk3eMzwliZ637jYyGu/wvW8GL/wRJh2XHsUn1tfISwu8VnYRtxOUib lFyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=t7EhJNUg0BjnwSGODK6yPYsZoYprC8EphbB6jalbmZA=; b=UZdSLj9Tj/j/NRTrtRRB8SzVjoQlSe7dnFazbET8d8OAVjxhIOvEVWbCRajNam3aUr tlSi5xZJwp0G2lqL43prtMv61MmbhBY98/nNXhwjbQmvPDlpk195vuBPsQ7dANG/4Nve 0zwl8FyPfwIBIVv323Lga6etit9dB3yq/hqTwUhK8sHwYoAnQOfo7SVe9OCp6FHjKJML ZKSu/cOqwmgfuLvi/jpMkjf6u+392TFxxzkRCR4BlhlSWu6SYnx/x/qddzxQ4L9RQeZ8 qaBlnd2udlVfvcIe1TyGc0jXiuZhCCtO1OkEWMUbv8A0vg/3SgP1iK35irAyTLC1Rq1U ylVg== X-Gm-Message-State: APjAAAWRvuK0/AlZW6EKOeKddB5R1YU/KbgDp67uKgv744BjdUPbLLa3 9s1G3XtMq7JDZU+FHDUQhe8qD6Uq X-Google-Smtp-Source: APXvYqyWttoHUrA6D9XxzJvtRuyhIsXkVaXpjlEaXwhfXZFtMmes1ykMFXrwk8lPQhQ+QtP2DDw5Hg== X-Received: by 2002:a17:902:a702:: with SMTP id w2mr29134529plq.341.1552223813347; Sun, 10 Mar 2019 06:16:53 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id h13sm4303244pfn.114.2019.03.10.06.16.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 06:16:52 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Mar 2019 21:16:46 +0800 Message-Id: <1552223806-32587-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V2] lavfi/showinfo: support regions of interest sidedata X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao support regions of interest sidedata Signed-off-by: Jun Zhao --- libavfilter/vf_showinfo.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index e41c330..d0e140f 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -111,6 +111,36 @@ static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd) av_log(ctx, AV_LOG_INFO, " (inverted)"); } +static void dump_roi(AVFilterContext *ctx, AVFrameSideData *sd) +{ + AVRegionOfInterest *roi; + int nb_rois; + + if (sd->size < sizeof(*roi)) { + av_log(ctx, AV_LOG_INFO, "invalid data"); + return; + } + + roi = (AVRegionOfInterest *)sd->data; + if (roi->self_size == 0 || sd->size % roi->self_size != 0) { + av_log(ctx, AV_LOG_INFO, "invalid ROI side data"); + return; + } + nb_rois = sd->size / roi->self_size; + + av_log(ctx, AV_LOG_INFO, "Regions Of Interest(RoI) information: "); + for (int index = 0; index < nb_rois; index++) { + av_log(ctx, AV_LOG_INFO, "index: %d, region: (%d %d)/(%d %d), qp offset: %d/%d", + index, roi->left, roi->top, roi->right, roi->bottom, roi->qoffset.num, roi->qoffset.den); + + if (roi->self_size == 0) + av_log(ctx, AV_LOG_INFO, + "AVRegionOfInterest.self_size must be set to sizeof(AVRegionOfInterest).\n"); + + roi = (AVRegionOfInterest *)((char *)roi + roi->self_size); + } +} + static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) { const char *color_range_str = av_color_range_name(frame->color_range); @@ -246,6 +276,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) case AV_FRAME_DATA_AFD: av_log(ctx, AV_LOG_INFO, "afd: value of %"PRIu8, sd->data[0]); break; + case AV_FRAME_DATA_REGIONS_OF_INTEREST: + dump_roi(ctx, sd); + break; default: av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)", sd->type, sd->size);