X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Flibnut.c;h=3bb355852e6f595b333f86e6502c6dfd8cc11ca8;hb=6d10c5bfc0e998aec69d0d59397bdb6bae458c76;hp=2cadaefcbd841b050f55da9d8c2520a665b2ba6f;hpb=bde15e74de442cebf61acc6cd598a13aca249030;p=ffmpeg diff --git a/libavformat/libnut.c b/libavformat/libnut.c index 2cadaefcbd8..3bb355852e6 100644 --- a/libavformat/libnut.c +++ b/libavformat/libnut.c @@ -2,30 +2,31 @@ * NUT (de)muxing via libnut * copyright (c) 2006 Oded Shimon * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file libnut.c + * @file * NUT demuxing and muxing via libnut. * @author Oded Shimon */ #include "avformat.h" +#include "internal.h" #include "riff.h" #include @@ -33,8 +34,8 @@ #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 AVCodecTag nut_tags[] = { @@ -44,18 +45,18 @@ static const AVCodecTag nut_tags[] = { { 0, 0 }, }; -#ifdef CONFIG_MUXERS +#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); - //put_flush_packet(bc); + AVIOContext * bc = h; + avio_write(bc, buf, len); + //avio_flush(bc); return len; } static int nut_write_header(AVFormatContext * avf) { NUTContext * priv = avf->priv_data; - ByteIOContext * bc = avf->pb; - nut_muxer_opts_t mopts = { + AVIOContext * bc = avf->pb; + nut_muxer_opts_tt mopts = { .output = { .priv = bc, .write = av_write, @@ -66,7 +67,7 @@ static int nut_write_header(AVFormatContext * avf) { .max_distance = 32768, .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); @@ -77,14 +78,14 @@ static int nut_write_header(AVFormatContext * avf) { int fourcc = 0; 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_tag(codec_bmp_tags, codec->codec_id); - if (codec->codec_type == CODEC_TYPE_AUDIO) fourcc = codec_get_tag(codec_wav_tags, 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; @@ -92,7 +93,7 @@ static int nut_write_header(AVFormatContext * avf) { for (j = 0; j < s[i].fourcc_len; j++) s[i].fourcc[j] = (fourcc >> (j*8)) & 0xFF; ff_parse_specific_params(codec, &num, &ssize, &denom); - av_set_pts_info(avf->streams[i], 60, denom, num); + avpriv_set_pts_info(avf->streams[i], 60, denom, num); s[i].time_base.num = denom; s[i].time_base.den = num; @@ -102,7 +103,7 @@ static int nut_write_header(AVFormatContext * avf) { 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; @@ -123,12 +124,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); @@ -137,12 +138,12 @@ static int nut_write_packet(AVFormatContext * avf, AVPacket * pkt) { } static int nut_write_trailer(AVFormatContext * avf) { - ByteIOContext * bc = avf->pb; + AVIOContext * bc = avf->pb; NUTContext * priv = avf->priv_data; int i; nut_muxer_uninit_reorder(priv->nut); - put_flush_packet(bc); + avio_flush(bc); for(i = 0; priv->s[i].type != -1; i++ ) av_freep(&priv->s[i].fourcc); av_freep(&priv->s); @@ -150,20 +151,20 @@ static int nut_write_trailer(AVFormatContext * avf) { return 0; } -AVOutputFormat libnut_muxer = { - "libnut", - "nut format", - "video/x-nut", - "nut", - sizeof(NUTContext), - CODEC_ID_VORBIS, - CODEC_ID_MPEG4, - nut_write_header, - nut_write_packet, - nut_write_trailer, +AVOutputFormat ff_libnut_muxer = { + .name = "libnut", + .long_name = "nut format", + .mime_type = "video/x-nut", + .extensions = "nut", + .priv_data_size = sizeof(NUTContext), + .audio_codec = CODEC_ID_VORBIS, + .video_codec = CODEC_ID_MPEG4, + .write_header = nut_write_header, + .write_packet = nut_write_packet, + .write_trailer = nut_write_trailer, .flags = AVFMT_GLOBALHEADER, }; -#endif //CONFIG_MUXERS +#endif /* CONFIG_LIBNUT_MUXER */ static int nut_probe(AVProbeData *p) { if (!memcmp(p->buf, ID_STRING, ID_LENGTH)) return AVPROBE_SCORE_MAX; @@ -172,23 +173,23 @@ static int nut_probe(AVProbeData *p) { } static size_t av_read(void * h, size_t len, uint8_t * buf) { - ByteIOContext * bc = h; - return get_buffer(bc, buf, len); + AVIOContext * bc = h; + return avio_read(bc, buf, len); } static off_t av_seek(void * h, long long pos, int whence) { - ByteIOContext * bc = h; + AVIOContext * bc = h; if (whence == SEEK_END) { - pos = url_fsize(bc) + pos; + pos = avio_size(bc) + pos; whence = SEEK_SET; } - return url_fseek(bc, pos, whence); + return avio_seek(bc, pos, whence); } -static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { +static int nut_read_header(AVFormatContext * avf) { NUTContext * priv = avf->priv_data; - ByteIOContext * bc = avf->pb; - nut_demuxer_opts_t dopts = { + AVIOContext * bc = avf->pb; + nut_demuxer_opts_tt dopts = { .input = { .priv = bc, .seek = av_seek, @@ -200,8 +201,8 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { .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))) { @@ -213,7 +214,7 @@ static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { priv->s = s; for (i = 0; s[i].type != -1 && i < 2; i++) { - AVStream * st = av_new_stream(avf, i); + AVStream * st = avformat_new_stream(avf, NULL); int j; for (j = 0; j < s[i].fourcc_len && j < 8; j++) st->codec->codec_tag |= s[i].fourcc[j]<<(j*8); @@ -226,28 +227,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.num, s[i].time_base.den); + avpriv_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_id(codec_wav_tags, 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_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_id(codec_bmp_tags, 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,7 +259,7 @@ 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; ret = nut_read_next_packet(priv->nut, &pd); @@ -269,10 +270,10 @@ static int nut_read_packet(AVFormatContext * avf, AVPacket * pkt) { 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 = avio_tell(avf->pb); ret = nut_read_frame(priv->nut, &pd.len, pkt->data); @@ -297,14 +298,14 @@ static int nut_read_close(AVFormatContext *s) { return 0; } -AVInputFormat libnut_demuxer = { - "libnut", - NULL_IF_CONFIG_SMALL("NUT format"), - sizeof(NUTContext), - nut_probe, - nut_read_header, - nut_read_packet, - nut_read_close, - nut_read_seek, +AVInputFormat ff_libnut_demuxer = { + .name = "libnut", + .long_name = NULL_IF_CONFIG_SMALL("NUT format"), + .priv_data_size = sizeof(NUTContext), + .read_probe = nut_probe, + .read_header = nut_read_header, + .read_packet = nut_read_packet, + .read_close = nut_read_close, + .read_seek = nut_read_seek, .extensions = "nut", };