From patchwork Wed Dec 22 23:03:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6789481iog; Wed, 22 Dec 2021 15:03:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzE63qlilsHlO+TFE09IWLkWcz0sdW9FVZneByqrXy/DB0Z9BIUEpF81G9uLK2UrWsWDHjh X-Received: by 2002:a17:907:6089:: with SMTP id ht9mr4107376ejc.292.1640214203800; Wed, 22 Dec 2021 15:03:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640214203; cv=none; d=google.com; s=arc-20160816; b=booTzr7Lx8bwuQ2Xi2fNE69fCo7V4we/W00ZCn4suA6TeoseXJd/u+sozYtXd9yl6/ uy76tOXlV/Pn2VGaoDm+akc5mXFlerOTapIIBYs3JK5ldmVbtRBSkFjh6l8bSw7bobni +VKpxONdrTP0nJOSNFb14NWI5Whco/Icqyh4BC5zjM1BfHtt9oLsZmowcYD4WLJ3S3rF LCQZzlcmbAnbekKJHysQXu73tGPbw7bUuvLDMR1CKlK1VTY89FIQkV8RATRLVtXafFPx ZVVS41xTVLJcq+wTFyj+KSXs8R9xQhlCmGLbqHry8PkCe/fx5MIcgxAB2oWQbzg1QgSo rePw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=KTKEc1friUWiQD6vyx7NitajCP1OmKVuzRrwbvlqlkI=; b=CJ9agQ7O0Z5CgefEFSGmijcg+CNQ9QaLlAjXx/hvkoOzzeBr7lk4EpO5wzJC2dJUj9 6lNiDjTj0ma+qRhADI36tvwvPSecISZs/pUEkjEjz7wCxzWAaC/UvGYjRzpAKjNFZp11 61nTtA2zmQHjIPbT8CG41n1zonTcVnoGy14eUlagJ6PUbTLuRKia8mPPRk4OamXy2ivN /tPgYoM+Mb/IgNhgOx7fw5rJYFKW5kGBw6IRCfM4o/GGSiTsvbSI5zXdjquq4+7pC7Bt C/miPleQ6px3FjYG0IB1haPVniNV5siWybX8x9aX/p/B0cr9aIsNWuET0aP/iabT4Jma pVjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JotH7zfc; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h8si1349115ejj.833.2021.12.22.15.03.23; Wed, 22 Dec 2021 15:03:23 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=JotH7zfc; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C53F468B0E3; Thu, 23 Dec 2021 01:03:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A09168B04B for ; Thu, 23 Dec 2021 01:03:12 +0200 (EET) Received: by mail-pl1-f176.google.com with SMTP id v19so2933450plo.7 for ; Wed, 22 Dec 2021 15:03:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HCCYl1Hijtny7nk4GKZs2ASXPzj9PfUE1zs7BB+bbn0=; b=JotH7zfcRcQRf1N2aeHnwQDfqwDdqCV7ZQHYClYccNASm40i2gXZVb4csGz4fF85BG Xl9XwwYGDrD8S18glVQUIR14QlyUxJLflfdzajS1oSb1J1JCOEQKXXfZf/rsCOYov1PK Gw62Ujy9Y4M5zTvZy9PrIcP9MRYHjcXdXcR1SC/aQyTo5Y+oFa+hAu4ltUOqCOlI9ffU V98V6gdXmVO2b7wn0E1R6SNBHIvbaxF3klr31At2rP312JBj85fMWVgJJ/w0IVSHd1mb o+7Mgx7Gjal5n9TmppZZ/iJCBcKoGrYHG9fTypaa8JIiuvdBhfXthXeliTV1RSkZcPmz AncA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HCCYl1Hijtny7nk4GKZs2ASXPzj9PfUE1zs7BB+bbn0=; b=0xZDx4p64zWbgZtPZUyidOI1mf61fPeFSe4UX4cD9D5/IMy+g4wPhmlATnkUttRESX H4sTsvKNIE+iwTLIeJKfk3F1ZRLYPchkmDJtd9L/NBil8FHVtkl2nR0rCAGUzooQs2Ok 1cye8XRu7dkLLDF5nbOPj4lnuTNSXNIHZaBRksxcHzJBdceBOQJFCOmYonEDKN7haQW8 lJj7L8DElDqdRO6UGUfE5LVE6iE5C14bXfn/gkHCuiSH3NJOXn/0uySpW6hwGSx/ObCN VoX7CITrfXf5e83M6Z63cVhnpV+3MuCKs4VtopPEpikq9jkxbeA04k4l510EZwQpsci2 QjlA== X-Gm-Message-State: AOAM531Pplhn1fauWA1bw58WWmSP1DAOJohbNs71g/Eu575PD5bapE7S HZwXFGHd8chGOnkC3Mv9pu+ajTVUkfA= X-Received: by 2002:a17:90b:4c11:: with SMTP id na17mr18059pjb.84.1640214190005; Wed, 22 Dec 2021 15:03:10 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v63sm2962973pgv.71.2021.12.22.15.03.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Dec 2021 15:03:09 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 07:03:02 +0800 Message-Id: <1640214184-12529-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1639492513-12002-1-git-send-email-lance.lmwang@gmail.com> References: <1639492513-12002-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 1/3] avformat: add bitpacked demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Wn1a/2reJr4n From: Limin Wang Allows user can playback bitpacked pixel format directly: ffplay -video_size 1280x720 -pixel_format yuv422p10 test.bitpacked ffplay -f bitpacked -video_size 1280x720 -pixel_format uyvy422 test.yuv Signed-off-by: Limin Wang --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawvideodec.c | 56 ++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 2b5caf9..65fb789 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -138,6 +138,7 @@ OBJS-$(CONFIG_BINKA_DEMUXER) += binka.o OBJS-$(CONFIG_BINTEXT_DEMUXER) += bintext.o sauce.o OBJS-$(CONFIG_BIT_DEMUXER) += bit.o OBJS-$(CONFIG_BIT_MUXER) += bit.o +OBJS-$(CONFIG_BITPACKED_DEMUXER) += rawvideodec.o OBJS-$(CONFIG_BMV_DEMUXER) += bmv.o OBJS-$(CONFIG_BOA_DEMUXER) += boadec.o OBJS-$(CONFIG_BFSTM_DEMUXER) += brstm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 1054ac9..a100639 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -96,6 +96,7 @@ extern const AVInputFormat ff_bink_demuxer; extern const AVInputFormat ff_binka_demuxer; extern const AVInputFormat ff_bit_demuxer; extern const AVOutputFormat ff_bit_muxer; +extern const AVInputFormat ff_bitpacked_demuxer; extern const AVInputFormat ff_bmv_demuxer; extern const AVInputFormat ff_bfstm_demuxer; extern const AVInputFormat ff_brstm_demuxer; diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index 5049a29..a2ce423 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -59,10 +59,39 @@ static int rawvideo_read_header(AVFormatContext *ctx) st->codecpar->width = s->width; st->codecpar->height = s->height; + + if (ctx->iformat->raw_codec_id == AV_CODEC_ID_BITPACKED) { + unsigned int pgroup; /* size of the pixel group in bytes */ + unsigned int xinc; + const AVPixFmtDescriptor *desc; + int tag; + + desc = av_pix_fmt_desc_get(pix_fmt); + st->codecpar->bits_per_coded_sample = av_get_bits_per_pixel(desc); + if (pix_fmt == AV_PIX_FMT_YUV422P10) { + tag = MKTAG('U', 'Y', 'V', 'Y'); + pgroup = 5; + xinc = 2; + } else if (pix_fmt == AV_PIX_FMT_UYVY422) { + tag = MKTAG('U', 'Y', 'V', 'Y'); + pgroup = 4; + xinc = 2; + pix_fmt = AV_PIX_FMT_UYVY422; + st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; + } else { + av_log(ctx, AV_LOG_ERROR, "unsupported format: %s for bitpacked.\n", + s->pixel_format); + return AVERROR(EINVAL); + } + st->codecpar->codec_tag = tag; + packet_size = s->width * s->height * pgroup / xinc; + } else { + packet_size = av_image_get_buffer_size(pix_fmt, s->width, s->height, 1); + if (packet_size < 0) + return packet_size; + } + st->codecpar->format = pix_fmt; - packet_size = av_image_get_buffer_size(st->codecpar->format, s->width, s->height, 1); - if (packet_size < 0) - return packet_size; ctx->packet_size = packet_size; st->codecpar->bit_rate = av_rescale_q(ctx->packet_size, (AVRational){8,1}, st->time_base); @@ -111,3 +140,24 @@ const AVInputFormat ff_rawvideo_demuxer = { .raw_codec_id = AV_CODEC_ID_RAWVIDEO, .priv_class = &rawvideo_demuxer_class, }; + +static const AVClass bitpacked_demuxer_class = { + .class_name = "bitpacked demuxer", + .item_name = av_default_item_name, + .option = rawvideo_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +#if CONFIG_BITPACKED_DEMUXER +const AVInputFormat ff_bitpacked_demuxer = { + .name = "bitpacked", + .long_name = NULL_IF_CONFIG_SMALL("Bitpacked"), + .priv_data_size = sizeof(RawVideoDemuxerContext), + .read_header = rawvideo_read_header, + .read_packet = rawvideo_read_packet, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "bitpacked", + .raw_codec_id = AV_CODEC_ID_BITPACKED, + .priv_class = &bitpacked_demuxer_class, +}; +#endif // CONFIG_BITPACKED_DEMUXER From patchwork Wed Dec 22 23:03:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32845 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6789612iog; Wed, 22 Dec 2021 15:03:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJztH5y3nSjyIV9ER1IeVnCBeCj618aeKi2Znr4Z7SGy24uouVMnvQ56tllEVT5WziUwzk75 X-Received: by 2002:a17:906:65c8:: with SMTP id z8mr4384069ejn.727.1640214213636; Wed, 22 Dec 2021 15:03:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640214213; cv=none; d=google.com; s=arc-20160816; b=dCQUGHxIa/THXw8mUqBZF4FjWlG9wiwkS+xICHSl2++J2wnjBEIIEPgF3VgjZ0Aqkm JT0qHCOGd7LHNIeSsEHGd2UY/YGinXQ8wbvoNg1QD3KTcruog0TqbPY+lwTj9IAqlTsK qRCeIkNR3t2WNEV3/q9rwmsX6d8UGjx6B+K+TEOIHwqHgKjSzaYU4u0jno9D0GiU2QRb glxSRWG+A73BBG7a6G42sZTdclFc775vk07J4aRZF1lmGY5DLPvdD5zI6YnR2Vk/dUJm kR316JKsT5+5zeI5aZEtzI9azo0cCa7Ta8cu4AcoZWJOiSdoMD4KnuG1i5e/YOzlWxHv s20g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=9WlQPUga6bc9BojGcKUiyBE7sWdu3USJEZFNpR1LPjc=; b=EqXLFAmM7SfHEdL+aCVM34noz4btGI3ghuvPME1fYkLdqFrJRP5FYNVhjmF+o29N9/ k0XSX1ycb77ayn4abKQJBFnIWfyognR/MEVC9e3Tnm5mRaLdIILk5OZQM9S/m9ZCv3QK pxSsqy7SM11ENKXEFxRNBIH/YzVPCSgPjNazuBzb367ftF5ETwxgSjAYaV9YzVdTLRrk P4xchxcK5lK3Sss6fQzaN8h54m9sTwWp4sG1RYnteWaqMRJyB0Al4p5LoHsqa0luw+ZU C2y5wSbJDQONznkb5TxvZtxisbjzRFgt1mbEHRs6xIio0Kh4QGsdfnda3LKoRmXalQvm osYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VWnoM2AS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v20si1468063edx.310.2021.12.22.15.03.33; Wed, 22 Dec 2021 15:03:33 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VWnoM2AS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C950268B0EE; Thu, 23 Dec 2021 01:03:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5446C68A7B8 for ; Thu, 23 Dec 2021 01:03:13 +0200 (EET) Received: by mail-pj1-f44.google.com with SMTP id b1-20020a17090a990100b001b14bd47532so3998419pjp.0 for ; Wed, 22 Dec 2021 15:03:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a5ep3iA8sOZUj+IQxHoS447wmJaa1zy6x0ZSkWiUnos=; b=VWnoM2ASeZ9wpbG4Va/laLpur+v1i2p5xDkyWH0ptpCcRJkd+VyosaLTmEnQAzHwPi 3qmA5Z5HbPHfVyfbDfSo44LTeAoh266ReRLntYYp/TIIole4lqUSNExZNCZX2dPpJoHl q0urZVEaWwmC20+a9JEmOf0dy7wg67G2bPm80wEyK6LCa2Fb6F9Orv5K6saji5ui1XOR fr0mturijJDLhbFCgqpxzVrasYNGhe1cgQT24o0Yyf0UKED4hjc5MCZ4V1b3MnSqjBKF 2c2S59KLnDnVbrPt8mRyp8Mrw3aAlsTGzIsCjzVskN6H7QnwoJPJvOLTrSUHrGOyTvgL 3FNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=a5ep3iA8sOZUj+IQxHoS447wmJaa1zy6x0ZSkWiUnos=; b=7Bm8btgv6ee8RlElBK5icNG7Ltt1L0A5aUvrlu9KoA+F9Y1EZewoFKvB1vcw3/guaU Zdgt7ql1OTk1fiI27OjPGBcIlo735SZrxGNgBchtN8LjjmyzH9QsvfkNc9JJ5J9820mj +QkCOWojfRkjaoGhkqtDvKBaITYS1F966V2HU+ZLA3iV/yZFG7T67Hd5gcA2gLqj5XHM I9Yz39DTtv8Z0Rxv637/9o0/d1Zh3ccp5r+v9QgMDQYxB9A8cdBS5My3s88tofyZRcVb g5XF1o475E20eyUqGewfUrfxSFAQz1C3Eu40sesq1qd984fFArln64VM6+ijkO6CocX/ qfIg== X-Gm-Message-State: AOAM533OAoKwep3++goSB+e9lUiw4DKZClh89hQT37e0TYXSY6ywZdjS YOlhTC30+l8EEcs2iutKB1uJs4qNTFc= X-Received: by 2002:a17:90a:db81:: with SMTP id h1mr3656705pjv.163.1640214191311; Wed, 22 Dec 2021 15:03:11 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v63sm2962973pgv.71.2021.12.22.15.03.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Dec 2021 15:03:11 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 07:03:03 +0800 Message-Id: <1640214184-12529-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1640214184-12529-1-git-send-email-lance.lmwang@gmail.com> References: <1639492513-12002-1-git-send-email-lance.lmwang@gmail.com> <1640214184-12529-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 2/3] avformat: reuse the common code for v210/v210x X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: QyG7Qlv2oun6 From: Limin Wang As suggested by Andreas Rheinhardt, most code of v210 demuxer is common code which is duplicated from rawvideodec, so it's better to move v210/v210x demuxer code to rawvideodec.c and reuse the common code. Signed-off-by: Limin Wang --- libavformat/Makefile | 4 ++-- libavformat/rawvideodec.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 65fb789..14b66e4 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -559,8 +559,8 @@ OBJS-$(CONFIG_TTY_DEMUXER) += tty.o sauce.o OBJS-$(CONFIG_TY_DEMUXER) += ty.o OBJS-$(CONFIG_TXD_DEMUXER) += txd.o OBJS-$(CONFIG_UNCODEDFRAMECRC_MUXER) += uncodedframecrcenc.o framehash.o -OBJS-$(CONFIG_V210_DEMUXER) += v210.o -OBJS-$(CONFIG_V210X_DEMUXER) += v210.o +OBJS-$(CONFIG_V210_DEMUXER) += rawvideodec.o +OBJS-$(CONFIG_V210X_DEMUXER) += rawvideodec.o OBJS-$(CONFIG_VAG_DEMUXER) += vag.o OBJS-$(CONFIG_VC1_DEMUXER) += rawdec.o vc1dec.o OBJS-$(CONFIG_VC1_MUXER) += rawenc.o diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index a2ce423..6ff87a8 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -33,6 +33,8 @@ typedef struct RawVideoDemuxerContext { AVRational framerate; /**< AVRational describing framerate, set by a private option. */ } RawVideoDemuxerContext; +// v210 frame width is padded to multiples of 48 +#define GET_PACKET_SIZE(w, h) (((w + 47) / 48) * 48 * h * 8 / 3) static int rawvideo_read_header(AVFormatContext *ctx) { @@ -85,6 +87,12 @@ static int rawvideo_read_header(AVFormatContext *ctx) } st->codecpar->codec_tag = tag; packet_size = s->width * s->height * pgroup / xinc; + } else if ((ctx->iformat->raw_codec_id == AV_CODEC_ID_V210) || + (ctx->iformat->raw_codec_id == AV_CODEC_ID_V210X)) { + pix_fmt = ctx->iformat->raw_codec_id == AV_CODEC_ID_V210 ? + AV_PIX_FMT_YUV422P10 : AV_PIX_FMT_YUV422P16; + + packet_size = GET_PACKET_SIZE(s->width, s->height); } else { packet_size = av_image_get_buffer_size(pix_fmt, s->width, s->height, 1); if (packet_size < 0) @@ -161,3 +169,38 @@ const AVInputFormat ff_bitpacked_demuxer = { .priv_class = &bitpacked_demuxer_class, }; #endif // CONFIG_BITPACKED_DEMUXER + +static const AVClass v210_demuxer_class = { + .class_name = "v210(x) demuxer", + .item_name = av_default_item_name, + .option = rawvideo_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +#if CONFIG_V210_DEMUXER +const AVInputFormat ff_v210_demuxer = { + .name = "v210", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .priv_data_size = sizeof(RawVideoDemuxerContext), + .read_header = rawvideo_read_header, + .read_packet = rawvideo_read_packet, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "v210", + .raw_codec_id = AV_CODEC_ID_V210, + .priv_class = &v210_demuxer_class, +}; +#endif // CONFIG_V210_DEMUXER + +#if CONFIG_V210X_DEMUXER +const AVInputFormat ff_v210x_demuxer = { + .name = "v210x", + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), + .priv_data_size = sizeof(RawVideoDemuxerContext), + .read_header = rawvideo_read_header, + .read_packet = rawvideo_read_packet, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "yuv10", + .raw_codec_id = AV_CODEC_ID_V210X, + .priv_class = &v210_demuxer_class, +}; +#endif // CONFIG_V210X_DEMUXER From patchwork Wed Dec 22 23:03:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32846 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6789742iog; Wed, 22 Dec 2021 15:03:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzz2c77yQ7xNjZo5ppbTdGIw/DodiS033mx5CyAGq5RF98iQZXe2MlZYi10Dq3YiNkWUrVt X-Received: by 2002:a05:6402:34ca:: with SMTP id w10mr4660971edc.106.1640214223882; Wed, 22 Dec 2021 15:03:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640214223; cv=none; d=google.com; s=arc-20160816; b=i3MdzBZQpD9VUAvL9kRAgNaIYZZx9E2DIbhGfEnntqS9hVGutmxXzbrtQravFixO0P bzrbWL5lMtGwyCrKgWRpVzW+QrCB6ajtqfx2LNC6Zy43DE7Q1at40tamS+E0CGUjEQue DK4zK926jj7xQJCHTBKyfM93+38PioNoDERcm1/0fvXeeBaWnRtI2bOcFZRzDDg+naA3 58h5B0h3FpXi0pv8O56/83HA+DGzBAk/Hiv6igMDuzavyfBOnss+d5UAr6y0EH0cE++P e65ENp50FpGLLEGNw/dg4ljY7N8IMgMIGxW4CmkG5qGJm0XxzYF0h93T2summGZVvn4K 4Q8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=p5Llc0r6euY4MD/b6VE/F9z6MniTcWxskMQIVlM/iqY=; b=ykh1wDEWou4mYUB9DKlAXJwjPbldA9APhDD6RthPdWB/MbTPFhjQaPXA9E0a8qBfyT QzmTaWr8uR8d9cnKQG0tv5HdLG0DqUYviurxMKZrKf+doSnDXeJBzMYqHTbiDmaZ5bOq qpzmTK9UEmbQwpf6VUNVNgq3ZWUxhJMJn7zW8Ek5116852yVlkF8oM5ELaoLQsU/byJe G+mxlf7N7tuFxE5f9mOE3fGTXBF6LUEAGR8tv3d/cmUigGzbfdkFQlulIhB5LoI4eFZJ yjwTKmqTvAMI2MjkWNm0umdmOvKp5QKhgCuK3Z17H80JE54eI+Jf/gt/FAzZv8rPXDT9 4vHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZSBZ17YF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h19si1421238edr.611.2021.12.22.15.03.43; Wed, 22 Dec 2021 15:03:43 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ZSBZ17YF; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C5CD68B0F6; Thu, 23 Dec 2021 01:03:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF41068B0E7 for ; Thu, 23 Dec 2021 01:03:14 +0200 (EET) Received: by mail-pg1-f180.google.com with SMTP id 2so3255476pgb.12 for ; Wed, 22 Dec 2021 15:03:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ogqvza+Tddcs4tWnKw7hMZyhfSkQveDhd4sAjq2BHw0=; b=ZSBZ17YFhjFkk9q3VH/ZlGZ7ndIumeL7nVZQxJ/RzxLFBqDdVRRBIjOpC1ieN4U6L8 wF8cmdgvC9vi2t8LD0w/wmVuonCiaaAgQN2Y42xyspYywsCcCp1skYnCEMLXs8jE8Zxr VTcF4Ukz4w9mTP7vnv8YYLt8ETwq+xQlupm1k4tS/sF/HXtBjArIvkoBd2hvXab06oMS atv8wss1sHLG2EtC+zeLI7eyA8LOQ8OI9TmI+H86+xQh+ExFGXq83wRtPl3j5+pP/d2v 3GPRba5ny309/zh/S6kLZlxg46+G+hS7k6TqwqA3IkolXiNMrw2rV4u8DQbIcggR2AbR 75tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ogqvza+Tddcs4tWnKw7hMZyhfSkQveDhd4sAjq2BHw0=; b=lLf90s8npmgoR8TWQjtYNJsNK+L3XBnOW5TawmjmfyS3U5MV00AkDAB+avABU2JQA3 eH0ZYISDpzCvmFrvRQxlCVOG0Mhi2IjgxzoOfXl7XeA9DlNWpUTZM6CszpSbaZjzTbzK d4fPHfiz7KiFjXfnHHXX3WkbygRzuCAmdrdHyNlACF0w7lSBWXxGOBVufS+IF2pPlB4m nsMCxBoCsAyULDwdInAWjWQD6hIIm4YNWSJzKFTUS/HpaOY/GQlKwAvH8ju75M0TKb4i okLbBbS/Pcsxz1fC5xUag0ONmxetx+tlECpAwdJUzYZJ3wX9lIgU+fKklhVsT6yhJ+xA wwlA== X-Gm-Message-State: AOAM533WOInUhq+kG0+9hpaHNfgAq/RJpw6O3WrbL5ZPzkUzbgIDJrkX 28IoZY0v48NA5mr5m02VrE+p+azk44g= X-Received: by 2002:a63:c110:: with SMTP id w16mr4453229pgf.388.1640214192621; Wed, 22 Dec 2021 15:03:12 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id v63sm2962973pgv.71.2021.12.22.15.03.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Dec 2021 15:03:12 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 07:03:04 +0800 Message-Id: <1640214184-12529-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1640214184-12529-1-git-send-email-lance.lmwang@gmail.com> References: <1639492513-12002-1-git-send-email-lance.lmwang@gmail.com> <1640214184-12529-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/3] avformat: remove unused v210.c X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: owBkBg1qIKGN From: Limin Wang Signed-off-by: Limin Wang --- libavformat/v210.c | 123 ----------------------------------------------------- 1 file changed, 123 deletions(-) delete mode 100644 libavformat/v210.c diff --git a/libavformat/v210.c b/libavformat/v210.c deleted file mode 100644 index 24f71d4..0000000 --- a/libavformat/v210.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Raw v210 video demuxer - * Copyright (c) 2015 Tiancheng "Timothy" Gu - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "libavutil/imgutils.h" -#include "libavutil/parseutils.h" -#include "libavutil/pixdesc.h" -#include "libavutil/opt.h" -#include "internal.h" -#include "avformat.h" - -typedef struct V210DemuxerContext { - const AVClass *class; /**< Class for private options. */ - int width, height; /**< Integers describing video size, set by a private option. */ - AVRational framerate; /**< AVRational describing framerate, set by a private option. */ -} V210DemuxerContext; - -// v210 frame width is padded to multiples of 48 -#define GET_PACKET_SIZE(w, h) (((w + 47) / 48) * 48 * h * 8 / 3) - -static int v210_read_header(AVFormatContext *ctx) -{ - V210DemuxerContext *s = ctx->priv_data; - AVStream *st; - int ret; - - st = avformat_new_stream(ctx, NULL); - if (!st) - return AVERROR(ENOMEM); - - st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; - - st->codecpar->codec_id = ctx->iformat->raw_codec_id; - - avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num); - - ret = av_image_check_size(s->width, s->height, 0, ctx); - if (ret < 0) - return ret; - st->codecpar->width = s->width; - st->codecpar->height = s->height; - st->codecpar->format = ctx->iformat->raw_codec_id == AV_CODEC_ID_V210 ? - AV_PIX_FMT_YUV422P10 : AV_PIX_FMT_YUV422P16; - ctx->packet_size = GET_PACKET_SIZE(s->width, s->height); - st->codecpar->bit_rate = av_rescale_q(ctx->packet_size, - (AVRational){8,1}, st->time_base); - - return 0; -} - - -static int v210_read_packet(AVFormatContext *s, AVPacket *pkt) -{ - int ret; - - ret = av_get_packet(s->pb, pkt, s->packet_size); - pkt->pts = pkt->dts = pkt->pos / s->packet_size; - - pkt->stream_index = 0; - if (ret < 0) - return ret; - return 0; -} - -#define OFFSET(x) offsetof(V210DemuxerContext, x) -#define DEC AV_OPT_FLAG_DECODING_PARAM -static const AVOption v210_options[] = { - { "video_size", "set frame size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC }, - { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC }, - { NULL }, -}; - -static const AVClass v210_demuxer_class = { - .class_name = "v210(x) demuxer", - .item_name = av_default_item_name, - .option = v210_options, - .version = LIBAVUTIL_VERSION_INT, -}; - -#if CONFIG_V210_DEMUXER -const AVInputFormat ff_v210_demuxer = { - .name = "v210", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), - .priv_data_size = sizeof(V210DemuxerContext), - .read_header = v210_read_header, - .read_packet = v210_read_packet, - .flags = AVFMT_GENERIC_INDEX, - .extensions = "v210", - .raw_codec_id = AV_CODEC_ID_V210, - .priv_class = &v210_demuxer_class, -}; -#endif // CONFIG_V210_DEMUXER - -#if CONFIG_V210X_DEMUXER -const AVInputFormat ff_v210x_demuxer = { - .name = "v210x", - .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"), - .priv_data_size = sizeof(V210DemuxerContext), - .read_header = v210_read_header, - .read_packet = v210_read_packet, - .flags = AVFMT_GENERIC_INDEX, - .extensions = "yuv10", - .raw_codec_id = AV_CODEC_ID_V210X, - .priv_class = &v210_demuxer_class, -}; -#endif // CONFIG_V210X_DEMUXER