From patchwork Sun Dec 10 20:52:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6685 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2028666jah; Sun, 10 Dec 2017 12:53:09 -0800 (PST) X-Google-Smtp-Source: AGs4zMZLapwdPgpRU3kuMKq0RnrqU+e3dGiSLcICLSXktmHAM48w+Hpf6tRUiD8fCOCDFcevGsyf X-Received: by 10.223.152.234 with SMTP id w97mr32108269wrb.215.1512939189377; Sun, 10 Dec 2017 12:53:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512939189; cv=none; d=google.com; s=arc-20160816; b=xkd3HHhMrLS5ayb4jVN+iXEuQY6Yy0dcVoGoAtzEYcZHK7Hb7JdSPxCaKdDSRXpW2A gIvK5DdhhLUtsWPD24Lmd/nhVR2k/r7KwmCnneUBFi2A/9aYP7z51ag4zgtHRcnkZdZr c8K4pgyG+NBl5u2BINw5ZxMML9FT4ztZ8MaUzqEmqUin1qT/pEmlMLOUr3Dwba3ihmXg SZ9zU4cu9nrX+VNdTbt4aKoNve8wYPXr8nBqDtLt0M+t9+SoLDNaka9pPq7Qh3o8GQPx marYyVZh8sscD+3xgNvVXSIIK1ChTyzcsT9WZ7kTsRgI4ARFvyFV2OfTFU532apttiXO atTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=eNUX29hnxPtUdtW+tJyDBys0Ys412I2voJ/7Hoyl4kQ=; b=0x8v0syjtzeRXy5IIXlnswoVW/COHfQxtemvrKBaI7SCy7oHqvK7GNG+PUnlvTTA/k edxsHf9MotjF4vyjJDda6+lwFii2RW553DINHmWsxbdPJsExRRefrMtmfauh6/im4dxI kCfPn1M8LUDA1XTmjVawxPLgJdQtpE6yacaRbLuabIGSN5NzZkzzknqmqULYvIg83ieh ypgAAPQnl+JLK1WWqDChV2zsU5wlRN+Uy1kGf6VE8SUmuBeh6/LkOBaBE/uEV7NFAHlZ P7i3KwOP3Hsf2YGw6khPBKFGXokNWjzmSfKTTwkYv2Tcbwz6WZT2PuBAQ6WRUSJ2HaaV lFpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YmiSbjQ+; 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=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 c19si9544602wrc.328.2017.12.10.12.53.09; Sun, 10 Dec 2017 12:53:09 -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=@gmail.com header.s=20161025 header.b=YmiSbjQ+; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C205968A68C; Sun, 10 Dec 2017 22:52:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DD75168A5F9 for ; Sun, 10 Dec 2017 22:52:45 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id z18so15590088wrb.8 for ; Sun, 10 Dec 2017 12:52:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=G7tDdchwXUvNfy0odANCCSrOBNVaQOsCEc3H7WFEJw4=; b=YmiSbjQ+YHQi06YSN7SBIu5n0bhbr1v85N/mDcpVTcrX7A5+nxBu3RqvxEmlu6QnzI kJVHs62whyuu+yy+G1kVB8lX26QDRtVMdVQ1AbVSKXIfG9XlRA3QlP1opUdMMfHNSd05 F0ISrjfriHgBvU7TZnRc8n9tN3JQI1LIRfbiNheBUT9Hriwk5G084Ss6K2f3dg0zMstw FJzH9WVraEvNgDS9mLnABuHdli3IEkfEWj5fW55rQyidiQjHT9VgeLEGMozDmRjQHEyV vIYeS1YF9nONT/n+rv6fAQjijURR6G5PyOIZuABOk0uYg3lcv4p8rJS44Z3xyi6NeJOc n06g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=G7tDdchwXUvNfy0odANCCSrOBNVaQOsCEc3H7WFEJw4=; b=q7xZxcpDZq+XJ3zEiMWmPT9OQggBEhfaKRQ/HLeuOo/qsLsPw0kocX6wsn8tklgnfU DQvkodHgDAdnkzu4izcs5zqZnKEHtwJw9egKhOs2VewIpRUw1yolVewgs7gRryxra1ke RLizndMeagJ1PVC9it3yEt4Bwy+r6GWfF2Tg0eRtls9IT3ez689xAApKgS4PuDaV78UZ c0Er+Rjjc+jmcKdrB1M8BRSGDCWpvTXH2EmjPOANh4gIx8ZcsaMVfklPeMVBqkgb2449 eIEIlWzjEzSasuq+kXlg/HkX0c3M/VjVhndDzgZ5ty53sx/eLu4qTs1WbHqodrMi4u/M YLnQ== X-Gm-Message-State: AJaThX5Ng4bVQa1heRaypwGWGRHkbmTXMdl/ImOJfB8Hl5OTX7fupJlw 3ixidbVAf57tvkc8YXu7h0scsg== X-Received: by 10.223.152.1 with SMTP id v1mr36246411wrb.234.1512939172678; Sun, 10 Dec 2017 12:52:52 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id f56sm19114939wra.75.2017.12.10.12.52.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 12:52:52 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 21:52:09 +0100 Message-Id: <20171210205209.9456-2-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210205209.9456-1-onemda@gmail.com> References: <20171210205209.9456-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_aspect: change outlink sample aspect ratio instead of inlink 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavfilter/vf_aspect.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 4c93639554..c042698ef7 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -125,9 +125,11 @@ static int get_aspect_ratio(AVFilterLink *inlink, AVRational *aspect_ratio) #if CONFIG_SETDAR_FILTER -static int setdar_config_props(AVFilterLink *inlink) +static int setdar_config_props(AVFilterLink *outlink) { - AspectContext *s = inlink->dst->priv; + AVFilterContext *ctx = outlink->src; + AVFilterLink *inlink = ctx->inputs[0]; + AspectContext *s = ctx->priv; AVRational dar; AVRational old_dar; AVRational old_sar = inlink->sample_aspect_ratio; @@ -140,17 +142,17 @@ static int setdar_config_props(AVFilterLink *inlink) av_reduce(&s->sar.num, &s->sar.den, s->dar.num * inlink->h, s->dar.den * inlink->w, INT_MAX); - inlink->sample_aspect_ratio = s->sar; + outlink->sample_aspect_ratio = s->sar; dar = s->dar; } else { - inlink->sample_aspect_ratio = (AVRational){ 1, 1 }; + outlink->sample_aspect_ratio = (AVRational){ 1, 1 }; dar = (AVRational){ inlink->w, inlink->h }; } compute_dar(&old_dar, old_sar, inlink->w, inlink->h); - av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d dar:%d/%d sar:%d/%d -> dar:%d/%d sar:%d/%d\n", + av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d dar:%d/%d sar:%d/%d -> dar:%d/%d sar:%d/%d\n", inlink->w, inlink->h, old_dar.num, old_dar.den, old_sar.num, old_sar.den, - dar.num, dar.den, inlink->sample_aspect_ratio.num, inlink->sample_aspect_ratio.den); + dar.num, dar.den, outlink->sample_aspect_ratio.num, outlink->sample_aspect_ratio.den); return 0; } @@ -169,7 +171,6 @@ static const AVFilterPad avfilter_vf_setdar_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .config_props = setdar_config_props, .filter_frame = filter_frame, }, { NULL } @@ -179,6 +180,7 @@ static const AVFilterPad avfilter_vf_setdar_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, + .config_props = setdar_config_props, }, { NULL } }; @@ -196,9 +198,11 @@ AVFilter ff_vf_setdar = { #if CONFIG_SETSAR_FILTER -static int setsar_config_props(AVFilterLink *inlink) +static int setsar_config_props(AVFilterLink *outlink) { - AspectContext *s = inlink->dst->priv; + AVFilterContext *ctx = outlink->src; + AVFilterLink *inlink = ctx->inputs[0]; + AspectContext *s = ctx->priv; AVRational old_sar = inlink->sample_aspect_ratio; AVRational old_dar, dar; int ret; @@ -206,13 +210,13 @@ static int setsar_config_props(AVFilterLink *inlink) if ((ret = get_aspect_ratio(inlink, &s->sar))) return ret; - inlink->sample_aspect_ratio = s->sar; + outlink->sample_aspect_ratio = s->sar; compute_dar(&old_dar, old_sar, inlink->w, inlink->h); compute_dar(&dar, s->sar, inlink->w, inlink->h); - av_log(inlink->dst, AV_LOG_VERBOSE, "w:%d h:%d sar:%d/%d dar:%d/%d -> sar:%d/%d dar:%d/%d\n", + av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d sar:%d/%d dar:%d/%d -> sar:%d/%d dar:%d/%d\n", inlink->w, inlink->h, old_sar.num, old_sar.den, old_dar.num, old_dar.den, - inlink->sample_aspect_ratio.num, inlink->sample_aspect_ratio.den, dar.num, dar.den); + outlink->sample_aspect_ratio.num, outlink->sample_aspect_ratio.den, dar.num, dar.den); return 0; } @@ -231,7 +235,6 @@ static const AVFilterPad avfilter_vf_setsar_inputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .config_props = setsar_config_props, .filter_frame = filter_frame, }, { NULL } @@ -241,6 +244,7 @@ static const AVFilterPad avfilter_vf_setsar_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, + .config_props = setsar_config_props, }, { NULL } };