[FFmpeg-devel] [PATCH] Added Turing codec interface for ffmpeg
wm4
nfxjfg at googlemail.com
Tue Nov 29 20:15:51 EET 2016
On Tue, 29 Nov 2016 17:18:49 +0000
Matteo Naccari <matteo.naccari at bbc.co.uk> wrote:
> - This patch contains the changes to interface the Turing codec
> (http://turingcodec.org/) to ffmpeg. The patch was modified to address
> the comments in the review as follows:
> - Added a pkg-config file to list all dependencies required by
> libturing. This should address the issue pointed out by Hendrik
> Leppkes on Fri 18/11/2016
> - The buffer to store the turing-params options has now a size which
> depends on how many of these parameters have been passed by the user.
> The sizeof(char) and casting for the malloc calls have been removed as
> per suggestion of wm4. Moreover, the maximum length for a whole option
> (i.e. --param=value) is computed and the related buffer size allocated
> accordingly.
> ---
> LICENSE.md | 1 +
> configure | 5 +
> libavcodec/Makefile | 1 +
> libavcodec/allcodecs.c | 1 +
> libavcodec/libturing.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++++
> 5 files changed, 278 insertions(+)
> create mode 100644 libavcodec/libturing.c
>
> diff --git a/LICENSE.md b/LICENSE.md
> index 640633c..86e5371 100644
> --- a/LICENSE.md
> +++ b/LICENSE.md
> @@ -85,6 +85,7 @@ The following libraries are under GPL:
> - frei0r
> - libcdio
> - librubberband
> +- libturing
> - libvidstab
> - libx264
> - libx265
> diff --git a/configure b/configure
> index 6345fc2..022ffa9 100755
> --- a/configure
> +++ b/configure
> @@ -255,6 +255,7 @@ External library support:
> --enable-libssh enable SFTP protocol via libssh [no]
> --enable-libtesseract enable Tesseract, needed for ocr filter [no]
> --enable-libtheora enable Theora encoding via libtheora [no]
> + --enable-libturing enable H.265/HEVC encoding via libturing [no]
> --enable-libtwolame enable MP2 encoding via libtwolame [no]
> --enable-libv4l2 enable libv4l2/v4l-utils [no]
> --enable-libvidstab enable video stabilization using vid.stab [no]
> @@ -1534,6 +1535,7 @@ EXTERNAL_LIBRARY_LIST="
> libssh
> libtesseract
> libtheora
> + libturing
> libtwolame
> libv4l2
> libvidstab
> @@ -2831,6 +2833,7 @@ libspeex_decoder_deps="libspeex"
> libspeex_encoder_deps="libspeex"
> libspeex_encoder_select="audio_frame_queue"
> libtheora_encoder_deps="libtheora"
> +libturing_encoder_deps="libturing"
> libtwolame_encoder_deps="libtwolame"
> libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
> libvorbis_decoder_deps="libvorbis"
> @@ -5096,6 +5099,7 @@ die_license_disabled gpl frei0r
> die_license_disabled gpl libcdio
> die_license_disabled gpl librubberband
> die_license_disabled gpl libsmbclient
> +die_license_disabled gpl libturing
> die_license_disabled gpl libvidstab
> die_license_disabled gpl libx264
> die_license_disabled gpl libx265
> @@ -5754,6 +5758,7 @@ enabled libssh && require_pkg_config libssh libssh/sftp.h sftp_init
> enabled libspeex && require_pkg_config speex speex/speex.h speex_decoder_init -lspeex
> enabled libtesseract && require_pkg_config tesseract tesseract/capi.h TessBaseAPICreate
> enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
> +enabled libturing && require_pkg_config libturing turing.h turing_version
> enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame &&
> { check_lib twolame.h twolame_encode_buffer_float32_interleaved -ltwolame ||
> die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; }
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 82f7fa2..cadefdc 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -880,6 +880,7 @@ OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
> OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o
> OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
> OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o
> +OBJS-$(CONFIG_LIBTURING_ENCODER) += libturing.o
> OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
> OBJS-$(CONFIG_LIBVORBIS_DECODER) += libvorbisdec.o
> OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbisenc.o \
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index ada9481..0e61a4a 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -610,6 +610,7 @@ void avcodec_register_all(void)
> REGISTER_ENCDEC (LIBSPEEX, libspeex);
> REGISTER_ENCODER(LIBTHEORA, libtheora);
> REGISTER_ENCODER(LIBTWOLAME, libtwolame);
> + REGISTER_ENCODER(LIBTURING, libturing);
> REGISTER_ENCODER(LIBVO_AMRWBENC, libvo_amrwbenc);
> REGISTER_ENCDEC (LIBVORBIS, libvorbis);
> REGISTER_ENCDEC (LIBVPX_VP8, libvpx_vp8);
> diff --git a/libavcodec/libturing.c b/libavcodec/libturing.c
> new file mode 100644
> index 0000000..a62fafb
> --- /dev/null
> +++ b/libavcodec/libturing.c
> @@ -0,0 +1,270 @@
> +/*
> + * libturing encoder
> + *
> + * Copyright (c) 2016 Turing Codec contributors
> + *
> + * 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
> + */
> +
> +#include <turing.h>
> +#include <float.h>
> +#include "libavutil/internal.h"
> +#include "libavutil/common.h"
> +#include "libavutil/opt.h"
> +#include "libavutil/pixdesc.h"
> +#include "avcodec.h"
> +#include "internal.h"
> +
> +typedef struct libturingEncodeContext {
> + const AVClass *class;
> + turing_encoder *encoder;
> + const char *options;
> +} libturingEncodeContext;
> +
> +static av_cold int libturing_encode_close(AVCodecContext *avctx)
> +{
> + libturingEncodeContext *ctx = avctx->priv_data;
> +
> + if (ctx->encoder)
> + turing_destroy_encoder(ctx->encoder);
> +
> + return 0;
> +}
> +
> +static av_cold int libturing_encode_init(AVCodecContext *avctx)
> +{
> + libturingEncodeContext *ctx = avctx->priv_data;
> +
> + char *options;
> + char* s;
> +
> + char const** argv;
> + char const** p;
> + turing_encoder_settings settings;
> + int option_counter = 0;
> + int current_option_length = 0;
> + int max_option_length = -1;
> +
> + if (ctx->options) {
> + AVDictionary *dict = NULL;
> + AVDictionaryEntry *en = NULL;
> +
> + if (!av_dict_parse_string(&dict, ctx->options, "=", ":", 0)) {
> + while ((en = av_dict_get(dict, "", en, AV_DICT_IGNORE_SUFFIX))) {
> + int const illegal_option =
> + !strcmp("input-res", en->key) ||
> + !strcmp("frame-rate", en->key) ||
> + !strcmp("f", en->key) ||
> + !strcmp("frames", en->key) ||
> + !strcmp("sar", en->key) ||
> + !strcmp("bit-depth", en->key) ||
> + !strcmp("internal-bit-depth", en->key);
> + if (!illegal_option) {
> + option_counter++;
> + current_option_length = strlen(en->key) + strlen(en->value) + 3;
> + if(current_option_length > max_option_length)
> + max_option_length = current_option_length;
> + }
> + }
> + av_dict_free(&dict);
> + }
> + }
This is even worse, because it duplicates a lot of code just to compute
the buffer length in a rather fragile way. Why not do it the simple,
straight-forward way, and just append to the option string using
something involving realloc?
More information about the ffmpeg-devel
mailing list