From 13bcb4de33b3cd2591b93e531bb0ccbc626b6e23 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 28 Mar 2014 17:23:32 +0100 Subject: avformat: add image2 alias pix demuxer Reviewed-by: wm4 Signed-off-by: Michael Niedermayer --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/img2_alias_pix.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 libavformat/img2_alias_pix.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 838ce63182..0866e3b3a7 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -182,6 +182,7 @@ OBJS-$(CONFIG_IMAGE2_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE2_MUXER) += img2enc.o img2.o OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2enc.o img2.o +OBJS-$(CONFIG_IMAGE2_ALIAS_PIX_DEMUXER) += img2_alias_pix.o OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o OBJS-$(CONFIG_IRCAM_DEMUXER) += ircamdec.o ircam.o pcm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 631284897a..d057f5e863 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -146,6 +146,7 @@ void av_register_all(void) REGISTER_MUXDEMUX(ILBC, ilbc); REGISTER_MUXDEMUX(IMAGE2, image2); REGISTER_MUXDEMUX(IMAGE2PIPE, image2pipe); + REGISTER_DEMUXER (IMAGE2_ALIAS_PIX, image2_alias_pix); REGISTER_DEMUXER (INGENIENT, ingenient); REGISTER_DEMUXER (IPMOVIE, ipmovie); REGISTER_MUXER (IPOD, ipod); diff --git a/libavformat/img2_alias_pix.c b/libavformat/img2_alias_pix.c new file mode 100644 index 0000000000..3d00f845d6 --- /dev/null +++ b/libavformat/img2_alias_pix.c @@ -0,0 +1,51 @@ +/* + * Alias PIX image demuxer + * Copyright (c) 2014 Michael Niedermayer + * + * 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 "img2.h" +#include "libavutil/intreadwrite.h" + +static int brender_read_probe(AVProbeData *p) +{ + int width = AV_RB16(p->buf); + int height = AV_RB16(p->buf+2); + int ox = AV_RB16(p->buf+4); + int oy = AV_RB16(p->buf+6); + int bpp = AV_RB16(p->buf+8); + int count = p->buf[10]; + + if (!count || !height || count > width) + return 0; + + if (bpp != 24 && bpp != 8) + return 0; + + return AVPROBE_SCORE_EXTENSION + 1; +} + +AVInputFormat ff_image2_alias_pix_demuxer = { + .name = "alias_pix", + .long_name = NULL_IF_CONFIG_SMALL("Alias/Wavefront PIX image"), + .priv_data_size = sizeof(VideoDemuxData), + .read_probe = brender_read_probe, + .read_header = ff_img_read_header, + .read_packet = ff_img_read_packet, + .raw_codec_id = AV_CODEC_ID_ALIAS_PIX, +}; -- cgit v1.2.3