francesco/fml13v01-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fm7110-6.6
fml13v01-buildroot/package/ffmpeg/0006-add-hevc-decoder-and-encoder-support.patch
T
arvin.zhu de10ff115b ffmpeg: add omx_pix_fmt option for mjpeg_omx decoder 
add omx_pix_fmt option for mjpeg_omx decoder and modify code foramt

Signed-off-by: arvin.zhu <arvin.zhu@starfivetech.com>
2022-10-28 22:14:43 +08:00

211 lines
7.8 KiB
Diff
Raw Permalink Blame History

From 0adf789b7c3060e241b82e6afdfc2f7975f1ee39 Mon Sep 17 00:00:00 2001
From: "sw.multimedia" <se.multimedia@starfivetech.com>
Date: Wed, 25 May 2022 20:28:21 +0800
Subject: [PATCH 2/8] add hevc decoder and encoder support
Signed-off-by: sw.multimedia <se.multimedia@starfivetech.com>
---
configure | 2 ++
libavcodec/allcodecs.c | 2 ++
libavcodec/omx.c | 35 +++++++++++++++++++++++++++++++++++
libavcodec/omxdec.c | 35 ++++++++++++++++++++++++++++++++++-
libavformat/utils.c | 7 +++++++
5 files changed, 80 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index e3976df..80be074 100755
--- a/configure
+++ b/configure
@@ -3093,6 +3093,8 @@ h264_vaapi_encoder_select="cbs_h264 vaapi_encode"
h264_v4l2m2m_decoder_deps="v4l2_m2m h264_v4l2_m2m"
h264_v4l2m2m_decoder_select="h264_mp4toannexb_bsf"
h264_v4l2m2m_encoder_deps="v4l2_m2m h264_v4l2_m2m"
+hevc_omx_encoder_deps="omx"
+hevc_omx_decoder_deps="omx"
hevc_amf_encoder_deps="amf"
hevc_cuvid_decoder_deps="cuvid"
hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf"
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index e42fa30..0c7a18d 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -793,6 +793,8 @@ extern AVCodec ff_h264_mf_encoder;
extern AVCodec ff_h264_nvenc_encoder;
extern AVCodec ff_h264_omx_encoder;
extern AVCodec ff_h264_omx_decoder;
+extern AVCodec ff_hevc_omx_encoder;
+extern AVCodec ff_hevc_omx_decoder;
extern AVCodec ff_h264_qsv_encoder;
extern AVCodec ff_h264_v4l2m2m_encoder;
extern AVCodec ff_h264_vaapi_encoder;
diff --git a/libavcodec/omx.c b/libavcodec/omx.c
index 0a6a308..86e32a8 100644
--- a/libavcodec/omx.c
+++ b/libavcodec/omx.c
@@ -43,6 +43,7 @@
#include "avcodec.h"
#include "h264.h"
#include "internal.h"
+#include "profiles.h"
#ifdef OMX_SKIP64BIT
static OMX_TICKS to_omx_ticks(int64_t value)
@@ -501,6 +502,8 @@ static av_cold int omx_component_init(AVCodecContext *avctx, const char *role)
out_port_params.format.video.eCompressionFormat = OMX_VIDEO_CodingMPEG4;
else if (avctx->codec->id == AV_CODEC_ID_H264)
out_port_params.format.video.eCompressionFormat = OMX_VIDEO_CodingAVC;
+ else if (avctx->codec->id == AV_CODEC_ID_HEVC)
+ out_port_params.format.video.eCompressionFormat = OMX_VIDEO_CodingHEVC;
err = OMX_SetParameter(s->handle, OMX_IndexParamPortDefinition, &out_port_params);
CHECK(err);
@@ -666,6 +669,9 @@ static av_cold int omx_encode_init(AVCodecContext *avctx)
case AV_CODEC_ID_H264:
role = "video_encoder.avc";
break;
+ case AV_CODEC_ID_HEVC:
+ role = "video_encoder.hevc";
+ break;
default:
return AVERROR(ENOSYS);
}
@@ -941,6 +947,13 @@ static const AVOption options[] = {
{ NULL }
};
+static const AVOption options_hevc[] = {
+ { "omx_libname", "OpenMAX library name", OFFSET(libname), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE },
+ { "omx_libprefix", "OpenMAX library prefix", OFFSET(libprefix), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE },
+ { "zerocopy", "Try to avoid copying input frames if possible", OFFSET(input_zerocopy), AV_OPT_TYPE_INT, { .i64 = CONFIG_OMX_RPI }, 0, 1, VE },
+ { NULL },
+};
+
static const enum AVPixelFormat omx_encoder_pix_fmts[] = {
AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
};
@@ -986,3 +999,25 @@ AVCodec ff_h264_omx_encoder = {
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.priv_class = &omx_h264enc_class,
};
+
+static const AVClass omx_hevcenc_class = {
+ .class_name = "hevc_omx",
+ .item_name = av_default_item_name,
+ .option = options_hevc,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+AVCodec ff_hevc_omx_encoder = {
+ .name = "hevc_omx",
+ .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL HEVC video encoder"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_HEVC,
+ .priv_data_size = sizeof(OMXCodecContext),
+ .init = omx_encode_init,
+ .encode2 = omx_encode_frame,
+ .close = omx_encode_end,
+ .pix_fmts = omx_encoder_pix_fmts,
+ .profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles),
+ .capabilities = AV_CODEC_CAP_DELAY,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
+ .priv_class = &omx_hevcenc_class,
+};
diff --git a/libavcodec/omxdec.c b/libavcodec/omxdec.c
index 7f76ec3..96a2829 100644
--- a/libavcodec/omxdec.c
+++ b/libavcodec/omxdec.c
@@ -44,6 +44,7 @@
#include "avcodec.h"
#include "h264.h"
#include "internal.h"
+#include "profiles.h"
#ifdef OMX_SKIP64BIT
static OMX_TICKS to_omx_ticks(int64_t value)
@@ -494,6 +495,8 @@ static av_cold int omx_component_init(AVCodecContext *avctx, const char *role)
out_port_params.format.video.eCompressionFormat = OMX_VIDEO_CodingMPEG4;
else if (avctx->codec->id == AV_CODEC_ID_H264)
out_port_params.format.video.eCompressionFormat = OMX_VIDEO_CodingAVC;
+ else if (avctx->codec->id == AV_CODEC_ID_HEVC)
+ out_port_params.format.video.eCompressionFormat = OMX_VIDEO_CodingHEVC;
err = OMX_SetParameter(s->handle, OMX_IndexParamPortDefinition, &out_port_params);
CHECK(err);
@@ -627,6 +630,9 @@ static av_cold int omx_decode_init(AVCodecContext *avctx)
case AV_CODEC_ID_H264:
role = "video_decoder.avc";
break;
+ case AV_CODEC_ID_HEVC:
+ role = "video_decoder.hevc";
+ break;
default:
return AVERROR(ENOSYS);
}
@@ -733,7 +739,7 @@ static int omx_decode_frame(AVCodecContext *avctx, void *data,
buffer->nFilledLen = pkt->size;
}
- /* reduce memcpy. point it addr*/
+ /* avoid memcpy. point it addr*/
//buffer->pAppPrivate = pkt;
//buffer->pBuffer = pkt->data;
//buffer->nFilledLen = pkt->size;
@@ -851,6 +857,12 @@ static const AVOption options[] = {
{ NULL }
};
+static const AVOption options_hevc[] = {
+ { "omx_libname", "OpenMAX library name", OFFSET(libname), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE },
+ { "omx_libprefix", "OpenMAX library prefix", OFFSET(libprefix), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE },
+ { "zerocopy", "Try to avoid copying input frames if possible", OFFSET(input_zerocopy), AV_OPT_TYPE_INT, { .i64 = CONFIG_OMX_RPI }, 0, 1, VE },
+ { NULL },
+};
static const AVClass omx_mpeg4dec_class = {
.class_name = "mpeg4_omx",
@@ -891,3 +903,24 @@ AVCodec ff_h264_omx_decoder = {
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
.priv_class = &omx_h264dec_class,
};
+
+static const AVClass omx_hevcdec_class = {
+ .class_name = "hevc_omx",
+ .item_name = av_default_item_name,
+ .option = options_hevc,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+AVCodec ff_hevc_omx_decoder = {
+ .name = "hevc_omx",
+ .long_name = NULL_IF_CONFIG_SMALL("OpenMAX IL HEVC video decoder"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_HEVC,
+ .priv_data_size = sizeof(OMXCodecContext),
+ .init = omx_decode_init,
+ .decode = omx_decode_frame,
+ .close = omx_decode_end,
+ .profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles),
+ .capabilities = AV_CODEC_CAP_DELAY,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
+ .priv_class = &omx_hevcdec_class,
+};
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 75e5350..262ff5f 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -212,6 +212,13 @@ static const AVCodec *find_probe_decoder(AVFormatContext *s, const AVStream *st,
return avcodec_find_decoder_by_name("h264");
#endif
+#if CONFIG_HEVC_DECODER
+ /* Other parts of the code assume this decoder to be used for h265,
+ * so force it if possible. */
+ if (codec_id == AV_CODEC_ID_HEVC)
+ return avcodec_find_decoder_by_name("hevc");
+#endif
+
codec = find_decoder(s, st, codec_id);
if (!codec)
return NULL;
--
2.17.1
Reference in New Issue View Git Blame Copy Permalink