From patchwork Thu Nov 19 13:47:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 23727 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 E661044B534 for ; Thu, 19 Nov 2020 16:50:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD31668B84B; Thu, 19 Nov 2020 16:50:19 +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 427AE68B606 for ; Thu, 19 Nov 2020 16:50:13 +0200 (EET) Received: by mail-pf1-f193.google.com with SMTP id q10so4722229pfn.0 for ; Thu, 19 Nov 2020 06:50:13 -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=r6Is68vIfUwky1QRUZqTQG10o+2isCW1maSJCvK6grQ=; b=nCTuJZHisROTjzfTMMsJo9EmLxfL2aoM9KO8OYwRsi+zasfqCEyr8m9lTY6ZS2KKl7 qk1b6Fwm/YDmzI+IT+22pEGzhYpS3CplOh4uHVifjvLyvaMijXnJeQomcwRt151+uizS eAafSk0At5rP2Cyyb+aMWYuGexaOecTSTdSvDnV2/PpXnbkRGBtfTInz9PqUYF7Iuxj6 zA1E1j0xMpUa4fBoMxjsTRtgknBDIYIIsX/F6Zj1R+uwzkm9Qh0y07/aORnj02s+/3MY tEk92yDXMc41+by8X+boDGNbhO5F1T9Irh7zsM2svazwPtDdJGVLE7Ss88lqAz/p7+W5 xPMw== 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=r6Is68vIfUwky1QRUZqTQG10o+2isCW1maSJCvK6grQ=; b=WzoQVuR6vKnFzvtT6fSS+YzjmMyeo9FfMA7y7wPWxnCN0P3sNo5AxfznUHn6CrsILp Pe5vyODhZ9gbOTtpF6uRZNY2zdhbcMeYBhzQSzEkIprkk0jsgDB7vRzjZv4XS+UVY7j1 WOYPVD8VS3VgrFEAXNk5tTzOVLK1et+B/QkAhmP1/GZ34aftaeCwT/9kISvcv3Kb1Nnc jRybVUqnNtNGkXg+OGiKSsdMxSEe1BZ8L9YoRpC4QSmxmj/Npa+vR3ytN69N0JkYIK4x XZ1dIoHxDB4MZpRPatUqbEXRuFYmQNSuCr1ERyoVFEbqubkVEdYM2eToSvNn/QXCJxkz 8TFw== X-Gm-Message-State: AOAM532aG8QoRl3IA4t7L37kPWwdkRy4t7x6/oIwSJ62FZ3i2XRS8WLI 7dwzTCRlsTIu2BW0qwziEMyDaYbLULcHxg== X-Google-Smtp-Source: ABdhPJxXRPshmdxMU3Dnm9s4X0ipzQ9eHA/+h9qLeIdfFKOrG3lBHSKQl1Fl+3q7gwFNxum51at6KQ== X-Received: by 2002:a63:e41:: with SMTP id 1mr12505927pgo.195.1605793662802; Thu, 19 Nov 2020 05:47:42 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id y1sm3499652pfe.80.2020.11.19.05.47.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Nov 2020 05:47:42 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Nov 2020 21:47:37 +0800 Message-Id: <1605793657-31264-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 v3] 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 The patch will change the numerical values for the string constants so bump micro version. Signed-off-by: Limin Wang --- libavdevice/decklink_common.h | 9 +++++++++ libavdevice/decklink_dec.cpp | 3 ++- libavdevice/decklink_dec_c.c | 14 +++++++------- libavdevice/version.h | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index f35bd9a..05380ef 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..59044fe 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -33,13 +33,13 @@ static const AVOption options[] = { { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, DEC }, { "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"}, + { "raw_format", "pixel format to be returned by the card when capturing" , OFFSET(raw_format), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 6, 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"}, diff --git a/libavdevice/version.h b/libavdevice/version.h index e3aca9e..7022fdb 100644 --- a/libavdevice/version.h +++ b/libavdevice/version.h @@ -29,7 +29,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 58 #define LIBAVDEVICE_VERSION_MINOR 11 -#define LIBAVDEVICE_VERSION_MICRO 102 +#define LIBAVDEVICE_VERSION_MICRO 103 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \