From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 413BA406A1 for ; Wed, 22 Dec 2021 13:38:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E193C68B07F; Wed, 22 Dec 2021 15:38:21 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074058.outbound.protection.outlook.com [40.92.74.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63E3268B055 for ; Wed, 22 Dec 2021 15:38:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=abJ/odyKH/8qpFFNbr0APYLI6b4hF8WbbAYHfcS3lR2LCAUJMhs/fdP1n+zsRS1Vf2P8UaHaIr4xVvAEeijG4OCl3pptMbMLI2xvIfIT4e9Fc6FnzSxkEOh1yYZJ7/Sq93O7G6x+aH0Fw1cXR238U2ZpEmL5Rw6dRSB1NLdYtqvJ6DQwjbEFPSHc3N2Le8zFppKIYVY/O481qf2W+Lq04EtJQ2py3w/8JXcSxSLKKliGgsDitiPGUGh1MLjpm110bIT6hxgWZzy6ZGjCverztRiWu1lM+LN8Q39WZZjYmR8bmvU8NzmnKXc4VMnO/cys2EI0tk0cm2MSzQQN2tU++g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=44x8V8bJ1me6kVje7U2qd0cGPy3lRA17avnnS9o69RI=; b=Gwu07zRQX5o9AVjhZomZIvsbG7VmazqPBj6xMJkdej7ds/WEiyKeK6lCk9ezBH0Eq/U094OHeeu8jb7MlNHFuu2svNGH3QZxukdV2dj8+lNQFSifCpWnvur+0Ha0auuBzdoBotI3XCQNFkN1Z0M9N6e1pKtxaPSvM3/oZ6DpH1+4YsvJvBT3Nzdnmh/hD7deLt64yeWKTM5dnCI+3ayW/RKnJf+Qvz2NpIlqETAXkUf8pgz9SOP0qWQQsDuAKr6KVjk7cFzjzdrqvTGF/4hTsTrr66TU/OS+cm4gzt+cxBwI0+C8NcDvrHgpOnJXVGJ9CS3XRxozPESx9zTv1m2YKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=44x8V8bJ1me6kVje7U2qd0cGPy3lRA17avnnS9o69RI=; b=aehEB2SAOa09JXXrhcvO1vKX3vnHu8gjCtDdnM6/TD90iHtGi08UW9gcXmQEsrQaBhYRA0AbQQkndqezvG7kXl6lgm4U/a+JtAk+OvRkTQC0Cl3xumTXlFaF7QHv/hC//0X1KzDMLcC9HPX1JcMrRFXjqb7OQZFX5gM4hpdopfHV9zE3ywxWbBOv4Q2rqucWpwQAZ+IDG6mSCYCZ/A9an+9rEg8F+03S/yHk4adNh/sqcn6HusgWYVJwhu7qN0ezXmBz0Nu/VE6InVKw04Ek+xtQfeEsRj6Cb/i0awJDEKhAVu5E3ABsY81D4wDw8QlmC+VVMT6rBwYg78w2ZTLAJA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AM5PR0301MB2513.eurprd03.prod.outlook.com (10.169.155.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.19; Wed, 22 Dec 2021 13:38:14 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.022; Wed, 22 Dec 2021 13:38:14 +0000 Message-ID: Date: Wed, 22 Dec 2021 14:38:13 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <1639492513-12002-1-git-send-email-lance.lmwang@gmail.com> <20211221133427.GA27532@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20211221133427.GA27532@gmail.com> X-TMN: [TGJWn1iGfU8JuheKd+a4bUUY8Bok9S5f] X-ClientProxiedBy: AM8P189CA0019.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:218::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <05213aeb-82a8-7124-733e-d6350cf2bbbd@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3eb1443-13a1-4f81-2c86-08d9c5504e04 X-MS-TrafficTypeDiagnostic: AM5PR0301MB2513:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: APIQZ4p/CV8cf1Cg40/LVqspHO3C9Eb/po58UbRAn2w7n62qOTly10bLKVLrGYFyh4NNv+CncVHD7zEaw1w/G/u+/WuLlwjpZ1kWhpkmlWHiFdPF6vIHQARUyuWKg3smeioqvJi2mDphkdc1RFi4IvM2zEzmhuIrMqpp0FYaKPfyketQAHqXWkvWObJA2H79Cvm6s5FTdCNh9RWKtO84Et0yQKmKz1FEL0fXGAKnn9e3uj8/fSuNAmGyTwxSkrqawGDDKfvAA17sVYzbh30DUfycvTLttR9WEG7HCNsh0IuWea/26llMtRq9k0eciXMreWdY0ZnRPssO358IfhTD6JLAqmR/OGWbswpEvi2P48bCm4Ss25X90jwvAEIO8R+SW/p/Ih/S/eo3fuF31sUFflfpbsZgAsCZtvUGij2JUAKOm9tKwVAQiA1z+StcMhkVvfGeg3X15miKyPMf8w1zkfE7iyQQ1s7KJGx4qBAi5xObnEStg0cZ0BI2/rNoun4JnUKFNMzUh4eG8sS8OW7IE/J02w2TdjsS5ePollvFe6B6rUBY+szOzfmNWlJlnkkfaiG2ms8TDF4wU8YsSoiLUw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dzVodkNHbTQ4SzVRbGhLbkJRbXd5S0NTc2w3bFRtNlNTRm0xWFN4Q3JhWmFU?= =?utf-8?B?RTRVOTU1YXJIZ2NWVFJYZE4weithYWRZOFJkUE8rSjBaUXZMdGlZSzJkSUl0?= =?utf-8?B?czZDYk1iNm80QWYxaE5HK1VnTmRsTzJQZG1vWnlrZ0tHaklCejdCSkt1cHVi?= =?utf-8?B?dUwxWlQxZHpKOEN5LzkzbjhXUUt4VGlxMHl3Vkt2MVluM0JQQVFDRXNDR1Nu?= =?utf-8?B?YkVubEVHbWozU0RJdUlQUXR6YU5oUnJIcmMzekc2Nm1XMEVqMmR5ak92MWZJ?= =?utf-8?B?eVVQb0xqMW42M0wzYVhEeHhDZyt6T3crZ0tMc1ZqSTQ0VUxTUjNVVFQwTWI2?= =?utf-8?B?ZnhvdHQyUitwT0VFN2lUNkFTcHV3NGU2U3ZDczJKRHNOWS91cVp0RjYvMXNa?= =?utf-8?B?eVFuanZZUW1xZ25ZNnRBZENIV2FKWEtJZlhnck1HcWZVUDZPRG4rWTFobDEy?= =?utf-8?B?ZUpXNFh3eHZKbHBVTVN4UVI1VEVYcmFDcElPeU9oS29ZV1BxRUNHd3Q1RHlx?= =?utf-8?B?akp6SjBxUUh0U0xhQUdCVWl3V01XSmYyL3FhNWRSVUh2SkdwaCtZY0o2TVRV?= =?utf-8?B?OEwrL0VhRVVEaGhjTEVkbG1SYjl6VVZmOHg1VU9uWnRXRDF5Y095M2lHMFBj?= =?utf-8?B?c1FXOXgzS2o4NWM3dGhtdWlSOHdsck1OdFZRczVsZktzcVNaNVdZTk9QM1pO?= =?utf-8?B?UXhFVDJwVkhrTjVoSFhydVZIV0RtaERJTUdJZmZOTEtnOEp3MUdEbTBnMUR2?= =?utf-8?B?TVFTbitvcHVyNmNvc0R6b1FLZC9OdDNZdjRORjluWHZnSVR3dk9zNUc5Mjdu?= =?utf-8?B?aEVKbEViTnZ3OHBmbGNvS1VvOVhjcnV0SFkxWDVzMkM4emlrSzNPT0lxY1JX?= =?utf-8?B?SUd2Q2M0d3VMdmt4ckM0SExTeVdiUGFsQXM4eU90OXhabDZ2NjB6ZVlVclgx?= =?utf-8?B?ZFEwcnFXWTdlTmRZL3IvWUpNN09HMWVBZThKanA3ejVhcmRFUHhyMVFCMlRX?= =?utf-8?B?U2dRTHlYazdYVEVrMlpOb2xXWXRuN29aK2tsYVJtc25lc2dJektwVEFHKzky?= =?utf-8?B?dXpoYjJPK0dXSXY4bGRFcXBZdU50bHVUSmJDc2RmclQ1UDluNW5vN3Zlbllr?= =?utf-8?B?aEo4UmErZVo4MUx0Z2ZqSHFBenRSUCtjUURXdWdIZWQ0bE8yWEgvbHlFMmdX?= =?utf-8?B?NGg3NExKRDNxVFhZb0FHM1A1MHp0UlE4eUpPckZBRy9yZlNCNVVxeWtSWXhZ?= =?utf-8?B?YlNBUTYxUDI1M1A1d1hDV0dHWU45M2swekFCVk5jTTJWdzJsZz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3eb1443-13a1-4f81-2c86-08d9c5504e04 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2021 13:38:14.8618 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0301MB2513 Subject: Re: [FFmpeg-devel] [PATCH] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: lance.lmwang@gmail.com: > On Tue, Dec 21, 2021 at 02:20:31PM +0100, Andreas Rheinhardt wrote: >> lance.lmwang@gmail.com: >>> From: Limin Wang >>> >>> Allows user can playback bitpacked pixel format directly: >>> ffplay -video_size 1280x720 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/bitpackeddec.c | 136 +++++++++++++++++++++++++++++++++++++++++++++ >>> 3 files changed, 138 insertions(+) >>> create mode 100644 libavformat/bitpackeddec.c >>> >>> diff --git a/libavformat/Makefile b/libavformat/Makefile >>> index 2b5caf9..90b7333 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) += bitpackeddec.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/bitpackeddec.c b/libavformat/bitpackeddec.c >>> new file mode 100644 >>> index 0000000..ba404ad >>> --- /dev/null >>> +++ b/libavformat/bitpackeddec.c >>> @@ -0,0 +1,136 @@ >>> +/* >>> + * Raw bitpacked video demuxer >>> + * Copyright (c) 2021 Limin Wang >>> + * >>> + * 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 BitPackedDemuxerContext { >>> + const AVClass *class; /**< Class for private options. */ >>> + int width, height; /**< Integers describing video size, set by a private option. */ >>> + char *pixel_format; /**< Set by a private option. */ >>> + AVRational framerate; /**< AVRational describing framerate, set by a private option. */ >>> +} BitPackedDemuxerContext; >>> + >>> +static int bitpacked_read_header(AVFormatContext *ctx) >>> +{ >>> + BitPackedDemuxerContext *s = ctx->priv_data; >>> + AVStream *st; >>> + enum AVPixelFormat pix_fmt; >>> + unsigned int pgroup; /* size of the pixel group in bytes */ >>> + unsigned int xinc; >>> + const AVPixFmtDescriptor *desc; >>> + int tag; >>> + 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; >> >> Seems like you copied this code from somewhere. Where did you copy it from? > > Yes, this part is coming from v210 demuxer I think. > The original source seems to be rawvideodec; it has exactly the same options, exactly the same private struct, exactly the same read_packet function and its read_header function is quite similar. You should reuse the common code. >> >>> + >>> + if ((pix_fmt = av_get_pix_fmt(s->pixel_format)) == AV_PIX_FMT_NONE) { >>> + av_log(ctx, AV_LOG_ERROR, "No such pixel format: %s.\n", s->pixel_format); >>> + return AVERROR(EINVAL); >>> + } >>> + desc = av_pix_fmt_desc_get(pix_fmt); >>> + >>> + 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 = 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 the pixel format: %s yet.\n", >>> + s->pixel_format); >>> + return AVERROR(EINVAL); >>> + } >>> + st->codecpar->format = pix_fmt; >>> + st->codecpar->codec_tag = tag; >>> + >>> + avpriv_set_pts_info(st, 64, s->framerate.den, s->framerate.num); >>> + ctx->packet_size = s->width * s->height * pgroup / xinc; >>> + st->codecpar->bit_rate = av_rescale_q(ctx->packet_size, >>> + (AVRational){8,1}, st->time_base); >>> + >>> + return 0; >>> +} >>> + >>> +static int bitpacked_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(BitPackedDemuxerContext, x) >>> +#define DEC AV_OPT_FLAG_DECODING_PARAM >>> +static const AVOption bitpacked_options[] = { >>> + { "video_size", "set frame size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = NULL}, 0, 0, DEC }, >>> + { "pixel_format", "set pixel format", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = "yuv422p10"}, 0, 0, DEC }, >>> + { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC }, >>> + { NULL }, >>> +}; >>> + >>> +static const AVClass bitpacked_demuxer_class = { >>> + .class_name = "bitpacked demuxer", >>> + .item_name = av_default_item_name, >>> + .option = bitpacked_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(BitPackedDemuxerContext), >>> + .read_header = bitpacked_read_header, >>> + .read_packet = bitpacked_read_packet, >>> + .flags = AVFMT_GENERIC_INDEX, >>> + .extensions = "bitpacked", >>> + .raw_codec_id = AV_CODEC_ID_BITPACKED, >>> + .priv_class = &bitpacked_demuxer_class, >>> +}; >>> +#endif // CONFIG_BITPACKED_DEMUXER >>> _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".