From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 5BBA742B3C for ; Sat, 25 Jun 2022 05:24:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E76E68B78B; Sat, 25 Jun 2022 08:24:22 +0300 (EEST) Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DE6F68B69B for ; Sat, 25 Jun 2022 08:24:16 +0300 (EEST) Received: by mail-ed1-f54.google.com with SMTP id c13so6043047eds.10 for ; Fri, 24 Jun 2022 22:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lKmp7PGzriK0/sDAuNLASJutv5Jb9UFgb4b6cas8Sms=; b=OAkXKDIy/QSTM/PXQm580ZzYFFbFJrJsoFLv4WdpWCgOYEGC8ELuZlkEOeMr5i6uaN huZ7aDcscJ5htTkf+bYda1Mfqqm8WOjDEYHkfYBWO0NC9deCWnuWHvOOQyq6f/l7tITK 3QcamAmwnsJqPiwxoUPlQO1tGHwUvq09mRG7qrD9twDdKXIq/Qv/vN4k28d+wfyEgiwe gKFxaW58ZdlgVRWjHqyfQ0p0/pbsQxnuEwb7V79cKcyP1jLfuqWqkozGShLgujDV96A3 aGBY1ErZwdOTCeKvSKbeZhCkckQWCjrbVcK/e1masbhOrjcnnYz+NnLpERDzwk69Gv9H 5CHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=lKmp7PGzriK0/sDAuNLASJutv5Jb9UFgb4b6cas8Sms=; b=yEm1VzcWCwoaR962HdLJFnFfLqXV+kwauKhVa51oadtVPr+QUOBPigWSwyqjH7Q+yV lIsIx4SP++gD5l+RPxNnbqsWR7CF8IhbExATpfARlC9j1LUHgW8oVF5EIzI+5IvJ3m/G Wvegw7UrXL1iMcruxcDCSBFWFb+YNXFFJIrWtoY86F6+vSG1Sag1y1I4RoKi7er0vMGU ohbrKbPCOifGweNnXNXa4TwPZSYrOCXhKMStyfYNaFlcDyRCVbaC+zBfUkMxloFDZXyR 8JBA6o/z8SQORcD3udva21wWLOrE1y+obUcNRE8jtlbmDjDDUCyUP/Gy1NAkO6PSmpqj DaiQ== X-Gm-Message-State: AJIora8N1EGW7NBcJ7/JaWHpwFxo1ASW66ZPT17FiTjsggzle8Q5u/Kq xrVr0C/c+K/FHVFkITZwP7Ve1tSNxbnprTznJ/Ur+KDl150GQZv6RVk= X-Google-Smtp-Source: AGRyM1vlJpLGPjNrIlojckRTjvfP8YT38QK3QhUNT5mp1VpSZ2eKDeRszwHm6LEO1T0lY7ebHChvH2j5UdFxhcpCTQg= X-Received: by 2002:a05:6402:298e:b0:435:61b0:41a with SMTP id eq14-20020a056402298e00b0043561b0041amr3138929edb.278.1656134655348; Fri, 24 Jun 2022 22:24:15 -0700 (PDT) MIME-Version: 1.0 References: <20220623150040.1981341-1-wolfleekay@gmail.com> <72023989-5CD8-4EAF-BF84-F896B23257C0@chinaffmpeg.org> In-Reply-To: <72023989-5CD8-4EAF-BF84-F896B23257C0@chinaffmpeg.org> From: Li Kai Date: Sat, 25 Jun 2022 13:24:03 +0800 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000d51d6905e23ee5db" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] avformat/hls:use EXT-X-START instead of live_start_index if it's in playlist X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000d51d6905e23ee5db Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Ok, I add allowed_x_start option, and the option default is 0. So current users will not be affected. please review again. At last, Thanks your tips. Steven Liu =E4=BA=8E2022=E5=B9=B46=E6=9C=8825=E6=97=A5= =E5=91=A8=E5=85=AD 12:51=E5=86=99=E9=81=93=EF=BC=9A > > > > =E5=9C=A8 2022=E5=B9=B46=E6=9C=8825=E6=97=A5=EF=BC=8C12:32=EF=BC=8C=E5= =B0=91=E5=AE=87=E6=9D=8E =E5=86=99=E9=81=93=EF=BC=9A > > > > Hi Steven, > > > > Please review code. > > > > I changed code, but I still have a question. > > If EXT-X-START tag in playlist and users set live_start_index, the > > live_start_index will not work > > for current codes, which makes maybe users confused. > > Is that OK? > for current codes, user cannot aware there have EXT-X-START tag in the > playlist, so i think we should reserve the old use method. > or maybe you can add an option for user to decide which way they can use > (either EXT-X-START or live_start_index). > Because there should have many people using live_start_index for 'time > shift=E2=80=99 by player (user control), > > > > > In other hand, if make live_start_index valid when EXT-X-START tag in > > playlist, maybe live_start_index needs a flag, or > > make live_start_index default value is INT_MIN to distinguish. > > becuase the live_start_index default value is -3, I have no idea to > > distinguish users action or > > default value when live_start_index=3D-3. > yes cannot distinguish users action, but user should can decided use > live_start_index or EXT-X-START. > > > > > May I need to set default value=3DINT_MIN as live_start_index default > value? > > And only when does not exist EXT-X-START > > tag in playlist, make live_start_index =3D -3 or users's configuration > value. > > I have no idea which is better~ > > > > Thanks a lot! > > > > Steven Liu =E4=BA=8E2022=E5=B9=B46=E6=9C=8824= =E6=97=A5=E5=91=A8=E4=BA=94 14:21=E5=86=99=E9=81=93=EF=BC=9A > > > >> =E5=B0=91=E5=AE=87=E6=9D=8E =E4=BA=8E2022=E5=B9= =B46=E6=9C=8824=E6=97=A5=E5=91=A8=E4=BA=94 11:58=E5=86=99=E9=81=93=EF=BC=9A > >>>> > >>>> > >>>> Hi, Steven > >>> > >>> > >>> I got it. > >>> > >>> User could use "live_start_index" option even if #EXT-X-START in the > >> playlist. > >>> > >>> I changed the priority about #EXT-X-START/live_start_index, > >>> > >>> this is new bellow: > >>> > >>> --- > >>> libavformat/hls.c | 69 +++++++++++++++++++++++++++++++++++++++++++---= - > >>> 1 file changed, 64 insertions(+), 5 deletions(-) > >>> > >>> diff --git a/libavformat/hls.c b/libavformat/hls.c > >>> index b736f093a9..309471efce 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; > >>> @@ -741,6 +743,7 @@ static int parse_playlist(HLSContext *c, const ch= ar > >> *url, > >>> struct segment **prev_segments =3D NULL; > >>> int prev_n_segments =3D 0; > >>> int64_t prev_start_seq_no =3D -1; > >>> + const char *p; > >>> > >>> if (is_http && !in && c->http_persistent && c->playlist_pb) { > >>> in =3D c->playlist_pb; > >>> @@ -889,6 +892,18 @@ static int parse_playlist(HLSContext *c, const > char > >> *url, > >>> cur_init_section->key =3D NULL; > >>> } > >>> > >>> + } else if (av_strstart(line, "#EXT-X-START:", &ptr)) { > >>> + ret =3D ensure_playlist(c, &pls, url); > >>> + if (ret < 0) { > >>> + goto fail; > >>> + } > >>> + if (av_strstart(ptr, "TIME-OFFSET=3D", &p)) { > >>> + float offset =3D strtof(p, NULL); > >>> + pls->start_time_offset =3D offset * AV_TIME_BASE; > >>> + pls->time_offset_flag =3D 1; > >>> + } else { > >>> + goto fail; > >>> + } > >>> } else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) { > >>> if (pls) > >>> pls->finished =3D 1; > >>> @@ -1721,10 +1736,54 @@ 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); > >>> - else > >>> - return pls->start_seq_no + FFMIN(c->live_start_index, > >> pls->n_segments - 1); > >>> + if (c->live_start_index !=3D INT_MIN) { > >> Maybe you should not change current logic. > >> You can just add about process EXT-X-START sence,. > >> For example: > >> compute the start_seq_no and save the value to a temp varible and > >> don't return immediately, check the third scence which get EXT-X-START > >> tag from playlist. > >> process the temp varible after start_seq_no compute from > >> live_start_index or EXT-X-START. > >> > >>> + if (c->live_start_index < 0) > >>> + return 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)= ; > >>> + } else if (c->live_start_index =3D=3D INT_MIN && > >> !pls->time_offset_flag) { > >>> + return pls->start_seq_no + FFMAX(pls->n_segments - 3, 0)= ; > >>> + } else { > >>> + /* If playlist indicate a TIME-OFFSET and user not use > >> live_start_index, > >>> + * need to recalculate seq_no */ > >>> + int i; > >>> + int64_t start_timestamp; > >>> + int64_t playlist_duration =3D 0; > >>> + int64_t cur_timestamp =3D c->cur_timestamp =3D=3D AV_NOP= TS_VALUE > >> ? 0 : > >>> + c->cur_timestamp; > >>> + > >>> + for (i =3D 0; i < pls->n_segments; i++) { > >>> + playlist_duration +=3D 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 playli= st > >> (if > >>> + * negative). */ > >>> + if (pls->start_time_offset >=3D0 && > >>> + pls->start_time_offset > playlist_duration) > >>> + start_timestamp =3D cur_timestamp + playlist_duratio= n; > >>> + else if (pls->start_time_offset >=3D 0 && > >>> + pls->start_time_offset <=3D playlist_duratio= n) > >>> + start_timestamp =3D cur_timestamp + > >> pls->start_time_offset; > >>> + else if (pls->start_time_offset < 0 && > >>> + pls->start_time_offset < -playlist_duration) > >>> + start_timestamp =3D cur_timestamp; > >>> + else if (pls->start_time_offset < 0 && > >>> + pls->start_time_offset > -playlist_duration) > >>> + start_timestamp =3D cur_timestamp + playlist_duratio= n + > >>> + pls->start_time_offset; > >>> + else > >>> + start_timestamp =3D cur_timestamp; > >>> + > >>> + find_timestamp_in_playlist(c, pls, start_timestamp, > >> &seq_no, NULL); > >>> + av_log(c, AV_LOG_DEBUG, "start_timestamp: %" PRId64 > >>> + "cur_timestamp:%" PRId64 > >>> + "cur_seq_no:%" PRId64 "\n", > >>> + start_timestamp, cur_timestamp, > >> seq_no); > >>> + return seq_no; > >>> + } > >>> } > >>> > >>> /* Otherwise just start on the first segment. */ > >>> @@ -2475,7 +2534,7 @@ static int hls_probe(const AVProbeData *p) > >>> #define FLAGS AV_OPT_FLAG_DECODING_PARAM > >>> static const AVOption hls_options[] =3D { > >>> {"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 =3D -3}, > >> INT_MIN, INT_MAX, FLAGS}, > >>> + OFFSET(live_start_index), AV_OPT_TYPE_INT, {.i64 =3D INT_MIN= }, > >> INT_MIN, INT_MAX, FLAGS}, > >> This is unnecessary=EF=BC=8C because the default -3 is ok and be using= by > >> users from many years ago. > >> > >>> {"allowed_extensions", "List of file extensions that hls is allow= ed > >> to access", > >>> OFFSET(allowed_extensions), AV_OPT_TYPE_STRING, > >>> {.str =3D > >> > "3gp,aac,avi,ac3,eac3,flac,mkv,m3u8,m4a,m4s,m4v,mpg,mov,mp2,mp3,mp4,mpeg,= mpegts,ogg,ogv,oga,ts,vob,wav"}, > >>> -- > >>> 2.24.1 (Apple Git-126) > >>> > >>> > >>> Thanks Steven > >> > > > <0001-avformat-hls-use-EXT-X-START-instead-of-live_start_i.patch>________= _______________________________________ > > 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". > > Thanks > Steven > > > > > _______________________________________________ > 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". > --000000000000d51d6905e23ee5db Content-Type: text/x-patch; charset="US-ASCII"; name="v2-0001-avformat-hls-add-EXT-X-START-tag-support-by-allow.patch" Content-Disposition: attachment; filename="v2-0001-avformat-hls-add-EXT-X-START-tag-support-by-allow.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l4tfsf5u0 RnJvbSA3MDVhYWRmNzY1NmM2NWRiYWM5OTlmMWYyZTc2ODk4YzM3ZjExMzIxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBMaSBLYWkgPHdvbGZsaWthaUAxNjMuY29tPgpEYXRlOiBUaHUs IDIzIEp1biAyMDIyIDAwOjU1OjM4ICswODAwClN1YmplY3Q6IFtQQVRDSCB2Ml0gYXZmb3JtYXQv aGxzOiBhZGQgI0VYVC1YLVNUQVJUIHRhZyBzdXBwb3J0IGJ5CiBhbGxvd2VkX3hfc3RhcnQgb3B0 CgpTaWduZWQtb2ZmLWJ5OiBMaSBLYWkgPHdvbGZsZWVrYXlAZ21haWwuY29tPgotLS0KIGxpYmF2 Zm9ybWF0L2hscy5jIHwgNTggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L2hscy5jIGIvbGliYXZmb3JtYXQvaGxzLmMKaW5k ZXggODIwNGY1NWRmMy4uZDBkYWFkYWM3YyAxMDA2NDQKLS0tIGEvbGliYXZmb3JtYXQvaGxzLmMK KysrIGIvbGliYXZmb3JtYXQvaGxzLmMKQEAgLTEyMCw2ICsxMjAsOCBAQCBzdHJ1Y3QgcGxheWxp c3QgewogICAgIGVudW0gUGxheWxpc3RUeXBlIHR5cGU7CiAgICAgaW50NjRfdCB0YXJnZXRfZHVy YXRpb247CiAgICAgaW50NjRfdCBzdGFydF9zZXFfbm87CisgICAgaW50IHRpbWVfb2Zmc2V0X2Zs YWc7CisgICAgaW50NjRfdCBzdGFydF90aW1lX29mZnNldDsKICAgICBpbnQgbl9zZWdtZW50czsK ICAgICBzdHJ1Y3Qgc2VnbWVudCAqKnNlZ21lbnRzOwogICAgIGludCBuZWVkZWQ7CkBAIC0yMTEs NiArMjEzLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgSExTQ29udGV4dCB7CiAgICAgaW50NjRfdCBjdXJf c2VxX25vOwogICAgIGludCBtM3U4X2hvbGRfY291bnRlcnM7CiAgICAgaW50IGxpdmVfc3RhcnRf aW5kZXg7CisgICAgaW50IGFsbG93ZWRfeF9zdGFydDsKICAgICBpbnQgZmlyc3RfcGFja2V0Owog ICAgIGludDY0X3QgZmlyc3RfdGltZXN0YW1wOwogICAgIGludDY0X3QgY3VyX3RpbWVzdGFtcDsK QEAgLTc0MSw2ICs3NDQsNyBAQCBzdGF0aWMgaW50IHBhcnNlX3BsYXlsaXN0KEhMU0NvbnRleHQg KmMsIGNvbnN0IGNoYXIgKnVybCwKICAgICBzdHJ1Y3Qgc2VnbWVudCAqKnByZXZfc2VnbWVudHMg PSBOVUxMOwogICAgIGludCBwcmV2X25fc2VnbWVudHMgPSAwOwogICAgIGludDY0X3QgcHJldl9z dGFydF9zZXFfbm8gPSAtMTsKKyAgICBjb25zdCBjaGFyICpwOwogCiAgICAgaWYgKGlzX2h0dHAg JiYgIWluICYmIGMtPmh0dHBfcGVyc2lzdGVudCAmJiBjLT5wbGF5bGlzdF9wYikgewogICAgICAg ICBpbiA9IGMtPnBsYXlsaXN0X3BiOwpAQCAtODg5LDYgKzg5MywxOCBAQCBzdGF0aWMgaW50IHBh cnNlX3BsYXlsaXN0KEhMU0NvbnRleHQgKmMsIGNvbnN0IGNoYXIgKnVybCwKICAgICAgICAgICAg ICAgICBjdXJfaW5pdF9zZWN0aW9uLT5rZXkgPSBOVUxMOwogICAgICAgICAgICAgfQogCisgICAg ICAgIH0gZWxzZSBpZiAoYXZfc3Ryc3RhcnQobGluZSwgIiNFWFQtWC1TVEFSVDoiLCAmcHRyKSkg eworICAgICAgICAgICAgcmV0ID0gZW5zdXJlX3BsYXlsaXN0KGMsICZwbHMsIHVybCk7CisgICAg ICAgICAgICBpZiAocmV0IDwgMCkgeworICAgICAgICAgICAgICAgIGdvdG8gZmFpbDsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIGlmIChhdl9zdHJzdGFydChwdHIsICJUSU1FLU9GRlNFVD0i LCAmcCkpIHsKKyAgICAgICAgICAgICAgICBmbG9hdCBvZmZzZXQgPSBzdHJ0b2YocCwgTlVMTCk7 CisgICAgICAgICAgICAgICAgcGxzLT5zdGFydF90aW1lX29mZnNldCA9IG9mZnNldCAqIEFWX1RJ TUVfQkFTRTsKKyAgICAgICAgICAgICAgICBwbHMtPnRpbWVfb2Zmc2V0X2ZsYWcgPSAxOworICAg ICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBnb3RvIGZhaWw7CisgICAgICAgICAg ICB9CiAgICAgICAgIH0gZWxzZSBpZiAoYXZfc3Ryc3RhcnQobGluZSwgIiNFWFQtWC1FTkRMSVNU IiwgJnB0cikpIHsKICAgICAgICAgICAgIGlmIChwbHMpCiAgICAgICAgICAgICAgICAgcGxzLT5m aW5pc2hlZCA9IDE7CkBAIC0xNzIyLDkgKzE3MzgsNDUgQEAgc3RhdGljIGludDY0X3Qgc2VsZWN0 X2N1cl9zZXFfbm8oSExTQ29udGV4dCAqYywgc3RydWN0IHBsYXlsaXN0ICpwbHMpCiAgICAgICAg IC8qIElmIHRoaXMgaXMgYSBsaXZlIHN0cmVhbSwgc3RhcnQgbGl2ZV9zdGFydF9pbmRleCBzZWdt ZW50cyBmcm9tIHRoZQogICAgICAgICAgKiBzdGFydCBvciBlbmQgKi8KICAgICAgICAgaWYgKGMt PmxpdmVfc3RhcnRfaW5kZXggPCAwKQotICAgICAgICAgICAgcmV0dXJuIHBscy0+c3RhcnRfc2Vx X25vICsgRkZNQVgocGxzLT5uX3NlZ21lbnRzICsgYy0+bGl2ZV9zdGFydF9pbmRleCwgMCk7Cisg ICAgICAgICAgICBzZXFfbm8gPSBwbHMtPnN0YXJ0X3NlcV9ubyArIEZGTUFYKHBscy0+bl9zZWdt ZW50cyArCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGMtPmxp dmVfc3RhcnRfaW5kZXgsIDApOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICByZXR1cm4gcGxz LT5zdGFydF9zZXFfbm8gKyBGRk1JTihjLT5saXZlX3N0YXJ0X2luZGV4LCBwbHMtPm5fc2VnbWVu dHMgLSAxKTsKKyAgICAgICAgICAgIHNlcV9ubyA9IHBscy0+c3RhcnRfc2VxX25vICsgRkZNSU4o Yy0+bGl2ZV9zdGFydF9pbmRleCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcGxzLT5uX3NlZ21lbnRzIC0gMSk7CisKKyAgICAgICAgLyogSWYgI0VYVC1YLVNU QVJUIGluIHBsYXlsaXN0LCBuZWVkIHRvIHJlY2FsY3VsYXRlICovCisgICAgICAgIGlmIChwbHMt PnRpbWVfb2Zmc2V0X2ZsYWcgJiYgYy0+YWxsb3dlZF94X3N0YXJ0KSB7CisgICAgICAgICAgICBp bnQ2NF90IHN0YXJ0X3RpbWVzdGFtcDsKKyAgICAgICAgICAgIGludDY0X3QgcGxheWxpc3RfZHVy YXRpb24gPSAwOworICAgICAgICAgICAgaW50NjRfdCBjdXJfdGltZXN0YW1wID0gYy0+Y3VyX3Rp bWVzdGFtcCA9PSBBVl9OT1BUU19WQUxVRSA/IDAgOgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYy0+Y3VyX3RpbWVzdGFtcDsKKworICAgICAgICAgICAgZm9yIChpbnQgaSA9 IDA7IGkgPCBwbHMtPm5fc2VnbWVudHM7IGkrKykKKyAgICAgICAgICAgICAgICBwbGF5bGlzdF9k dXJhdGlvbiArPSBwbHMtPnNlZ21lbnRzW2ldLT5kdXJhdGlvbjsKKworICAgICAgICAgICAgLyog SWYgdGhlIGFic29sdXRlIHZhbHVlIG9mIFRJTUUtT0ZGU0VUIGV4Y2VlZHMKKyAgICAgICAgICAg ICAqIHRoZSBkdXJhdGlvbiBvZiB0aGUgcGxheWxpc3QsIGl0IGluZGljYXRlcyBlaXRoZXIgdGhl IGVuZCBvZiB0aGUKKyAgICAgICAgICAgICAqIHBsYXlsaXN0IChpZiBwb3NpdGl2ZSkgb3IgdGhl IGJlZ2lubmluZyBvZiB0aGUgcGxheWxpc3QgKGlmCisgICAgICAgICAgICAgKiBuZWdhdGl2ZSku ICovCisgICAgICAgICAgICBpZiAocGxzLT5zdGFydF90aW1lX29mZnNldCA+PTAgJiYKKyAgICAg ICAgICAgICAgICBwbHMtPnN0YXJ0X3RpbWVfb2Zmc2V0ID4gcGxheWxpc3RfZHVyYXRpb24pCisg ICAgICAgICAgICAgICAgc3RhcnRfdGltZXN0YW1wID0gY3VyX3RpbWVzdGFtcCArIHBsYXlsaXN0 X2R1cmF0aW9uOworICAgICAgICAgICAgZWxzZSBpZiAocGxzLT5zdGFydF90aW1lX29mZnNldCA+ PSAwICYmCisgICAgICAgICAgICAgICAgICAgICAgICBwbHMtPnN0YXJ0X3RpbWVfb2Zmc2V0IDw9 IHBsYXlsaXN0X2R1cmF0aW9uKQorICAgICAgICAgICAgICAgIHN0YXJ0X3RpbWVzdGFtcCA9IGN1 cl90aW1lc3RhbXAgKyBwbHMtPnN0YXJ0X3RpbWVfb2Zmc2V0OworICAgICAgICAgICAgZWxzZSBp ZiAocGxzLT5zdGFydF90aW1lX29mZnNldCA8IDAgJiYKKyAgICAgICAgICAgICAgICAgICAgICAg IHBscy0+c3RhcnRfdGltZV9vZmZzZXQgPCAtcGxheWxpc3RfZHVyYXRpb24pCisgICAgICAgICAg ICAgICAgc3RhcnRfdGltZXN0YW1wID0gY3VyX3RpbWVzdGFtcDsKKyAgICAgICAgICAgIGVsc2Ug aWYgKHBscy0+c3RhcnRfdGltZV9vZmZzZXQgPCAwICYmCisgICAgICAgICAgICAgICAgICAgICAg ICBwbHMtPnN0YXJ0X3RpbWVfb2Zmc2V0ID4gLXBsYXlsaXN0X2R1cmF0aW9uKQorICAgICAgICAg ICAgICAgIHN0YXJ0X3RpbWVzdGFtcCA9IGN1cl90aW1lc3RhbXAgKyBwbGF5bGlzdF9kdXJhdGlv biArCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwbHMtPnN0YXJ0X3RpbWVf b2Zmc2V0OworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIHN0YXJ0X3RpbWVzdGFt cCA9IGN1cl90aW1lc3RhbXA7CisKKyAgICAgICAgICAgIGZpbmRfdGltZXN0YW1wX2luX3BsYXls aXN0KGMsIHBscywgc3RhcnRfdGltZXN0YW1wLCAmc2VxX25vLCBOVUxMKTsKKyAgICAgICAgfQor ICAgICAgICByZXR1cm4gc2VxX25vOwogICAgIH0KIAogICAgIC8qIE90aGVyd2lzZSBqdXN0IHN0 YXJ0IG9uIHRoZSBmaXJzdCBzZWdtZW50LiAqLwpAQCAtMjQ3Niw2ICsyNTI4LDggQEAgc3RhdGlj IGludCBobHNfcHJvYmUoY29uc3QgQVZQcm9iZURhdGEgKnApCiBzdGF0aWMgY29uc3QgQVZPcHRp b24gaGxzX29wdGlvbnNbXSA9IHsKICAgICB7ImxpdmVfc3RhcnRfaW5kZXgiLCAic2VnbWVudCBp bmRleCB0byBzdGFydCBsaXZlIHN0cmVhbXMgYXQgKG5lZ2F0aXZlIHZhbHVlcyBhcmUgZnJvbSB0 aGUgZW5kKSIsCiAgICAgICAgIE9GRlNFVChsaXZlX3N0YXJ0X2luZGV4KSwgQVZfT1BUX1RZUEVf SU5ULCB7Lmk2NCA9IC0zfSwgSU5UX01JTiwgSU5UX01BWCwgRkxBR1N9LAorICAgIHsiYWxsb3dl ZF94X3N0YXJ0IiwgImFsbG93IHRvIHVzZSAjRVhULVgtU1RBUlQgaWYgaXQncyBpbiBwbGF5bGlz dCBpbnN0ZWFkIG9mIGxpdmVfc3RhcnRfaW5kZXgiLAorICAgICAgICBPRkZTRVQoYWxsb3dlZF94 X3N0YXJ0KSwgQVZfT1BUX1RZUEVfQk9PTCwgeyAuaTY0ID0gMCB9LCAwLCAxLCBGTEFHU30sCiAg ICAgeyJhbGxvd2VkX2V4dGVuc2lvbnMiLCAiTGlzdCBvZiBmaWxlIGV4dGVuc2lvbnMgdGhhdCBo bHMgaXMgYWxsb3dlZCB0byBhY2Nlc3MiLAogICAgICAgICBPRkZTRVQoYWxsb3dlZF9leHRlbnNp b25zKSwgQVZfT1BUX1RZUEVfU1RSSU5HLAogICAgICAgICB7LnN0ciA9ICIzZ3AsYWFjLGF2aSxh YzMsZWFjMyxmbGFjLG1rdixtM3U4LG00YSxtNHMsbTR2LG1wZyxtb3YsbXAyLG1wMyxtcDQsbXBl ZyxtcGVndHMsb2dnLG9ndixvZ2EsdHMsdm9iLHdhdiJ9LAotLSAKMi4yNS4xCgo= --000000000000d51d6905e23ee5db Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --000000000000d51d6905e23ee5db--