From d590e211a28cecd04559ab9a6a223a87fa974ee3 Mon Sep 17 00:00:00 2001 From: Limin Wang Date: Wed, 22 Dec 2021 22:36:17 +0800 Subject: [PATCH] avformat: add bitpacked demuxer 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 | 55 ++++++++++++++++++++++++++++++++++++--- libavformat/version.h | 2 +- 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 2b5caf9d33..65fb789aa3 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 1054ac9667..a100639773 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 5049a29b9c..710724c2d1 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -59,10 +59,38 @@ 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; + 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 +139,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 diff --git a/libavformat/version.h b/libavformat/version.h index 379a68cc7c..9b90bbf156 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 10 +#define LIBAVFORMAT_VERSION_MINOR 11 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \