diff mbox series

[FFmpeg-devel,v2,2/2] avformat/movenc: sidx earliest_presentation_time is applied after editlist

Message ID tencent_1E40699A4C9F21AB6F4E84701C2D7E9AAB08@qq.com
State New
Headers show
Series [FFmpeg-devel,v3,1/2] avformat/mov: log the right variable | expand

Checks

Context Check Description
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Zhao Zhili March 4, 2022, 5:33 p.m. UTC 
Fix #8334
---
Remove casual change due to clang-format plugin.

 libavformat/movenc.c  |  3 ++-
 tests/ref/fate/movenc | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

Comments

Zhao Zhili March 18, 2022, 3:06 a.m. UTC | #1 
Ping for review. The following is copied from ISO-14496-12 as reference:

> earliest_presentation_time is the earliest presentation time of any content in the reference
> stream in the first subsegment, in the timescale indicated in the timescale field; the earliest
> presentation time is derived from media in access units, or parts of access units, that are not
> omitted by an edit list (if any);


> On Mar 5, 2022, at 1:33 AM, Zhao Zhili <quinkblack@foxmail.com> wrote:
> 
> Fix #8334
> ---
> Remove casual change due to clang-format plugin.
> 
> libavformat/movenc.c  |  3 ++-
> tests/ref/fate/movenc | 10 +++++-----
> 2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/libavformat/movenc.c b/libavformat/movenc.c
> index 4c868919ae..a2da80bc00 100644
> --- a/libavformat/movenc.c
> +++ b/libavformat/movenc.c
> @@ -4750,7 +4750,8 @@ static int mov_write_sidx_tag(AVIOContext *pb,
> 
>     if (track->entry) {
>         entries = 1;
> -        presentation_time = track->cluster[0].dts + track->cluster[0].cts;
> +        presentation_time = track->cluster[0].dts + track->cluster[0].cts -
> +                            track->start_dts - track->start_cts;
>         duration = track->end_pts -
>                    (track->cluster[0].dts + track->cluster[0].cts);
>         starts_with_SAP = track->cluster[0].flags & MOV_SYNC_SAMPLE;
> diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc
> index 19e4e291b8..968a3d27f2 100644
> --- a/tests/ref/fate/movenc
> +++ b/tests/ref/fate/movenc
> @@ -101,28 +101,28 @@ write_data len 1223, time nopts, type header atom ftyp
> 041ac8efc35a0d023c26d05eedb20403 1223 delay-moov-elst-signal-init
> write_data len 1004, time -33333, type sync atom sidx
> write_data len 996, time 966667, type sync atom sidx
> -5a583d89318827d2569eecbeaa18c238 996 delay-moov-elst-signal-second-frag
> +69c9025ffb10302c7b5c2ed9fde86c44 996 delay-moov-elst-signal-second-frag
> write_data len 148, time nopts, type trailer atom -
> write_data len 1223, time nopts, type header atom ftyp
> 041ac8efc35a0d023c26d05eedb20403 1223 delay-moov-elst-signal-init-discont
> write_data len 996, time 966667, type sync atom sidx
> -5a583d89318827d2569eecbeaa18c238 996 delay-moov-elst-signal-second-frag-discont
> +69c9025ffb10302c7b5c2ed9fde86c44 996 delay-moov-elst-signal-second-frag-discont
> write_data len 110, time nopts, type trailer atom -
> write_data len 1247, time nopts, type header atom ftyp
> 80511a51d1ac9cde62337eed7176ae03 1247 delay-moov-elst-signal-init-discont-largets
> write_data len 996, time 279621233333, type sync atom sidx
> -dc695d65e8a0cdafee28acd8a5ccf81a 996 delay-moov-elst-signal-second-frag-discont-largets
> +471fc64644a6bf4065c489fe4e04be7d 996 delay-moov-elst-signal-second-frag-discont-largets
> write_data len 110, time nopts, type trailer atom -
> write_data len 1223, time nopts, type header atom ftyp
> write_data len 2572, time -333333, type sync atom sidx
> write_data len 996, time 5166667, type sync atom sidx
> write_data len 148, time nopts, type trailer atom -
> -d37a7eda807912b9ed05ccfe003a9e4f 4939 vfr
> +5c873f6e37d5af09e3c6329cf94cd6ca 4939 vfr
> write_data len 1223, time nopts, type header atom ftyp
> write_data len 2572, time -333333, type sync atom sidx
> write_data len 996, time 5166667, type sync atom sidx
> write_data len 148, time nopts, type trailer atom -
> -d37a7eda807912b9ed05ccfe003a9e4f 4939 vfr-noduration
> +5c873f6e37d5af09e3c6329cf94cd6ca 4939 vfr-noduration
> write_data len 1231, time nopts, type header atom ftyp
> write_data len 1500, time -333333, type sync atom moof
> write_data len 1500, time nopts, type unknown atom -
> -- 
> 2.31.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".
diff mbox series

Patch

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 4c868919ae..a2da80bc00 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4750,7 +4750,8 @@  static int mov_write_sidx_tag(AVIOContext *pb,
 
     if (track->entry) {
         entries = 1;
-        presentation_time = track->cluster[0].dts + track->cluster[0].cts;
+        presentation_time = track->cluster[0].dts + track->cluster[0].cts -
+                            track->start_dts - track->start_cts;
         duration = track->end_pts -
                    (track->cluster[0].dts + track->cluster[0].cts);
         starts_with_SAP = track->cluster[0].flags & MOV_SYNC_SAMPLE;
diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc
index 19e4e291b8..968a3d27f2 100644
--- a/tests/ref/fate/movenc
+++ b/tests/ref/fate/movenc
@@ -101,28 +101,28 @@  write_data len 1223, time nopts, type header atom ftyp
 041ac8efc35a0d023c26d05eedb20403 1223 delay-moov-elst-signal-init
 write_data len 1004, time -33333, type sync atom sidx
 write_data len 996, time 966667, type sync atom sidx
-5a583d89318827d2569eecbeaa18c238 996 delay-moov-elst-signal-second-frag
+69c9025ffb10302c7b5c2ed9fde86c44 996 delay-moov-elst-signal-second-frag
 write_data len 148, time nopts, type trailer atom -
 write_data len 1223, time nopts, type header atom ftyp
 041ac8efc35a0d023c26d05eedb20403 1223 delay-moov-elst-signal-init-discont
 write_data len 996, time 966667, type sync atom sidx
-5a583d89318827d2569eecbeaa18c238 996 delay-moov-elst-signal-second-frag-discont
+69c9025ffb10302c7b5c2ed9fde86c44 996 delay-moov-elst-signal-second-frag-discont
 write_data len 110, time nopts, type trailer atom -
 write_data len 1247, time nopts, type header atom ftyp
 80511a51d1ac9cde62337eed7176ae03 1247 delay-moov-elst-signal-init-discont-largets
 write_data len 996, time 279621233333, type sync atom sidx
-dc695d65e8a0cdafee28acd8a5ccf81a 996 delay-moov-elst-signal-second-frag-discont-largets
+471fc64644a6bf4065c489fe4e04be7d 996 delay-moov-elst-signal-second-frag-discont-largets
 write_data len 110, time nopts, type trailer atom -
 write_data len 1223, time nopts, type header atom ftyp
 write_data len 2572, time -333333, type sync atom sidx
 write_data len 996, time 5166667, type sync atom sidx
 write_data len 148, time nopts, type trailer atom -
-d37a7eda807912b9ed05ccfe003a9e4f 4939 vfr
+5c873f6e37d5af09e3c6329cf94cd6ca 4939 vfr
 write_data len 1223, time nopts, type header atom ftyp
 write_data len 2572, time -333333, type sync atom sidx
 write_data len 996, time 5166667, type sync atom sidx
 write_data len 148, time nopts, type trailer atom -
-d37a7eda807912b9ed05ccfe003a9e4f 4939 vfr-noduration
+5c873f6e37d5af09e3c6329cf94cd6ca 4939 vfr-noduration
 write_data len 1231, time nopts, type header atom ftyp
 write_data len 1500, time -333333, type sync atom moof
 write_data len 1500, time nopts, type unknown atom -