Uyanide/ffmpeg-PKGBUILD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated to version 3.2

Browse Source
This commit is contained in:
Iacopo Isimbaldi
2016-10-31 10:38:57 +01:00
parent 5317789a5f
commit d8447c7906
4 changed files with 35 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.SRCINFO
+19 -16
View File
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
# Mon Oct 24 21:09:01 UTC 2016
# Mon Oct 31 09:37:50 UTC 2016
pkgbase = ffmpeg-full
pkgdesc = Complete solution to record, convert and stream audio and video (with all options)
pkgver = 3.1.5
pkgver = 3.2
pkgrel = 1
epoch = 1
url = http://ffmpeg.org/
@@ -18,39 +18,45 @@ pkgbase = ffmpeg-full
depends = bzip2
depends = fontconfig
depends = fribidi
depends = glibc
depends = gmp
depends = gnutls
depends = gsm
depends = jack
depends = lame
depends = libass
depends = libavc1394
depends = libbluray
depends = libiec61883
depends = libmodplug
depends = libpulse
depends = libraw1394
depends = libsoxr
depends = libssh
depends = libtheora
depends = libva
depends = libvdpau
depends = libwebp
depends = libx11
depends = libxcb
depends = opencore-amr
depends = openjpeg
depends = openjpeg2
depends = opus
depends = schroedinger
depends = sdl
depends = sdl2
depends = speex
depends = v4l-utils
depends = xvidcore
depends = xz
depends = zlib
depends = libass.so
depends = libbluray.so
depends = libfreetype.so
depends = libnetcdf.so
depends = libvidstab.so
depends = libvorbis.so
depends = libvorbisenc.so
depends = libvorbis.so
depends = libvpx.so
depends = libx264.so
depends = libx265.so
depends = libnetcdf.so
depends = libxvidcore.so
depends = celt
depends = chromaprint-fftw
depends = faac
@@ -67,6 +73,7 @@ pkgbase = ffmpeg-full
depends = libgme
depends = libilbc
depends = libmfx-git
depends = libopenmpt
depends = libxv
depends = java-environment-common
depends = mesa
@@ -103,16 +110,12 @@ pkgbase = ffmpeg-full
conflicts = ffmpeg
conflicts = ffmpeg-git
conflicts = ffmpeg-full-git
source = https://ffmpeg.org/releases/ffmpeg-3.1.5.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-3.1.5.tar.xz.asc
source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz
source = https://ffmpeg.org/releases/ffmpeg-3.2.tar.xz.asc
source = UNREDISTRIBUTABLE.txt
source = openh264-1.6.0-fix.patch
source = openh264-dec-wrapper.patch
sha256sums = 49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a
sha256sums = 88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da
sha256sums = SKIP
sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
sha256sums = 1f1830169aa15507cd50e2099147db33a31a73123a8a90e74296dcc1243be457
sha256sums = 4e122061f9602447c4875966e75e52db2113c46a564cc65285ffa06ee1c44c77
pkgname = ffmpeg-full
PKGBUILD
+16 -26
View File
@@ -3,24 +3,25 @@
#
pkgname=ffmpeg-full
pkgver=3.1.5
pkgver=3.2
pkgrel=1
epoch=1
pkgdesc='Complete solution to record, convert and stream audio and video (with all options)'
arch=('i686' 'x86_64')
url='http://ffmpeg.org/'
license=('GPL3' 'custom:UNREDISTRIBUTABLE')
depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'gmp' 'gnutls' 'gsm' 'jack'
'lame' 'libass' 'libavc1394' 'libbluray' 'libiec61883' 'libmodplug'
'libpulse' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp'
'opencore-amr' 'openjpeg' 'opus' 'schroedinger' 'sdl' 'speex'
'v4l-utils' 'xvidcore' 'zlib'
'libvidstab.so' 'libvorbis.so' 'libvorbisenc.so' 'libvpx.so'
'libx264.so' 'libx265.so' 'libnetcdf.so'
depends=('alsa-lib' 'bzip2' 'fontconfig' 'fribidi' 'glibc' 'gmp' 'gnutls' 'gsm'
'jack' 'lame' 'libavc1394' 'libiec61883' 'libmodplug' 'libpulse'
'libraw1394' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau'
'libwebp' 'libx11' 'libxcb' 'opencore-amr' 'openjpeg2' 'opus'
'schroedinger' 'sdl2' 'speex' 'v4l-utils' 'xz' 'zlib'
'libass.so' 'libbluray.so' 'libfreetype.so' 'libnetcdf.so'
'libvidstab.so' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so'
'libx264.so' 'libx265.so' 'libxvidcore.so'
'celt' 'chromaprint-fftw' 'faac' 'frei0r-plugins' 'kvazaar'
'ladspa' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libcl' 'libdc1394'
'libebur128' 'libfdk-aac' 'libgme' 'libilbc' 'libmfx-git' 'libxv'
'java-environment-common' 'mesa' 'nut-multimedia-git' 'openal'
'libebur128' 'libfdk-aac' 'libgme' 'libilbc' 'libmfx-git' 'libopenmpt'
'libxv' 'java-environment-common' 'mesa' 'nut-multimedia-git' 'openal'
'opencl-headers' 'openh264' 'rubberband' 'rtmpdump' 'shine'
'smbclient' 'snappy' 'tesseract' 'twolame' 'vid.stab' 'vo-aacenc'
'vo-amrwbenc' 'wavpack' 'xavs' 'zeromq' 'zimg' 'zvbi')
@@ -32,22 +33,11 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
'libswscale.so'
'ffmpeg')
source=(https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz{,.asc}
UNREDISTRIBUTABLE.txt
openh264-1.6.0-fix.patch
openh264-dec-wrapper.patch)
UNREDISTRIBUTABLE.txt)
validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8') # ffmpeg-devel
sha256sums=('49cc3105f7891c5637f8fabb1b75ebb19c9b5123b311a3ccc6182aa35d58b89a'
sha256sums=('88f70c1b8cab108f494ecbab5ba302cdb35d59a84cea88008b5fe49be068d5da'
'SKIP'
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4'
'1f1830169aa15507cd50e2099147db33a31a73123a8a90e74296dcc1243be457'
'4e122061f9602447c4875966e75e52db2113c46a564cc65285ffa06ee1c44c77')
prepare() {
cd ${pkgname%-full}-$pkgver
patch -p1 -i "${srcdir}/openh264-dec-wrapper.patch"
patch -p1 -i "${srcdir}/openh264-1.6.0-fix.patch"
}
'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4')
build() {
cd ${pkgname%-full}-$pkgver
@@ -81,7 +71,6 @@ build() {
--enable-libcelt \
--enable-libdc1394 \
--enable-libebur128 \
--enable-libfaac \
--enable-libfdk-aac \
--enable-libfontconfig \
--enable-libfreetype \
@@ -98,8 +87,9 @@ build() {
--enable-libopencore-amrnb \
--enable-libopencore-amrwb \
--enable-libopencv \
--enable-libopenjpeg \
--enable-libopenh264 \
--enable-libopenjpeg \
--enable-libopenmpt \
--enable-libopus \
--enable-libpulse \
--enable-librtmp \
openh264-1.6.0-fix.patch
-99
View File
@@ -1,99 +0,0 @@
From 293676c476733e81d7b596736add6cd510eb6960 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Fri, 8 Jul 2016 23:21:41 +0300
Subject: [PATCH] libopenh264: Support building with the 1.6 release
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
This fixes trac issue #5417.
This is cherry-picked from libav commit
d825b1a5306576dcd0553b7d0d24a3a46ad92864.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavcodec/libopenh264dec.c | 2 ++
libavcodec/libopenh264enc.c | 26 ++++++++++++++++++++++++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
index f642082..6af60af 100644
--- a/libavcodec/libopenh264dec.c
+++ b/libavcodec/libopenh264dec.c
@@ -90,7 +90,9 @@ static av_cold int svc_decode_init(AVCodecContext *avctx)
(*s->decoder)->SetOption(s->decoder, DECODER_OPTION_TRACE_CALLBACK, (void *)&callback_function);
(*s->decoder)->SetOption(s->decoder, DECODER_OPTION_TRACE_CALLBACK_CONTEXT, (void *)&avctx);
+#if !OPENH264_VER_AT_LEAST(1, 6)
param.eOutputColorFormat = videoFormatI420;
+#endif
param.eEcActiveIdc = ERROR_CON_DISABLE;
param.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index d27fc41..07af31d 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -33,6 +33,10 @@
#include "internal.h"
#include "libopenh264.h"
+#if !OPENH264_VER_AT_LEAST(1, 6)
+#define SM_SIZELIMITED_SLICE SM_DYN_SLICE
+#endif
+
typedef struct SVCContext {
const AVClass *av_class;
ISVCEncoder *encoder;
@@ -48,11 +52,20 @@ typedef struct SVCContext {
#define OFFSET(x) offsetof(SVCContext, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
+#if OPENH264_VER_AT_LEAST(1, 6)
+ { "slice_mode", "set slice mode", OFFSET(slice_mode), AV_OPT_TYPE_INT, { .i64 = SM_FIXEDSLCNUM_SLICE }, SM_SINGLE_SLICE, SM_RESERVED, VE, "slice_mode" },
+#else
{ "slice_mode", "set slice mode", OFFSET(slice_mode), AV_OPT_TYPE_INT, { .i64 = SM_AUTO_SLICE }, SM_SINGLE_SLICE, SM_RESERVED, VE, "slice_mode" },
+#endif
{ "fixed", "a fixed number of slices", 0, AV_OPT_TYPE_CONST, { .i64 = SM_FIXEDSLCNUM_SLICE }, 0, 0, VE, "slice_mode" },
+#if OPENH264_VER_AT_LEAST(1, 6)
+ { "dyn", "Size limited (compatibility name)", 0, AV_OPT_TYPE_CONST, { .i64 = SM_SIZELIMITED_SLICE }, 0, 0, VE, "slice_mode" },
+ { "sizelimited", "Size limited", 0, AV_OPT_TYPE_CONST, { .i64 = SM_SIZELIMITED_SLICE }, 0, 0, VE, "slice_mode" },
+#else
{ "rowmb", "one slice per row of macroblocks", 0, AV_OPT_TYPE_CONST, { .i64 = SM_ROWMB_SLICE }, 0, 0, VE, "slice_mode" },
{ "auto", "automatic number of slices according to number of threads", 0, AV_OPT_TYPE_CONST, { .i64 = SM_AUTO_SLICE }, 0, 0, VE, "slice_mode" },
{ "dyn", "Dynamic slicing", 0, AV_OPT_TYPE_CONST, { .i64 = SM_DYN_SLICE }, 0, 0, VE, "slice_mode" },
+#endif
{ "loopfilter", "enable loop filter", OFFSET(loopfilter), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE },
{ "profile", "set profile restrictions", OFFSET(profile), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE },
{ "max_nal_size", "set maximum NAL size in bytes", OFFSET(max_nal_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
@@ -159,15 +172,24 @@ FF_ENABLE_DEPRECATION_WARNINGS
s->slice_mode = SM_FIXEDSLCNUM_SLICE;
if (s->max_nal_size)
- s->slice_mode = SM_DYN_SLICE;
+ s->slice_mode = SM_SIZELIMITED_SLICE;
+#if OPENH264_VER_AT_LEAST(1, 6)
+ param.sSpatialLayers[0].sSliceArgument.uiSliceMode = s->slice_mode;
+ param.sSpatialLayers[0].sSliceArgument.uiSliceNum = avctx->slices;
+#else
param.sSpatialLayers[0].sSliceCfg.uiSliceMode = s->slice_mode;
param.sSpatialLayers[0].sSliceCfg.sSliceArgument.uiSliceNum = avctx->slices;
+#endif
- if (s->slice_mode == SM_DYN_SLICE) {
+ if (s->slice_mode == SM_SIZELIMITED_SLICE) {
if (s->max_nal_size){
param.uiMaxNalSize = s->max_nal_size;
+#if OPENH264_VER_AT_LEAST(1, 6)
+ param.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = s->max_nal_size;
+#else
param.sSpatialLayers[0].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = s->max_nal_size;
+#endif
} else {
av_log(avctx, AV_LOG_ERROR, "Invalid -max_nal_size, "
"specify a valid max_nal_size to use -slice_mode dyn\n");
--
2.1.4
openh264-dec-wrapper.patch
-550
View File
@@ -1,550 +0,0 @@
From c5d326f551b0312ff581bf1df35b21d956e01523 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Fri, 24 Jun 2016 00:58:17 +0300
Subject: [PATCH] Add an OpenH264 decoder wrapper
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
This is cherrypicked from libav, from commits
82b7525173f20702a8cbc26ebedbf4b69b8fecec and
d0b1e6049b06eeeeca146ece4d2f199c5dba1565.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
Changelog | 1 +
configure | 2 +
doc/general.texi | 9 +-
libavcodec/Makefile | 3 +-
libavcodec/allcodecs.c | 2 +-
libavcodec/libopenh264.c | 62 +++++++++++
libavcodec/libopenh264.h | 39 +++++++
libavcodec/libopenh264dec.c | 243 ++++++++++++++++++++++++++++++++++++++++++++
libavcodec/libopenh264enc.c | 48 ++-------
libavcodec/version.h | 2 +-
10 files changed, 366 insertions(+), 45 deletions(-)
create mode 100644 libavcodec/libopenh264.c
create mode 100644 libavcodec/libopenh264.h
create mode 100644 libavcodec/libopenh264dec.c
diff --git a/configure b/configure
index 1b41303..9f5b31f 100755
--- a/configure
+++ b/configure
@@ -2771,6 +2771,8 @@ libopencore_amrnb_decoder_deps="libopencore_amrnb"
libopencore_amrnb_encoder_deps="libopencore_amrnb"
libopencore_amrnb_encoder_select="audio_frame_queue"
libopencore_amrwb_decoder_deps="libopencore_amrwb"
+libopenh264_decoder_deps="libopenh264"
+libopenh264_decoder_select="h264_mp4toannexb_bsf"
libopenh264_encoder_deps="libopenh264"
libopenjpeg_decoder_deps="libopenjpeg"
libopenjpeg_encoder_deps="libopenjpeg"
diff --git a/doc/general.texi b/doc/general.texi
index 7823dc1..6b5975c 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -103,12 +103,19 @@ enable it.
@section OpenH264
-FFmpeg can make use of the OpenH264 library for H.264 encoding.
+FFmpeg can make use of the OpenH264 library for H.264 encoding and decoding.
Go to @url{http://www.openh264.org/} and follow the instructions for
installing the library. Then pass @code{--enable-libopenh264} to configure to
enable it.
+For decoding, this library is much more limited than the built-in decoder
+in libavcodec; currently, this library lacks support for decoding B-frames
+and some other main/high profile features. (It currently only supports
+constrained baseline profile and CABAC.) Using it is mostly useful for
+testing and for taking advantage of Cisco's patent portfolio license
+(@url{http://www.openh264.org/BINARY_LICENSE.txt}).
+
@section x264
FFmpeg can make use of the x264 library for H.264 encoding.
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index a548e02..3def3ad 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -868,7 +868,8 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodata.o mpegau
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o
OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o
-OBJS-$(CONFIG_LIBOPENH264_ENCODER) += libopenh264enc.o
+OBJS-$(CONFIG_LIBOPENH264_DECODER) += libopenh264dec.o libopenh264.o
+OBJS-$(CONFIG_LIBOPENH264_ENCODER) += libopenh264enc.o libopenh264.o
OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o
OBJS-$(CONFIG_LIBOPENJPEG_ENCODER) += libopenjpegenc.o
OBJS-$(CONFIG_LIBOPUS_DECODER) += libopusdec.o libopus.o \
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 951e199..a1ae61f 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -623,7 +623,7 @@ void avcodec_register_all(void)
/* external libraries, that shouldn't be used by default if one of the
* above is available */
- REGISTER_ENCODER(LIBOPENH264, libopenh264);
+ REGISTER_ENCDEC (LIBOPENH264, libopenh264);
REGISTER_DECODER(H264_CUVID, h264_cuvid);
REGISTER_ENCODER(H264_NVENC, h264_nvenc);
REGISTER_ENCODER(H264_OMX, h264_omx);
diff --git a/libavcodec/libopenh264.c b/libavcodec/libopenh264.c
new file mode 100644
index 0000000..59c61a3
--- /dev/null
+++ b/libavcodec/libopenh264.c
@@ -0,0 +1,62 @@
+/*
+ * OpenH264 shared utils
+ * Copyright (C) 2014 Martin Storsjo
+ *
+ * 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 <string.h>
+#include <wels/codec_api.h>
+#include <wels/codec_ver.h>
+
+#include "libavutil/log.h"
+
+#include "libopenh264.h"
+
+// Convert libopenh264 log level to equivalent ffmpeg log level.
+static int libopenh264_to_ffmpeg_log_level(int libopenh264_log_level)
+{
+ if (libopenh264_log_level >= WELS_LOG_DETAIL) return AV_LOG_TRACE;
+ else if (libopenh264_log_level >= WELS_LOG_DEBUG) return AV_LOG_DEBUG;
+ else if (libopenh264_log_level >= WELS_LOG_INFO) return AV_LOG_VERBOSE;
+ else if (libopenh264_log_level >= WELS_LOG_WARNING) return AV_LOG_WARNING;
+ else if (libopenh264_log_level >= WELS_LOG_ERROR) return AV_LOG_ERROR;
+ else return AV_LOG_QUIET;
+}
+
+void ff_libopenh264_trace_callback(void *ctx, int level, const char *msg)
+{
+ // The message will be logged only if the requested EQUIVALENT ffmpeg log level is
+ // less than or equal to the current ffmpeg log level.
+ int equiv_ffmpeg_log_level = libopenh264_to_ffmpeg_log_level(level);
+ av_log(ctx, equiv_ffmpeg_log_level, "%s\n", msg);
+}
+
+int ff_libopenh264_check_version(void *logctx)
+{
+ // Mingw GCC < 4.7 on x86_32 uses an incorrect/buggy ABI for the WelsGetCodecVersion
+ // function (for functions returning larger structs), thus skip the check in those
+ // configurations.
+#if !defined(_WIN32) || !defined(__GNUC__) || !ARCH_X86_32 || AV_GCC_VERSION_AT_LEAST(4, 7)
+ OpenH264Version libver = WelsGetCodecVersion();
+ if (memcmp(&libver, &g_stCodecVersion, sizeof(libver))) {
+ av_log(logctx, AV_LOG_ERROR, "Incorrect library version loaded\n");
+ return AVERROR(EINVAL);
+ }
+#endif
+ return 0;
+}
diff --git a/libavcodec/libopenh264.h b/libavcodec/libopenh264.h
new file mode 100644
index 0000000..dbb9c5d
--- /dev/null
+++ b/libavcodec/libopenh264.h
@@ -0,0 +1,39 @@
+/*
+ * OpenH264 shared utils
+ * Copyright (C) 2014 Martin Storsjo
+ *
+ * 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
+ */
+
+#ifndef AVCODEC_LIBOPENH264_H
+#define AVCODEC_LIBOPENH264_H
+
+#define OPENH264_VER_AT_LEAST(maj, min) \
+ ((OPENH264_MAJOR > (maj)) || \
+ (OPENH264_MAJOR == (maj) && OPENH264_MINOR >= (min)))
+
+// This function will be provided to the libopenh264 library. The function will be called
+// when libopenh264 wants to log a message (error, warning, info, etc.). The signature for
+// this function (defined in .../codec/api/svc/codec_api.h) is:
+//
+// typedef void (*WelsTraceCallback) (void* ctx, int level, const char* string);
+
+void ff_libopenh264_trace_callback(void *ctx, int level, const char *msg);
+
+int ff_libopenh264_check_version(void *logctx);
+
+#endif /* AVCODEC_LIBOPENH264_H */
diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
new file mode 100644
index 0000000..f642082
--- /dev/null
+++ b/libavcodec/libopenh264dec.c
@@ -0,0 +1,243 @@
+/*
+ * OpenH264 video decoder
+ * Copyright (C) 2016 Martin Storsjo
+ *
+ * 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 <wels/codec_api.h>
+#include <wels/codec_ver.h>
+
+#include "libavutil/common.h"
+#include "libavutil/fifo.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
+
+#include "avcodec.h"
+#include "internal.h"
+#include "libopenh264.h"
+
+typedef struct SVCContext {
+ ISVCDecoder *decoder;
+ AVBSFContext *bsf;
+ AVFifoBuffer *packet_fifo;
+ AVPacket pkt_filtered;
+} SVCContext;
+
+static av_cold int svc_decode_close(AVCodecContext *avctx)
+{
+ SVCContext *s = avctx->priv_data;
+ AVPacket pkt;
+
+ if (s->decoder)
+ WelsDestroyDecoder(s->decoder);
+
+ while (s->packet_fifo && av_fifo_size(s->packet_fifo) >= sizeof(pkt)) {
+ av_fifo_generic_read(s->packet_fifo, &pkt, sizeof(pkt), NULL);
+ av_packet_unref(&pkt);
+ }
+
+ av_bsf_free(&s->bsf);
+ av_packet_unref(&s->pkt_filtered);
+ av_fifo_free(s->packet_fifo);
+
+ return 0;
+}
+
+static av_cold int svc_decode_init(AVCodecContext *avctx)
+{
+ SVCContext *s = avctx->priv_data;
+ SDecodingParam param = { 0 };
+ int err;
+ int log_level;
+ WelsTraceCallback callback_function;
+
+ if ((err = ff_libopenh264_check_version(avctx)) < 0)
+ return err;
+
+ s->packet_fifo = av_fifo_alloc(sizeof(AVPacket));
+ if (!s->packet_fifo) {
+ err = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ if (WelsCreateDecoder(&s->decoder)) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to create decoder\n");
+ err = AVERROR_UNKNOWN;
+ goto fail;
+ }
+
+ // Pass all libopenh264 messages to our callback, to allow ourselves to filter them.
+ log_level = WELS_LOG_DETAIL;
+ callback_function = ff_libopenh264_trace_callback;
+ (*s->decoder)->SetOption(s->decoder, DECODER_OPTION_TRACE_LEVEL, &log_level);
+ (*s->decoder)->SetOption(s->decoder, DECODER_OPTION_TRACE_CALLBACK, (void *)&callback_function);
+ (*s->decoder)->SetOption(s->decoder, DECODER_OPTION_TRACE_CALLBACK_CONTEXT, (void *)&avctx);
+
+ param.eOutputColorFormat = videoFormatI420;
+ param.eEcActiveIdc = ERROR_CON_DISABLE;
+ param.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
+
+ if ((*s->decoder)->Initialize(s->decoder, &param) != cmResultSuccess) {
+ av_log(avctx, AV_LOG_ERROR, "Initialize failed\n");
+ err = AVERROR_UNKNOWN;
+ goto fail;
+ }
+
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+
+fail:
+ return err;
+}
+
+static int init_bsf(AVCodecContext *avctx)
+{
+ SVCContext *s = avctx->priv_data;
+ const AVBitStreamFilter *filter;
+ int ret;
+
+ if (s->bsf)
+ return 0;
+
+ // If the input stream already is annex b, this BSF only passes the
+ // packets through unchanged.
+ filter = av_bsf_get_by_name("h264_mp4toannexb");
+ if (!filter)
+ return AVERROR_BUG;
+
+ ret = av_bsf_alloc(filter, &s->bsf);
+ if (ret < 0)
+ return ret;
+
+ ret = avcodec_parameters_from_context(s->bsf->par_in, avctx);
+ if (ret < 0)
+ return ret;
+
+ s->bsf->time_base_in = avctx->time_base;
+
+ ret = av_bsf_init(s->bsf);
+ if (ret < 0)
+ return ret;
+
+ return ret;
+}
+
+static int svc_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame, AVPacket *avpkt)
+{
+ SVCContext *s = avctx->priv_data;
+ SBufferInfo info = { 0 };
+ uint8_t* ptrs[3];
+ int linesize[3];
+ AVFrame *avframe = data;
+ int ret;
+ DECODING_STATE state;
+
+ if ((ret = init_bsf(avctx)) < 0)
+ return ret;
+
+ if (avpkt->size) {
+ AVPacket input_ref = { 0 };
+ if (av_fifo_space(s->packet_fifo) < sizeof(input_ref)) {
+ ret = av_fifo_realloc2(s->packet_fifo,
+ av_fifo_size(s->packet_fifo) + sizeof(input_ref));
+ if (ret < 0)
+ return ret;
+ }
+
+ ret = av_packet_ref(&input_ref, avpkt);
+ if (ret < 0)
+ return ret;
+ av_fifo_generic_write(s->packet_fifo, &input_ref, sizeof(input_ref), NULL);
+ }
+
+ while (!*got_frame) {
+ /* prepare the input data -- convert to Annex B if needed */
+ if (s->pkt_filtered.size <= 0) {
+ AVPacket input_ref;
+
+ /* no more data */
+ if (av_fifo_size(s->packet_fifo) < sizeof(AVPacket))
+ return avpkt->size ? avpkt->size : 0;
+
+ av_packet_unref(&s->pkt_filtered);
+
+ av_fifo_generic_read(s->packet_fifo, &input_ref, sizeof(input_ref), NULL);
+ ret = av_bsf_send_packet(s->bsf, &input_ref);
+ if (ret < 0) {
+ av_packet_unref(&input_ref);
+ return ret;
+ }
+
+ ret = av_bsf_receive_packet(s->bsf, &s->pkt_filtered);
+ if (ret < 0)
+ av_packet_move_ref(&s->pkt_filtered, &input_ref);
+ else
+ av_packet_unref(&input_ref);
+ }
+
+ state = (*s->decoder)->DecodeFrame2(s->decoder, s->pkt_filtered.data, s->pkt_filtered.size, ptrs, &info);
+ s->pkt_filtered.size = 0;
+ if (state != dsErrorFree) {
+ av_log(avctx, AV_LOG_ERROR, "DecodeFrame2 failed\n");
+ return AVERROR_UNKNOWN;
+ }
+ if (info.iBufferStatus != 1) {
+ av_log(avctx, AV_LOG_DEBUG, "No frame produced\n");
+ continue;
+ }
+
+ ret = ff_set_dimensions(avctx, info.UsrData.sSystemBuffer.iWidth, info.UsrData.sSystemBuffer.iHeight);
+ if (ret < 0)
+ return ret;
+ // The decoder doesn't (currently) support decoding into a user
+ // provided buffer, so do a copy instead.
+ if (ff_get_buffer(avctx, avframe, 0) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Unable to allocate buffer\n");
+ return AVERROR(ENOMEM);
+ }
+
+ linesize[0] = info.UsrData.sSystemBuffer.iStride[0];
+ linesize[1] = linesize[2] = info.UsrData.sSystemBuffer.iStride[1];
+ av_image_copy(avframe->data, avframe->linesize, (const uint8_t **) ptrs, linesize, avctx->pix_fmt, avctx->width, avctx->height);
+
+ avframe->pts = s->pkt_filtered.pts;
+ avframe->pkt_dts = s->pkt_filtered.dts;
+ avframe->pkt_pts = s->pkt_filtered.pts;
+
+ *got_frame = 1;
+ }
+ return avpkt->size;
+}
+
+AVCodec ff_libopenh264_decoder = {
+ .name = "libopenh264",
+ .long_name = NULL_IF_CONFIG_SMALL("OpenH264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_H264,
+ .priv_data_size = sizeof(SVCContext),
+ .init = svc_decode_init,
+ .decode = svc_decode_frame,
+ .close = svc_decode_close,
+ // The decoder doesn't currently support B-frames, and the decoder's API
+ // doesn't support reordering/delay, but the BSF could incur delay.
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_THREADSAFE |
+ FF_CODEC_CAP_INIT_CLEANUP,
+};
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index 24bc228..d27fc41 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -31,6 +31,7 @@
#include "avcodec.h"
#include "internal.h"
+#include "libopenh264.h"
typedef struct SVCContext {
const AVClass *av_class;
@@ -44,10 +45,6 @@ typedef struct SVCContext {
int cabac;
} SVCContext;
-#define OPENH264_VER_AT_LEAST(maj, min) \
- ((OPENH264_MAJOR > (maj)) || \
- (OPENH264_MAJOR == (maj) && OPENH264_MINOR >= (min)))
-
#define OFFSET(x) offsetof(SVCContext, x)
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
@@ -68,31 +65,6 @@ static const AVClass class = {
"libopenh264enc", av_default_item_name, options, LIBAVUTIL_VERSION_INT
};
-// Convert libopenh264 log level to equivalent ffmpeg log level.
-static int libopenh264_to_ffmpeg_log_level(int libopenh264_log_level)
-{
- if (libopenh264_log_level >= WELS_LOG_DETAIL) return AV_LOG_TRACE;
- else if (libopenh264_log_level >= WELS_LOG_DEBUG) return AV_LOG_DEBUG;
- else if (libopenh264_log_level >= WELS_LOG_INFO) return AV_LOG_VERBOSE;
- else if (libopenh264_log_level >= WELS_LOG_WARNING) return AV_LOG_WARNING;
- else if (libopenh264_log_level >= WELS_LOG_ERROR) return AV_LOG_ERROR;
- else return AV_LOG_QUIET;
-}
-
-// This function will be provided to the libopenh264 library. The function will be called
-// when libopenh264 wants to log a message (error, warning, info, etc.). The signature for
-// this function (defined in .../codec/api/svc/codec_api.h) is:
-//
-// typedef void (*WelsTraceCallback) (void* ctx, int level, const char* string);
-
-static void libopenh264_trace_callback(void *ctx, int level, const char *msg)
-{
- // The message will be logged only if the requested EQUIVALENT ffmpeg log level is
- // less than or equal to the current ffmpeg log level.
- int equiv_ffmpeg_log_level = libopenh264_to_ffmpeg_log_level(level);
- av_log(ctx, equiv_ffmpeg_log_level, "%s\n", msg);
-}
-
static av_cold int svc_encode_close(AVCodecContext *avctx)
{
SVCContext *s = avctx->priv_data;
@@ -108,21 +80,15 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
{
SVCContext *s = avctx->priv_data;
SEncParamExt param = { 0 };
- int err = AVERROR_UNKNOWN;
+ int err;
int log_level;
WelsTraceCallback callback_function;
AVCPBProperties *props;
- // Mingw GCC < 4.7 on x86_32 uses an incorrect/buggy ABI for the WelsGetCodecVersion
- // function (for functions returning larger structs), thus skip the check in those
- // configurations.
-#if !defined(_WIN32) || !defined(__GNUC__) || !ARCH_X86_32 || AV_GCC_VERSION_AT_LEAST(4, 7)
- OpenH264Version libver = WelsGetCodecVersion();
- if (memcmp(&libver, &g_stCodecVersion, sizeof(libver))) {
- av_log(avctx, AV_LOG_ERROR, "Incorrect library version loaded\n");
- return AVERROR(EINVAL);
- }
-#endif
+ if ((err = ff_libopenh264_check_version(avctx)) < 0)
+ return err;
+ // Use a default error for multiple error paths below
+ err = AVERROR_UNKNOWN;
if (WelsCreateSVCEncoder(&s->encoder)) {
av_log(avctx, AV_LOG_ERROR, "Unable to create encoder\n");
@@ -134,7 +100,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
(*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_LEVEL, &log_level);
// Set the logging callback function to one that uses av_log() (see implementation above).
- callback_function = (WelsTraceCallback) libopenh264_trace_callback;
+ callback_function = (WelsTraceCallback) ff_libopenh264_trace_callback;
(*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK, (void *)&callback_function);
// Set the AVCodecContext as the libopenh264 callback context so that it can be passed to av_log().
--
2.1.4