MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <lance.lmwang@gmail.com>
This commit is contained in:
Limin Wang 2021-12-22 22:36:17 +08:00
parent 7cee3b3718
commit d590e211a2
4 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/Makefile
View File

@ -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

1
libavformat/allformats.c
View File

@ -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;

55
libavformat/rawvideodec.c
View File

@ -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

2
libavformat/version.h
View File

@ -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, \