From: "Xiang, Haihao" <haihao.xiang-at-intel.com@ffmpeg.org> To: "ffmpeg-devel@ffmpeg.org" <ffmpeg-devel@ffmpeg.org>, "softworkz@hotmail.com" <softworkz@hotmail.com> Cc: "kierank@obe.tv" <kierank@obe.tv>, "haihao.xiang-at-intel.com@ffmpeg.org" <haihao.xiang-at-intel.com@ffmpeg.org>, "andreas.rheinhardt@outlook.com" <andreas.rheinhardt@outlook.com> Subject: Re: [FFmpeg-devel] [PATCH v6 3/3] avcodec/qsvdec: Implement SEI parsing for QSV decoders Date: Tue, 22 Nov 2022 05:41:24 +0000 Message-ID: <2ab71bc98e637a5c2509dacc8918dfb9664dc2ab.camel@intel.com> (raw) In-Reply-To: <DM8P223MB03653B0565B7C2CA616EDFDEBA0A9@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> On Mon, 2022-11-21 at 15:58 +0000, Soft Works wrote: > > -----Original Message----- > > From: Xiang, Haihao <haihao.xiang@intel.com> > > Sent: Monday, November 21, 2022 3:45 AM > > To: ffmpeg-devel@ffmpeg.org > > Cc: softworkz@hotmail.com; kierank@obe.tv; haihao.xiang-at- > > intel.com@ffmpeg.org; andreas.rheinhardt@outlook.com > > Subject: Re: [FFmpeg-devel] [PATCH v6 3/3] avcodec/qsvdec: Implement > > SEI parsing for QSV decoders > > > > On Tue, 2022-10-25 at 04:03 +0000, softworkz wrote: > > > From: softworkz <softworkz@hotmail.com> > > > > > > Signed-off-by: softworkz <softworkz@hotmail.com> > > > --- > > > libavcodec/Makefile | 2 +- > > > libavcodec/qsvdec.c | 321 > > ++++++++++++++++++++++++++++++++++++++++++++ > > > 2 files changed, 322 insertions(+), 1 deletion(-) > > > > > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > > > index 90c7f113a3..cbddbb0ace 100644 > > > --- a/libavcodec/Makefile > > > +++ b/libavcodec/Makefile > > > @@ -146,7 +146,7 @@ OBJS-$(CONFIG_MSS34DSP) += > > mss34dsp.o > > > OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o > > > OBJS-$(CONFIG_QPELDSP) += qpeldsp.o > > > OBJS-$(CONFIG_QSV) += qsv.o > > > -OBJS-$(CONFIG_QSVDEC) += qsvdec.o > > > +OBJS-$(CONFIG_QSVDEC) += qsvdec.o h264_sei.o > > hevc_sei.o > > > OBJS-$(CONFIG_QSVENC) += qsvenc.o > > > OBJS-$(CONFIG_RANGECODER) += rangecoder.o > > > OBJS-$(CONFIG_RDFT) += rdft.o > > > diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c > > > index 73405b5747..467a248224 100644 > > > --- a/libavcodec/qsvdec.c > > > +++ b/libavcodec/qsvdec.c > > > @@ -41,6 +41,7 @@ > > > #include "libavutil/time.h" > > > #include "libavutil/imgutils.h" > > > #include "libavutil/film_grain_params.h" > > > +#include <libavutil/reverse.h> > > > > > > #include "avcodec.h" > > > #include "codec_internal.h" > > > @@ -49,6 +50,9 @@ > > > #include "hwconfig.h" > > > #include "qsv.h" > > > #include "qsv_internal.h" > > > +#include "h264_sei.h" > > > +#include "hevc_ps.h" > > > +#include "hevc_sei.h" > > > > > > #if QSV_ONEVPL > > > #include <mfxdispatcher.h> > > > @@ -66,6 +70,8 @@ static const AVRational mfx_tb = { 1, 90000 }; > > > AV_NOPTS_VALUE : pts_tb.num ? \ > > > av_rescale_q(mfx_pts, mfx_tb, pts_tb) : mfx_pts) > > > > > > +#define PAYLOAD_BUFFER_SIZE 65535 > > > + > > > typedef struct QSVAsyncFrame { > > > mfxSyncPoint *sync; > > > QSVFrame *frame; > > > @@ -107,6 +113,9 @@ typedef struct QSVContext { > > > > > > mfxExtBuffer **ext_buffers; > > > int nb_ext_buffers; > > > + > > > + mfxU8 payload_buffer[PAYLOAD_BUFFER_SIZE]; > > > + AVBufferRef *a53_buf_ref; > > > } QSVContext; > > > > > > static const AVCodecHWConfigInternal *const qsv_hw_configs[] = { > > > @@ -628,6 +637,299 @@ static int > > qsv_export_film_grain(AVCodecContext *avctx, > > > mfxExtAV1FilmGrainParam > > > } > > > #endif > > > > > > +static int find_start_offset(mfxU8 data[4]) > > > +{ > > > + if (data[0] == 0 && data[1] == 0 && data[2] == 1) > > > + return 3; > > > + > > > + if (data[0] == 0 && data[1] == 0 && data[2] == 0 && data[3] == > > 1) > > > + return 4; > > > + > > > + return 0; > > > +} > > > + > > > +static int parse_sei_h264(AVCodecContext* avctx, QSVContext* q, > > AVFrame* out) > > > +{ > > > + H264SEIContext sei = { 0 }; > > > + GetBitContext gb = { 0 }; > > > + mfxPayload payload = { 0, .Data = &q->payload_buffer[0], > > .BufSize = > > > sizeof(q->payload_buffer) - AV_INPUT_BUFFER_PADDING_SIZE }; > > > + mfxU64 ts; > > > + int ret; > > > + > > > + while (1) { > > > + int start; > > > + memset(payload.Data, 0, payload.BufSize); > > > + > > > + ret = MFXVideoDECODE_GetPayload(q->session, &ts, > > &payload); > > > + if (ret == MFX_ERR_NOT_ENOUGH_BUFFER) { > > > + av_log(avctx, AV_LOG_WARNING, "Warning: Insufficient > > buffer on > > > GetPayload(). Size: %"PRIu64" Needed: %d\n", sizeof(q- > > > payload_buffer), > > > payload.BufSize); > > > + return 0; > > > + } > > > + if (ret != MFX_ERR_NONE) > > > + return ret; > > > + > > > + if (payload.NumBit == 0 || payload.NumBit >= > > payload.BufSize * 8) > > > + break; > > > + > > > + start = find_start_offset(payload.Data); > > > + > > > + switch (payload.Type) { > > > + case SEI_TYPE_BUFFERING_PERIOD: > > > + case SEI_TYPE_PIC_TIMING: > > > + continue; > > > + } > > > + > > > + if (init_get_bits(&gb, &payload.Data[start], > > payload.NumBit - start * > > > 8) < 0) > > > + av_log(avctx, AV_LOG_ERROR, "Error initializing > > bitstream reader > > > SEI type: %d Numbits %d error: %d\n", payload.Type, > > payload.NumBit, ret); > > > + else { > > > + ret = ff_h264_sei_decode(&sei, &gb, NULL, avctx); > > > + > > > + if (ret < 0) > > > + av_log(avctx, AV_LOG_WARNING, "Failed to parse SEI > > type: > > > %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); > > > + else > > > + av_log(avctx, AV_LOG_DEBUG, "mfxPayload Type: %d > > Numbits > > > %d\n", payload.Type, payload.NumBit); > > > + } > > > + } > > > + > > > + if (out) > > > + return ff_h264_set_sei_to_frame(avctx, &sei, out, NULL, > > 0); > > > + > > > + return 0; > > > +} > > > + > > > +static int parse_sei_hevc(AVCodecContext* avctx, QSVContext* q, > > QSVFrame* > > > out) > > > +{ > > > + HEVCSEI sei = { 0 }; > > > + HEVCParamSets ps = { 0 }; > > > + GetBitContext gb = { 0 }; > > > + mfxPayload payload = { 0, .Data = &q->payload_buffer[0], > > .BufSize = > > > sizeof(q->payload_buffer) - AV_INPUT_BUFFER_PADDING_SIZE }; > > > + mfxFrameSurface1 *surface = &out->surface; > > > + mfxU64 ts; > > > + int ret, has_logged = 0; > > > + > > > + while (1) { > > > + int start; > > > + memset(payload.Data, 0, payload.BufSize); > > > + > > > + ret = MFXVideoDECODE_GetPayload(q->session, &ts, > > &payload); > > > + if (ret == MFX_ERR_NOT_ENOUGH_BUFFER) { > > > + av_log(avctx, AV_LOG_WARNING, "Warning: Insufficient > > buffer on > > > GetPayload(). Size: %"PRIu64" Needed: %d\n", sizeof(q- > > > payload_buffer), > > > payload.BufSize); > > > + return 0; > > > + } > > > + if (ret != MFX_ERR_NONE) > > > + return ret; > > > + > > > + if (payload.NumBit == 0 || payload.NumBit >= > > payload.BufSize * 8) > > > + break; > > > + > > > + if (!has_logged) { > > > + has_logged = 1; > > > + av_log(avctx, AV_LOG_VERBOSE, "----------------------- > > --------- > > > ---------\n"); > > > + av_log(avctx, AV_LOG_VERBOSE, "Start reading SEI - > > payload > > > timestamp: %llu - surface timestamp: %llu\n", ts, surface- > > > Data.TimeStamp); > > > + } > > > + > > > + if (ts != surface->Data.TimeStamp) { > > > + av_log(avctx, AV_LOG_WARNING, "GetPayload timestamp > > (%llu) does > > > not match surface timestamp: (%llu)\n", ts, surface- > > > Data.TimeStamp); > > > + } > > > + > > > + start = find_start_offset(payload.Data); > > > + > > > + av_log(avctx, AV_LOG_VERBOSE, "parsing SEI type: %3d > > Numbits > > > %3d Start: %d\n", payload.Type, payload.NumBit, start); > > > + > > > + switch (payload.Type) { > > > + case SEI_TYPE_BUFFERING_PERIOD: > > > + case SEI_TYPE_PIC_TIMING: > > > + continue; > > > + case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: > > > + // There seems to be a bug in MSDK > > > + payload.NumBit -= 8; > > > + > > > + break; > > > + case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: > > > + // There seems to be a bug in MSDK > > > + payload.NumBit = 48; > > > + > > > + break; > > > + case SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35: > > > + // There seems to be a bug in MSDK > > > + if (payload.NumBit == 552) > > > + payload.NumBit = 528; > > > + break; > > > + } > > > + > > > + if (init_get_bits(&gb, &payload.Data[start], > > payload.NumBit - start * > > > 8) < 0) > > > + av_log(avctx, AV_LOG_ERROR, "Error initializing > > bitstream reader > > > SEI type: %d Numbits %d error: %d\n", payload.Type, > > payload.NumBit, ret); > > > + else { > > > + ret = ff_hevc_decode_nal_sei(&gb, avctx, &sei, &ps, > > > HEVC_NAL_SEI_PREFIX); > > > + > > > + if (ret < 0) > > > + av_log(avctx, AV_LOG_WARNING, "Failed to parse SEI > > type: > > > %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); > > > + else > > > + av_log(avctx, AV_LOG_DEBUG, "mfxPayload Type: %d > > Numbits > > > %d\n", payload.Type, payload.NumBit); > > > + } > > > + } > > > + > > > + if (has_logged) { > > > + av_log(avctx, AV_LOG_VERBOSE, "End reading SEI\n"); > > > + } > > > + > > > + if (out && out->frame) > > > + return ff_hevc_set_sei_to_frame(avctx, &sei, out->frame, > > avctx- > > > > framerate, 0, &ps.sps->vui, ps.sps->bit_depth, ps.sps- > > > bit_depth_chroma); > > > > I got segfault when trying your patchset, > > > > Thread 1 "ffmpeg" received signal SIGSEGV, Segmentation fault. > > 0x00007ffff67c0497 in parse_sei_hevc > > (avctx=avctx@entry=0x5555555e4280, q=q@entry=0x555555625288, > > out=out@entry=0x5555559b6f80) at libavcodec/qsvdec.c:777 > > 777 return ff_hevc_set_sei_to_frame(avctx, &sei, out- > > > frame, avctx->framerate, 0, &ps.sps->vui, ps.sps->bit_depth, ps.sps- > > > bit_depth_chroma); > > (gdb) bt > > #0 0x00007ffff67c0497 in parse_sei_hevc > > (avctx=avctx@entry=0x5555555e4280, q=q@entry=0x555555625288, > > out=out@entry=0x5555559b6f80) at libavcodec/qsvdec.c:777 > > #1 0x00007ffff67c1afe in qsv_decode > > (avctx=avctx@entry=0x5555555e4280, q=q@entry=0x555555625288, > > frame=frame@entry=0x5555556df740, > > got_frame=got_frame@entry=0x7fffffffd6bc, > > avpkt=avpkt@entry=0x555555635398) at libavcodec/qsvdec.c:1020 > > BTW the SDK provides support for hevc HDR metadata, we needn't parse > > SEI payload > > in qsvdec and may get the corresponding info from the SDK, see > > https://ffmpeg.org/pipermail/ffmpeg-devel/2022-November/304142.html > > I know. I was the one who had requested this to be added to MSDK :-) > > But it's just one small part of SEI information, it's limited to > the latest MSDK versions and I'm not sure whether it's working > as reliably as this implementation. This would need to be tested. > > You should still have access to the repo with the test files for > demoing the offset problems (which my patchset is working around). I worked out a patchset (https://github.com/intel-media-ci/ffmpeg/pull/518), including https://ffmpeg.org/pipermail/ffmpeg-devel/2022-November/304142.html an d others. I may use your command (with some changes) to convert all HDR clips in your repo to SDR clips except one clip (w/wo my changes, there is a GPU hang issue with this clip). We may only do a small update to support AV1 HDR in the future if applying https://ffmpeg.org/pipermail/ffmpeg-devel/2022-November/304142.html. Note the command below doesn't work with all test files in your repo with your patchset v6. $ ffmpeg -hwaccel qsv -c:v hevc_qsv -i input.mp4 -f null - Thanks Haihao > > But it's also about dynamic HDR data, dovi data, etc. - which > MSDK doesn't provide, so this single bit of SEI data doesn't > help much. > > Best regards, > softworkz > > > _______________________________________________ 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".
next prev parent reply other threads:[~2022-11-22 5:42 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-26 8:08 [FFmpeg-devel] [PATCH 0/6] " ffmpegagent 2022-05-26 8:08 ` [FFmpeg-devel] [PATCH 1/6] avutil/frame: Add av_frame_copy_side_data() and av_frame_remove_all_side_data() softworkz 2022-05-27 14:35 ` Soft Works 2022-05-26 8:08 ` [FFmpeg-devel] [PATCH 2/6] avcodec/vpp_qsv: Copy side data from input to output frame softworkz 2022-05-31 9:19 ` Xiang, Haihao 2022-05-26 8:08 ` [FFmpeg-devel] [PATCH 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible softworkz 2022-05-31 9:24 ` Xiang, Haihao 2022-05-26 8:08 ` [FFmpeg-devel] [PATCH 4/6] avcodec/hevcdec: make set_side_data() accessible softworkz 2022-05-31 9:38 ` Xiang, Haihao 2022-05-31 16:03 ` Soft Works 2022-05-31 9:40 ` Xiang, Haihao 2022-05-26 8:08 ` [FFmpeg-devel] [PATCH 5/6] avcodec/h264dec: make h264_export_frame_props() accessible softworkz 2022-05-26 8:08 ` [FFmpeg-devel] [PATCH 6/6] avcodec/qsvdec: Implement SEI parsing for QSV decoders softworkz 2022-06-01 5:15 ` Xiang, Haihao 2022-06-01 8:51 ` Soft Works 2022-06-01 9:06 ` [FFmpeg-devel] [PATCH v2 0/6] " ffmpegagent 2022-06-01 9:06 ` [FFmpeg-devel] [PATCH v2 1/6] avutil/frame: Add av_frame_copy_side_data() and av_frame_remove_all_side_data() softworkz 2022-06-01 9:06 ` [FFmpeg-devel] [PATCH v2 2/6] avcodec/vpp_qsv: Copy side data from input to output frame softworkz 2022-06-01 9:06 ` [FFmpeg-devel] [PATCH v2 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible softworkz 2022-06-01 9:06 ` [FFmpeg-devel] [PATCH v2 4/6] avcodec/hevcdec: make set_side_data() accessible softworkz 2022-06-01 9:06 ` [FFmpeg-devel] [PATCH v2 5/6] avcodec/h264dec: make h264_export_frame_props() accessible softworkz 2022-06-01 9:06 ` [FFmpeg-devel] [PATCH v2 6/6] avcodec/qsvdec: Implement SEI parsing for QSV decoders softworkz 2022-06-01 17:20 ` Xiang, Haihao 2022-06-01 17:50 ` Soft Works 2022-06-01 18:01 ` [FFmpeg-devel] [PATCH v3 0/6] " ffmpegagent 2022-06-01 18:01 ` [FFmpeg-devel] [PATCH v3 1/6] avutil/frame: Add av_frame_copy_side_data() and av_frame_remove_all_side_data() softworkz 2022-06-24 7:01 ` Xiang, Haihao 2022-06-26 23:35 ` Soft Works 2022-06-01 18:01 ` [FFmpeg-devel] [PATCH v3 2/6] avcodec/vpp_qsv: Copy side data from input to output frame softworkz 2022-06-01 18:01 ` [FFmpeg-devel] [PATCH v3 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible softworkz 2022-06-01 18:01 ` [FFmpeg-devel] [PATCH v3 4/6] avcodec/hevcdec: make set_side_data() accessible softworkz 2022-06-01 18:01 ` [FFmpeg-devel] [PATCH v3 5/6] avcodec/h264dec: make h264_export_frame_props() accessible softworkz 2022-06-01 18:01 ` [FFmpeg-devel] [PATCH v3 6/6] avcodec/qsvdec: Implement SEI parsing for QSV decoders softworkz 2022-06-26 23:41 ` [FFmpeg-devel] [PATCH v4 0/6] " ffmpegagent 2022-06-26 23:41 ` [FFmpeg-devel] [PATCH v4 1/6] avutil/frame: Add av_frame_copy_side_data() and av_frame_remove_all_side_data() softworkz 2022-06-26 23:41 ` [FFmpeg-devel] [PATCH v4 2/6] avcodec/vpp_qsv: Copy side data from input to output frame softworkz 2022-06-26 23:41 ` [FFmpeg-devel] [PATCH v4 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible softworkz 2022-06-26 23:41 ` [FFmpeg-devel] [PATCH v4 4/6] avcodec/hevcdec: make set_side_data() accessible softworkz 2022-06-26 23:41 ` [FFmpeg-devel] [PATCH v4 5/6] avcodec/h264dec: make h264_export_frame_props() accessible softworkz 2022-06-26 23:41 ` [FFmpeg-devel] [PATCH v4 6/6] avcodec/qsvdec: Implement SEI parsing for QSV decoders softworkz 2022-06-28 4:16 ` Andreas Rheinhardt 2022-06-28 5:25 ` Soft Works 2022-06-27 4:18 ` [FFmpeg-devel] [PATCH v4 0/6] " Xiang, Haihao 2022-07-01 20:48 ` [FFmpeg-devel] [PATCH v5 " ffmpegagent 2022-07-01 20:48 ` [FFmpeg-devel] [PATCH v5 1/6] avutil/frame: Add av_frame_copy_side_data() and av_frame_remove_all_side_data() softworkz 2022-07-01 20:48 ` [FFmpeg-devel] [PATCH v5 2/6] avcodec/vpp_qsv: Copy side data from input to output frame softworkz 2022-07-01 20:48 ` [FFmpeg-devel] [PATCH v5 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible softworkz 2022-07-01 20:48 ` [FFmpeg-devel] [PATCH v5 4/6] avcodec/hevcdec: make set_side_data() accessible softworkz 2022-07-01 20:48 ` [FFmpeg-devel] [PATCH v5 5/6] avcodec/h264dec: make h264_export_frame_props() accessible softworkz 2022-07-01 20:48 ` [FFmpeg-devel] [PATCH v5 6/6] avcodec/qsvdec: Implement SEI parsing for QSV decoders softworkz 2022-07-19 6:55 ` [FFmpeg-devel] [PATCH v5 0/6] " Xiang, Haihao 2022-07-21 21:06 ` Soft Works 2022-07-21 21:56 ` Andreas Rheinhardt 2022-10-21 7:42 ` Soft Works 2022-10-25 4:03 ` [FFmpeg-devel] [PATCH v6 0/3] " ffmpegagent 2022-10-25 4:03 ` [FFmpeg-devel] [PATCH v6 1/3] avcodec/hevcdec: factor out ff_hevc_set_set_to_frame softworkz 2022-10-25 4:03 ` [FFmpeg-devel] [PATCH v6 2/3] avcodec/h264dec: make h264_export_frame_props() accessible softworkz 2022-10-25 4:03 ` [FFmpeg-devel] [PATCH v6 3/3] avcodec/qsvdec: Implement SEI parsing for QSV decoders softworkz 2022-11-21 2:44 ` Xiang, Haihao 2022-11-21 15:58 ` Soft Works 2022-11-22 5:41 ` Xiang, Haihao [this message] 2022-06-01 19:15 ` [FFmpeg-devel] [PATCH 0/6] " Kieran Kunhya 2022-06-01 19:46 ` Soft Works 2022-06-01 20:25 ` Kieran Kunhya 2022-06-01 21:24 ` Soft Works
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=2ab71bc98e637a5c2509dacc8918dfb9664dc2ab.camel@intel.com \ --to=haihao.xiang-at-intel.com@ffmpeg.org \ --cc=andreas.rheinhardt@outlook.com \ --cc=ffmpeg-devel@ffmpeg.org \ --cc=kierank@obe.tv \ --cc=softworkz@hotmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
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