diff --git a/Changelog b/Changelog index 0285ec2b59..5c3e4b549a 100644 --- a/Changelog +++ b/Changelog @@ -114,6 +114,7 @@ version - VFW grabber - Ipod/Iphone compatible mp4 muxer - Mimic decoder +- MSN TCP Webcam stream demuxer version 0.4.9-pre1: diff --git a/MAINTAINERS b/MAINTAINERS index 57630f81d6..00300a7f26 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -249,6 +249,7 @@ Muxers/Demuxers: movenc.c Michael Niedermayer, Baptiste Coudurier mpc.c Kostya Shishkov mpegts* Mans Rullgard + msnwc_tcp.c Ramiro Polla mtv.c Reynaldo H. Verdejo Pinochet mxf.c Baptiste Coudurier nsvdec.c Francois Revol diff --git a/libavformat/Makefile b/libavformat/Makefile index f870dda04b..d84f003daf 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -102,6 +102,7 @@ OBJS-$(CONFIG_MPEGTSRAW_DEMUXER) += mpegts.o OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o +OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 97b9b9b1ce..58759cbfee 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -116,6 +116,7 @@ void av_register_all(void) REGISTER_DEMUXER (MPEGTSRAW, mpegtsraw); REGISTER_DEMUXER (MPEGVIDEO, mpegvideo); REGISTER_MUXER (MPJPEG, mpjpeg); + REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp); REGISTER_DEMUXER (MTV, mtv); REGISTER_DEMUXER (MXF, mxf); REGISTER_DEMUXER (NSV, nsv); diff --git a/libavformat/avformat.h b/libavformat/avformat.h index fa6687f316..a2390e9189 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define FFMPEG_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 10 +#define LIBAVFORMAT_VERSION_MINOR 11 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c new file mode 100644 index 0000000000..05e44b27c0 --- /dev/null +++ b/libavformat/msnwc_tcp.c @@ -0,0 +1,140 @@ +/* + * Copyright (C) 2008 Ramiro Polla + * + * 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 "bytestream.h" + +#define HEADER_SIZE 24 + +/* + * Header structure: + * uint16_t ss; // struct size + * uint16_t width; // frame width + * uint16_t height; // frame height + * uint16_t ff; // keyframe + some other info(???) + * uint32_t size; // size of data + * uint32_t fourcc; // ML20 + * uint32_t u3; // ? + * uint32_t ts; // time + */ + +static int msnwc_tcp_probe(AVProbeData *p) +{ + int i; + + for(i = 0 ; i + HEADER_SIZE <= p->buf_size ; i++) { + uint16_t width, height; + uint32_t fourcc; + const uint8_t *bytestream = p->buf+i; + + if(bytestream_get_le16(&bytestream) != HEADER_SIZE) + continue; + width = bytestream_get_le16(&bytestream); + height = bytestream_get_le16(&bytestream); + if(!(width==320 && height==240) && !(width==160 && height==120)) + continue; + bytestream += 2; // keyframe + bytestream += 4; // size + fourcc = bytestream_get_le32(&bytestream); + if(fourcc != MKTAG('M', 'L', '2', '0')) + continue; + + if(i) { + if(i < 14) /* starts with SwitchBoard connection info */ + return AVPROBE_SCORE_MAX / 2; + else /* starts in the middle of stream */ + return AVPROBE_SCORE_MAX / 3; + } else { + return AVPROBE_SCORE_MAX; + } + } + + return -1; +} + +static int msnwc_tcp_read_header(AVFormatContext *ctx, AVFormatParameters *ap) +{ + ByteIOContext *pb = ctx->pb; + AVCodecContext *codec; + AVStream *st; + + st = av_new_stream(ctx, 0); + if(!st) + return AVERROR_NOMEM; + + codec = st->codec; + codec->codec_type = CODEC_TYPE_VIDEO; + codec->codec_id = CODEC_ID_MIMIC; + codec->codec_tag = MKTAG('M', 'L', '2', '0'); + + av_set_pts_info(st, 32, 1, 1000); + + /* Some files start with "connected\r\n\r\n". + * So skip until we find the first byte of struct size */ + while(get_byte(pb) != HEADER_SIZE && !url_feof(pb)); + + if(url_feof(pb)) { + av_log(ctx, AV_LOG_ERROR, "Could not find valid start."); + return -1; + } + + return 0; +} + +static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt) +{ + ByteIOContext *pb = ctx->pb; + uint16_t keyframe; + uint32_t size, timestamp; + + url_fskip(pb, 1); /* one byte has been read ahead */ + url_fskip(pb, 2); + url_fskip(pb, 2); + keyframe = get_le16(pb); + size = get_le32(pb); + url_fskip(pb, 4); + url_fskip(pb, 4); + timestamp = get_le32(pb); + + if(!size || av_get_packet(pb, pkt, size) != size) + return -1; + + url_fskip(pb, 1); /* Read ahead one byte of struct size like read_header */ + + pkt->pts = timestamp; + pkt->dts = timestamp; + pkt->stream_index = 0; + + /* Some aMsn generated videos (or was it Mercury Messenger?) don't set + * this bit and rely on the codec to get keyframe information */ + if(keyframe&1) + pkt->flags |= PKT_FLAG_KEY; + + return HEADER_SIZE + size; +} + +AVInputFormat msnwc_tcp_demuxer = { + "msnwctcp", + "MSN TCP Webcam stream", + 0, + msnwc_tcp_probe, + msnwc_tcp_read_header, + msnwc_tcp_read_packet, +};