X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Flibnut.c;h=4543df7bd9270b5620400e41d9219e7032f462af;hb=8bf0f969547ec694a314764e7ca3d883bf416b21;hp=7c3c344ae6cc829bfcf0f290cd33d5a159e0f9ac;hpb=b43afb53439fb4d8f59ab291483d09f8ca99881b;p=ffmpeg diff --git a/libavformat/libnut.c b/libavformat/libnut.c index 7c3c344ae6c..4543df7bd92 100644 --- a/libavformat/libnut.c +++ b/libavformat/libnut.c @@ -1,51 +1,50 @@ +/* + * NUT (de)muxing via libnut + * copyright (c) 2006 Oded Shimon + * + * 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 + */ + +/** + * @file + * NUT demuxing and muxing via libnut. + * @author Oded Shimon + */ + #include "avformat.h" #include "riff.h" -#include +#include #define ID_STRING "nut/multimedia container" #define ID_LENGTH (strlen(ID_STRING) + 1) typedef struct { - nut_context_t * nut; - nut_stream_header_t * s; + nut_context_tt * nut; + nut_stream_header_tt * s; } NUTContext; -static const CodecTag nut_tags[] = { - { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 's') }, +static const AVCodecTag nut_tags[] = { + { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') }, { 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 -}; - +#if CONFIG_LIBNUT_MUXER static int av_write(void * h, size_t len, const uint8_t * buf) { ByteIOContext * bc = h; put_buffer(bc, buf, len); @@ -55,8 +54,8 @@ static int av_write(void * h, size_t len, const uint8_t * buf) { static int nut_write_header(AVFormatContext * avf) { NUTContext * priv = avf->priv_data; - ByteIOContext * bc = &avf->pb; - nut_muxer_opts_t mopts = { + ByteIOContext * bc = avf->pb; + nut_muxer_opts_tt mopts = { .output = { .priv = bc, .write = av_write, @@ -65,9 +64,9 @@ static int nut_write_header(AVFormatContext * avf) { .write_index = 1, .realtime_stream = 0, .max_distance = 32768, - .fti = ft_default + .fti = NULL, }; - nut_stream_header_t * s; + nut_stream_header_tt * s; int i; priv->s = s = av_mallocz((avf->nb_streams + 1) * sizeof*s); @@ -76,41 +75,41 @@ static int nut_write_header(AVFormatContext * avf) { AVCodecContext * codec = avf->streams[i]->codec; int j; int fourcc = 0; - int nom, denom, ssize; + int num, denom, ssize; - s[i].type = codec->codec_type == CODEC_TYPE_VIDEO ? NUT_VIDEO_CLASS : NUT_AUDIO_CLASS; + s[i].type = codec->codec_type == AVMEDIA_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); + else fourcc = ff_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); + if (codec->codec_type == AVMEDIA_TYPE_VIDEO) fourcc = ff_codec_get_tag(ff_codec_bmp_tags, codec->codec_id); + if (codec->codec_type == AVMEDIA_TYPE_AUDIO) fourcc = ff_codec_get_tag(ff_codec_wav_tags, 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); + ff_parse_specific_params(codec, &num, &ssize, &denom); + av_set_pts_info(avf->streams[i], 60, denom, num); - s[i].time_base.nom = denom; - s[i].time_base.den = nom; + s[i].time_base.num = denom; + s[i].time_base.den = num; 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) { + if (codec->codec_type == AVMEDIA_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_num = codec->sample_rate; s[i].samplerate_denom = 1; s[i].channel_count = codec->channels; } @@ -124,12 +123,12 @@ static int nut_write_header(AVFormatContext * avf) { static int nut_write_packet(AVFormatContext * avf, AVPacket * pkt) { NUTContext * priv = avf->priv_data; - nut_packet_t p; + nut_packet_tt 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.flags = pkt->flags & AV_PKT_FLAG_KEY ? NUT_FLAG_KEY : 0; p.next_pts = 0; nut_write_frame_reorder(priv->nut, &p, pkt->data); @@ -138,7 +137,7 @@ static int nut_write_packet(AVFormatContext * avf, AVPacket * pkt) { } static int nut_write_trailer(AVFormatContext * avf) { - ByteIOContext * bc = &avf->pb; + ByteIOContext * bc = avf->pb; NUTContext * priv = avf->priv_data; int i; @@ -151,8 +150,8 @@ static int nut_write_trailer(AVFormatContext * avf) { return 0; } -AVOutputFormat nut_muxer = { - "nut", +AVOutputFormat libnut_muxer = { + "libnut", "nut format", "video/x-nut", "nut", @@ -164,10 +163,10 @@ AVOutputFormat nut_muxer = { nut_write_trailer, .flags = AVFMT_GLOBALHEADER, }; -#endif //CONFIG_MUXERS +#endif /* CONFIG_LIBNUT_MUXER */ static int nut_probe(AVProbeData *p) { - if (p->buf_size >= ID_LENGTH && !memcmp(p->buf, ID_STRING, ID_LENGTH)) return AVPROBE_SCORE_MAX; + if (!memcmp(p->buf, ID_STRING, ID_LENGTH)) return AVPROBE_SCORE_MAX; return 0; } @@ -188,8 +187,8 @@ static off_t av_seek(void * h, long long pos, int whence) { static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { NUTContext * priv = avf->priv_data; - ByteIOContext * bc = &avf->pb; - nut_demuxer_opts_t dopts = { + ByteIOContext * bc = avf->pb; + nut_demuxer_opts_tt dopts = { .input = { .priv = bc, .seek = av_seek, @@ -198,14 +197,15 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { .file_pos = 0, }, .alloc = { av_malloc, av_realloc, av_free }, - .read_index = 1 + .read_index = 1, + .cache_syncpoints = 1, }; - nut_context_t * nut = priv->nut = nut_demuxer_init(&dopts); - nut_stream_header_t * s; + nut_context_tt * nut = priv->nut = nut_demuxer_init(&dopts); + nut_stream_header_tt * 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)); + av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret)); nut_demuxer_uninit(nut); return -1; } @@ -226,28 +226,28 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { 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); + av_set_pts_info(avf->streams[i], 60, s[i].time_base.num, 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); + st->codec->codec_id = ff_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->codec_type = AVMEDIA_TYPE_AUDIO; + if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, st->codec->codec_tag); st->codec->channels = s[i].channel_count; - st->codec->sample_rate = s[i].samplerate_nom / s[i].samplerate_denom; + st->codec->sample_rate = s[i].samplerate_num / 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->codec_type = AVMEDIA_TYPE_VIDEO; + if (st->codec->codec_id == CODEC_ID_NONE) st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, 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; + st->sample_aspect_ratio.num = s[i].sample_width; + st->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"); @@ -258,18 +258,21 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) { NUTContext * priv = avf->priv_data; - nut_packet_t pd; + nut_packet_tt 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)); + ret = nut_read_next_packet(priv->nut, &pd); - if (ret || av_new_packet(pkt, pd.len) < 0) return -1; + if (ret || av_new_packet(pkt, pd.len) < 0) { + if (ret != NUT_ERR_EOF) + av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret)); + return -1; + } - if (pd.flags & NUT_FLAG_KEY) pkt->flags |= PKT_FLAG_KEY; + if (pd.flags & NUT_FLAG_KEY) pkt->flags |= AV_PKT_FLAG_KEY; pkt->pts = pd.pts; pkt->stream_index = pd.stream; - pkt->pos = url_ftell(&avf->pb); + pkt->pos = url_ftell(avf->pb); ret = nut_read_frame(priv->nut, &pd.len, pkt->data); @@ -279,7 +282,7 @@ static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) { 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; + double time_pos = target_ts * priv->s[stream_index].time_base.num / (double)priv->s[stream_index].time_base.den; if (nut_seek(priv->nut, time_pos, 2*!(flags & AVSEEK_FLAG_BACKWARD), active_streams)) return -1; @@ -290,14 +293,13 @@ 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", +AVInputFormat libnut_demuxer = { + "libnut", + NULL_IF_CONFIG_SMALL("NUT format"), sizeof(NUTContext), nut_probe, nut_read_header,