From patchwork Sat Nov 14 14:02:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23627 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 DA091449ECB for ; Sat, 14 Nov 2020 16:02:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD8F468C127; Sat, 14 Nov 2020 16:02:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 856DF68B814 for ; Sat, 14 Nov 2020 16:02:44 +0200 (EET) Received: by mail-pf1-f196.google.com with SMTP id y7so9750995pfq.11 for ; Sat, 14 Nov 2020 06:02:44 -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=k+qko7Hv23QQZu8AhqwRpHzFYxdRn1mU+xCAyX3zXG4=; b=Y/6671jgRKAkr+ZVvISd0EttuSTPSM/xDGneFh4G26jzJOiEbfzVWUP0tfZrFd/s3j FLjwFw8WwifRBbx17EGLV3RfbFItW5+7LmCGJV9w1ZXOxV77HI2InsSTznWYxo1FrlVW lwT3x/FBa1v59cUVCaeKMgJi2y8zBnvSh3w7DCSVv/k31AY42C4UliPQwG83RcMNpuWo lcvHQHrGk/1hgD3J+onMbUYYvzQ73U4tNgmQ9L4aa8QWSCaMzBfd7b3DEkPWoBrALPrK PAU/gyTH0bfti3D+AP3K8aemGM0j9l93EvBYB5qCvW7IJvT9CQAs4OOC15NPtXuqdBPO IpGQ== 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=k+qko7Hv23QQZu8AhqwRpHzFYxdRn1mU+xCAyX3zXG4=; b=sy5oG+SyxgrR/MWJHH9RIP2g4NJnI++YAqhvn3XtkkCkYeuCnwMiIgNSBgduP9lYMw +FSx970BWNDOol55Ea5BWUSI8//AbDpBe0HtaMOR2LMluh/cpO8w34Pgv71wCoDQwYa4 igLrQ1ied+EVmzKwD0937Pn1II+zxsPD9mYsTz3m3vJtSRYUZ3j2Ty1YqN9/GNQQpwhL 6IM7dBsAfa2LTaMaaOFWPByow8MkHzu7l/gWofTMu41Jdy++nb4LUkoxT/P/QFfvNlI+ l0Kv8m1TUlrItx6apcUDzevktr/QB+Xl0rmGWF2ZQ/z8T5b/f5YpuUFhO1/PYFFVGcui qwEw== X-Gm-Message-State: AOAM532luwrGq0XK0/SdzEo0F51Ur7VX27bUXed2SjLJs0cWJZlJgD3h ubOCDN16USzPawihDmElB2ZOpIygFcZmcg== X-Google-Smtp-Source: ABdhPJx2VS47zN0yLDjgtnckXW62FyqO4ILncEo0QwSlIku+Mu7wFvibE3wemjEb3lKxr2c2oZOeXQ== X-Received: by 2002:a62:248:0:b029:18c:992f:e407 with SMTP id 69-20020a6202480000b029018c992fe407mr6390275pfc.37.1605362562372; Sat, 14 Nov 2020 06:02:42 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id p127sm12887828pfp.93.2020.11.14.06.02.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 14 Nov 2020 06:02:41 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Nov 2020 22:02:38 +0800 Message-Id: <1605362558-20576-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1605277802-26409-2-git-send-email-lance.lmwang@gmail.com> References: <1605277802-26409-2-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avdevice/decklink_dec: map the raw_format instead of hardcode 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_common.h | 9 +++++++++ libavdevice/decklink_dec.cpp | 3 ++- libavdevice/decklink_dec_c.c | 12 ++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index f35bd9a..ac15488 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -162,6 +162,15 @@ IDeckLinkIterator *CreateDeckLinkIteratorInstance(void); typedef uint32_t buffercount_type; #endif +static const BMDPixelFormat decklink_raw_format_map[] = { + BMDPixelFormat(0), + bmdFormat8BitYUV, + bmdFormat10BitYUV, + bmdFormat8BitARGB, + bmdFormat8BitBGRA, + bmdFormat10BitRGB, +}; + static const BMDAudioConnection decklink_audio_connection_map[] = { (BMDAudioConnection)0, bmdAudioConnectionEmbedded, diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 6517b9d..049e133 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1152,7 +1152,8 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) ctx->video_pts_source = cctx->video_pts_source; ctx->draw_bars = cctx->draw_bars; ctx->audio_depth = cctx->audio_depth; - ctx->raw_format = (BMDPixelFormat)cctx->raw_format; + if (cctx->raw_format > 0 && (unsigned int)cctx->raw_format < FF_ARRAY_ELEMS(decklink_raw_format_map)) + ctx->raw_format = decklink_raw_format_map[cctx->raw_format]; cctx->ctx = ctx; /* Check audio channel option for valid values: 2, 8 or 16 */ diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c index f3fdcd3..66786db 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 = 0 }, 0, 0, DEC, "raw_format"}, + { "uyvy422", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, DEC, "raw_format"}, + { "yuv422p10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, DEC, "raw_format"}, + { "argb", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3 }, 0, 0, DEC, "raw_format"}, + { "bgra", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 4 }, 0, 0, DEC, "raw_format"}, + { "rgb10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 5 }, 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"},