From 82b7525173f20702a8cbc26ebedbf4b69b8fecec Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 24 Jun 2016 00:58:17 +0300 Subject: Add an OpenH264 decoder wrapper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While it is less featureful (and slower) than the built-in H264 decoder, one could potentially want to use it to take advantage of the cisco patent license offer. Signed-off-by: Martin Storsjö --- libavcodec/libopenh264enc.c | 48 +++++++-------------------------------------- 1 file changed, 7 insertions(+), 41 deletions(-) (limited to 'libavcodec/libopenh264enc.c') diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 01cb6fb960..ab2adf010d 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 libav log level. -static int libopenh264_to_libav_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 libav log level is - // less than or equal to the current libav log level. - int equiv_libav_log_level = libopenh264_to_libav_log_level(level); - av_log(ctx, equiv_libav_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(). -- cgit v1.2.3