Browse Source

avformat: add image2 brender pix demuxer

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
commit
075d6c066b
3 changed files with 51 additions and 0 deletions
  1. +1
    -0
      libavformat/Makefile
  2. +1
    -0
      libavformat/allformats.c
  3. +49
    -0
      libavformat/img2_brender_pix.c

+ 1
- 0
libavformat/Makefile View File

@@ -183,6 +183,7 @@ OBJS-$(CONFIG_IMAGE2_MUXER) += img2enc.o img2.o
OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2dec.o img2.o
OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2enc.o img2.o OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2enc.o img2.o
OBJS-$(CONFIG_IMAGE2_ALIAS_PIX_DEMUXER) += img2_alias_pix.o OBJS-$(CONFIG_IMAGE2_ALIAS_PIX_DEMUXER) += img2_alias_pix.o
OBJS-$(CONFIG_IMAGE2_BRENDER_PIX_DEMUXER) += img2_brender_pix.o
OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o OBJS-$(CONFIG_INGENIENT_DEMUXER) += ingenientdec.o rawdec.o
OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o
OBJS-$(CONFIG_IRCAM_DEMUXER) += ircamdec.o ircam.o pcm.o OBJS-$(CONFIG_IRCAM_DEMUXER) += ircamdec.o ircam.o pcm.o


+ 1
- 0
libavformat/allformats.c View File

@@ -147,6 +147,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX(IMAGE2, image2); REGISTER_MUXDEMUX(IMAGE2, image2);
REGISTER_MUXDEMUX(IMAGE2PIPE, image2pipe); REGISTER_MUXDEMUX(IMAGE2PIPE, image2pipe);
REGISTER_DEMUXER (IMAGE2_ALIAS_PIX, image2_alias_pix); REGISTER_DEMUXER (IMAGE2_ALIAS_PIX, image2_alias_pix);
REGISTER_DEMUXER (IMAGE2_BRENDER_PIX, image2_brender_pix);
REGISTER_DEMUXER (INGENIENT, ingenient); REGISTER_DEMUXER (INGENIENT, ingenient);
REGISTER_DEMUXER (IPMOVIE, ipmovie); REGISTER_DEMUXER (IPMOVIE, ipmovie);
REGISTER_MUXER (IPOD, ipod); REGISTER_MUXER (IPOD, ipod);


+ 49
- 0
libavformat/img2_brender_pix.c View File

@@ -0,0 +1,49 @@
/*
* BRender 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 aliaspix_read_probe(AVProbeData *p)
{
static const uint8_t brender_magic[16] = {
0,0,0,0x12,0,0,0,8,0,0,0,2,0,0,0,2
};

if (memcmp(p->buf, brender_magic, sizeof(brender_magic)))
return 0;

if (AV_RB32(p->buf+16) != 0x03 &&
AV_RB32(p->buf+16) != 0x3D)
return 0;

return AVPROBE_SCORE_MAX-10;
}

AVInputFormat ff_image2_brender_pix_demuxer = {
.name = "brender_pix",
.long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"),
.priv_data_size = sizeof(VideoDemuxData),
.read_probe = aliaspix_read_probe,
.read_header = ff_img_read_header,
.read_packet = ff_img_read_packet,
.raw_codec_id = AV_CODEC_ID_BRENDER_PIX,
};

Loading…
Cancel
Save