Mercurial > libavformat.hg
changeset 6447:ef0ad6df55b2 libavformat
move raw video demuxer to its own file
author | aurel |
---|---|
date | Mon, 30 Aug 2010 22:53:16 +0000 |
parents | 659a7e022950 |
children | 4775a49a6045 |
files | Makefile raw.c rawvideodec.c |
diffstat | 3 files changed, 58 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Aug 30 22:42:25 2010 +0000 +++ b/Makefile Mon Aug 30 22:53:16 2010 +0000 @@ -204,7 +204,7 @@ OBJS-$(CONFIG_PVA_DEMUXER) += pva.o OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o -OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += raw.o +OBJS-$(CONFIG_RAWVIDEO_DEMUXER) += rawvideodec.o raw.o OBJS-$(CONFIG_RAWVIDEO_MUXER) += raw.o OBJS-$(CONFIG_RL2_DEMUXER) += rl2.o OBJS-$(CONFIG_RM_DEMUXER) += rmdec.o rm.o
--- a/raw.c Mon Aug 30 22:42:25 2010 +0000 +++ b/raw.c Mon Aug 30 22:53:16 2010 +0000 @@ -101,33 +101,7 @@ pkt->size = ret; return ret; } -#endif -#if CONFIG_RAWVIDEO_DEMUXER -static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) -{ - int packet_size, ret, width, height; - AVStream *st = s->streams[0]; - - width = st->codec->width; - height = st->codec->height; - - packet_size = avpicture_get_size(st->codec->pix_fmt, width, height); - if (packet_size < 0) - return -1; - - ret= av_get_packet(s->pb, pkt, packet_size); - pkt->pts= - pkt->dts= pkt->pos / packet_size; - - pkt->stream_index = 0; - if (ret < 0) - return ret; - return 0; -} -#endif - -#if CONFIG_DEMUXERS int ff_raw_audio_read_header(AVFormatContext *s, AVFormatParameters *ap) { @@ -469,20 +443,6 @@ }; #endif -#if CONFIG_RAWVIDEO_DEMUXER -AVInputFormat rawvideo_demuxer = { - "rawvideo", - NULL_IF_CONFIG_SMALL("raw video format"), - 0, - NULL, - ff_raw_read_header, - rawvideo_read_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "yuv,cif,qcif,rgb", - .value = CODEC_ID_RAWVIDEO, -}; -#endif - #if CONFIG_RAWVIDEO_MUXER AVOutputFormat rawvideo_muxer = { "rawvideo",
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rawvideodec.c Mon Aug 30 22:53:16 2010 +0000 @@ -0,0 +1,57 @@ +/* + * RAW video demuxer + * Copyright (c) 2001 Fabrice Bellard + * + * 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 "avformat.h" +#include "raw.h" + +static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int packet_size, ret, width, height; + AVStream *st = s->streams[0]; + + width = st->codec->width; + height = st->codec->height; + + packet_size = avpicture_get_size(st->codec->pix_fmt, width, height); + if (packet_size < 0) + return -1; + + ret= av_get_packet(s->pb, pkt, packet_size); + pkt->pts= + pkt->dts= pkt->pos / packet_size; + + pkt->stream_index = 0; + if (ret < 0) + return ret; + return 0; +} + +AVInputFormat rawvideo_demuxer = { + "rawvideo", + NULL_IF_CONFIG_SMALL("raw video format"), + 0, + NULL, + ff_raw_read_header, + rawvideo_read_packet, + .flags= AVFMT_GENERIC_INDEX, + .extensions = "yuv,cif,qcif,rgb", + .value = CODEC_ID_RAWVIDEO, +};