* [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding
@ 2024-05-21 5:39 Xiang, Haihao
2024-05-21 5:39 ` [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have Xiang, Haihao
2024-05-21 6:14 ` [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding Andreas Rheinhardt
0 siblings, 2 replies; 8+ messages in thread
From: Xiang, Haihao @ 2024-05-21 5:39 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang
From: Haihao Xiang <haihao.xiang@intel.com>
The SDK may provides HDR metadata for HDR streams via mfxExtBuffer
attached on output mfxFrameSurface1
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavcodec/qsvdec.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index df0d49bc10..7ffc7f0571 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -538,7 +538,8 @@ static int alloc_frame(AVCodecContext *avctx, QSVContext *q, QSVFrame *frame)
#endif
#if QSV_VERSION_ATLEAST(1, 35)
- if (QSV_RUNTIME_VERSION_ATLEAST(q->ver, 1, 35) && avctx->codec_id == AV_CODEC_ID_HEVC) {
+ if ((QSV_RUNTIME_VERSION_ATLEAST(q->ver, 1, 35) && avctx->codec_id == AV_CODEC_ID_HEVC) ||
+ (QSV_RUNTIME_VERSION_ATLEAST(q->ver, 2, 9) && avctx->codec_id == AV_CODEC_ID_AV1)) {
frame->mdcv.Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME;
frame->mdcv.Header.BufferSz = sizeof(frame->mdcv);
// The data in mdcv is valid when this flag is 1
@@ -742,6 +743,46 @@ static int qsv_export_hdr_side_data(AVCodecContext *avctx, mfxExtMasteringDispla
return 0;
}
+static int qsv_export_hdr_side_data_av1(AVCodecContext *avctx, mfxExtMasteringDisplayColourVolume *mdcv,
+ mfxExtContentLightLevelInfo *clli, AVFrame *frame)
+{
+ if (mdcv->InsertPayloadToggle) {
+ AVMasteringDisplayMetadata *mastering = av_mastering_display_metadata_create_side_data(frame);
+ const int chroma_den = 1 << 16;
+ const int max_luma_den = 1 << 8;
+ const int min_luma_den = 1 << 14;
+ int i;
+
+ if (!mastering)
+ return AVERROR(ENOMEM);
+
+ for (i = 0; i < 3; i++) {
+ mastering->display_primaries[i][0] = av_make_q(mdcv->DisplayPrimariesX[i], chroma_den);
+ mastering->display_primaries[i][1] = av_make_q(mdcv->DisplayPrimariesY[i], chroma_den);
+ }
+
+ mastering->white_point[0] = av_make_q(mdcv->WhitePointX, chroma_den);
+ mastering->white_point[1] = av_make_q(mdcv->WhitePointY, chroma_den);
+
+ mastering->max_luminance = av_make_q(mdcv->MaxDisplayMasteringLuminance, max_luma_den);
+ mastering->min_luminance = av_make_q(mdcv->MinDisplayMasteringLuminance, min_luma_den);
+
+ mastering->has_luminance = 1;
+ mastering->has_primaries = 1;
+ }
+
+ if (clli->InsertPayloadToggle) {
+ AVContentLightMetadata *light = av_content_light_metadata_create_side_data(frame);
+ if (!light)
+ return AVERROR(ENOMEM);
+
+ light->MaxCLL = clli->MaxContentLightLevel;
+ light->MaxFALL = clli->MaxPicAverageLightLevel;
+ }
+
+ return 0;
+}
+
#endif
static int qsv_decode(AVCodecContext *avctx, QSVContext *q,
@@ -874,6 +915,12 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q,
if (ret < 0)
return ret;
}
+
+ if (QSV_RUNTIME_VERSION_ATLEAST(q->ver, 2, 9) && avctx->codec_id == AV_CODEC_ID_AV1) {
+ ret = qsv_export_hdr_side_data_av1(avctx, &aframe.frame->mdcv, &aframe.frame->clli, frame);
+ if (ret < 0)
+ return ret;
+ }
#endif
frame->repeat_pict =
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 8+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have
2024-05-21 5:39 [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding Xiang, Haihao
@ 2024-05-21 5:39 ` Xiang, Haihao
2024-05-21 6:35 ` Andreas Rheinhardt
2024-05-21 6:14 ` [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding Andreas Rheinhardt
1 sibling, 1 reply; 8+ messages in thread
From: Xiang, Haihao @ 2024-05-21 5:39 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang
From: Haihao Xiang <haihao.xiang@intel.com>
The sdk av1 encoder can accept HDR metadata via mfxEncodeCtrl::ExtParam.
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavcodec/qsvenc_av1.c | 75 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 75 insertions(+)
diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c
index 33727bb07e..a7d35d7bef 100644
--- a/libavcodec/qsvenc_av1.c
+++ b/libavcodec/qsvenc_av1.c
@@ -26,6 +26,8 @@
#include "libavutil/common.h"
#include "libavutil/opt.h"
+#include "libavutil/mem.h"
+#include "libavutil/mastering_display_metadata.h"
#include "avcodec.h"
#include "codec_internal.h"
@@ -39,6 +41,77 @@ typedef struct QSVAV1EncContext {
QSVEncContext qsv;
} QSVAV1EncContext;
+static int qsv_av1_set_encode_ctrl(AVCodecContext *avctx,
+ const AVFrame *frame, mfxEncodeCtrl *enc_ctrl)
+{
+ QSVAV1EncContext *q = avctx->priv_data;
+ AVFrameSideData *sd;
+
+ if (!frame || !QSV_RUNTIME_VERSION_ATLEAST(q->qsv.ver, 2, 11))
+ return 0;
+
+ sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
+ if (sd) {
+ AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd->data;
+
+ if (mdm->has_primaries && mdm->has_luminance) {
+ const int chroma_den = 1 << 16;
+ const int max_luma_den = 1 << 8;
+ const int min_luma_den = 1 << 14;
+ int i;
+ mfxExtMasteringDisplayColourVolume *mdcv = av_mallocz(sizeof(mfxExtMasteringDisplayColourVolume));
+ if (!mdcv)
+ return AVERROR(ENOMEM);
+
+ mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME;
+ mdcv->Header.BufferSz = sizeof(*mdcv);
+
+ for (i = 0; i < 3; i++) {
+ mdcv->DisplayPrimariesX[i] =
+ av_rescale(mdm->display_primaries[i][0].num, chroma_den,
+ mdm->display_primaries[i][0].den);
+ mdcv->DisplayPrimariesY[i] =
+ av_rescale(mdm->display_primaries[i][1].num, chroma_den,
+ mdm->display_primaries[i][1].den);
+ }
+
+ mdcv->WhitePointX =
+ av_rescale(mdm->white_point[0].num, chroma_den,
+ mdm->white_point[0].den);
+ mdcv->WhitePointY =
+ av_rescale(mdm->white_point[1].num, chroma_den,
+ mdm->white_point[1].den);
+
+ mdcv->MaxDisplayMasteringLuminance =
+ av_rescale(mdm->max_luminance.num, max_luma_den,
+ mdm->max_luminance.den);
+ mdcv->MinDisplayMasteringLuminance =
+ av_rescale(mdm->min_luminance.num, min_luma_den,
+ mdm->min_luminance.den);
+
+ enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)mdcv;
+ }
+ }
+
+ sd = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
+ if (sd) {
+ AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data;
+ mfxExtContentLightLevelInfo * clli = av_mallocz(sizeof(mfxExtContentLightLevelInfo));
+ if (!clli)
+ return AVERROR(ENOMEM);
+
+ clli->Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
+ clli->Header.BufferSz = sizeof(*clli);
+
+ clli->MaxContentLightLevel = clm->MaxCLL;
+ clli->MaxPicAverageLightLevel = clm->MaxFALL;
+
+ enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)clli;
+ }
+
+ return 0;
+}
+
static av_cold int qsv_enc_init(AVCodecContext *avctx)
{
QSVAV1EncContext *q = avctx->priv_data;
@@ -61,6 +134,8 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx)
return ret;
}
+ q->qsv.set_encode_ctrl_cb = qsv_av1_set_encode_ctrl;
+
return ff_qsv_enc_init(avctx, &q->qsv);
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding
2024-05-21 5:39 [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding Xiang, Haihao
2024-05-21 5:39 ` [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have Xiang, Haihao
@ 2024-05-21 6:14 ` Andreas Rheinhardt
1 sibling, 0 replies; 8+ messages in thread
From: Andreas Rheinhardt @ 2024-05-21 6:14 UTC (permalink / raw)
To: ffmpeg-devel
Xiang, Haihao:
> +static int qsv_export_hdr_side_data_av1(AVCodecContext *avctx, mfxExtMasteringDisplayColourVolume *mdcv,
> + mfxExtContentLightLevelInfo *clli, AVFrame *frame)
> +{
> + if (mdcv->InsertPayloadToggle) {
> + AVMasteringDisplayMetadata *mastering = av_mastering_display_metadata_create_side_data(frame);
> + const int chroma_den = 1 << 16;
> + const int max_luma_den = 1 << 8;
> + const int min_luma_den = 1 << 14;
> + int i;
Iterators with loop scope should be preferred if possible (like here).
> +
> + if (!mastering)
> + return AVERROR(ENOMEM);
> +
> + for (i = 0; i < 3; i++) {
> + mastering->display_primaries[i][0] = av_make_q(mdcv->DisplayPrimariesX[i], chroma_den);
> + mastering->display_primaries[i][1] = av_make_q(mdcv->DisplayPrimariesY[i], chroma_den);
> + }
> +
> + mastering->white_point[0] = av_make_q(mdcv->WhitePointX, chroma_den);
> + mastering->white_point[1] = av_make_q(mdcv->WhitePointY, chroma_den);
> +
> + mastering->max_luminance = av_make_q(mdcv->MaxDisplayMasteringLuminance, max_luma_den);
> + mastering->min_luminance = av_make_q(mdcv->MinDisplayMasteringLuminance, min_luma_den);
> +
> + mastering->has_luminance = 1;
> + mastering->has_primaries = 1;
> + }
> +
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have
2024-05-21 5:39 ` [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have Xiang, Haihao
@ 2024-05-21 6:35 ` Andreas Rheinhardt
2024-05-21 6:39 ` Andreas Rheinhardt
2024-05-21 7:22 ` Xiang, Haihao
0 siblings, 2 replies; 8+ messages in thread
From: Andreas Rheinhardt @ 2024-05-21 6:35 UTC (permalink / raw)
To: ffmpeg-devel
Xiang, Haihao:
> From: Haihao Xiang <haihao.xiang@intel.com>
>
> The sdk av1 encoder can accept HDR metadata via mfxEncodeCtrl::ExtParam.
>
> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> ---
> libavcodec/qsvenc_av1.c | 75 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 75 insertions(+)
>
> diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c
> index 33727bb07e..a7d35d7bef 100644
> --- a/libavcodec/qsvenc_av1.c
> +++ b/libavcodec/qsvenc_av1.c
> @@ -26,6 +26,8 @@
>
> #include "libavutil/common.h"
> #include "libavutil/opt.h"
> +#include "libavutil/mem.h"
> +#include "libavutil/mastering_display_metadata.h"
Breaks alphabetical ordering
>
> #include "avcodec.h"
> #include "codec_internal.h"
> @@ -39,6 +41,77 @@ typedef struct QSVAV1EncContext {
> QSVEncContext qsv;
> } QSVAV1EncContext;
>
> +static int qsv_av1_set_encode_ctrl(AVCodecContext *avctx,
> + const AVFrame *frame, mfxEncodeCtrl *enc_ctrl)
> +{
> + QSVAV1EncContext *q = avctx->priv_data;
> + AVFrameSideData *sd;
> +
> + if (!frame || !QSV_RUNTIME_VERSION_ATLEAST(q->qsv.ver, 2, 11))
> + return 0;
> +
> + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
> + if (sd) {
> + AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd->data;
> +
> + if (mdm->has_primaries && mdm->has_luminance) {
> + const int chroma_den = 1 << 16;
> + const int max_luma_den = 1 << 8;
> + const int min_luma_den = 1 << 14;
> + int i;
Should have loop-scope
> + mfxExtMasteringDisplayColourVolume *mdcv = av_mallocz(sizeof(mfxExtMasteringDisplayColourVolume));
> + if (!mdcv)
> + return AVERROR(ENOMEM);
> +
> + mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME;
> + mdcv->Header.BufferSz = sizeof(*mdcv);
> +
> + for (i = 0; i < 3; i++) {
> + mdcv->DisplayPrimariesX[i] =
> + av_rescale(mdm->display_primaries[i][0].num, chroma_den,
> + mdm->display_primaries[i][0].den);
> + mdcv->DisplayPrimariesY[i] =
> + av_rescale(mdm->display_primaries[i][1].num, chroma_den,
> + mdm->display_primaries[i][1].den);
> + }
> +
> + mdcv->WhitePointX =
> + av_rescale(mdm->white_point[0].num, chroma_den,
> + mdm->white_point[0].den);
> + mdcv->WhitePointY =
> + av_rescale(mdm->white_point[1].num, chroma_den,
> + mdm->white_point[1].den);
> +
> + mdcv->MaxDisplayMasteringLuminance =
> + av_rescale(mdm->max_luminance.num, max_luma_den,
> + mdm->max_luminance.den);
> + mdcv->MinDisplayMasteringLuminance =
> + av_rescale(mdm->min_luminance.num, min_luma_den,
> + mdm->min_luminance.den);
> +
> + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)mdcv;
> + }
> + }
> +
> + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
> + if (sd) {
> + AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data;
> + mfxExtContentLightLevelInfo * clli = av_mallocz(sizeof(mfxExtContentLightLevelInfo));
sizeof(*clli)
But actually, both allocations seem to be unnecessary: This callback is
only called when there is a QSVFrame and it already contains a
mfxExtContentLightLevelInfo and mfxExtMasteringDisplayColourVolume (used
by the decoder), so why not simply reuse that? The type of
set_encode_ctrl_cb would need to be changed of course.
(Btw: The relevant QSVFrame fields are under "#if QSV_VERSION_ATLEAST(1,
35)", yet this patch does not use any such #if. Why?)
> + if (!clli)
> + return AVERROR(ENOMEM);
> +
> + clli->Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
> + clli->Header.BufferSz = sizeof(*clli);
> +
> + clli->MaxContentLightLevel = clm->MaxCLL;
> + clli->MaxPicAverageLightLevel = clm->MaxFALL;
> +
> + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)clli;
> + }
> +
> + return 0;
> +}
> +
> static av_cold int qsv_enc_init(AVCodecContext *avctx)
> {
> QSVAV1EncContext *q = avctx->priv_data;
> @@ -61,6 +134,8 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx)
> return ret;
> }
>
> + q->qsv.set_encode_ctrl_cb = qsv_av1_set_encode_ctrl;
> +
> return ff_qsv_enc_init(avctx, &q->qsv);
> }
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have
2024-05-21 6:35 ` Andreas Rheinhardt
@ 2024-05-21 6:39 ` Andreas Rheinhardt
2024-05-21 6:57 ` Andreas Rheinhardt
2024-05-21 7:22 ` Xiang, Haihao
1 sibling, 1 reply; 8+ messages in thread
From: Andreas Rheinhardt @ 2024-05-21 6:39 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> Xiang, Haihao:
>> From: Haihao Xiang <haihao.xiang@intel.com>
>>
>> The sdk av1 encoder can accept HDR metadata via mfxEncodeCtrl::ExtParam.
>>
>> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
>> ---
>> libavcodec/qsvenc_av1.c | 75 +++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 75 insertions(+)
>>
>> diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c
>> index 33727bb07e..a7d35d7bef 100644
>> --- a/libavcodec/qsvenc_av1.c
>> +++ b/libavcodec/qsvenc_av1.c
>> @@ -26,6 +26,8 @@
>>
>> #include "libavutil/common.h"
>> #include "libavutil/opt.h"
>> +#include "libavutil/mem.h"
>> +#include "libavutil/mastering_display_metadata.h"
>
> Breaks alphabetical ordering
>
>>
>> #include "avcodec.h"
>> #include "codec_internal.h"
>> @@ -39,6 +41,77 @@ typedef struct QSVAV1EncContext {
>> QSVEncContext qsv;
>> } QSVAV1EncContext;
>>
>> +static int qsv_av1_set_encode_ctrl(AVCodecContext *avctx,
>> + const AVFrame *frame, mfxEncodeCtrl *enc_ctrl)
>> +{
>> + QSVAV1EncContext *q = avctx->priv_data;
>> + AVFrameSideData *sd;
>> +
>> + if (!frame || !QSV_RUNTIME_VERSION_ATLEAST(q->qsv.ver, 2, 11))
>> + return 0;
>> +
>> + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
>> + if (sd) {
>> + AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd->data;
>> +
>> + if (mdm->has_primaries && mdm->has_luminance) {
>> + const int chroma_den = 1 << 16;
>> + const int max_luma_den = 1 << 8;
>> + const int min_luma_den = 1 << 14;
>> + int i;
>
> Should have loop-scope
>
>> + mfxExtMasteringDisplayColourVolume *mdcv = av_mallocz(sizeof(mfxExtMasteringDisplayColourVolume));
>> + if (!mdcv)
>> + return AVERROR(ENOMEM);
>> +
>> + mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME;
>> + mdcv->Header.BufferSz = sizeof(*mdcv);
>> +
>> + for (i = 0; i < 3; i++) {
>> + mdcv->DisplayPrimariesX[i] =
>> + av_rescale(mdm->display_primaries[i][0].num, chroma_den,
>> + mdm->display_primaries[i][0].den);
>> + mdcv->DisplayPrimariesY[i] =
>> + av_rescale(mdm->display_primaries[i][1].num, chroma_den,
>> + mdm->display_primaries[i][1].den);
>> + }
>> +
>> + mdcv->WhitePointX =
>> + av_rescale(mdm->white_point[0].num, chroma_den,
>> + mdm->white_point[0].den);
>> + mdcv->WhitePointY =
>> + av_rescale(mdm->white_point[1].num, chroma_den,
>> + mdm->white_point[1].den);
>> +
>> + mdcv->MaxDisplayMasteringLuminance =
>> + av_rescale(mdm->max_luminance.num, max_luma_den,
>> + mdm->max_luminance.den);
>> + mdcv->MinDisplayMasteringLuminance =
>> + av_rescale(mdm->min_luminance.num, min_luma_den,
>> + mdm->min_luminance.den);
>> +
>> + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)mdcv;
>> + }
>> + }
>> +
>> + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
>> + if (sd) {
>> + AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data;
>> + mfxExtContentLightLevelInfo * clli = av_mallocz(sizeof(mfxExtContentLightLevelInfo));
>
> sizeof(*clli)
>
> But actually, both allocations seem to be unnecessary: This callback is
> only called when there is a QSVFrame and it already contains a
> mfxExtContentLightLevelInfo and mfxExtMasteringDisplayColourVolume (used
> by the decoder), so why not simply reuse that? The type of
> set_encode_ctrl_cb would need to be changed of course.
>
I know see that this would necessitate more changes because the ExtParam
pointers are currently ownership pointers. So ignore this suggestion.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have
2024-05-21 6:39 ` Andreas Rheinhardt
@ 2024-05-21 6:57 ` Andreas Rheinhardt
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Rheinhardt @ 2024-05-21 6:57 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> Andreas Rheinhardt:
>> Xiang, Haihao:
>>> From: Haihao Xiang <haihao.xiang@intel.com>
>>>
>>> The sdk av1 encoder can accept HDR metadata via mfxEncodeCtrl::ExtParam.
>>>
>>> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
>>> ---
>>> libavcodec/qsvenc_av1.c | 75 +++++++++++++++++++++++++++++++++++++++++
>>> 1 file changed, 75 insertions(+)
>>>
>>> diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c
>>> index 33727bb07e..a7d35d7bef 100644
>>> --- a/libavcodec/qsvenc_av1.c
>>> +++ b/libavcodec/qsvenc_av1.c
>>> @@ -26,6 +26,8 @@
>>>
>>> #include "libavutil/common.h"
>>> #include "libavutil/opt.h"
>>> +#include "libavutil/mem.h"
>>> +#include "libavutil/mastering_display_metadata.h"
>>
>> Breaks alphabetical ordering
>>
>>>
>>> #include "avcodec.h"
>>> #include "codec_internal.h"
>>> @@ -39,6 +41,77 @@ typedef struct QSVAV1EncContext {
>>> QSVEncContext qsv;
>>> } QSVAV1EncContext;
>>>
>>> +static int qsv_av1_set_encode_ctrl(AVCodecContext *avctx,
>>> + const AVFrame *frame, mfxEncodeCtrl *enc_ctrl)
>>> +{
>>> + QSVAV1EncContext *q = avctx->priv_data;
>>> + AVFrameSideData *sd;
>>> +
>>> + if (!frame || !QSV_RUNTIME_VERSION_ATLEAST(q->qsv.ver, 2, 11))
>>> + return 0;
>>> +
>>> + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
>>> + if (sd) {
>>> + AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd->data;
>>> +
>>> + if (mdm->has_primaries && mdm->has_luminance) {
>>> + const int chroma_den = 1 << 16;
>>> + const int max_luma_den = 1 << 8;
>>> + const int min_luma_den = 1 << 14;
>>> + int i;
>>
>> Should have loop-scope
>>
>>> + mfxExtMasteringDisplayColourVolume *mdcv = av_mallocz(sizeof(mfxExtMasteringDisplayColourVolume));
>>> + if (!mdcv)
>>> + return AVERROR(ENOMEM);
>>> +
>>> + mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME;
>>> + mdcv->Header.BufferSz = sizeof(*mdcv);
>>> +
>>> + for (i = 0; i < 3; i++) {
>>> + mdcv->DisplayPrimariesX[i] =
>>> + av_rescale(mdm->display_primaries[i][0].num, chroma_den,
>>> + mdm->display_primaries[i][0].den);
>>> + mdcv->DisplayPrimariesY[i] =
>>> + av_rescale(mdm->display_primaries[i][1].num, chroma_den,
>>> + mdm->display_primaries[i][1].den);
>>> + }
>>> +
>>> + mdcv->WhitePointX =
>>> + av_rescale(mdm->white_point[0].num, chroma_den,
>>> + mdm->white_point[0].den);
>>> + mdcv->WhitePointY =
>>> + av_rescale(mdm->white_point[1].num, chroma_den,
>>> + mdm->white_point[1].den);
>>> +
>>> + mdcv->MaxDisplayMasteringLuminance =
>>> + av_rescale(mdm->max_luminance.num, max_luma_den,
>>> + mdm->max_luminance.den);
>>> + mdcv->MinDisplayMasteringLuminance =
>>> + av_rescale(mdm->min_luminance.num, min_luma_den,
>>> + mdm->min_luminance.den);
>>> +
>>> + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)mdcv;
>>> + }
>>> + }
>>> +
>>> + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
>>> + if (sd) {
>>> + AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data;
>>> + mfxExtContentLightLevelInfo * clli = av_mallocz(sizeof(mfxExtContentLightLevelInfo));
>>
>> sizeof(*clli)
>>
>> But actually, both allocations seem to be unnecessary: This callback is
>> only called when there is a QSVFrame and it already contains a
>> mfxExtContentLightLevelInfo and mfxExtMasteringDisplayColourVolume (used
>> by the decoder), so why not simply reuse that? The type of
>> set_encode_ctrl_cb would need to be changed of course.
>>
>
> I know see that this would necessitate more changes because the ExtParam
> pointers are currently ownership pointers. So ignore this suggestion.
>
s/know/now/
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have
2024-05-21 6:35 ` Andreas Rheinhardt
2024-05-21 6:39 ` Andreas Rheinhardt
@ 2024-05-21 7:22 ` Xiang, Haihao
1 sibling, 0 replies; 8+ messages in thread
From: Xiang, Haihao @ 2024-05-21 7:22 UTC (permalink / raw)
To: ffmpeg-devel
On Di, 2024-05-21 at 08:35 +0200, Andreas Rheinhardt wrote:
> Xiang, Haihao:
> > From: Haihao Xiang <haihao.xiang@intel.com>
> >
> > The sdk av1 encoder can accept HDR metadata via mfxEncodeCtrl::ExtParam.
> >
> > Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
> > ---
> > libavcodec/qsvenc_av1.c | 75 +++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 75 insertions(+)
> >
> > diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c
> > index 33727bb07e..a7d35d7bef 100644
> > --- a/libavcodec/qsvenc_av1.c
> > +++ b/libavcodec/qsvenc_av1.c
> > @@ -26,6 +26,8 @@
> >
> > #include "libavutil/common.h"
> > #include "libavutil/opt.h"
> > +#include "libavutil/mem.h"
> > +#include "libavutil/mastering_display_metadata.h"
>
> Breaks alphabetical ordering
Thanks, I will fix it in the new version.
>
> >
> > #include "avcodec.h"
> > #include "codec_internal.h"
> > @@ -39,6 +41,77 @@ typedef struct QSVAV1EncContext {
> > QSVEncContext qsv;
> > } QSVAV1EncContext;
> >
> > +static int qsv_av1_set_encode_ctrl(AVCodecContext *avctx,
> > + const AVFrame *frame, mfxEncodeCtrl
> > *enc_ctrl)
> > +{
> > + QSVAV1EncContext *q = avctx->priv_data;
> > + AVFrameSideData *sd;
> > +
> > + if (!frame || !QSV_RUNTIME_VERSION_ATLEAST(q->qsv.ver, 2, 11))
> > + return 0;
> > +
> > + sd = av_frame_get_side_data(frame,
> > AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
> > + if (sd) {
> > + AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd-
> > >data;
> > +
> > + if (mdm->has_primaries && mdm->has_luminance) {
> > + const int chroma_den = 1 << 16;
> > + const int max_luma_den = 1 << 8;
> > + const int min_luma_den = 1 << 14;
> > + int i;
>
> Should have loop-scope
Thanks, I will fix it in the new version.
>
> > + mfxExtMasteringDisplayColourVolume *mdcv =
> > av_mallocz(sizeof(mfxExtMasteringDisplayColourVolume));
> > + if (!mdcv)
> > + return AVERROR(ENOMEM);
> > +
> > + mdcv->Header.BufferId =
> > MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME;
> > + mdcv->Header.BufferSz = sizeof(*mdcv);
> > +
> > + for (i = 0; i < 3; i++) {
> > + mdcv->DisplayPrimariesX[i] =
> > + av_rescale(mdm->display_primaries[i][0].num,
> > chroma_den,
> > + mdm->display_primaries[i][0].den);
> > + mdcv->DisplayPrimariesY[i] =
> > + av_rescale(mdm->display_primaries[i][1].num,
> > chroma_den,
> > + mdm->display_primaries[i][1].den);
> > + }
> > +
> > + mdcv->WhitePointX =
> > + av_rescale(mdm->white_point[0].num, chroma_den,
> > + mdm->white_point[0].den);
> > + mdcv->WhitePointY =
> > + av_rescale(mdm->white_point[1].num, chroma_den,
> > + mdm->white_point[1].den);
> > +
> > + mdcv->MaxDisplayMasteringLuminance =
> > + av_rescale(mdm->max_luminance.num, max_luma_den,
> > + mdm->max_luminance.den);
> > + mdcv->MinDisplayMasteringLuminance =
> > + av_rescale(mdm->min_luminance.num, min_luma_den,
> > + mdm->min_luminance.den);
> > +
> > + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer
> > *)mdcv;
> > + }
> > + }
> > +
> > + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
> > + if (sd) {
> > + AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data;
> > + mfxExtContentLightLevelInfo * clli =
> > av_mallocz(sizeof(mfxExtContentLightLevelInfo));
>
> sizeof(*clli)
>
> But actually, both allocations seem to be unnecessary: This callback is
> only called when there is a QSVFrame and it already contains a
> mfxExtContentLightLevelInfo and mfxExtMasteringDisplayColourVolume (used
> by the decoder), so why not simply reuse that? The type of
> set_encode_ctrl_cb would need to be changed of course.
>
> (Btw: The relevant QSVFrame fields are under "#if QSV_VERSION_ATLEAST(1,
> 35)", yet this patch does not use any such #if. Why?)
av1_qsv encoder depends on libvpl in configure (therefore the required api
version at compile time is greater than 2.0), so this patch needn't use the
above #if.
Thanks
Haihao
>
> > + if (!clli)
> > + return AVERROR(ENOMEM);
> > +
> > + clli->Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
> > + clli->Header.BufferSz = sizeof(*clli);
> > +
> > + clli->MaxContentLightLevel = clm->MaxCLL;
> > + clli->MaxPicAverageLightLevel = clm->MaxFALL;
> > +
> > + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)clli;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > static av_cold int qsv_enc_init(AVCodecContext *avctx)
> > {
> > QSVAV1EncContext *q = avctx->priv_data;
> > @@ -61,6 +134,8 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx)
> > return ret;
> > }
> >
> > + q->qsv.set_encode_ctrl_cb = qsv_av1_set_encode_ctrl;
> > +
> > return ff_qsv_enc_init(avctx, &q->qsv);
> > }
> >
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 8+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have
2024-05-22 4:15 Xiang, Haihao
@ 2024-05-22 4:16 ` Xiang, Haihao
0 siblings, 0 replies; 8+ messages in thread
From: Xiang, Haihao @ 2024-05-22 4:16 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Haihao Xiang
From: Haihao Xiang <haihao.xiang@intel.com>
The sdk av1 encoder can accept HDR metadata via mfxEncodeCtrl::ExtParam.
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
libavcodec/qsvenc_av1.c | 73 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/libavcodec/qsvenc_av1.c b/libavcodec/qsvenc_av1.c
index 33727bb07e..56002746b9 100644
--- a/libavcodec/qsvenc_av1.c
+++ b/libavcodec/qsvenc_av1.c
@@ -25,6 +25,8 @@
#include <mfxvideo.h>
#include "libavutil/common.h"
+#include "libavutil/mastering_display_metadata.h"
+#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "avcodec.h"
@@ -39,6 +41,75 @@ typedef struct QSVAV1EncContext {
QSVEncContext qsv;
} QSVAV1EncContext;
+static int qsv_av1_set_encode_ctrl(AVCodecContext *avctx,
+ const AVFrame *frame, mfxEncodeCtrl *enc_ctrl)
+{
+ QSVAV1EncContext *q = avctx->priv_data;
+ AVFrameSideData *sd;
+
+ if (!frame || !QSV_RUNTIME_VERSION_ATLEAST(q->qsv.ver, 2, 11))
+ return 0;
+
+ sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
+ if (sd) {
+ AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd->data;
+ if (mdm->has_primaries && mdm->has_luminance) {
+ const int chroma_den = 1 << 16;
+ const int max_luma_den = 1 << 8;
+ const int min_luma_den = 1 << 14;
+ mfxExtMasteringDisplayColourVolume *mdcv = av_mallocz(sizeof(*mdcv));
+ if (!mdcv)
+ return AVERROR(ENOMEM);
+
+ mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME;
+ mdcv->Header.BufferSz = sizeof(*mdcv);
+
+ for (int i = 0; i < 3; i++) {
+ mdcv->DisplayPrimariesX[i] =
+ av_rescale(mdm->display_primaries[i][0].num, chroma_den,
+ mdm->display_primaries[i][0].den);
+ mdcv->DisplayPrimariesY[i] =
+ av_rescale(mdm->display_primaries[i][1].num, chroma_den,
+ mdm->display_primaries[i][1].den);
+ }
+
+ mdcv->WhitePointX =
+ av_rescale(mdm->white_point[0].num, chroma_den,
+ mdm->white_point[0].den);
+ mdcv->WhitePointY =
+ av_rescale(mdm->white_point[1].num, chroma_den,
+ mdm->white_point[1].den);
+
+ mdcv->MaxDisplayMasteringLuminance =
+ av_rescale(mdm->max_luminance.num, max_luma_den,
+ mdm->max_luminance.den);
+ mdcv->MinDisplayMasteringLuminance =
+ av_rescale(mdm->min_luminance.num, min_luma_den,
+ mdm->min_luminance.den);
+
+ enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)mdcv;
+ }
+ }
+
+ sd = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
+ if (sd) {
+ AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data;
+ mfxExtContentLightLevelInfo *clli = av_mallocz(sizeof(*clli));
+ if (!clli)
+ return AVERROR(ENOMEM);
+
+ clli->Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO;
+ clli->Header.BufferSz = sizeof(*clli);
+
+ clli->MaxContentLightLevel = clm->MaxCLL;
+ clli->MaxPicAverageLightLevel = clm->MaxFALL;
+
+ enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)clli;
+ }
+
+ return 0;
+}
+
static av_cold int qsv_enc_init(AVCodecContext *avctx)
{
QSVAV1EncContext *q = avctx->priv_data;
@@ -61,6 +132,8 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx)
return ret;
}
+ q->qsv.set_encode_ctrl_cb = qsv_av1_set_encode_ctrl;
+
return ff_qsv_enc_init(avctx, &q->qsv);
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-05-22 4:16 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-21 5:39 [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding Xiang, Haihao
2024-05-21 5:39 ` [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have Xiang, Haihao
2024-05-21 6:35 ` Andreas Rheinhardt
2024-05-21 6:39 ` Andreas Rheinhardt
2024-05-21 6:57 ` Andreas Rheinhardt
2024-05-21 7:22 ` Xiang, Haihao
2024-05-21 6:14 ` [FFmpeg-devel] [PATCH 1/2] lavc/qsvdec: update HDR side data on output AVFrame for AV1 decoding Andreas Rheinhardt
2024-05-22 4:15 Xiang, Haihao
2024-05-22 4:16 ` [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc_av1: accept HDR metadata if have Xiang, Haihao
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git