From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E2ECC433DF for ; Wed, 24 Jun 2020 13:44:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7A062082F for ; Wed, 24 Jun 2020 13:44:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=es-iitr-ac-in.20150623.gappssmtp.com header.i=@es-iitr-ac-in.20150623.gappssmtp.com header.b="kfY6jX42" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403954AbgFXNo3 (ORCPT ); Wed, 24 Jun 2020 09:44:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390774AbgFXNoZ (ORCPT ); Wed, 24 Jun 2020 09:44:25 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D768AC0613ED for ; Wed, 24 Jun 2020 06:44:25 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id x11so1075877plo.7 for ; Wed, 24 Jun 2020 06:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=es-iitr-ac-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mlOpwt/OrDwY18/efyoHHrZ4eC1JjYFXEeCPwXIZHEk=; b=kfY6jX42WbvkbvD7fYTjlqt+AAu2GI51V6oGzhE79RDtVgzGso7h42FxxF6seDohTq vpUgWGkb355z437A9Iu8RSCZfU/hIUp7lJAbcjS8X5CROUBXHJHJsmvLBuTAhyYl1Lfx Lp30kGfbwURHGjD35RvA9/h8rmm4iHDy7Gykq4LtBong0w1yffuHHQOv54R/smbS1VMa yrHxg7b4upz6PC6NC8A907ICegiJ5in7Jyuv//AtIMdqTrb8lOgs2Sw24H8HPPII0xz8 lKFzB3vRfT0nG9qsfyIKWjOg3F86Kw90zEBx67CjwJGnHCq4fjhL3az5/FqmZkUWBXv1 TSmQ== 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:in-reply-to :references; bh=mlOpwt/OrDwY18/efyoHHrZ4eC1JjYFXEeCPwXIZHEk=; b=iXmX1lau3khTpv+rq4I5EjfXTCXKz0N+p+FKu6latqS/pJf9QpJSgbng6Z4Hs9DCbg edeEq8IPAz6Nwz4NnALIiBqtEPxSYA95yi0ruaQq7zr+y1A7zCTqpDElHDkoGnfv5jKa TIjFhz60JBFEv1KKLq4L6esbo7OpJ6nl9OR7rXvSpmirn80jImXo7Zdxh1jAJKXPgAUo +woRbJ6yenBIC79HrGtxb+sN5jG3xanlavt7wLAlJMIDVM0qTAbB8q0Mkcs4pjJewW7q bqTdhkMytI7nnk5dIg3FjaMOOnfZB4XbfA4ty+B3ztxoglyrMkPPp3UcL3eadfTWsBfE 7P4Q== X-Gm-Message-State: AOAM532PfWKHVwdSk0otfOryaUiafzoS4ZuFrvvNyfGoPTEa+F/wQlCb 9sWveXYP003VkRVPOL9PBfRZLg== X-Google-Smtp-Source: ABdhPJw9xfC2lmCF3UH+L3g/XKkPyru+Tkq5C7DHTC0wID2xmL1n9R52g41g+wh4qKlFB+WZbhd1Bw== X-Received: by 2002:a17:902:8a8f:: with SMTP id p15mr15273313plo.172.1593006265318; Wed, 24 Jun 2020 06:44:25 -0700 (PDT) Received: from kaaira-HP-Pavilion-Notebook ([2401:4900:4174:4b69:7433:bb27:35ac:b181]) by smtp.gmail.com with ESMTPSA id q13sm20909612pfk.8.2020.06.24.06.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 06:44:24 -0700 (PDT) From: Kaaira Gupta To: Helen Koike , Shuah Khan , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Kieran Bingham , hverkuil@xs4all.nl Cc: Kaaira Gupta Subject: [PATCH v5 2/3] media: tpg: Add function to return colors' order of test image Date: Wed, 24 Jun 2020 19:13:53 +0530 Message-Id: <20200624134354.7023-3-kgupta@es.iitr.ac.in> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200624134354.7023-1-kgupta@es.iitr.ac.in> References: <20200624134354.7023-1-kgupta@es.iitr.ac.in> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently there is no method to know the correct order of the colors for a test image generated by tpg. Write a function that returns a string of colors' order given a tpg. It returns a NULL pointer in case of test patterns which do not have a well defined colors' order. Hence add a NULL check for text in tpg_gen_text(). Signed-off-by: Kaaira Gupta Reviewed-by: Kieran Bingham --- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 29 +++++++++++++++++-- include/media/tpg/v4l2-tpg.h | 1 + 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c index dde22a4cbd6c..a052b656fa6a 100644 --- a/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +++ b/drivers/media/common/v4l2-tpg/v4l2-tpg-core.c @@ -1959,12 +1959,14 @@ void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2], unsigned step = V4L2_FIELD_HAS_T_OR_B(tpg->field) ? 2 : 1; unsigned div = step; unsigned first = 0; - unsigned len = strlen(text); + unsigned len; unsigned p; - if (font8x16 == NULL || basep == NULL) + if (font8x16 == NULL || basep == NULL || text == NULL) return; + len = strlen(text); + /* Checks if it is possible to show string */ if (y + 16 >= tpg->compose.height || x + 8 >= tpg->compose.width) return; @@ -2006,6 +2008,29 @@ void tpg_gen_text(const struct tpg_data *tpg, u8 *basep[TPG_MAX_PLANES][2], } EXPORT_SYMBOL_GPL(tpg_gen_text); +const char *tpg_g_color_order(const struct tpg_data *tpg) +{ + switch (tpg->pattern) { + case TPG_PAT_75_COLORBAR: + case TPG_PAT_100_COLORBAR: + case TPG_PAT_CSC_COLORBAR: + case TPG_PAT_100_HCOLORBAR: + return "white, yellow, cyan, green, magenta, red, blue, black"; + case TPG_PAT_BLACK: + return "Black"; + case TPG_PAT_WHITE: + return "White"; + case TPG_PAT_RED: + return "Red"; + case TPG_PAT_GREEN: + return "Green"; + case TPG_PAT_BLUE: + return "Blue"; + default: + return NULL; + } +} + void tpg_update_mv_step(struct tpg_data *tpg) { int factor = tpg->mv_hor_mode > TPG_MOVE_NONE ? -1 : 1; diff --git a/include/media/tpg/v4l2-tpg.h b/include/media/tpg/v4l2-tpg.h index 9749ed409856..0b0ddb87380e 100644 --- a/include/media/tpg/v4l2-tpg.h +++ b/include/media/tpg/v4l2-tpg.h @@ -252,6 +252,7 @@ void tpg_fillbuffer(struct tpg_data *tpg, v4l2_std_id std, bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc); void tpg_s_crop_compose(struct tpg_data *tpg, const struct v4l2_rect *crop, const struct v4l2_rect *compose); +const char *tpg_g_color_order(const struct tpg_data *tpg); static inline void tpg_s_pattern(struct tpg_data *tpg, enum tpg_pattern pattern) { -- 2.17.1