[FFmpeg-devel] [PATCH] lavf: remove the libnut library wrapper

wm4 nfxjfg at googlemail.com
Mon May 29 12:28:09 EEST 2017


On Sun, 28 May 2017 20:28:30 +0100
Rostislav Pehlivanov <atomnuker at gmail.com> wrote:

> libnut is outdated and not developed anymore, all nut developments
> happens in this repo, so users are getting mislead
> ---
>  Changelog                |   1 +
>  MAINTAINERS              |   1 -
>  configure                |   6 -
>  libavformat/Makefile     |   2 -
>  libavformat/allformats.c |   1 -
>  libavformat/libnut.c     | 324 -----------------------------------------------
>  6 files changed, 1 insertion(+), 334 deletions(-)
>  delete mode 100644 libavformat/libnut.c
> 
> diff --git a/Changelog b/Changelog
> index 475a0a80c9..fad8304701 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -14,6 +14,7 @@ version <next>:
>  - librsvg support for svg rasterization
>  - crossfeed audio filter
>  - spec compliant VP9 muxing support in MP4
> +- remove the libnut muxer/demuxer wrappers
>  
>  version 3.3:
>  - CrystalHD decoder moved to new decode API
> diff --git a/MAINTAINERS b/MAINTAINERS
> index dab3ec5859..5e5c6886df 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -416,7 +416,6 @@ Muxers/Demuxers:
>    iss.c                                 Stefan Gehrer
>    jvdec.c                               Peter Ross
>    libmodplug.c                          Clément Bœsch
> -  libnut.c                              Oded Shimon
>    libopenmpt.c                          Josh de Kock
>    lmlm4.c                               Ivo van Poorten
>    lvfdec.c                              Paul B Mahol
> diff --git a/configure b/configure
> index f8eb4417d8..70b47fb95b 100755
> --- a/configure
> +++ b/configure
> @@ -234,8 +234,6 @@ External library support:
>    --enable-libkvazaar      enable HEVC encoding via libkvazaar [no]
>    --enable-libmodplug      enable ModPlug via libmodplug [no]
>    --enable-libmp3lame      enable MP3 encoding via libmp3lame [no]
> -  --enable-libnut          enable NUT (de)muxing via libnut,
> -                           native (de)muxer exists [no]
>    --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
>    --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
>    --enable-libopencv       enable video filtering via libopencv [no]
> @@ -1553,7 +1551,6 @@ EXTERNAL_LIBRARY_LIST="
>      libkvazaar
>      libmodplug
>      libmp3lame
> -    libnut
>      libopencv
>      libopenh264
>      libopenjpeg
> @@ -2940,8 +2937,6 @@ image2_alias_pix_demuxer_select="image2_demuxer"
>  image2_brender_pix_demuxer_select="image2_demuxer"
>  ipod_muxer_select="mov_muxer"
>  ismv_muxer_select="mov_muxer"
> -libnut_demuxer_deps="libnut"
> -libnut_muxer_deps="libnut"
>  matroska_audio_muxer_select="matroska_muxer"
>  matroska_demuxer_select="iso_media riffdec"
>  matroska_demuxer_suggest="bzlib lzo zlib"
> @@ -5825,7 +5820,6 @@ enabled libmfx            && { use_pkg_config libmfx "mfx/mfxvideo.h" MFXInit ||
>                                 { require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } }
>  enabled libmodplug        && require_pkg_config libmodplug libmodplug/modplug.h ModPlug_Load
>  enabled libmp3lame        && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
> -enabled libnut            && require libnut libnut.h nut_demuxer_init -lnut
>  enabled libnpp            && require libnpp npp.h nppGetLibVersion -lnppi -lnppc
>  enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
>  enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
> diff --git a/libavformat/Makefile b/libavformat/Makefile
> index bfba0c1cb4..00cba52a43 100644
> --- a/libavformat/Makefile
> +++ b/libavformat/Makefile
> @@ -537,8 +537,6 @@ OBJS-$(CONFIG_AVISYNTH_DEMUXER)          += avisynth.o
>  OBJS-$(CONFIG_CHROMAPRINT_MUXER)         += chromaprint.o
>  OBJS-$(CONFIG_LIBGME_DEMUXER)            += libgme.o
>  OBJS-$(CONFIG_LIBMODPLUG_DEMUXER)        += libmodplug.o
> -OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o
> -OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o
>  OBJS-$(CONFIG_LIBOPENMPT_DEMUXER)        += libopenmpt.o
>  OBJS-$(CONFIG_LIBRTMP)                   += librtmp.o
>  OBJS-$(CONFIG_LIBSSH_PROTOCOL)           += libssh.o
> diff --git a/libavformat/allformats.c b/libavformat/allformats.c
> index b3ffe0f2b6..ad516eba06 100644
> --- a/libavformat/allformats.c
> +++ b/libavformat/allformats.c
> @@ -379,7 +379,6 @@ static void register_all(void)
>      REGISTER_MUXER   (CHROMAPRINT,      chromaprint);
>      REGISTER_DEMUXER (LIBGME,           libgme);
>      REGISTER_DEMUXER (LIBMODPLUG,       libmodplug);
> -    REGISTER_MUXDEMUX(LIBNUT,           libnut);
>      REGISTER_DEMUXER (LIBOPENMPT,       libopenmpt);
>  }
>  
> diff --git a/libavformat/libnut.c b/libavformat/libnut.c
> deleted file mode 100644
> index 26bb35483f..0000000000
> --- a/libavformat/libnut.c
> +++ /dev/null
> @@ -1,324 +0,0 @@
> -/*
> - * NUT (de)muxing via libnut
> - * copyright (c) 2006 Oded Shimon <ods15 at ods15.dyndns.org>
> - *
> - * 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 <ods15 at ods15.dyndns.org>
> - */
> -
> -#include "avformat.h"
> -#include "internal.h"
> -#include "riff.h"
> -#include <libnut.h>
> -
> -#define ID_STRING "nut/multimedia container"
> -#define ID_LENGTH (strlen(ID_STRING) + 1)
> -
> -typedef struct {
> -    nut_context_tt * nut;
> -    nut_stream_header_tt * s;
> -} NUTContext;
> -
> -static const AVCodecTag nut_tags[] = {
> -    { AV_CODEC_ID_MPEG4,  MKTAG('m', 'p', '4', 'v') },
> -    { AV_CODEC_ID_MP3,    MKTAG('m', 'p', '3', ' ') },
> -    { AV_CODEC_ID_VORBIS, MKTAG('v', 'r', 'b', 's') },
> -    { 0, 0 },
> -};
> -
> -#if CONFIG_LIBNUT_MUXER
> -static int av_write(void * h, size_t len, const uint8_t * buf) {
> -    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;
> -    AVIOContext * bc = avf->pb;
> -    nut_muxer_opts_tt mopts = {
> -        .output = {
> -            .priv = bc,
> -            .write = av_write,
> -        },
> -        .alloc = { av_malloc, av_realloc, av_free },
> -        .write_index = 1,
> -        .realtime_stream = 0,
> -        .max_distance = 32768,
> -        .fti = NULL,
> -    };
> -    nut_stream_header_tt * s;
> -    int i;
> -
> -    priv->s = s = av_mallocz_array(avf->nb_streams + 1, sizeof*s);
> -    if(!s)
> -        return AVERROR(ENOMEM);
> -
> -    for (i = 0; i < avf->nb_streams; i++) {
> -        AVCodecParameters *par = avf->streams[i]->codecpar;
> -        int j;
> -        int fourcc = 0;
> -        int num, denom, ssize;
> -
> -        s[i].type = par->codec_type == AVMEDIA_TYPE_VIDEO ? NUT_VIDEO_CLASS : NUT_AUDIO_CLASS;
> -
> -        if (par->codec_tag) fourcc = par->codec_tag;
> -        else fourcc = ff_codec_get_tag(nut_tags, par->codec_id);
> -
> -        if (!fourcc) {
> -            if (par->codec_type == AVMEDIA_TYPE_VIDEO) fourcc = ff_codec_get_tag(ff_codec_bmp_tags, par->codec_id);
> -            if (par->codec_type == AVMEDIA_TYPE_AUDIO) fourcc = ff_codec_get_tag(ff_codec_wav_tags, par->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(avf->streams[i], &num, &ssize, &denom);
> -        avpriv_set_pts_info(avf->streams[i], 60, denom, num);
> -
> -        s[i].time_base.num = denom;
> -        s[i].time_base.den = num;
> -
> -        s[i].fixed_fps = 0;
> -        s[i].decode_delay = par->video_delay;
> -        s[i].codec_specific_len = par->extradata_size;
> -        s[i].codec_specific = par->extradata;
> -
> -        if (par->codec_type == AVMEDIA_TYPE_VIDEO) {
> -            s[i].width = par->width;
> -            s[i].height = par->height;
> -            s[i].sample_width = 0;
> -            s[i].sample_height = 0;
> -            s[i].colorspace_type = 0;
> -        } else {
> -            s[i].samplerate_num = par->sample_rate;
> -            s[i].samplerate_denom = 1;
> -            s[i].channel_count = par->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_tt p;
> -
> -    p.len = pkt->size;
> -    p.stream = pkt->stream_index;
> -    p.pts = pkt->pts;
> -    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);
> -
> -    return 0;
> -}
> -
> -static int nut_write_trailer(AVFormatContext * avf) {
> -    AVIOContext * bc = avf->pb;
> -    NUTContext * priv = avf->priv_data;
> -    int i;
> -
> -    nut_muxer_uninit_reorder(priv->nut);
> -    avio_flush(bc);
> -
> -    for(i = 0; priv->s[i].type != -1; i++ ) av_freep(&priv->s[i].fourcc);
> -    av_freep(&priv->s);
> -
> -    return 0;
> -}
> -
> -AVOutputFormat ff_libnut_muxer = {
> -    .name              = "libnut",
> -    .long_name         = "nut format",
> -    .mime_type         = "video/x-nut",
> -    .extensions        = "nut",
> -    .priv_data_size    = sizeof(NUTContext),
> -    .audio_codec       = AV_CODEC_ID_VORBIS,
> -    .video_codec       = AV_CODEC_ID_MPEG4,
> -    .write_header      = nut_write_header,
> -    .write_packet      = nut_write_packet,
> -    .write_trailer     = nut_write_trailer,
> -    .flags             = AVFMT_GLOBALHEADER,
> -};
> -#endif /* CONFIG_LIBNUT_MUXER */
> -
> -static int nut_probe(AVProbeData *p) {
> -    if (!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) {
> -    AVIOContext * bc = h;
> -    return avio_read(bc, buf, len);
> -}
> -
> -static off_t av_seek(void * h, int64_t pos, int whence) {
> -    AVIOContext * bc = h;
> -    if (whence == SEEK_END) {
> -        pos = avio_size(bc) + pos;
> -        whence = SEEK_SET;
> -    }
> -    return avio_seek(bc, pos, whence);
> -}
> -
> -static int nut_read_header(AVFormatContext * avf) {
> -    NUTContext * priv = avf->priv_data;
> -    AVIOContext * bc = avf->pb;
> -    nut_demuxer_opts_tt 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,
> -        .cache_syncpoints = 1,
> -    };
> -    nut_context_tt * nut = priv->nut = nut_demuxer_init(&dopts);
> -    nut_stream_header_tt * s;
> -    int ret, i;
> -
> -    if(!nut)
> -        return -1;
> -
> -    if ((ret = nut_read_headers(nut, &s, NULL))) {
> -        av_log(avf, AV_LOG_ERROR, " NUT error: %s\n", nut_error(ret));
> -        nut_demuxer_uninit(nut);
> -        priv->nut = NULL;
> -        return -1;
> -    }
> -
> -    priv->s = s;
> -
> -    for (i = 0; s[i].type != -1 && i < 2; i++) {
> -        AVStream * st = avformat_new_stream(avf, NULL);
> -        int j;
> -
> -        if (!st)
> -            return AVERROR(ENOMEM);
> -
> -        for (j = 0; j < s[i].fourcc_len && j < 8; j++) st->codecpar->codec_tag |= s[i].fourcc[j]<<(j*8);
> -
> -        st->codecpar->video_delay = s[i].decode_delay;
> -
> -        st->codecpar->extradata_size = s[i].codec_specific_len;
> -        if (st->codecpar->extradata_size) {
> -            if(ff_alloc_extradata(st->codecpar, st->codecpar->extradata_size)){
> -                nut_demuxer_uninit(nut);
> -                priv->nut = NULL;
> -                return AVERROR(ENOMEM);
> -            }
> -            memcpy(st->codecpar->extradata, s[i].codec_specific, st->codecpar->extradata_size);
> -        }
> -
> -        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->codecpar->codec_id = ff_codec_get_id(nut_tags, st->codecpar->codec_tag);
> -
> -        switch(s[i].type) {
> -        case NUT_AUDIO_CLASS:
> -            st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
> -            if (st->codecpar->codec_id == AV_CODEC_ID_NONE) st->codecpar->codec_id = ff_codec_get_id(ff_codec_wav_tags, st->codecpar->codec_tag);
> -
> -            st->codecpar->channels = s[i].channel_count;
> -            st->codecpar->sample_rate = s[i].samplerate_num / s[i].samplerate_denom;
> -            break;
> -        case NUT_VIDEO_CLASS:
> -            st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
> -            if (st->codecpar->codec_id == AV_CODEC_ID_NONE) st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, st->codecpar->codec_tag);
> -
> -            st->codecpar->width = s[i].width;
> -            st->codecpar->height = s[i].height;
> -            st->sample_aspect_ratio.num = s[i].sample_width;
> -            st->sample_aspect_ratio.den = s[i].sample_height;
> -            break;
> -        }
> -        if (st->codecpar->codec_id == AV_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_tt pd;
> -    int ret;
> -
> -    ret = nut_read_next_packet(priv->nut, &pd);
> -
> -    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 |= AV_PKT_FLAG_KEY;
> -    pkt->pts = pd.pts;
> -    pkt->stream_index = pd.stream;
> -    pkt->pos = avio_tell(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.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;
> -
> -    return 0;
> -}
> -
> -static int nut_read_close(AVFormatContext *s) {
> -    NUTContext * priv = s->priv_data;
> -
> -    nut_demuxer_uninit(priv->nut);
> -
> -    return 0;
> -}
> -
> -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",
> -};

LGTM


More information about the ffmpeg-devel mailing list