NC camera demuxer

Patch by Nicolas Martin - elvadrias at gmail

Originally committed as revision 17062 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Nicolas Martin 16 years ago committed by Vitor Sessak
parent 998b6f7ca2
commit eaf5d0112b
  1. 1
      Changelog
  2. 2
      doc/general.texi
  3. 1
      libavformat/Makefile
  4. 1
      libavformat/allformats.c
  5. 100
      libavformat/ncdec.c

@ -148,6 +148,7 @@ version <next>
- ALSA support for playback and record - ALSA support for playback and record
- Electronic Arts TQI decoder - Electronic Arts TQI decoder
- OpenJPEG based JPEG 2000 decoder - OpenJPEG based JPEG 2000 decoder
- NC (NC4600) cameras file demuxer
version 0.4.9-pre1: version 0.4.9-pre1:

@ -108,6 +108,8 @@ library:
@tab Used by MSN Messenger webcam streams. @tab Used by MSN Messenger webcam streams.
@item MXF @tab X @tab X @item MXF @tab X @tab X
@tab Material eXchange Format SMPTE 377M, used by D-Cinema, broadcast industry. @tab Material eXchange Format SMPTE 377M, used by D-Cinema, broadcast industry.
@item NC @tab @tab X
@tab NC (AVIP NC4600) cameras streams.
@item Nullsoft Video @tab @tab X @item Nullsoft Video @tab @tab X
@item NUT @tab X @tab X @item NUT @tab X @tab X
@tab NUT Open Container Format @tab NUT Open Container Format

@ -117,6 +117,7 @@ OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o
OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o
OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o audiointerleave.o OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o audiointerleave.o
OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o
OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o
OBJS-$(CONFIG_NULL_MUXER) += raw.o OBJS-$(CONFIG_NULL_MUXER) += raw.o
OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.o OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.o

@ -126,6 +126,7 @@ void av_register_all(void)
REGISTER_DEMUXER (MTV, mtv); REGISTER_DEMUXER (MTV, mtv);
REGISTER_DEMUXER (MVI, mvi); REGISTER_DEMUXER (MVI, mvi);
REGISTER_MUXDEMUX (MXF, mxf); REGISTER_MUXDEMUX (MXF, mxf);
REGISTER_DEMUXER (NC, nc);
REGISTER_DEMUXER (NSV, nsv); REGISTER_DEMUXER (NSV, nsv);
REGISTER_MUXER (NULL, null); REGISTER_MUXER (NULL, null);
REGISTER_MUXDEMUX (NUT, nut); REGISTER_MUXDEMUX (NUT, nut);

@ -0,0 +1,100 @@
/*
* NC camera feed demuxer
* Copyright (c) 2009 Nicolas Martin (martinic at iro dot umontreal dot ca)
* Edouard Auvinet
*
* 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 "libavutil/intreadwrite.h"
#include "avformat.h"
#define NC_VIDEO_FLAG 0x1A5
static int nc_probe(AVProbeData *probe_packet)
{
int size;
if (AV_RB32(probe_packet->buf) != NC_VIDEO_FLAG)
return 0;
size = AV_RL16(probe_packet->buf + 5);
if (size + 20 > probe_packet->buf_size)
return 3*AVPROBE_SCORE_MAX/2;
if (AV_RB32(probe_packet->buf+16+size) == NC_VIDEO_FLAG)
return AVPROBE_SCORE_MAX;
return 0;
}
static int nc_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
AVStream *st = av_new_stream(s, 0);
if (!st)
return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_MPEG4;
st->need_parsing = AVSTREAM_PARSE_FULL;
av_set_pts_info(st, 64, 1, 100);
return 0;
}
static int nc_read_packet(AVFormatContext *s, AVPacket *pkt)
{
int size;
uint32_t state=-1;
while (state != NC_VIDEO_FLAG) {
if (url_feof(s->pb))
return AVERROR(EIO);
state = (state<<8) + get_byte(s->pb);
}
get_byte(s->pb);
size = get_le16(s->pb);
url_fskip(s->pb, 9);
if (size == 0) {
av_log(s, AV_LOG_DEBUG, "Next packet size is zero\n");
return AVERROR(EAGAIN);
}
int ret = av_get_packet(s->pb, pkt, size);
if (ret != size) {
if (ret > 0) av_free_packet(pkt);
return AVERROR(EIO);
}
pkt->stream_index = 0;
return size;
}
AVInputFormat nc_demuxer = {
"nc",
NULL_IF_CONFIG_SMALL("NC camera feed format"),
0,
nc_probe,
nc_read_header,
nc_read_packet,
.extensions = "v",
};
Loading…
Cancel
Save