August 2018 - ffmpeg-cvslog - lists.ffmpeg.org

libavfilter: Adds on the fly generation of default DNN models for tensorflow backend instead of storing binary model.
by Sergey Lavrushkin 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Sergey Lavrushkin <dualfal(a)gmail.com> | Fri Jul 27 19:31:55 2018 +0300| [4eb63efbdaea6d36ad94f1bb0dd129b7f7aaa899] | committer: Pedro Arthur libavfilter: Adds on the fly generation of default DNN models for tensorflow backend instead of storing binary model. Signed-off-by: Pedro Arthur <bygrandao(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4eb63efbdaea6d36a… --- libavfilter/dnn_backend_native.c | 12 +- libavfilter/dnn_backend_tf.c | 271 +- libavfilter/dnn_espcn.h | 17981 +++++++++++-------------------------- libavfilter/dnn_srcnn.h | 7013 +++++---------- libavfilter/vf_sr.c | 24 +- 5 files changed, 7742 insertions(+), 17559 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commitdiff;h=4eb63efbdaea6…

1 0

avformat/flvdec: add flv_full_metadata option into flvdec
by Steven Liu 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Tue Aug 7 15:51:36 2018 +0800| [243ecadad5e5e83afdd518c067030e12ac457120] | committer: Steven Liu avformat/flvdec: add flv_full_metadata option into flvdec output all the metadata context when use this option. Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=243ecadad5e5e83af… --- doc/demuxers.texi | 3 +++ libavformat/flvdec.c | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 5007e6339f..aad94eb50e 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -272,6 +272,9 @@ Allocate the streams according to the onMetaData array content. @item -flv_ignore_prevtag @var{bool} Ignore the size of previous tag value. + +@item -flv_full_metadata @var{bool} +Output all context of the onMetadata. @end table @section gif diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index ce3cac04ab..93c7f85237 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -45,6 +45,7 @@ typedef struct FLVContext { const AVClass *class; ///< Class for private options. int trust_metadata; ///< configure streams according onMetaData int trust_datasize; ///< trust data size of FLVTag + int dump_full_metadata; ///< Dump full metadata of the onMetadata int wrong_dts; ///< wrong dts due to negative cts uint8_t *new_extradata[FLV_STREAM_TYPE_NB]; int new_extradata_size[FLV_STREAM_TYPE_NB]; @@ -612,7 +613,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, (!vpar && !strcmp(key, "videocodecid")))) s->ctx_flags &= ~AVFMTCTX_NOHEADER; //If there is either audio/video missing, codecid will be an empty object - if (!strcmp(key, "duration") || + if ((!strcmp(key, "duration") || !strcmp(key, "filesize") || !strcmp(key, "width") || !strcmp(key, "height") || @@ -624,7 +625,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, !strcmp(key, "audiosamplesize") || !strcmp(key, "stereo") || !strcmp(key, "audiocodecid") || - !strcmp(key, "datastream")) + !strcmp(key, "datastream")) && !flv->dump_full_metadata) return 0; s->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; @@ -1280,6 +1281,7 @@ static int flv_read_seek(AVFormatContext *s, int stream_index, #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { { "flv_metadata", "Allocate streams according to the onMetaData array", OFFSET(trust_metadata), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, + { "flv_full_metadata", "Dump full metadata of the onMetadata", OFFSET(dump_full_metadata), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, { "flv_ignore_prevtag", "Ignore the Size of previous tag", OFFSET(trust_datasize), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, { "missing_streams", "", OFFSET(missing_streams), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0xFF, VD | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, { NULL }

1 0

avformat/flvdec: reindent code for previous commit
by Steven Liu 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Tue Aug 7 15:50:47 2018 +0800| [3b99bb38890375ebef2851a35bc048a37f6fd7f1] | committer: Steven Liu avformat/flvdec: reindent code for previous commit Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b99bb38890375ebe… --- libavformat/flvdec.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index ff91008371..ce3cac04ab 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1252,19 +1252,19 @@ retry_duration: leave: last = avio_rb32(s->pb); if (!flv->trust_datasize) { - if (last != orig_size + 11 && last != orig_size + 10 && - !avio_feof(s->pb) && - (last != orig_size || !last) && last != flv->sum_flv_tag_size && - !flv->broken_sizes) { - av_log(s, AV_LOG_ERROR, "Packet mismatch %d %d %d\n", last, orig_size + 11, flv->sum_flv_tag_size); - avio_seek(s->pb, pos + 1, SEEK_SET); - ret = resync(s); - av_packet_unref(pkt); - if (ret >= 0) { - goto retry; + if (last != orig_size + 11 && last != orig_size + 10 && + !avio_feof(s->pb) && + (last != orig_size || !last) && last != flv->sum_flv_tag_size && + !flv->broken_sizes) { + av_log(s, AV_LOG_ERROR, "Packet mismatch %d %d %d\n", last, orig_size + 11, flv->sum_flv_tag_size); + avio_seek(s->pb, pos + 1, SEEK_SET); + ret = resync(s); + av_packet_unref(pkt); + if (ret >= 0) { + goto retry; + } } } - } return ret; }

1 0

avformat/flvdec: add flv_ignore_prevtag option into flvdec
by Steven Liu 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Tue Aug 7 15:48:23 2018 +0800| [d37125fb910e466ab3e505afd0a687486f4e7c93] | committer: Steven Liu avformat/flvdec: add flv_ignore_prevtag option into flvdec Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d37125fb910e466ab… --- doc/demuxers.texi | 3 +++ libavformat/flvdec.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 072918be28..5007e6339f 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -269,6 +269,9 @@ ffmpeg -f live_flv -i rtmp://<any.server>/anything/key .... @table @option @item -flv_metadata @var{bool} Allocate the streams according to the onMetaData array content. + +@item -flv_ignore_prevtag @var{bool} +Ignore the size of previous tag value. @end table @section gif diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 975641757a..ff91008371 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -44,6 +44,7 @@ typedef struct FLVContext { const AVClass *class; ///< Class for private options. int trust_metadata; ///< configure streams according onMetaData + int trust_datasize; ///< trust data size of FLVTag int wrong_dts; ///< wrong dts due to negative cts uint8_t *new_extradata[FLV_STREAM_TYPE_NB]; int new_extradata_size[FLV_STREAM_TYPE_NB]; @@ -1250,6 +1251,7 @@ retry_duration: leave: last = avio_rb32(s->pb); + if (!flv->trust_datasize) { if (last != orig_size + 11 && last != orig_size + 10 && !avio_feof(s->pb) && (last != orig_size || !last) && last != flv->sum_flv_tag_size && @@ -1262,6 +1264,7 @@ leave: goto retry; } } + } return ret; } @@ -1277,6 +1280,7 @@ static int flv_read_seek(AVFormatContext *s, int stream_index, #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { { "flv_metadata", "Allocate streams according to the onMetaData array", OFFSET(trust_metadata), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, + { "flv_ignore_prevtag", "Ignore the Size of previous tag", OFFSET(trust_datasize), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD }, { "missing_streams", "", OFFSET(missing_streams), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0xFF, VD | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, { NULL } };

1 0

avformat/dashdec: remove unused functions and process code
by Steven Liu 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Steven Liu <lq(a)chinaffmpeg.org> | Tue Aug 7 12:37:02 2018 +0800| [d54ae9b782c85e626a1e49a8ee204728746227d1] | committer: Steven Liu avformat/dashdec: remove unused functions and process code Based on a patch for hls by Richard Shaffer Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d54ae9b782c85e626… --- libavformat/dashdec.c | 46 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index c710e56727..09b06ef3ed 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -143,9 +143,6 @@ typedef struct DASHContext { int is_live; AVIOInterruptCB *interrupt_callback; - char *user_agent; ///< holds HTTP user agent set as an AVOption to the HTTP protocol context - char *cookies; ///< holds HTTP cookie values set in either the initial response or as an AVOption to the HTTP protocol context - char *headers; ///< holds HTTP headers set as an AVOption to the HTTP protocol context char *allowed_extensions; AVDictionary *avio_opts; int max_url_size; @@ -377,24 +374,6 @@ static void free_audio_list(DASHContext *c) c->n_audios = 0; } -static void set_httpheader_options(DASHContext *c, AVDictionary **opts) -{ - // broker prior HTTP options that should be consistent across requests - av_dict_set(opts, "user_agent", c->user_agent, 0); - av_dict_set(opts, "cookies", c->cookies, 0); - av_dict_set(opts, "headers", c->headers, 0); - if (c->is_live) { - av_dict_set(opts, "seekable", "0", 0); - } -} -static void update_options(char **dest, const char *name, void *src) -{ - av_freep(dest); - av_opt_get(src, name, AV_OPT_SEARCH_CHILDREN, (uint8_t**)dest); - if (*dest) - av_freep(dest); -} - static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, AVDictionary *opts, AVDictionary *opts2, int *is_http) { @@ -448,11 +427,9 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, av_opt_get(*pb, "cookies", AV_OPT_SEARCH_CHILDREN, (uint8_t**)&new_cookies); if (new_cookies) { - av_free(c->cookies); - c->cookies = new_cookies; + av_dict_set(&opts, "cookies", new_cookies, AV_DICT_DONT_STRDUP_VAL); } - av_dict_set(&opts, "cookies", c->cookies, 0); } av_dict_free(&tmp); @@ -1142,7 +1119,7 @@ static int parse_manifest(AVFormatContext *s, const char *url, AVIOContext *in) if (!in) { close_in = 1; - set_httpheader_options(c, &opts); + av_dict_copy(&opts, c->avio_opts, 0); ret = avio_open2(&in, url, AVIO_FLAG_READ, c->interrupt_callback, &opts); av_dict_free(&opts); if (ret < 0) @@ -1587,7 +1564,7 @@ static int open_input(DASHContext *c, struct representation *pls, struct fragmen if (!url) { goto cleanup; } - set_httpheader_options(c, &opts); + if (seg->size >= 0) { /* try to restrict the HTTP request to the part we want * (if this is in fact a HTTP request) */ @@ -1734,7 +1711,7 @@ end: static int save_avio_options(AVFormatContext *s) { DASHContext *c = s->priv_data; - const char *opts[] = { "headers", "user_agent", "user_agent", "cookies", NULL }, **opt = opts; + const char *opts[] = { "headers", "user_agent", "cookies", NULL }, **opt = opts; uint8_t *buf = NULL; int ret = 0; @@ -1913,24 +1890,19 @@ static void copy_init_section(struct representation *rep_dest, struct representa static int dash_read_header(AVFormatContext *s) { - void *u = (s->flags & AVFMT_FLAG_CUSTOM_IO) ? NULL : s->pb; DASHContext *c = s->priv_data; int ret = 0; int stream_index = 0; int i; c->interrupt_callback = &s->interrupt_callback; - // if the URL context is good, read important options we must broker later - if (u) { - update_options(&c->user_agent, "user_agent", u); - update_options(&c->cookies, "cookies", u); - update_options(&c->headers, "headers", u); - } - if ((ret = parse_manifest(s, s->url, s->pb)) < 0) + if ((ret = save_avio_options(s)) < 0) goto fail; - if ((ret = save_avio_options(s)) < 0) + av_dict_set(&c->avio_opts, "seekable", "0", 0); + + if ((ret = parse_manifest(s, s->url, s->pb)) < 0) goto fail; /* If this isn't a live stream, fill the total duration of the @@ -2096,8 +2068,6 @@ static int dash_close(AVFormatContext *s) free_audio_list(c); free_video_list(c); - av_freep(&c->cookies); - av_freep(&c->user_agent); av_dict_free(&c->avio_opts); av_freep(&c->base_url); return 0;

1 0

avformat/dashdec: Fix memleak when resolve_content_path
by Jacek Jendrzej 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Jacek Jendrzej <overx300(a)gmail.com> | Tue Aug 7 11:32:05 2018 +0800| [0cf5e6b5b4e162efd71e0e331b0aa87d903517e3] | committer: Steven Liu avformat/dashdec: Fix memleak when resolve_content_path Can be reproduced with: valgrind --leak-check=full -v ffmpeg -i http://yt-dash-mse-test.commondatastorage.googleapis.com/media/motion-20120… Reviewed-by: Steven Liu <lq(a)onvideo.cn> Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cf5e6b5b4e162efd… --- libavformat/dashdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index f0939f4425..c710e56727 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -754,9 +754,12 @@ static int resolve_content_path(AVFormatContext *s, const char *url, int *max_ur if (!(node = baseurl_nodes[rootId])) { continue; } - if (ishttp(xmlNodeGetContent(node))) { + text = xmlNodeGetContent(node); + if (ishttp(text)) { + xmlFree(text); break; } + xmlFree(text); } node = baseurl_nodes[rootId];

1 0

avformat/dashdec: fix for ticket #7336
by Jacek Jendrzej 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Jacek Jendrzej <overx300(a)gmail.com> | Tue Aug 7 11:30:04 2018 +0800| [2f45378ba14417cbb4fc9494ba941cb06443c4f9] | committer: Steven Liu avformat/dashdec: fix for ticket #7336 fix for ticket #7336 Reviewed-by: Steven Liu <lq(a)onvideo.cn> Signed-off-by: Steven Liu <lq(a)chinaffmpeg.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f45378ba14417cbb… --- libavformat/dashdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 89f3ac2759..f0939f4425 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1936,7 +1936,8 @@ static int dash_read_header(AVFormatContext *s) s->duration = (int64_t) c->media_presentation_duration * AV_TIME_BASE; } - c->is_init_section_common_video = is_common_init_section_exist(c->videos, c->n_videos); + if(c->n_videos) + c->is_init_section_common_video = is_common_init_section_exist(c->videos, c->n_videos); /* Open the demuxer for video and audio components if available */ for (i = 0; i < c->n_videos; i++) { @@ -1952,7 +1953,8 @@ static int dash_read_header(AVFormatContext *s) ++stream_index; } - c->is_init_section_common_audio = is_common_init_section_exist(c->audios, c->n_audios); + if(c->n_audios) + c->is_init_section_common_audio = is_common_init_section_exist(c->audios, c->n_audios); for (i = 0; i < c->n_audios; i++) { struct representation *cur_audio = c->audios[i];

1 0

fftools/qsv: add extra_hw_frames support
by Zhong Li 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Zhong Li <zhong.li(a)intel.com> | Wed Jul 25 16:05:38 2018 +0800| [6434b84460bb8b996bc52b33b2012e6b05d3a459] | committer: Zhong Li fftools/qsv: add extra_hw_frames support Currently extra_hw_frames can't be applied to qsv since it doesn't call function avcodec_get_hw_frames_parameters(). Give an option to fix ticket #7261 though it is not a perfect soultion (allocate the minimum pool size internally and automatically). Signed-off-by: Zhong Li <zhong.li(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6434b84460bb8b996… --- fftools/ffmpeg_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_qsv.c b/fftools/ffmpeg_qsv.c index 7442750029..9c4285b6c7 100644 --- a/fftools/ffmpeg_qsv.c +++ b/fftools/ffmpeg_qsv.c @@ -93,7 +93,7 @@ int qsv_init(AVCodecContext *s) frames_ctx->height = FFALIGN(s->coded_height, 32); frames_ctx->format = AV_PIX_FMT_QSV; frames_ctx->sw_format = s->sw_pix_fmt; - frames_ctx->initial_pool_size = 64; + frames_ctx->initial_pool_size = 64 + s->extra_hw_frames; frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET; ret = av_hwframe_ctx_init(ist->hw_frames_ctx);

1 0

lavc/qsvenc: expose qp of encoded frames
by Zhong Li 07 Aug '18

07 Aug '18

ffmpeg | branch: master | Zhong Li <zhong.li(a)intel.com> | Fri Jun 1 18:21:28 2018 +0800| [6088b7b0373faad7a8e62a8c4eb4ced9084ad2d9] | committer: Zhong Li lavc/qsvenc: expose qp of encoded frames Requirement from ticket #7254. Currently only H264 supported by MSDK. Signed-off-by: Zhong Li <zhong.li(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6088b7b0373faad7a… --- libavcodec/qsvenc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/qsvenc.h | 2 ++ libavcodec/qsvenc_h264.c | 5 +++++ 3 files changed, 50 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 3ce5ffecd5..c4fc2c5299 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1128,6 +1128,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, { AVPacket new_pkt = { 0 }; mfxBitstream *bs; +#if QSV_VERSION_ATLEAST(1, 26) + mfxExtAVCEncodedFrameInfo *enc_info; + mfxExtBuffer **enc_buf; +#endif mfxFrameSurface1 *surf = NULL; mfxSyncPoint *sync = NULL; @@ -1161,6 +1165,22 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, bs->Data = new_pkt.data; bs->MaxLength = new_pkt.size; +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) { + enc_info = av_mallocz(sizeof(*enc_info)); + if (!enc_info) + return AVERROR(ENOMEM); + + enc_info->Header.BufferId = MFX_EXTBUFF_ENCODED_FRAME_INFO; + enc_info->Header.BufferSz = sizeof (*enc_info); + bs->NumExtParam = 1; + enc_buf = av_mallocz(sizeof(mfxExtBuffer *)); + enc_buf[0] = (mfxExtBuffer *)enc_info; + + bs->ExtParam = enc_buf; + } +#endif + if (q->set_encode_ctrl_cb) { q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); } @@ -1168,6 +1188,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, sync = av_mallocz(sizeof(*sync)); if (!sync) { av_freep(&bs); + #if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) + av_freep(&enc_info); + #endif av_packet_unref(&new_pkt); return AVERROR(ENOMEM); } @@ -1184,6 +1208,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, if (ret < 0) { av_packet_unref(&new_pkt); av_freep(&bs); +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) + av_freep(&enc_info); +#endif av_freep(&sync); return (ret == MFX_ERR_MORE_DATA) ? 0 : ff_qsv_print_error(avctx, ret, "Error during encoding"); @@ -1200,6 +1228,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, av_freep(&sync); av_packet_unref(&new_pkt); av_freep(&bs); +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) + av_freep(&enc_info); +#endif } return 0; @@ -1219,6 +1251,9 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, AVPacket new_pkt; mfxBitstream *bs; mfxSyncPoint *sync; +#if QSV_VERSION_ATLEAST(1, 26) + mfxExtAVCEncodedFrameInfo *enc_info; +#endif av_fifo_generic_read(q->async_fifo, &new_pkt, sizeof(new_pkt), NULL); av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); @@ -1247,6 +1282,14 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) { + enc_info = (mfxExtAVCEncodedFrameInfo *)(*bs->ExtParam); + av_log(avctx, AV_LOG_DEBUG, "QP is %d\n", enc_info->QP); + q->sum_frame_qp += enc_info->QP; + av_freep(&enc_info); + } +#endif av_freep(&bs); av_freep(&sync); diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index bb175c5df8..d1c8a0c998 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -103,6 +103,8 @@ typedef struct QSVEncContext { int width_align; int height_align; + int sum_frame_qp; + mfxVideoParam param; mfxFrameAllocRequest req; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 7aa65e96bc..985f4aca9c 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -94,6 +94,11 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx) { QSVH264EncContext *q = avctx->priv_data; +#if QSV_VERSION_ATLEAST(1, 26) + av_log(avctx, AV_LOG_VERBOSE, "encoded %d frames, avarge qp is %.2f\n", + avctx->frame_number,(double)q->qsv.sum_frame_qp / avctx->frame_number); +#endif + return ff_qsv_enc_close(avctx, &q->qsv); }

1 0

vf_tonemap: Update hdr metadata with the new peak value
by Vittorio Giovara 06 Aug '18

06 Aug '18

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara(a)gmail.com> | Wed Jul 25 17:45:46 2018 +0200| [aa8e5eecac97dd3c87518e0accfb96dea05066c8] | committer: Vittorio Giovara vf_tonemap: Update hdr metadata with the new peak value Less effective than the approach in vf_tonemap_opencl because there is no peak detection, but it's still a good idea to implement this. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa8e5eecac97dd3c8… --- libavfilter/vf_tonemap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/vf_tonemap.c b/libavfilter/vf_tonemap.c index b62532946b..98a2c4bd23 100644 --- a/libavfilter/vf_tonemap.c +++ b/libavfilter/vf_tonemap.c @@ -265,6 +265,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) av_frame_free(&in); + ff_update_hdr_metadata(out, peak); + return ff_filter_frame(outlink, out); }

1 0