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.
---
I got a user explicitly requesting this feature, so apparently there
is (some) demand for it.
The decoder is very simple; it doesn't handle B-frames, so there's
no decoding delay, and the decoder doesn't allow decoding into
user-supplied buffers.
---
configure | 2 +
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 2 +-
libavcodec/libopenh264dec.c | 262 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 266 insertions(+), 1 deletion(-)
create mode 100644 libavcodec/libopenh264dec.c
diff --git a/configure b/configure
index 1a58a4c..015bd61 100755
--- a/configure
+++ b/configure
@@ -2235,6 +2235,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/libavcodec/Makefile b/libavcodec/Makefile
index 622e100..544c1ba 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -678,6 +678,7 @@ OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o
mpegaudiodecheader.o
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_DECODER) += libopenh264dec.o
OBJS-$(CONFIG_LIBOPENH264_ENCODER) += libopenh264enc.o
OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpegdec.o
OBJS-$(CONFIG_LIBOPENJPEG_ENCODER) += libopenjpegenc.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 6fa1617..e259de2 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -488,7 +488,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_ENCODER(H264_NVENC, h264_nvenc);
REGISTER_ENCODER(H264_OMX, h264_omx);
REGISTER_ENCODER(H264_QSV, h264_qsv);
diff --git a/libavcodec/libopenh264dec.c b/libavcodec/libopenh264dec.c
new file mode 100644
index 0000000..1cef58f
--- /dev/null
+++ b/libavcodec/libopenh264dec.c
@@ -0,0 +1,262 @@
+/*
+ * OpenH264 video decoder
+ * Copyright (C) 2016 Martin Storsjo
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; 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"
+
+typedef struct SVCContext {
+ ISVCDecoder *decoder;
+ AVBSFContext *bsf;
+ AVFifoBuffer *packet_fifo;
+ AVPacket pkt_filtered;
+} SVCContext;
+
+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;
+}
+
+static void libopenh264_trace_callback(void *ctx, int level, const char *msg)
+{
+ 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_decode_close(AVCodecContext *avctx)
+{
+ SVCContext *s = avctx->priv_data;
+ AVPacket pkt;
+
+ if (s->decoder)
+ WelsDestroyDecoder(s->decoder);
+
+ while (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 = AVERROR_UNKNOWN;
+ int log_level;
+ WelsTraceCallback callback_function;
+
+ // 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
+
+ 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");
+ goto fail;
+ }
+
+ // Pass all libopenh264 messages to our callback, to allow ourselves to
filter them.
+ log_level = WELS_LOG_DETAIL;
+ callback_function = 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;
//VIDEO_BITSTREAM_SVC;
+
+ if ((*s->decoder)->Initialize(s->decoder, ¶m) != cmResultSuccess) {
+ av_log(avctx, AV_LOG_ERROR, "Initialize failed\n");
+ goto fail;
+ }
+
+ avctx->pix_fmt = AV_PIX_FMT_YUV420P;
+
+ return 0;
+
+fail:
+ svc_decode_close(avctx);
+ return err;
+}
+
+static int init_bsf(AVCodecContext *avctx)
+{
+ SVCContext *s = avctx->priv_data;
+ const AVBitStreamFilter *filter;
+ int ret;
+
+ if (s->bsf)
+ return 0;
+
+ 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;
+
+ init_bsf(avctx);
+
+ 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;
+ }
+
+ avctx->width = info.UsrData.sSystemBuffer.iWidth;
+ avctx->height = info.UsrData.sSystemBuffer.iHeight;
+ 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;
+#if FF_API_PKT_PTS
+FF_DISABLE_DEPRECATION_WARNINGS
+ avframe->pkt_pts = s->pkt_filtered.pts;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ *got_frame = 1;
+ }
+ return avpkt->size;
+}
+
+AVCodec ff_libopenh264_decoder = {
+ .name = "libopenh264",
+ .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,
+ .long_name = NULL_IF_CONFIG_SMALL("OpenH264"),
+ .capabilities = AV_CODEC_CAP_DELAY, // The decoder itself doesn't have
delay, but the BSF might
+ .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
+};
--
2.7.4 (Apple Git-66)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
