[Ffmpeg-cvslog] CVS: ffmpeg/libavformat nuv.c, NONE, 1.1 Makefile, 1.126, 1.127 allformats.c, 1.64, 1.65 avformat.h, 1.146, 1.147 wav.c, 1.60, 1.61
Reimar Döffinger CVS
reimar
Tue Mar 28 00:22:53 CEST 2006
Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv28818/libavformat
Modified Files:
Makefile allformats.c avformat.h wav.c
Added Files:
nuv.c
Log Message:
NuppelVideo/MythTVVideo support, including rtjpeg decoder
--- NEW FILE: nuv.c ---
/*
* NuppelVideo demuxer.
* Copyright (c) 2006 Reimar Doeffinger.
*
* This library 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 of the License, or (at your option) any later version.
*
* This library 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 this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
#include "avi.h"
typedef struct {
int v_id;
int a_id;
} NUVContext;
typedef enum {
NUV_VIDEO = 'V',
NUV_EXTRADATA = 'D',
NUV_AUDIO = 'A',
NUV_SEEKP = 'R',
NUV_MYTHEXT = 'X'
} frametype_t;
static int nuv_probe(AVProbeData *p) {
if (p->buf_size < 12)
return 0;
if (!memcmp(p->buf, "NuppelVideo", 12))
return AVPROBE_SCORE_MAX;
if (!memcmp(p->buf, "MythTVVideo", 12))
return AVPROBE_SCORE_MAX;
return 0;
}
//! little macro to sanitize packet size
#define PKTSIZE(s) (s & 0xffffff)
/**
* \brief read until we found all data needed for decoding
* \param vst video stream of which to change parameters
* \param ast video stream of which to change parameters
* \param myth set if this is a MythTVVideo format file
* \return 1 if all required codec data was found
*/
static int get_codec_data(ByteIOContext *pb, AVStream *vst,
AVStream *ast, int myth) {
frametype_t frametype;
if (!vst && !myth)
return 1; // no codec data needed
while (!url_feof(pb)) {
int size, subtype;
frametype = get_byte(pb);
switch (frametype) {
case NUV_EXTRADATA:
subtype = get_byte(pb);
url_fskip(pb, 6);
size = PKTSIZE(get_le32(pb));
if (subtype == 'R') {
vst->codec->extradata_size = size;
vst->codec->extradata = av_malloc(size);
get_buffer(pb, vst->codec->extradata, size);
size = 0;
if (!myth)
return 1;
}
break;
case NUV_MYTHEXT:
url_fskip(pb, 7);
size = PKTSIZE(get_le32(pb));
if (size != 128 * 4)
break;
get_le32(pb); // version
if (vst) {
vst->codec->codec_tag = get_le32(pb);
vst->codec->codec_id =
codec_get_id(codec_bmp_tags, vst->codec->codec_tag);
} else
url_fskip(pb, 4);
if (ast) {
ast->codec->codec_tag = get_le32(pb);
ast->codec->sample_rate = get_le32(pb);
ast->codec->bits_per_sample = get_le32(pb);
ast->codec->channels = get_le32(pb);
ast->codec->codec_id =
wav_codec_get_id(ast->codec->codec_tag,
ast->codec->bits_per_sample);
} else
url_fskip(pb, 4 * 4);
size -= 6 * 4;
url_fskip(pb, size);
return 1;
case NUV_SEEKP:
size = 11;
break;
default:
url_fskip(pb, 7);
size = PKTSIZE(get_le32(pb));
break;
}
url_fskip(pb, size);
}
return 0;
}
static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
NUVContext *ctx = (NUVContext *)s->priv_data;
ByteIOContext *pb = &s->pb;
char id_string[12], version_string[5];
double aspect, fps;
int is_mythtv, width, height, v_packs, a_packs;
int stream_nr = 0;
AVStream *vst = NULL, *ast = NULL;
get_buffer(pb, id_string, 12);
is_mythtv = !memcmp(id_string, "MythTVVideo", 12);
get_buffer(pb, version_string, 5);
url_fskip(pb, 3); // padding
width = get_le32(pb);
height = get_le32(pb);
get_le32(pb); // unused, "desiredwidth"
get_le32(pb); // unused, "desiredheight"
get_byte(pb); // 'P' == progressive, 'I' == interlaced
url_fskip(pb, 3); // padding
aspect = av_int2dbl(get_le64(pb));
fps = av_int2dbl(get_le64(pb));
// number of packets per stream type, -1 means unknown, e.g. streaming
v_packs = get_le32(pb);
a_packs = get_le32(pb);
get_le32(pb); // text
get_le32(pb); // keyframe distance (?)
if (v_packs) {
ctx->v_id = stream_nr++;
vst = av_new_stream(s, ctx->v_id);
vst->codec->codec_type = CODEC_TYPE_VIDEO;
vst->codec->codec_id = CODEC_ID_NUV;
vst->codec->codec_tag = MKTAG('R', 'J', 'P', 'G');
vst->codec->width = width;
vst->codec->height = height;
vst->codec->bits_per_sample = 10;
vst->codec->sample_aspect_ratio = av_d2q(aspect, 10000);
vst->r_frame_rate = av_d2q(1.0 / fps, 10000);
av_set_pts_info(vst, 32, 1, 1000);
} else
ctx->v_id = -1;
if (a_packs) {
ctx->a_id = stream_nr++;
ast = av_new_stream(s, ctx->a_id);
ast->codec->codec_type = CODEC_TYPE_AUDIO;
ast->codec->codec_id = CODEC_ID_PCM_S16LE;
ast->codec->channels = 2;
ast->codec->sample_rate = 44100;
ast->codec->bit_rate = 2 * 2 * 44100 * 8;
ast->codec->block_align = 2 * 2;
ast->codec->bits_per_sample = 16;
av_set_pts_info(ast, 32, 1, 1000);
} else
ctx->a_id = -1;
get_codec_data(pb, vst, ast, is_mythtv);
return 0;
}
#define HDRSIZE 12
static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
NUVContext *ctx = (NUVContext *)s->priv_data;
ByteIOContext *pb = &s->pb;
uint8_t hdr[HDRSIZE];
frametype_t frametype;
int ret, size;
while (!url_feof(pb)) {
ret = get_buffer(pb, hdr, HDRSIZE);
if (ret <= 0)
return ret;
frametype = hdr[0];
size = PKTSIZE(LE_32(&hdr[8]));
switch (frametype) {
case NUV_VIDEO:
case NUV_EXTRADATA:
if (ctx->v_id < 0) {
av_log(s, AV_LOG_ERROR, "Video packet in file without video stream!\n");
url_fskip(pb, size);
break;
}
ret = av_new_packet(pkt, HDRSIZE + size);
if (ret < 0)
return ret;
pkt->pos = url_ftell(pb);
pkt->pts = LE_32(&hdr[4]);
pkt->stream_index = ctx->v_id;
memcpy(pkt->data, hdr, HDRSIZE);
ret = get_buffer(pb, pkt->data + HDRSIZE, size);
return ret;
case NUV_AUDIO:
if (ctx->a_id < 0) {
av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n");
url_fskip(pb, size);
break;
}
ret = av_get_packet(pb, pkt, size);
pkt->pts = LE_32(&hdr[4]);
pkt->stream_index = ctx->a_id;
return ret;
case NUV_SEEKP:
// contains no data, size value is invalid
break;
default:
url_fskip(pb, size);
break;
}
}
return AVERROR_IO;
}
static AVInputFormat nuv_iformat = {
"nuv",
"NuppelVideo format",
sizeof(NUVContext),
nuv_probe,
nuv_header,
nuv_packet,
NULL,
NULL,
};
int nuv_init(void) {
av_register_input_format(&nuv_iformat);
return 0;
}
Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- Makefile 21 Mar 2006 17:27:47 -0000 1.126
+++ Makefile 27 Mar 2006 22:22:50 -0000 1.127
@@ -18,7 +18,7 @@
nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \
ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o aiff.o \
- voc.o tta.o mm.o avs.o smacker.o
+ voc.o tta.o mm.o avs.o smacker.o nuv.o
# muxers
ifeq ($(CONFIG_MUXERS),yes)
Index: allformats.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- allformats.c 21 Mar 2006 17:27:47 -0000 1.64
+++ allformats.c 27 Mar 2006 22:22:50 -0000 1.65
@@ -120,6 +120,7 @@
voc_init();
tta_init();
avs_init();
+ nuv_init();
#ifdef CONFIG_MUXERS
/* image formats */
Index: avformat.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avformat.h,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- avformat.h 21 Mar 2006 17:27:47 -0000 1.146
+++ avformat.h 27 Mar 2006 22:22:50 -0000 1.147
@@ -549,6 +549,9 @@
/* daud.c */
int daud_init(void);
+/* nuv.c */
+int nuv_init(void);
+
/* aiff.c */
int ff_aiff_init(void);
Index: wav.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/wav.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- wav.c 12 Jan 2006 22:43:26 -0000 1.60
+++ wav.c 27 Mar 2006 22:22:50 -0000 1.61
@@ -45,6 +45,10 @@
{ CODEC_ID_ADPCM_CT, 0x200 },
{ CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
{ CODEC_ID_TRUESPEECH, 0x22 },
+
+ // for NuppelVideo (nuv.c)
+ { CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') },
+ { CODEC_ID_MP3, MKTAG('L', 'A', 'M', 'E') },
{ 0, 0 },
};
More information about the ffmpeg-cvslog
mailing list