From patchwork Fri Dec 27 22:17:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 17009 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 4148B4494D8 for ; Sat, 28 Dec 2019 00:18:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1FFDF68ACFA; Sat, 28 Dec 2019 00:18:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C6E0268ACF7 for ; Sat, 28 Dec 2019 00:18:03 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B044FE3215; Fri, 27 Dec 2019 23:18:03 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WOJnjhsL-4Fr; Fri, 27 Dec 2019 23:18:02 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 9B96AE3E5A; Fri, 27 Dec 2019 23:18:01 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Dec 2019 23:17:55 +0100 Message-Id: <20191227221756.10724-2-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191227221756.10724-1-cus@passwd.hu> References: <20191227221756.10724-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 2/3] avdevice/decklink_dec: remove -bm_v210 option 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Deprecated since Sep 28, 2017. Signed-off-by: Marton Balint --- doc/indevs.texi | 7 +------ libavdevice/decklink_common_c.h | 1 - libavdevice/decklink_dec.cpp | 5 ----- libavdevice/decklink_dec_c.c | 1 - 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/doc/indevs.texi b/doc/indevs.texi index 92bc65be41..d5940b8822 100644 --- a/doc/indevs.texi +++ b/doc/indevs.texi @@ -292,11 +292,6 @@ as @option{pal} (3 letters). Default behavior is autodetection of the input video format, if the hardware supports it. -@item bm_v210 -This is a deprecated option, you can use @option{raw_format} instead. -If set to @samp{1}, video is captured in 10 bit v210 instead -of uyvy422. Not all Blackmagic devices support this option. - @item raw_format Set the pixel format of the captured video. Available values are: @@ -430,7 +425,7 @@ ffmpeg -format_code Hi50 -f decklink -i 'Intensity Pro' -c:a copy -c:v copy outp @item Capture video clip at 1080i50 10 bit: @example -ffmpeg -bm_v210 1 -format_code Hi50 -f decklink -i 'UltraStudio Mini Recorder' -c:a copy -c:v copy output.avi +ffmpeg -raw_format yuv422p10 -format_code Hi50 -f decklink -i 'UltraStudio Mini Recorder' -c:a copy -c:v copy output.avi @end example @item diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index b78630b5fc..88b1eae18d 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -42,7 +42,6 @@ struct decklink_cctx { int list_formats; int64_t teletext_lines; double preroll; - int v210; int audio_channels; int audio_depth; int duplex_mode; diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 19ea1eccad..0360bd16fb 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1054,11 +1054,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) return AVERROR_EXIT; } - if (cctx->v210) { - av_log(avctx, AV_LOG_WARNING, "The bm_v210 option is deprecated and will be removed. Please use the -raw_format yuv422p10.\n"); - cctx->raw_format = MKBETAG('v','2','1','0'); - } - ret = ff_decklink_init_device(avctx, avctx->url); if (ret < 0) return ret; diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c index 99439f91ae..b59876994a 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -33,7 +33,6 @@ 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 }, - { "bm_v210", "v210 10 bit per channel" , OFFSET(v210), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, DEC }, { "raw_format", "pixel format to be returned by the card when capturing" , OFFSET(raw_format), AV_OPT_TYPE_INT, { .i64 = MKBETAG('2','v','u','y')}, 0, UINT_MAX, 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"},