From patchwork Tue Dec 14 14:35:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 32492 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7044405iog; Tue, 14 Dec 2021 06:35:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwCpQCUNLdUEkTPyTcF5y2sqXWpcixAo3MA1BrpJRfP6XYh8L5ZAH185JoPufpK2wCFnSUk X-Received: by 2002:aa7:cd89:: with SMTP id x9mr8094168edv.10.1639492530539; Tue, 14 Dec 2021 06:35:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639492530; cv=none; d=google.com; s=arc-20160816; b=qJhdq1I0zjZPyB/eSUOoGjcf1aYvGklH6VQmMsKOr43GmDSll+m36bOp2hCWJsOBmV sj5e03hYf99LFe0inLUW9f3SMCrpU7OBE3esNbKFN0F6HYKElhkCgzlvKlTtCf9N5ykT RLxffh4QERVSnufIhWOCJdoq2WIfJDOGxiKpgMl+7TVDeL+Ww1om9qm02QeRv3JmcJsa Dw+EtqdSt5tq/fC21Am4M2IKMto+VofeJhMvyKBgfj5DQGT2MQqr2t7uZ515E37YZ/Q9 5rWKrGww1RFSKwg4kwRbi20mrZD0ijdZO1lwDonnn6E+b3GDhh/Iw7un4UDo0JcGrJvZ AzZg== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=9TKXF+GuHM6iGKwUzTfH7sep9GtpK3gj3FCfiFJPngo=; b=BWSpC8nvU+9X6Rk7D0BXuLPIWGLlRa0AT6cGWwyXYkWiaMuOTu7MwLwb9tZ4qbVTxb s81S25WB7XI4cwepTQhIeh1DZrK7TUm3x/Xgifj6ojrIadJNnH9WeGMqTWPt8wg+oK52 fmgKRVTeXLBqmcewu+HTxy94iiQkYnirk/BufudRXhkfJTPD8W6Wi/4vXilxeEhY5lx4 hvU8GLTuSonbY6BqrvPEEBKFMM3ksvNdsa6tzmJ8o1nWPm2h2WRwMPwY4lCsjnxuzQMm 6RYG2/oYxgx1DM3NU8rRurRh5zZjmOgbuIm6kujTj72LB11zmj40nN+2hVIAd/xTTI6H 9tug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ARcsN2EX; 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 l8si52955edb.23.2021.12.14.06.35.30; Tue, 14 Dec 2021 06:35:30 -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=ARcsN2EX; 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 C6D4468AF67; Tue, 14 Dec 2021 16:35:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 866D8687FCE for ; Tue, 14 Dec 2021 16:35:20 +0200 (EET) Received: by mail-pf1-f176.google.com with SMTP id x5so18065515pfr.0 for ; Tue, 14 Dec 2021 06:35:20 -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; bh=Fcf8xirwE3esem2/xqQsuCWc2byOdH0+8A2zu/plV+Q=; b=ARcsN2EXADgcpEeZEyvjU5jTn3KCuUfb6lQ2YNuQ9116gcdY1vjtgvz0T3nj2TJEcH Og46UCGpf7LuK4k7wzI3w36P2t8W2jVNHPvSVeY6xIXngOVilkGS95RDP1wg5NBqi+Ad rdr5c7OsF/2yC8z/2SA61E3dYYVBR7oUnfybNACg/aSxynnwxoVIhdps0lEpWhwooz1q iyYJMpCI1Let7PrriPedmZUchChM78SwV2GPefFP89on2E/8o7DbD02BkVDkKrxWGh5Y OzHElv2Kdej/+Dm27eD2gFJhMOFuIQxB6RlVn1tmRjLnXTo3B+XnBXjRXvEeVHblLayM BCRg== 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; bh=Fcf8xirwE3esem2/xqQsuCWc2byOdH0+8A2zu/plV+Q=; b=qhhJmpkvjk81PEicmQFe75diT/sbIkS1pwNPUPcGa1gF5KAQMQmbe1R9JHIi+8tgS1 fDctzl+gPg6SRYCqKAN8PCyGTAzKwrnXdgo/ewWI3qgseey5pYuHVN1KkcUvrE7spp/N kuckBlFW+WQPKQFlAv6uDCv8E8QNaf3+GM+oFx9ce86y68jM8U00Cg6e+e1On+tZlRr5 43W221wD7AXxv1vDw41tg/tg/DJqpWXjehY42Tp1FIDTS5hhfmll226bzIjFsAVLyjal vVBs8aATVqPJ8EDTYhGOJ+yxIQujH7rDE64/X6tHynAkqu+cwB2a1V0xhhLAuDtyD9tK dPig== X-Gm-Message-State: AOAM530DiBT36wdFNBY7KbSyi9iVoOe4YYER1H6asj4Y+we9MclTUNG0 DvTeX1KvoippbphrHbeMQKp4daJp/mw= X-Received: by 2002:a63:d355:: with SMTP id u21mr3837291pgi.63.1639492518033; Tue, 14 Dec 2021 06:35:18 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id p15sm42641pfh.193.2021.12.14.06.35.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 06:35:17 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Dec 2021 22:35:13 +0800 Message-Id: <1639492513-12002-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /+yfdqZcTm+X 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; + + 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