RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add libnut support until ffmpeg gets an independant and complete de/muxer for NUT 

Originally committed as revision 6977 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Oded Shimon 2006-11-12 06:09:15 +00:00
parent bb54f6ab62
commit f956e12954
3 changed files with 327 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -31,6 +31,7 @@ show_help(){
echo " --incdir=DIR install includes in DIR [PREFIX/include/ffmpeg]"
echo " --mandir=DIR install man page in DIR [PREFIX/man]"
echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]"
echo " --enable-libnut enable NUT support via libnut [default=no]"
echo " --enable-libogg enable Ogg support via libogg [default=no]"
echo " --enable-vorbis enable Vorbis support via libvorbis [default=no]"
echo " --enable-faad enable FAAD support via libfaad [default=no]"
@ -422,6 +423,7 @@ ipv6="yes"
zlib="yes"
libgsm="no"
mp3lame="no"
libnut="no"
libogg="no"
vorbis="no"
faad="no"
@ -771,6 +773,8 @@ for opt do
;;
--enable-mp3lame) mp3lame="yes"
;;
--enable-libnut) libnut="yes"
;;
--enable-libogg) libogg="yes"
pkg_requires="$pkg_requires ogg >= 1.1"
;;
@ -1321,6 +1325,7 @@ enabled libgsm && require libgsm gsm.h gsm_create -lgsm
enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm
enabled vorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg
enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg
enabled libnut && require libnut nut.h nut_demuxer_init -lnut
enabled xvid && require XviD xvid.h xvid_global -lxvidcore
enabled x264 && require x264 x264.h x264_encoder_open -lx264
enabled dc1394 && require libdc1394 libdc1394/dc1394_control.h dc1394_create_handle -ldc1394_control -lraw1394
@ -1599,6 +1604,7 @@ echo "gprof enabled $gprof"
echo "zlib enabled $zlib"
echo "libgsm enabled $libgsm"
echo "mp3lame enabled $mp3lame"
echo "libnut enabled $libnut"
echo "libogg enabled $libogg"
echo "Vorbis enabled $vorbis"
echo "FAAD enabled $faad"
@ -1999,6 +2005,11 @@ if test "$mp3lame" = "yes" ; then
echo "CONFIG_MP3LAME=yes" >> config.mak
fi
if test "$libnut" = "yes" ; then
echo "#define CONFIG_LIBNUT 1" >> $TMPH
echo "CONFIG_LIBNUT=yes" >> config.mak
fi
if test "$libogg" = "yes" ; then
echo "#define CONFIG_LIBOGG 1" >> $TMPH
echo "CONFIG_LIBOGG=yes" >> config.mak

10
libavformat/Makefile
View File

@ -73,8 +73,6 @@ OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
OBJS-$(CONFIG_MXF_DEMUXER) += mxf.o
OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o riff.o
OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o
#OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o
OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \
oggparsevorbis.o \
@ -176,6 +174,14 @@ endif
endif
endif
ifeq ($(CONFIG_LIBNUT),yes)
OBJS-$(CONFIG_NUT_DEMUXER) += libnut.o riff.o
OBJS-$(CONFIG_NUT_MUXER) += libnut.o riff.o
else
OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o
#OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
endif
ifeq ($(CONFIG_LIBOGG),yes)
OBJS-$(CONFIG_OGG_MUXER) += ogg.o
endif

308
libavformat/libnut.c Normal file
View File

@ -0,0 +1,308 @@
#include "avformat.h"
#include "riff.h"
#include "nut.h"
#define ID_STRING "nut/multimedia container"
#define ID_LENGTH (strlen(ID_STRING) + 1)
typedef struct {
nut_context_t * nut;
nut_stream_header_t * s;
} NUTContext;
static const CodecTag nut_tags[] = {
{ CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 's') },
{ CODEC_ID_MP3, MKTAG('m', 'p', '3', ' ') },
{ CODEC_ID_VORBIS, MKTAG('v', 'r', 'b', 's') },
{ 0, 0 },
};
#ifdef CONFIG_MUXERS
frame_table_input_t ft_default[] = {
// There must be atleast this safety net:
//{ 4128, 3, 0, 1, 0, 0, 0 },
//{ flag, fields, pts, mul, stream, size, count }
{ 8192, 0, 0, 1, 0, 0, 0 }, // invalid 0x00
{ 56, 0, 0, 1, 0, 0, 0 }, // safety net non key frame
{ 56, 0, 0, 1, 0, 0, 0 }, // safety net key frame
{ 4128, 0, 0, 1, 0, 0, 0 }, // one more safety net
{ 27, 0, 0, 1, 0, 0, 0 }, // EOR frame
{ 1, 4, 1, 337, 1, 336, 0 }, // used 82427 times
{ 1, 4, 1, 385, 1, 384, 0 }, // used 56044 times
{ 0, 4, 2, 7, 0, 6, 0 }, // used 20993 times
{ 0, 4, 1, 7, 0, 6, 0 }, // used 10398 times
{ 1, 4, 1, 481, 1, 480, 0 }, // used 3527 times
{ 1, 4, 1, 289, 1, 288, 0 }, // used 2042 times
{ 1, 4, 1, 577, 1, 576, 0 }, // used 1480 times
{ 1, 4, 1, 673, 1, 672, 0 }, // used 862 times
{ 1, 4, 1, 769, 1, 768, 0 }, // used 433 times
{ 1, 4, 1, 961, 1, 960, 0 }, // used 191 times
{ 32, 3, 2, 101, 0, 0, 0 }, // "1.2.0" => 14187
{ 32, 3, -1, 40, 0, 0, 0 }, // "1.-1.0" => 5707
{ 32, 3, 1, 81, 0, 0, 0 }, // "1.1.0" => 11159
{ 33, 3, 1, 11, 0, 0, 0 }, // "1.1.1" => 1409
{ 105, 3, 0, 6, 0, 0, 0 }, // checksum for video
{ 8192, 2, 0, 1, 0, 0, 0 }, // invalid 0xFF
{ -1, 0, 0, 0, 0, 0, 0 }, // end
};
static int av_write(void * h, size_t len, const uint8_t * buf) {
ByteIOContext * bc = h;
put_buffer(bc, buf, len);
//put_flush_packet(bc);
return len;
}
static int nut_write_header(AVFormatContext * avf) {
NUTContext * priv = avf->priv_data;
ByteIOContext * bc = &avf->pb;
nut_muxer_opts_t mopts = {
.output = {
.priv = bc,
.write = av_write,
},
.alloc = { av_malloc, av_realloc, av_free },
.write_index = 1,
.realtime_stream = 0,
.max_distance = 32768,
.fti = ft_default
};
nut_stream_header_t * s;
int i;
priv->s = s = av_mallocz((avf->nb_streams + 1) * sizeof*s);
for (i = 0; i < avf->nb_streams; i++) {
AVCodecContext * codec = avf->streams[i]->codec;
int j;
int fourcc = 0;
int nom, denom, ssize;
s[i].type = codec->codec_type == CODEC_TYPE_VIDEO ? NUT_VIDEO_CLASS : NUT_AUDIO_CLASS;
if (codec->codec_tag) fourcc = codec->codec_tag;
else fourcc = codec_get_tag(nut_tags, codec->codec_id);
if (!fourcc) {
if (codec->codec_type == CODEC_TYPE_VIDEO) fourcc = codec_get_bmp_tag(codec->codec_id);
if (codec->codec_type == CODEC_TYPE_AUDIO) fourcc = codec_get_wav_tag(codec->codec_id);
}
s[i].fourcc_len = 4;
s[i].fourcc = av_malloc(s[i].fourcc_len);
for (j = 0; j < s[i].fourcc_len; j++) s[i].fourcc[j] = (fourcc >> (j*8)) & 0xFF;
ff_parse_specific_params(codec, &nom, &ssize, &denom);
av_set_pts_info(avf->streams[i], 60, denom, nom);
s[i].time_base.nom = denom;
s[i].time_base.den = nom;
s[i].fixed_fps = 0;
s[i].decode_delay = codec->has_b_frames;
s[i].codec_specific_len = codec->extradata_size;
s[i].codec_specific = codec->extradata;
if (codec->codec_type == CODEC_TYPE_VIDEO) {
s[i].width = codec->width;
s[i].height = codec->height;
s[i].sample_width = 0;
s[i].sample_height = 0;
s[i].colorspace_type = 0;
} else {
s[i].samplerate_nom = codec->sample_rate;
s[i].samplerate_denom = 1;
s[i].channel_count = codec->channels;
}
}
s[avf->nb_streams].type = -1;
priv->nut = nut_muxer_init(&mopts, s, NULL);
return 0;
}
static int nut_write_packet(AVFormatContext * avf, AVPacket * pkt) {
NUTContext * priv = avf->priv_data;
nut_packet_t p;
p.len = pkt->size;
p.stream = pkt->stream_index;
p.pts = pkt->pts;
p.flags = pkt->flags & PKT_FLAG_KEY ? NUT_FLAG_KEY : 0;
p.next_pts = 0;
nut_write_frame_reorder(priv->nut, &p, pkt->data);
return 0;
}
static int nut_write_trailer(AVFormatContext * avf) {
ByteIOContext * bc = &avf->pb;
NUTContext * priv = avf->priv_data;
int i;
nut_muxer_uninit_reorder(priv->nut);
put_flush_packet(bc);
for(i = 0; priv->s[i].type != -1; i++ ) av_freep(&priv->s[i].fourcc);
av_freep(&priv->s);
return 0;
}
AVOutputFormat nut_muxer = {
"nut",
"nut format",
"video/x-nut",
"nut",
sizeof(NUTContext),
CODEC_ID_VORBIS,
CODEC_ID_MPEG4,
nut_write_header,
nut_write_packet,
nut_write_trailer,
.flags = AVFMT_GLOBALHEADER,
};
#endif //CONFIG_MUXERS
static int nut_probe(AVProbeData *p) {
if (p->buf_size >= ID_LENGTH && !memcmp(p->buf, ID_STRING, ID_LENGTH)) return AVPROBE_SCORE_MAX;
return 0;
}
static size_t av_read(void * h, size_t len, uint8_t * buf) {
ByteIOContext * bc = h;
return get_buffer(bc, buf, len);
}
static off_t av_seek(void * h, long long pos, int whence) {
ByteIOContext * bc = h;
if (whence == SEEK_END) {
pos = url_fsize(bc) + pos;
whence = SEEK_SET;
}
return url_fseek(bc, pos, whence);
}
static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) {
NUTContext * priv = avf->priv_data;
ByteIOContext * bc = &avf->pb;
nut_demuxer_opts_t dopts = {
.input = {
.priv = bc,
.seek = av_seek,
.read = av_read,
.eof = NULL,
.file_pos = 0,
},
.alloc = { av_malloc, av_realloc, av_free },
.read_index = 1
};
nut_context_t * nut = priv->nut = nut_demuxer_init(&dopts);
nut_stream_header_t * s;
int ret, i;
if ((ret = nut_read_headers(nut, &s, NULL))) {
if (ret < 0) av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(-ret));
nut_demuxer_uninit(nut);
return -1;
}
priv->s = s;
for (i = 0; s[i].type != -1 && i < 2; i++) {
AVStream * st = av_new_stream(avf, i);
int j;
for (j = 0; j < s[i].fourcc_len && j < 8; j++) st->codec->codec_tag |= s[i].fourcc[j]<<(j*8);
st->codec->has_b_frames = s[i].decode_delay;
st->codec->extradata_size = s[i].codec_specific_len;
if (st->codec->extradata_size) {
st->codec->extradata = av_mallocz(st->codec->extradata_size);
memcpy(st->codec->extradata, s[i].codec_specific, st->codec->extradata_size);
}
av_set_pts_info(avf->streams[i], 60, s[i].time_base.nom, s[i].time_base.den);
st->start_time = 0;
st->duration = s[i].max_pts;
st->codec->codec_id = codec_get_id(nut_tags, st->codec->codec_tag);
switch(s[i].type) {
case NUT_AUDIO_CLASS:
st->codec->codec_type = CODEC_TYPE_AUDIO;
if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_wav_id(st->codec->codec_tag);
st->codec->channels = s[i].channel_count;
st->codec->sample_rate = s[i].samplerate_nom / s[i].samplerate_denom;
break;
case NUT_VIDEO_CLASS:
st->codec->codec_type = CODEC_TYPE_VIDEO;
if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = codec_get_bmp_id(st->codec->codec_tag);
st->codec->width = s[i].width;
st->codec->height = s[i].height;
st->codec->sample_aspect_ratio.num = s[i].sample_width;
st->codec->sample_aspect_ratio.den = s[i].sample_height;
break;
}
if (st->codec->codec_id == CODEC_ID_NONE) av_log(avf, AV_LOG_ERROR, "Unknown codec?!\n");
}
return 0;
}
static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) {
NUTContext * priv = avf->priv_data;
nut_packet_t pd;
int ret;
while ((ret = nut_read_next_packet(priv->nut, &pd)) < 0)
av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(-ret));
if (ret || av_new_packet(pkt, pd.len) < 0) return -1;
if (pd.flags & NUT_FLAG_KEY) pkt->flags |= PKT_FLAG_KEY;
pkt->pts = pd.pts;
pkt->stream_index = pd.stream;
pkt->pos = url_ftell(&avf->pb);
ret = nut_read_frame(priv->nut, &pd.len, pkt->data);
return ret;
}
static int nut_read_seek(AVFormatContext * avf, int stream_index, int64_t target_ts, int flags) {
NUTContext * priv = avf->priv_data;
int active_streams[] = { stream_index, -1 };
double time_pos = target_ts * priv->s[stream_index].time_base.nom / (double)priv->s[stream_index].time_base.den;
if (nut_seek(priv->nut, time_pos, 2*!(flags & AVSEEK_FLAG_BACKWARD), active_streams)) return -1;
return 0;
}
static int nut_read_close(AVFormatContext *s) {
NUTContext * priv = s->priv_data;
nut_demuxer_uninit(priv->nut);
av_free(priv->s);
return 0;
}
AVInputFormat nut_demuxer = {
"nut",
"nut format",
sizeof(NUTContext),
nut_probe,
nut_read_header,
nut_read_packet,
nut_read_close,
nut_read_seek,
.extensions = "nut",
};