From patchwork Fri Nov 13 14:30:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23615 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 1702D449BF6 for ; Fri, 13 Nov 2020 16:30:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E80D468C24C; Fri, 13 Nov 2020 16:30:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33CC168C251 for ; Fri, 13 Nov 2020 16:30:12 +0200 (EET) Received: by mail-pf1-f193.google.com with SMTP id b63so4142619pfg.12 for ; Fri, 13 Nov 2020 06:30:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d/RNeOauvgnr6ZYhUCy8+uAalPKm1KGkRwCK2SDbgeE=; b=nsYxx7z66QCew/6Ggl/YI0BDNeYAy0PU9dddiUbBik9V7TKau2HtfncYdxcDA+yq9+ x3Sh7n5wVbEblYeIoGpesfEhzW3zlvYaTa1/YLOw+/+1y0CzxD5HaOgYuPoyNIqWRWor y8ItrGWGn3dA0bB2K59H7TYmx7QWunv29Xhqd0ghffR3c339RrMKCCgtZJD6EEAaT/1G 0ytcv9lINHMbblJaXdYD8vJxfv59n4p9kOGsou3xhaB8jSowMoEWdDjZieG5ObvL8BKR Z3REn63OE2eXFSgKLIWPxw7ZB42WeClqkw8EpZAm+3y01RuLEG3ZLVuyir5pALWEuDRf hhLA== 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=d/RNeOauvgnr6ZYhUCy8+uAalPKm1KGkRwCK2SDbgeE=; b=prGBEFLW87vTkitNgRAubQ9BOGleahhSGvNV1VjtFosTBFVNpaaKZheRZJ4sac2fVt oumwbV4panGOUsi+F97F9oPL0WPS1Z5xkDeFFUc9KrcWdHnMvLLDrPHVmsryfJHf48aa kagbeQY3oaG/bBxKOBQ4y9h6+/VP5jcjOH3JjsNvB+/woVVDOqMog0tlE19fooScgifN 2GniL9QqVBxgv7g076VggEYynK41Y6h7U5Qq13Zc8tyNMWCQPOKaZRT96c1hUGPbjAU1 VRW5aFo/f7u/xI8h63z3+vlPaRuhZ7ukm7Mnj+4V9iRXSvfIkoa427EW24Z47JOwEk3A Wofw== X-Gm-Message-State: AOAM5315bL+98W8eGUeFdIpqsZQDnCCWe35dfvmqv1QWCqUBKcQt+Upc /oNv/4JQ0t5DIzLjLvyLoNONkNYYlAnFAA== X-Google-Smtp-Source: ABdhPJwU+THX+bAJspoScMUhtXYQ53aGjUfI33CojetEmTKHiF8DemTRyXmJMWYp3fItH6tH8x0r3Q== X-Received: by 2002:a05:6a00:88d:b029:164:5a00:29b8 with SMTP id q13-20020a056a00088db02901645a0029b8mr2445594pfj.10.1605277810179; Fri, 13 Nov 2020 06:30:10 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id k5sm10747726pjj.37.2020.11.13.06.30.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Nov 2020 06:30:09 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Nov 2020 22:30:02 +0800 Message-Id: <1605277802-26409-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1605277802-26409-1-git-send-email-lance.lmwang@gmail.com> References: <1605277802-26409-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avdevice/decklink_dec_c: use Decklink BMDPixelFormat constants directly 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavdevice/decklink_dec_c.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c index f3fdcd3..6e43c9e 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -34,12 +34,12 @@ static const AVOption options[] = { { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, DEC }, { "format_code", "set format by fourcc" , OFFSET(format_code), AV_OPT_TYPE_STRING, { .str = NULL}, 0, 0, DEC }, { "raw_format", "pixel format to be returned by the card when capturing" , OFFSET(raw_format), AV_OPT_TYPE_INT, { .i64 = 0}, 0, UINT_MAX, DEC, "raw_format" }, - { "auto", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, 0, 0, DEC, "raw_format"}, - { "uyvy422", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MKBETAG('2','v','u','y') }, 0, 0, DEC, "raw_format"}, - { "yuv422p10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MKBETAG('v','2','1','0') }, 0, 0, DEC, "raw_format"}, - { "argb", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 32 }, 0, 0, DEC, "raw_format"}, - { "bgra", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MKBETAG('B','G','R','A') }, 0, 0, DEC, "raw_format"}, - { "rgb10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MKBETAG('r','2','1','0') }, 0, 0, DEC, "raw_format"}, + { "auto", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = bmdFormatUnspecified }, 0, 0, DEC, "raw_format"}, + { "uyvy422", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = bmdFormat8BitYUV }, 0, 0, DEC, "raw_format"}, + { "yuv422p10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = bmdFormat10BitYUV }, 0, 0, DEC, "raw_format"}, + { "argb", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = bmdFormat8BitARGB }, 0, 0, DEC, "raw_format"}, + { "bgra", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = bmdFormat8BitBGRA }, 0, 0, DEC, "raw_format"}, + { "rgb10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = bmdFormat10BitRGB }, 0, 0, DEC, "raw_format"}, { "enable_klv", "output klv if present in vanc", OFFSET(enable_klv), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC }, { "teletext_lines", "teletext lines bitmask", OFFSET(teletext_lines), AV_OPT_TYPE_INT64, { .i64 = 0 }, 0, 0x7ffffffffLL, DEC, "teletext_lines"}, { "standard", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0x7fff9fffeLL}, 0, 0, DEC, "teletext_lines"},