Re: [FFmpeg-devel] [PATCH] Added Turing codec to ffmpeg
> > I still have an issue with this patch, while it would be nice to have > > another > HEVC encoder available in FFmpeg for comparisons and whatnot, I feel that > turingcodec isn't a mature enough encoder compared to what is already in > the project. > > > > Not to mention that development seems to have stalled (with only very > minor fixes for several months). In FFmpeg it is very difficult to remove > 'features', so if this patch were to be merged and then turingcodec to > actually go stale we'd be left with dead code for longer than is ideal > (forever). > > > > My opinion is that you should just maintain this separately as an out-of- > tree patch as it doesn't benefit us. > > > > Hi, > > After taking a look at the commit history of the last year+ or so, issue > tracker > and pull request list over at https://github.com/bbc/turingcodec I must say I > find it somewhat hard to disagree on a general level. > > Creating an encoder is great work and I applaud people for that, but > unfortunately it - at the current point of time - looks like neither from the > licensing, performance or project activity point of view merging a wrapper for > this library is a good idea. If stability of the project was your concern, you should have told us from the very beginning and save everyone's time. The project and its development is still active. We pushed additional fixes in November and we plan to add new features in the near future. We acknowledge that there is still a lot to do to get the encoder to the same level of maturity of others both from the performance and the licensing/collaboration point of view. At the same time, we also trust you appreciate that being a small team of researchers (3) working part time on this project we are slow in replying to requests and progressing with the development. Indeed we thought having the codec interfaced to FFmpeg would have been a good opportunity to share our work and know-how on content distribution for broadcasting applications using HEVC and provide an alternative codec to ffmpeg. Clearly we were wrong. We'll distribute the patch onto our website for those who are interested in having Turing in FFmpeg and stop pestering you with new requests. --- Matteo Naccari, Ph.D. Senior Technologist, BBC R Block D, Centre House 56 Wood lane, W12 7SB, London (UK) Phone: +44 (0)303 0409640 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] Added Turing codec to ffmpeg
- This patch contains the changes required to interface the Turing codec
(http://turingcodec.org/) to ffmpeg
---
Changelog | 1 +
LICENSE.md | 1 +
configure | 6 +
libavcodec/Makefile| 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/libturing.c | 338 +
6 files changed, 348 insertions(+)
create mode 100644 libavcodec/libturing.c
diff --git a/Changelog b/Changelog
index a1a7557..9ed18b5 100644
--- a/Changelog
+++ b/Changelog
@@ -25,6 +25,7 @@ version :
- AMD AMF H.264 and HEVC encoders
- video fillborders filter
- video setrange filter
+- Added support to interface with the Turing codec
version 3.4:
diff --git a/LICENSE.md b/LICENSE.md
index ba65b05..03787c0 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -84,6 +84,7 @@ The following libraries are under GPL:
- frei0r
- libcdio
- librubberband
+- libturing
- libvidstab
- libx264
- libx265
diff --git a/configure b/configure
index d053886..9be1fcb 100755
--- a/configure
+++ b/configure
@@ -260,6 +260,7 @@ External library support:
--enable-libssh enable SFTP protocol via libssh [no]
--enable-libtesseractenable 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]
@@ -1551,6 +1552,7 @@ EXTERNAL_LIBRARY_GPL_LIST="
frei0r
libcdio
librubberband
+libturing
libvidstab
libx264
libx265
@@ -2963,6 +2965,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"
@@ -5889,6 +5892,9 @@ enabled libssh&& require_pkg_config libssh
libssh libssh/sftp.h sftp
enabled libspeex && require_pkg_config libspeex speex speex/speex.h
speex_decoder_init
enabled libtesseract && require_pkg_config libtesseract tesseract
tesseract/capi.h TessBaseAPICreate
enabled libtheora && require libtheora theora/theoraenc.h th_info_init
-ltheoraenc -ltheoradec -logg
+enabled libturing && require_pkg_config libturing libturing turing.h
turing_version &&
+ { check_cpp_condition turing.h
"TURING_API_VERSION > 1" ||
+ die "ERROR: libturing requires turing api
version 2 or greater."; }
enabled libtwolame&& require libtwolame twolame.h twolame_init
-ltwolame &&
{ check_lib libtwolame 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 ab7893f..1c8d945 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -952,6 +952,7 @@ OBJS-$(CONFIG_LIBSHINE_ENCODER) += libshine.o
OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
+OBJS-$(CONFIG_LIBTURING_ENCODER) += libturing.o
OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o
OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
OBJS-$(CONFIG_LIBVORBIS_DECODER) += libvorbisdec.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index ed1e7ab..b42630d 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -551,6 +551,7 @@ static void register_all(void)
REGISTER_ENCODER(LIBSHINE, libshine);
REGISTER_ENCDEC (LIBSPEEX, libspeex);
REGISTER_ENCODER(LIBTHEORA, libtheora);
+REGISTER_ENCODER(LIBTURING, libturing);
REGISTER_ENCODER(LIBTWOLAME,libtwolame);
REGISTER_ENCODER(LIBVO_AMRWBENC,libvo_amrwbenc);
REGISTER_ENCDEC (LIBVORBIS, libvorbis);
diff --git a/libavcodec/libturing.c b/libavcodec/libturing.c
new file mode 100644
index 000..ac64797
--- /dev/null
+++ b/libavcodec/libturing.c
@@ -0,0 +1,338 @@
+/*
+ * libturing encoder
+ *
+ * Copyright (c) 2017 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
[FFmpeg-devel] [PATCH] Added Turing codec to ffmpeg
This patch contains the changes required to interface the Turing codec
(http://turingcodec.org/) to ffmpeg
---
LICENSE.md | 1 +
configure | 6 +
libavcodec/Makefile| 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/libturing.c | 318 +
5 files changed, 327 insertions(+)
create mode 100644 libavcodec/libturing.c
diff --git a/LICENSE.md b/LICENSE.md
index ba65b05..03787c0 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -84,6 +84,7 @@ The following libraries are under GPL:
- frei0r
- libcdio
- librubberband
+- libturing
- libvidstab
- libx264
- libx265
diff --git a/configure b/configure
index 8262358..566fa6e 100755
--- a/configure
+++ b/configure
@@ -260,6 +260,7 @@ External library support:
--enable-libssh enable SFTP protocol via libssh [no]
--enable-libtesseractenable 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]
@@ -1548,6 +1549,7 @@ EXTERNAL_LIBRARY_GPL_LIST="
frei0r
libcdio
librubberband
+ libturing
libvidstab
libx264
libx265
@@ -2965,6 +2967,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"
@@ -5891,6 +5894,9 @@ enabled libssh&& require_pkg_config libssh
libssh libssh/sftp.h sftp
enabled libspeex && require_pkg_config libspeex speex speex/speex.h
speex_decoder_init
enabled libtesseract && require_pkg_config libtesseract tesseract
tesseract/capi.h TessBaseAPICreate
enabled libtheora && require libtheora theora/theoraenc.h th_info_init
-ltheoraenc -ltheoradec -logg
+enabled libturing && require_pkg_config libturing libturing turing.h
turing_version &&
+ { check_cpp_condition turing.h
"TURING_API_VERSION > 1" ||
+ die "ERROR: libturing requires turing api
version 2 or greater."; }
enabled libtwolame&& require libtwolame twolame.h twolame_init
-ltwolame &&
{ check_lib libtwolame 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 494c76d..d94cce7 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -945,6 +945,7 @@ OBJS-$(CONFIG_LIBSHINE_ENCODER) += libshine.o
OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
+OBJS-$(CONFIG_LIBTURING_ENCODER) += libturing.o
OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o
OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o
OBJS-$(CONFIG_LIBVORBIS_DECODER) += libvorbisdec.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index e0adb71..b7a3493 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -631,6 +631,7 @@ static void register_all(void)
REGISTER_ENCODER(LIBSHINE, libshine);
REGISTER_ENCDEC (LIBSPEEX, libspeex);
REGISTER_ENCODER(LIBTHEORA, libtheora);
+REGISTER_ENCODER(LIBTURING, libturing);
REGISTER_ENCODER(LIBTWOLAME,libtwolame);
REGISTER_ENCODER(LIBVO_AMRWBENC,libvo_amrwbenc);
REGISTER_ENCDEC (LIBVORBIS, libvorbis);
diff --git a/libavcodec/libturing.c b/libavcodec/libturing.c
new file mode 100644
index 000..77688ea
--- /dev/null
+++ b/libavcodec/libturing.c
@@ -0,0 +1,318 @@
+/*
+ * libturing encoder
+ *
+ * Copyright (c) 2017 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
Re: [FFmpeg-devel] [PATCH v3] Added Turing codec interface for ffmpeg
> That's pretty old by now. Can you send a v4 patch set? Sorry my bad, I've already sent a v4 on the 14/12. Do you want me to rebase the patch to the latest commit on the branch master? Re: On removal of malloc, free, etc. I think this v4 takes care of this as the commit messages says. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] Added Turing codec interface for ffmpeg
Hello everyone, Any news on the integration of the patch identified in the subject line? Best regards, Matteo ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH v3] Added Turing codec interface for ffmpeg
> > It has. It points to the position in the options buffer which is going to be > filled with the command line being parsed. So it's not redundant. > > Then what does buffer_filled do? It keeps track on the number of characters written in the options buffer so far. I appreciate this could have been computed on the fly by doing: option_ctx->s - option_ctx->options but I though the code would have been more readable this way. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH v4] Added Turing codec interface for ffmpeg
- This patch contains the changes to interface the Turing codec
(http://turingcodec.org/) with 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
- As per suggestions of wm4, two functions (add_option and
finalise_options) have been created. The former appends new options
while the latter sets up the argv array of pointers to char*
accordingly. add_option re-allocates the buffer for options using
av_realloc
- Additionally, both these functions handle the errors in case the
memory wasn't allocated correctly
- malloc|free|realloc have been substituted with their corresponding
av_{malloc|free|realloc} version
- Check on bit-depth has been removed since the ffmpeg already casts
the right pix_fmt and bit depth
- pix_fmts is now set in ff_libturing_encoder as in h264dec.c.
---
LICENSE.md | 1 +
configure | 5 +
libavcodec/Makefile| 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/libturing.c | 305 +
5 files changed, 313 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 9dfd006..2cc84e9 100755
--- a/configure
+++ b/configure
@@ -255,6 +255,7 @@ External library support:
--enable-libssh enable SFTP protocol via libssh [no]
--enable-libtesseractenable 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]
@@ -1560,6 +1561,7 @@ EXTERNAL_LIBRARY_LIST="
libssh
libtesseract
libtheora
+libturing
libtwolame
libv4l2
libvidstab
@@ -2855,6 +2857,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"
@@ -5126,6 +5129,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
@@ -5784,6 +5788,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 23e41dd..6b3b2ba 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -881,6 +881,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 bbcecce..2c499db 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -611,6 +611,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
Re: [FFmpeg-devel] [PATCH v3] Added Turing codec interface for ffmpeg
> Missing error handling, and maybe overflow handling. Also, we don't use > malloc/realloc/free, but av_malloc/av_realloc/av_free. I'm not sure why we > do this (it doesn't have much of a justification for realloc at least), but > it's > probably better to be consistent. Ok, point taken on the av_* functions. On the handling bit, I was thinking to flag the error via av_log and then call exit_program(1), after, of course, having released the memory allocated up to that point. Would that be ok? > > Does the "s" field have any purpose? It seems to be redundant with the > other fields. It has. It points to the position in the options buffer which is going to be filled with the command line being parsed. So it's not redundant. - http://www.bbc.co.uk This e-mail (and any attachments) is confidential and may contain personal views which are not the views of the BBC unless specifically stated. If you have received it in error, please delete it from your system. Do not use, copy or disclose the information in any way nor act in reliance on it and notify the sender immediately. Please note that the BBC monitors e-mails sent or received. Further communication will signify your consent to this. - ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH v3] Added Turing codec interface for ffmpeg
- 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
- As per suggestions of wm4, two functions (add_option and
finalise_options) have been created. The former appends new options
while the latter sets up the argv array of pointers to char*
accordingly. add_option re-allocats the buffer for options using
realloc.
---
LICENSE.md | 1 +
configure | 5 +
libavcodec/Makefile| 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/libturing.c | 279 +
5 files changed, 287 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-libtesseractenable 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 000..fab17cd
--- /dev/null
+++ b/libavcodec/libturing.c
@@ -0,0 +1,279 @@
+/*
+ * 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
Re: [FFmpeg-devel] [PATCH] Fixes for ffmpeg and editorial typos
Please discard this message, I've sent the wrong patch. Sorry ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] Fixes for ffmpeg and editorial typos
- The libturing.pc file is added in CMAKE_INSTALL_PREFIX/lib/pkgconfig
and contains some CMAKE variables which get expanded during
installation
- Fixed some editorial typos and trailing space
- Fixed version numbering in the std output
- Added function to check for binary option as passed when calling the
codec from FFmpeg
- Modified boost program options so that an option can be repeated
multiple times and only the last value is used
---
boost/libs/program_options/src/value_semantic.cpp | 4 +-
turing/CMakeLists.txt | 57 --
turing/GetGitRevisionDescription.cmake| 1 +
turing/encode.cpp | 59 ++-
turing/libturing.pc.in| 11 +
turing/turing.h | 2 +
6 files changed, 106 insertions(+), 28 deletions(-)
create mode 100644 turing/libturing.pc.in
diff --git a/boost/libs/program_options/src/value_semantic.cpp
b/boost/libs/program_options/src/value_semantic.cpp
index d35d17d..fe129c2 100644
--- a/boost/libs/program_options/src/value_semantic.cpp
+++ b/boost/libs/program_options/src/value_semantic.cpp
@@ -11,6 +11,7 @@
#include
#include
+#include
namespace boost { namespace program_options {
@@ -204,8 +205,7 @@ namespace boost { namespace program_options {
void check_first_occurrence(const boost::any& value)
{
if (!value.empty())
-boost::throw_exception(
-multiple_occurrences());
+cerr<<"Warning: multiple values submitted for command line
option: "<
[FFmpeg-devel] [PATCH] Added Turing codec interface for ffmpeg
- 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-libtesseractenable 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 000..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
Re: [FFmpeg-devel] [PATCH] Added the interface for the Turing codec
> I hope it copes well with multiple definitions of the same option, like the > last > overwriting the previous ones. The latest stable version of the Turing codec deals correctly with multiple definitions of the same option. Matteo Naccari ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Added the interface for the Turing codec
> Back to the review: From first glance, the libturing codec/library (or the > executable only???) seems to have speed presets. Why are these not > exposed to the libavcodec user? All options, including the speed presets, can be specified using -turing-params (e.g. -turing-params speed=value). The reason why we decided to go for this option is because we want to be as less invasive as possible so that if we decide to change the name for a given option the changes will be transparent to FFmpeg. Matteo Naccari > -Original Message- > From: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] On Behalf > Of Moritz Barsnick > Sent: 19 November 2016 13:29 > To: FFmpeg development discussions and patches de...@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH] Added the interface for the Turing > codec > > On Fri, Nov 18, 2016 at 20:15:30 +0100, wm4 wrote: > > This lib has a really weird API... > > I can't judge the algorithms or the development direction and stuff - I'm sure > it's all state of the art. But the API sure gives me goosebumps, and I don't > mean the sexy feelgood type. > > Sure, it has all the flexibility, but also almost all the disadvantages of > calling an > external program. This makes it look so much like a proof of concept. > > But I'm sure that's not the point. If it turns out to be here to stay, to > compete > with x265 in one or the other way, it's probably worth integrating. > > Back to the review: From first glance, the libturing codec/library (or the > executable only???) seems to have speed presets. Why are these not > exposed to the libavcodec user? > > Furthermore: Documentation is missing. > > £0.02, > Moritz > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Added the interface for the Turing codec
> This lib has a really weird API... Anyway, access to p++ seems unbounded and > could go past the argv array. The string overflow checks also look > questionable. snprintf() returns the size the string would have had and isn't > limited by the buffer passed to it, so the s pointer can go out of bounds > (which is undefined behavior). Also, "end - s" > will underflow, making the attempt to avoid a buffer overflow pointless. The patch we just submitted should address this point: now the buffer size for the command line option depends on the actual number of options passed by the user for the Turing codec. Matteo Naccari - http://www.bbc.co.uk This e-mail (and any attachments) is confidential and may contain personal views which are not the views of the BBC unless specifically stated. If you have received it in error, please delete it from your system. Do not use, copy or disclose the information in any way nor act in reliance on it and notify the sender immediately. Please note that the BBC monitors e-mails sent or received. Further communication will signify your consent to this. - ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] Added the interface for the Turing codec
> These dependencies are kind of a mess. Maybe you can make libturning > include a pkg_config file so we don't have to maintain your library list here? The new patch we just submitted addresses this point: the Turing codec will install a pkg-config file to list the dependencies as suggested Matteo Naccari > -Original Message- > From: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] On Behalf > Of Hendrik Leppkes > Sent: 18 November 2016 18:51 > To: FFmpeg development discussions and patches de...@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH] Added the interface for the Turing > codec > > On Fri, Nov 18, 2016 at 4:25 PM, Matteo Naccari <matteo.nacc...@bbc.co.uk> > wrote: > > - The Turing codec is an open source HEVC encoder licensed under GPLv2 > > - More information at http://turingcodec.org/ > > --- > > LICENSE.md | 1 + > > configure | 5 ++ > > libavcodec/Makefile| 1 + > > libavcodec/allcodecs.c | 1 + > > libavcodec/libturing.c | 229 > > + > > 5 files changed, 237 insertions(+) > > create mode 100644 libavcodec/libturing.c > > > > diff --git a/LICENSE.md b/LICENSE.md > > index a384fa0..6f9fab8 100644 > > --- a/LICENSE.md > > +++ b/LICENSE.md > > @@ -86,6 +86,7 @@ The following libraries are under GPL: > > - frei0r > > - libcdio > > - librubberband > > +- libturing > > - libvidstab > > - libx264 > > - libx265 > > diff --git a/configure b/configure > > index b5bfad6..47d6b93 100755 > > --- a/configure > > +++ b/configure > > @@ -255,6 +255,7 @@ External library support: > >--enable-libssh enable SFTP protocol via libssh [no] > >--enable-libtesseractenable Tesseract, needed for ocr filter [no] > >--enable-libtheora enable Theora encoding via libtheora [no] > > + --enable-libturing enable 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] > > @@ -1521,6 +1522,7 @@ EXTERNAL_LIBRARY_LIST=" > > libssh > > libtesseract > > libtheora > > +libturing > > libtwolame > > libv4l2 > > libvidstab > > @@ -2814,6 +2816,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" > > @@ -5072,6 +5075,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 > > @@ -5735,6 +5739,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 libturing turing.h turing_version > > -lturing - > lstdc++ -lboost_chrono -lboost_program_options -lboost_timer - > lboost_system -lboost_filesystem -lhavoc > > These dependencies are kind of a mess. Maybe you can make libturning > include a pkg_config file so we don't have to maintain your library list here? > > - Hendrik > ___ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel - http://www.bbc.co.uk This e-mail (and any attachments) is confidential and may contain personal views which are not the views of the BBC unless specifically stated. If you have received it in error, please delete it from your system. Do not use, copy or disclose the information in any way nor act in reliance on it and notify the sender immediately. Please note that the BBC monitors e-mails sent or received. Further communication will signify your consent to this. - ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] Added Turing codec interface for ffmpeg
- 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.
This should address the issue pointed out by wm4 and Moritz Barsnick
on the ffmpeg-devel reflector
---
LICENSE.md | 1 +
configure | 5 +
libavcodec/Makefile| 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/libturing.c | 268 +
5 files changed, 276 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-libtesseractenable 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 000..eedaae0
--- /dev/null
+++ b/libavcodec/libturing.c
@@ -0,0 +1,268 @@
+/*
+ * 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
Re: [FFmpeg-devel] [PATCH] Added the interface for the Turing codec
> Can't currently test on macOS as libturing doesn't have macOS support > (https://github.com/bbc/turingcodec/issues/5), but it is being worked on > (supposedly), so it may make sense to wait until then before this is applied. > Ok we'll try to get this sorted out and then get back to you. Thanks for your reply. Best regards, Matteo - http://www.bbc.co.uk This e-mail (and any attachments) is confidential and may contain personal views which are not the views of the BBC unless specifically stated. If you have received it in error, please delete it from your system. Do not use, copy or disclose the information in any way nor act in reliance on it and notify the sender immediately. Please note that the BBC monitors e-mails sent or received. Further communication will signify your consent to this. - ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] Added the interface for the Turing codec
- The Turing codec is an open source HEVC encoder licensed under GPLv2
- More information at http://turingcodec.org/
---
LICENSE.md | 1 +
configure | 5 ++
libavcodec/Makefile| 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/libturing.c | 229 +
5 files changed, 237 insertions(+)
create mode 100644 libavcodec/libturing.c
diff --git a/LICENSE.md b/LICENSE.md
index a384fa0..6f9fab8 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -86,6 +86,7 @@ The following libraries are under GPL:
- frei0r
- libcdio
- librubberband
+- libturing
- libvidstab
- libx264
- libx265
diff --git a/configure b/configure
index b5bfad6..47d6b93 100755
--- a/configure
+++ b/configure
@@ -255,6 +255,7 @@ External library support:
--enable-libssh enable SFTP protocol via libssh [no]
--enable-libtesseractenable Tesseract, needed for ocr filter [no]
--enable-libtheora enable Theora encoding via libtheora [no]
+ --enable-libturing enable 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]
@@ -1521,6 +1522,7 @@ EXTERNAL_LIBRARY_LIST="
libssh
libtesseract
libtheora
+libturing
libtwolame
libv4l2
libvidstab
@@ -2814,6 +2816,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"
@@ -5072,6 +5075,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
@@ -5735,6 +5739,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 libturing turing.h turing_version
-lturing -lstdc++ -lboost_chrono -lboost_program_options -lboost_timer
-lboost_system -lboost_filesystem -lhavoc
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 000..3191a41
--- /dev/null
+++ b/libavcodec/libturing.c
@@ -0,0 +1,229 @@
+/*
+ * 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
[FFmpeg-devel] Specifying lib path when building ffmpeg
Dear FFmpeg developers, I'm trying to build a fork of ffmpeg under Linux (Ubuntu 14.04, gcc 4.82) which then integrates the codec I'm working on (https://github.com/bbc/turingcodec). This codec uses some boost libraries which ship with the source code. However, when I build ffmpeg enabling the Turing codec (--enable-libturing) I can see that the executable of ffmpeg links the system's boost libraries. Is there a way to link to the libraries associated with the Turing codec? I've tried the --extra-ldflags option but no joy. The way I configure the build is the following: PATH="/path/to/source/code/bin:$PATH" PKG_CONFIG_PATH="$HOME/ffmpeg_build/lib/pkgconfig" ./configure --prefix="$HOME/ffmpeg_build" --pkg-config-flags="--static" --extra-cflags="-I$HOME/ffmpeg_build/include" --extra-ldflags="-L$HOME/ffmpeg_build/lib-L/path/to/turing/source/code/build/release/boost" --bindir="$HOME/bin" --enable-gpl --enable-nonfree --enable-libturing Many thanks for your help! Best regards, Matteo -- Matteo Naccari, Ph.D., Senior Research Engineer BBC R, Centre House, London, 56 Wood lane, W12 7SB Phone: +44 (0)303 0409640 Skype: matteo_naccari Alternative emails: matteo.nacc...@polimi.it, matteo.nacc...@gmail.com Webpage: http://sites.google.com/site/matteonaccari - http://www.bbc.co.uk This e-mail (and any attachments) is confidential and may contain personal views which are not the views of the BBC unless specifically stated. If you have received it in error, please delete it from your system. Do not use, copy or disclose the information in any way nor act in reliance on it and notify the sender immediately. Please note that the BBC monitors e-mails sent or received. Further communication will signify your consent to this. - ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
