June 2022 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/exrenc: add grayf32 format support
by Paul B Mahol 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Jun 30 15:04:24 2022 +0200| [3f72155fc664b6abccd194d71cbec44183ab64d9] | committer: Paul B Mahol avcodec/exrenc: add grayf32 format support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f72155fc664b6abc… --- libavcodec/exrenc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/exrenc.c b/libavcodec/exrenc.c index 459afebb82..9138684bcb 100644 --- a/libavcodec/exrenc.c +++ b/libavcodec/exrenc.c @@ -54,8 +54,10 @@ enum ExrPixelType { static const char abgr_chlist[4] = { 'A', 'B', 'G', 'R' }; static const char bgr_chlist[4] = { 'B', 'G', 'R', 'A' }; +static const char y_chlist[4] = { 'Y' }; static const uint8_t gbra_order[4] = { 3, 1, 0, 2 }; static const uint8_t gbr_order[4] = { 1, 0, 2, 0 }; +static const uint8_t y_order[4] = { 0 }; typedef struct EXRScanlineData { uint8_t *compressed_data; @@ -106,6 +108,11 @@ static int encode_init(AVCodecContext *avctx) s->ch_names = abgr_chlist; s->ch_order = gbra_order; break; + case AV_PIX_FMT_GRAYF32: + s->planes = 1; + s->ch_names = y_chlist; + s->ch_order = y_order; + break; default: av_assert0(0); } @@ -546,6 +553,7 @@ const FFCodec ff_exr_encoder = { FF_CODEC_ENCODE_CB(encode_frame), .close = encode_close, .p.pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_GRAYF32, AV_PIX_FMT_GBRPF32, AV_PIX_FMT_GBRAPF32, AV_PIX_FMT_NONE },

1 0

avcodec/hevcdec: Return immediately upon hevc_init_context() failure
by Andreas Rheinhardt 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Jun 29 13:29:56 2022 +0200| [03b2ed9a50dc6cbf332a2d93e4c8811b88e6df7f] | committer: Andreas Rheinhardt avcodec/hevcdec: Return immediately upon hevc_init_context() failure This function is only called from the decoder's init function and given that this decoder has FF_CODEC_CAP_INIT_CLEANUP set, hevc_decode_free() is called automatically (currently it would be called twice with the second call being redundant). Reviewed-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03b2ed9a50dc6cbf3… --- libavcodec/hevcdec.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 7ab012d68f..7037048d53 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3647,34 +3647,34 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) s->HEVClcList = av_mallocz(sizeof(HEVCLocalContext*) * s->threads_number); s->sList = av_mallocz(sizeof(HEVCContext*) * s->threads_number); if (!s->HEVClc || !s->HEVClcList || !s->sList) - goto fail; + return AVERROR(ENOMEM); s->HEVClcList[0] = s->HEVClc; s->sList[0] = s; s->cabac_state = av_malloc(HEVC_CONTEXTS); if (!s->cabac_state) - goto fail; + return AVERROR(ENOMEM); s->output_frame = av_frame_alloc(); if (!s->output_frame) - goto fail; + return AVERROR(ENOMEM); for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { s->DPB[i].frame = av_frame_alloc(); if (!s->DPB[i].frame) - goto fail; + return AVERROR(ENOMEM); s->DPB[i].tf.f = s->DPB[i].frame; s->DPB[i].frame_grain = av_frame_alloc(); if (!s->DPB[i].frame_grain) - goto fail; + return AVERROR(ENOMEM); } s->max_ra = INT_MAX; s->md5_ctx = av_md5_alloc(); if (!s->md5_ctx) - goto fail; + return AVERROR(ENOMEM); ff_bswapdsp_init(&s->bdsp); @@ -3684,10 +3684,6 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) ff_hevc_reset_sei(&s->sei); return 0; - -fail: - hevc_decode_free(avctx); - return AVERROR(ENOMEM); } #if HAVE_THREADS

1 0

avcodec/hevcdec: Remove redundant context_initialized
by Andreas Rheinhardt 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Jun 29 13:14:39 2022 +0200| [a3b833c3ea9caf54d1a07980343bb82d9337105f] | committer: Andreas Rheinhardt avcodec/hevcdec: Remove redundant context_initialized All contexts are always initialized during init, regardless of whether frame threading is in use or not. Reviewed-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3b833c3ea9caf54d… --- libavcodec/hevcdec.c | 7 ------- libavcodec/hevcdec.h | 1 - 2 files changed, 8 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index e84c30dd13..7ab012d68f 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3679,7 +3679,6 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) ff_bswapdsp_init(&s->bdsp); s->dovi_ctx.logctx = avctx; - s->context_initialized = 1; s->eos = 0; ff_hevc_reset_sei(&s->sei); @@ -3699,12 +3698,6 @@ static int hevc_update_thread_context(AVCodecContext *dst, HEVCContext *s0 = src->priv_data; int i, ret; - if (!s->context_initialized) { - ret = hevc_init_context(dst); - if (ret < 0) - return ret; - } - for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { ff_hevc_unref_frame(s, &s->DPB[i], ~0); if (s0->DPB[i].frame->buf[0]) { diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index de861b88b3..ff2199aa5a 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -563,7 +563,6 @@ typedef struct HEVCContext { // type of the first VCL NAL of the current frame enum HEVCNALUnitType first_nal_type; - uint8_t context_initialized; int is_nalff; ///< this flag is != 0 if bitstream is encapsulated ///< as a format defined in 14496-15 int apply_defdispwin;

1 0

avcodec/avcodec: Don't mention removed function
by Andreas Rheinhardt 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Jun 29 20:35:08 2022 +0200| [9a167a15c7918d56a6a1f8d26ea17649566befb8] | committer: Andreas Rheinhardt avcodec/avcodec: Don't mention removed function avcodec_thread_init() has been removed in 9a79bb552a518f26bec1b5306a03b76076bcf8eb. Reviewed-by: Anton Khirnov <anton(a)khirnov.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a167a15c7918d56a… --- libavcodec/avcodec.h | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4dae23d06e..cb5c25bf63 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1518,7 +1518,6 @@ typedef struct AVCodecContext { * It will return only after finishing all tasks. * The user may replace this with some multithreaded implementation, * the default implementation will execute the parts serially. - * Also see avcodec_thread_init and e.g. the --enable-pthread configure option. * @param c context passed also to func * @param count the number of things to execute * @param arg2 argument passed unchanged to func

1 0

avformat/mov: Only read the primary item for AVIF
by Vignesh Venkatasubramanian 29 Jun '22

29 Jun '22

ffmpeg | branch: master | Vignesh Venkatasubramanian <vigneshv-at-google.com(a)ffmpeg.org> | Tue Jun 28 11:56:20 2022 -0700| [be4d1caad40e05b0c6b1cf2320fd8112fe9da14b] | committer: James Zern avformat/mov: Only read the primary item for AVIF Update the still AVIF parser to only read the primary item. With this patch, AVIF still images with exif/icc/alpha channel will no longer fail to parse. For example, this patch enables parsing of files in: https://github.com/AOMediaCodec/av1-avif/tree/master/testFiles/Microsoft Adding two fate tests: 1) demuxing of still image with 1 item - this test will pass regardless of this patch. 2) demuxing of still image with 2 items - this test will fail without this patch and will pass with patch applied. Partially fixes trac ticket #7621 Signed-off-by: Vignesh Venkatasubramanian <vigneshv(a)google.com> Signed-off-by: James Zern <jzern(a)google.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be4d1caad40e05b0c… --- libavformat/isom.h | 1 + libavformat/mov.c | 41 +++++++++++----------- tests/fate/mov.mak | 13 +++++++ tests/ref/fate/mov-avif-demux-still-image-1-item | 11 ++++++ .../fate/mov-avif-demux-still-image-multiple-items | 11 ++++++ 5 files changed, 57 insertions(+), 20 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index cf36f04d5b..f05c2d9c28 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -317,6 +317,7 @@ typedef struct MOVContext { uint32_t mfra_size; uint32_t max_stts_delta; int is_still_picture_avif; + int primary_item_id; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index c6fbe511c0..88669faa70 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7470,6 +7470,13 @@ static int rb_size(AVIOContext *pb, uint64_t* value, int size) return size; } +static int mov_read_pitm(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + avio_rb32(pb); // version & flags. + c->primary_item_id = avio_rb16(pb); + return atom.size; +} + static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) { int version, offset_size, length_size, base_offset_size, index_size; @@ -7526,34 +7533,25 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR_PATCHWELCOME; } item_count = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); - if (item_count > 1) { - // For still AVIF images, we only support one item. Second item will - // generally be found for AVIF images with alpha channel. We don't - // support them as of now. - av_log(c->fc, AV_LOG_ERROR, "iloc: item_count > 1 not supported.\n"); - return AVERROR_PATCHWELCOME; - } // Populate the necessary fields used by mov_build_index. - sc->stsc_count = item_count; - sc->stsc_data = av_malloc_array(item_count, sizeof(*sc->stsc_data)); + sc->stsc_count = 1; + sc->stsc_data = av_malloc_array(1, sizeof(*sc->stsc_data)); if (!sc->stsc_data) return AVERROR(ENOMEM); sc->stsc_data[0].first = 1; sc->stsc_data[0].count = 1; sc->stsc_data[0].id = 1; - sc->chunk_count = item_count; - sc->chunk_offsets = - av_malloc_array(item_count, sizeof(*sc->chunk_offsets)); + sc->chunk_count = 1; + sc->chunk_offsets = av_malloc_array(1, sizeof(*sc->chunk_offsets)); if (!sc->chunk_offsets) return AVERROR(ENOMEM); - sc->sample_count = item_count; - sc->sample_sizes = - av_malloc_array(item_count, sizeof(*sc->sample_sizes)); + sc->sample_count = 1; + sc->sample_sizes = av_malloc_array(1, sizeof(*sc->sample_sizes)); if (!sc->sample_sizes) return AVERROR(ENOMEM); - sc->stts_count = item_count; - sc->stts_data = av_malloc_array(item_count, sizeof(*sc->stts_data)); + sc->stts_count = 1; + sc->stts_data = av_malloc_array(1, sizeof(*sc->stts_data)); if (!sc->stts_data) return AVERROR(ENOMEM); sc->stts_data[0].count = 1; @@ -7561,7 +7559,7 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) sc->stts_data[0].duration = 0; for (int i = 0; i < item_count; i++) { - (version < 2) ? avio_rb16(pb) : avio_rb32(pb); // item_id; + int item_id = (version < 2) ? avio_rb16(pb) : avio_rb32(pb); if (version > 0) avio_rb16(pb); // construction_method. avio_rb16(pb); // data_reference_index. @@ -7577,8 +7575,10 @@ static int mov_read_iloc(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (rb_size(pb, &extent_offset, offset_size) < 0 || rb_size(pb, &extent_length, length_size) < 0) return AVERROR_INVALIDDATA; - sc->sample_sizes[0] = extent_length; - sc->chunk_offsets[0] = base_offset + extent_offset; + if (item_id == c->primary_item_id) { + sc->sample_sizes[0] = extent_length; + sc->chunk_offsets[0] = base_offset + extent_offset; + } } } @@ -7696,6 +7696,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('S','A','N','D'), mov_read_SAND }, /* non diegetic audio box */ { MKTAG('i','l','o','c'), mov_read_iloc }, { MKTAG('p','c','m','C'), mov_read_pcmc }, /* PCM configuration box */ +{ MKTAG('p','i','t','m'), mov_read_pitm }, { 0, NULL } }; diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 2fae054423..8a7218a215 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -17,6 +17,10 @@ FATE_MOV = fate-mov-3elist \ fate-mov-bbi-elst-starts-b \ fate-mov-neg-firstpts-discard-frames \ fate-mov-stream-shorter-than-movie \ +# FIXME: Uncomment these two lines once the test files are uploaded to the fate +# server. +# fate-mov-avif-demux-still-image-1-item \ +# fate-mov-avif-demux-still-image-multiple-items \ FATE_MOV_FFPROBE = fate-mov-neg-firstpts-discard \ fate-mov-neg-firstpts-discard-vorbis \ @@ -138,6 +142,15 @@ FATE_MOV_FFMPEG_FFPROBE-$(call TRANSCODE, TTML SUBRIP, MP4 MOV, SRT_DEMUXER TTML fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" +# FIXME: Uncomment these two tests once the test files are uploaded to the fate +# server. +# avif demuxing - still image with 1 item. +#fate-mov-avif-demux-still-image-1-item: CMD = framemd5 -i $(TARGET_SAMPLES)/avif/still_image.avif -c:v copy + +# avif demuxing - still image with multiple items. only the primary item will be +# parsed. +#fate-mov-avif-demux-still-image-multiple-items: CMD = framemd5 -i $(TARGET_SAMPLES)/avif/still_image_exif.avif -c:v copy + # Resulting remux should have: # 1. first audio stream with AV_DISPOSITION_HEARING_IMPAIRED # 2. second audio stream with AV_DISPOSITION_VISUAL_IMPAIRED | DESCRIPTIONS diff --git a/tests/ref/fate/mov-avif-demux-still-image-1-item b/tests/ref/fate/mov-avif-demux-still-image-1-item new file mode 100644 index 0000000000..93773afd4e --- /dev/null +++ b/tests/ref/fate/mov-avif-demux-still-image-1-item @@ -0,0 +1,11 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#extradata 0, 13, b52ae298d37128862ef1918cf916239c +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: av1 +#dimensions 0: 352x288 +#sar 0: 1/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 36265, 235b0c6e389c4084845981e08d60db04 diff --git a/tests/ref/fate/mov-avif-demux-still-image-multiple-items b/tests/ref/fate/mov-avif-demux-still-image-multiple-items new file mode 100644 index 0000000000..93773afd4e --- /dev/null +++ b/tests/ref/fate/mov-avif-demux-still-image-multiple-items @@ -0,0 +1,11 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#extradata 0, 13, b52ae298d37128862ef1918cf916239c +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: av1 +#dimensions 0: 352x288 +#sar 0: 1/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 36265, 235b0c6e389c4084845981e08d60db04

1 0

avcodec/pnmenc: reindent
by Paul B Mahol 29 Jun '22

29 Jun '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jun 29 09:51:58 2022 +0200| [42d75f2faae2033b107e4ce7fa8897d69c2eed09] | committer: Paul B Mahol avcodec/pnmenc: reindent > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42d75f2faae2033b1… --- libavcodec/pnmenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index 4afc588c08..c1820ac79e 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -139,13 +139,13 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, g += p->linesize[0] / 4; } } else { - ptr = p->data[0]; - linesize = p->linesize[0]; - for (i = 0; i < h; i++) { - memcpy(bytestream, ptr, n); - bytestream += n; - ptr += linesize; - } + ptr = p->data[0]; + linesize = p->linesize[0]; + for (i = 0; i < h; i++) { + memcpy(bytestream, ptr, n); + bytestream += n; + ptr += linesize; + } } if (avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV420P16BE) {

1 0

avcodec/pnmenc: add support for grayf32 in PFM image
by Paul B Mahol 29 Jun '22

29 Jun '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Jun 29 09:40:22 2022 +0200| [ed4bad9977b14e42b70b071be2f06dd60993f2e6] | committer: Paul B Mahol avcodec/pnmenc: add support for grayf32 in PFM image > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed4bad9977b14e42b… --- libavcodec/pnmenc.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index feb26b8bfa..4afc588c08 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -85,18 +85,25 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, c = 'F'; n = avctx->width * 4; break; + case AV_PIX_FMT_GRAYF32: + c = 'f'; + n = avctx->width * 4; + break; default: return -1; } snprintf(bytestream, bytestream_end - bytestream, "P%c\n%d %d\n", c, avctx->width, h1); bytestream += strlen(bytestream); - if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32) + if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32 || + avctx->pix_fmt == AV_PIX_FMT_GRAYF32) snprintf(bytestream, bytestream_end - bytestream, - "%f\n", avctx->pix_fmt == AV_PIX_FMT_GBRPF32BE ? 1.f: -1.f); + "%f\n", (avctx->pix_fmt == AV_PIX_FMT_GBRPF32BE || + avctx->pix_fmt == AV_PIX_FMT_GRAYF32BE) ? 1.f: -1.f); bytestream += strlen(bytestream); if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE && - avctx->pix_fmt != AV_PIX_FMT_GBRPF32) { + avctx->pix_fmt != AV_PIX_FMT_GBRPF32 && + avctx->pix_fmt != AV_PIX_FMT_GRAYF32) { int maxdepth = (1 << av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth) - 1; snprintf(bytestream, bytestream_end - bytestream, "%d\n", maxdepth); @@ -120,6 +127,17 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, g += p->linesize[0] / 4; b += p->linesize[1] / 4; } + } else if (avctx->pix_fmt == AV_PIX_FMT_GRAYF32) { + const float *g = (const float *)p->data[0]; + + for (int i = 0; i < avctx->height; i++) { + for (int j = 0; j < avctx->width; j++) { + AV_WN32(bytestream, av_float2int(g[j])); + bytestream += 4; + } + + g += p->linesize[0] / 4; + } } else { ptr = p->data[0]; linesize = p->linesize[0]; @@ -218,6 +236,7 @@ const FFCodec ff_pfm_encoder = { .p.capabilities = AV_CODEC_CAP_DR1, FF_CODEC_ENCODE_CB(pnm_encode_frame), .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_GBRPF32, + AV_PIX_FMT_GRAYF32, AV_PIX_FMT_NONE }, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, };

1 0

avformat/hlsenc: Add resend_headers option
by huheng 29 Jun '22

29 Jun '22

ffmpeg | branch: master | huheng <heng.hu.1989(a)gmail.com> | Mon Jun 27 21:30:11 2022 +0800| [8d4bdf99e5650019e25174de3ff41c8c3396a904] | committer: Steven Liu avformat/hlsenc: Add resend_headers option Add pat and pmt table at start of each segment in single_file mode enhanced compatibility of hls stream. Because some hls clients separate parsing segment of hls stream, the absence of pat/pmt will cause parsing to fail. Reviewed-by: Steven Liu <liuqi05(a)kuaishou.com> Signed-off-by: huheng <heng.hu.1989(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d4bdf99e5650019e… --- libavformat/hlsenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 7c097b4bf2..6f49ae1aa2 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2635,6 +2635,9 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) vs->start_pos += vs->size; if (hls->key_info_file || hls->encrypt) ret = hls_start(s, vs); + if (hls->segment_type == SEGMENT_TYPE_MPEGTS && oc->oformat->priv_class && oc->priv_data) { + av_opt_set(oc->priv_data, "mpegts_flags", "resend_headers", 0); + } } else if (hls->max_seg_size > 0) { if (vs->size + vs->start_pos >= hls->max_seg_size) { vs->sequence++;

1 0

avformat/hls: add #EXT-X-START tag support by prefer_x_start opt
by Li Kai 29 Jun '22

29 Jun '22

ffmpeg | branch: master | Li Kai <wolfleekay(a)gmail.com> | Thu Jun 23 00:55:38 2022 +0800| [df8ad4e3914c65d3ebcaac10bac6038eadb70d74] | committer: Steven Liu avformat/hls: add #EXT-X-START tag support by prefer_x_start opt Reviewed-by: Steven Liu <liuqi05(a)kuaishou.com> Signed-off-by: Li Kai <wolfleekay(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df8ad4e3914c65d3e… --- doc/demuxers.texi | 3 +++ libavformat/hls.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index c95a9ae594..2b6dd86c2a 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -373,6 +373,9 @@ It accepts the following options: @item live_start_index segment index to start live streams at (negative values are from the end). +@item prefer_x_start +prefer to use #EXT-X-START if it's in playlist instead of live_start_index. + @item allowed_extensions ',' separated list of file extensions that hls is allowed to access. diff --git a/libavformat/hls.c b/libavformat/hls.c index b736f093a9..3dc7bd3930 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -120,6 +120,8 @@ struct playlist { enum PlaylistType type; int64_t target_duration; int64_t start_seq_no; + int time_offset_flag; + int64_t start_time_offset; int n_segments; struct segment **segments; int needed; @@ -211,6 +213,7 @@ typedef struct HLSContext { int64_t cur_seq_no; int m3u8_hold_counters; int live_start_index; + int prefer_x_start; int first_packet; int64_t first_timestamp; int64_t cur_timestamp; @@ -889,6 +892,21 @@ static int parse_playlist(HLSContext *c, const char *url, cur_init_section->key = NULL; } + } else if (av_strstart(line, "#EXT-X-START:", &ptr)) { + const char *time_offset_value = NULL; + ret = ensure_playlist(c, &pls, url); + if (ret < 0) { + goto fail; + } + if (av_strstart(ptr, "TIME-OFFSET=", &time_offset_value)) { + float offset = strtof(time_offset_value, NULL); + pls->start_time_offset = offset * AV_TIME_BASE; + pls->time_offset_flag = 1; + } else { + av_log(c->ctx, AV_LOG_WARNING, "#EXT-X-START value is" + "invalid, it will be ignored"); + continue; + } } else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) { if (pls) pls->finished = 1; @@ -1722,9 +1740,45 @@ static int64_t select_cur_seq_no(HLSContext *c, struct playlist *pls) /* If this is a live stream, start live_start_index segments from the * start or end */ if (c->live_start_index < 0) - return pls->start_seq_no + FFMAX(pls->n_segments + c->live_start_index, 0); + seq_no = pls->start_seq_no + FFMAX(pls->n_segments + + c->live_start_index, 0); else - return pls->start_seq_no + FFMIN(c->live_start_index, pls->n_segments - 1); + seq_no = pls->start_seq_no + FFMIN(c->live_start_index, + pls->n_segments - 1); + + /* If #EXT-X-START in playlist, need to recalculate */ + if (pls->time_offset_flag && c->prefer_x_start) { + int64_t start_timestamp; + int64_t playlist_duration = 0; + int64_t cur_timestamp = c->cur_timestamp == AV_NOPTS_VALUE ? 0 : + c->cur_timestamp; + + for (int i = 0; i < pls->n_segments; i++) + playlist_duration += pls->segments[i]->duration; + + /* If the absolute value of TIME-OFFSET exceeds + * the duration of the playlist, it indicates either the end of the + * playlist (if positive) or the beginning of the playlist (if + * negative). */ + if (pls->start_time_offset >=0 && + pls->start_time_offset > playlist_duration) + start_timestamp = cur_timestamp + playlist_duration; + else if (pls->start_time_offset >= 0 && + pls->start_time_offset <= playlist_duration) + start_timestamp = cur_timestamp + pls->start_time_offset; + else if (pls->start_time_offset < 0 && + pls->start_time_offset < -playlist_duration) + start_timestamp = cur_timestamp; + else if (pls->start_time_offset < 0 && + pls->start_time_offset > -playlist_duration) + start_timestamp = cur_timestamp + playlist_duration + + pls->start_time_offset; + else + start_timestamp = cur_timestamp; + + find_timestamp_in_playlist(c, pls, start_timestamp, &seq_no, NULL); + } + return seq_no; } /* Otherwise just start on the first segment. */ @@ -2476,6 +2530,8 @@ static int hls_probe(const AVProbeData *p) static const AVOption hls_options[] = { {"live_start_index", "segment index to start live streams at (negative values are from the end)", OFFSET(live_start_index), AV_OPT_TYPE_INT, {.i64 = -3}, INT_MIN, INT_MAX, FLAGS}, + {"prefer_x_start", "prefer to use #EXT-X-START if it's in playlist instead of live_start_index", + OFFSET(prefer_x_start), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS}, {"allowed_extensions", "List of file extensions that hls is allowed to access", OFFSET(allowed_extensions), AV_OPT_TYPE_STRING, {.str = "3gp,aac,avi,ac3,eac3,flac,mkv,m3u8,m4a,m4s,m4v,mpg,mov,mp2,mp3,mp4,mpeg,mpegts,ogg,ogv,oga,ts,vob,wav"},

1 0

avformat/hlsenc: Use HLS version 2 if rounded durations are enabled
by Lucy 29 Jun '22

29 Jun '22

ffmpeg | branch: master | Lucy <lucy(a)absolucy.moe> | Wed Jun 29 11:43:11 2022 +0800| [1af36982965f91d72bbf41be3e8696a1990265db] | committer: Steven Liu avformat/hlsenc: Use HLS version 2 if rounded durations are enabled This allows for wider compatibility with older devices, such as those running iOS 3. The only difference between HLS version 2 and version 3 is that version 3 supports non-integer EXTINF values, and as such, we can default to version 2 if we're using whole-integer EXTINFs anyways, when `-hls_flags round_durations` is set. As this code seems to otherwise consistently use the lowest compatible version, this seems to fit in properly with existing behavior. Testing confirms with that this patch, HLS output can work all the way back to iOS 3. Reviewed-by: Steven Liu <liuqi05(a)kuaishou.com> Signed-off-by: Lucy <lucy(a)absolucy.moe> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1af36982965f91d72… --- doc/muxers.texi | 2 ++ libavformat/hlsenc.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index b6cafaa5fd..b2f4326aae 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1060,6 +1060,8 @@ and remove the @code{#EXT-X-ENDLIST} from the old segment list. @item round_durations Round the duration info in the playlist file segment info to integer values, instead of using floating point. +If there are no other features requiring higher HLS versions be used, +then this will allow ffmpeg to output a HLS version 2 m3u8. @item discont_start Add the @code{#EXT-X-DISCONTINUITY} tag to the playlist, before the diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 3bafddfa61..7c097b4bf2 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1550,7 +1550,11 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) double *prog_date_time_p = (hls->flags & HLS_PROGRAM_DATE_TIME) ? &prog_date_time : NULL; int byterange_mode = (hls->flags & HLS_SINGLE_FILE) || (hls->max_seg_size > 0); - hls->version = 3; + hls->version = 2; + if (!(hls->flags & HLS_ROUND_DURATIONS)) { + hls->version = 3; + } + if (byterange_mode) { hls->version = 4; sequence = 0;

1 0