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