When parsing a block, the passed data corresponds to the pos value. However, when constructing a packet, some offsets are made to the data, so the pos in the packet does not correspond to the position in the file.
Signed-off-by: wangyaqiang <[email protected]> --- libavformat/matroskadec.c | 4 +-- tests/ref/fate/h264-dts_5frames | 10 +++--- tests/ref/fate/matroska-encoding-delay | 10 +++--- tests/ref/fate/matroska-hdr10-plus-remux | 2 +- tests/ref/fate/matroska-ogg-opus-remux | 6 ++-- tests/ref/fate/matroska-opus-remux | 6 ++-- tests/ref/fate/webm-hdr10-plus-remux | 2 +- tests/ref/seek/lavf-mkv | 44 ++++++++++++------------ tests/ref/seek/mkv-codec-delay | 44 ++++++++++++------------ 9 files changed, 64 insertions(+), 64 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 503b99b286..0215855019 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -4116,7 +4116,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf int n, flags, laces = 0; uint64_t num; int trust_default_duration; - + uint8_t *data_start = data; av_assert1(buf); ffio_init_read_context(&pb, data, size); @@ -4200,7 +4200,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf if (cluster_time != (uint64_t)-1 && (block_time >= 0 || cluster_time >= -block_time)) track->end_timecode = FFMAX(track->end_timecode, timecode + block_duration); - + pos += (data - data_start); for (n = 0; n < laces; n++) { int64_t lace_duration = block_duration*(n+1) / laces - block_duration*n / laces; uint8_t *out_data = data; diff --git a/tests/ref/fate/h264-dts_5frames b/tests/ref/fate/h264-dts_5frames index 1e66e3854b..7d5d1da463 100644 --- a/tests/ref/fate/h264-dts_5frames +++ b/tests/ref/fate/h264-dts_5frames @@ -10,7 +10,7 @@ best_effort_timestamp=0 best_effort_timestamp_time=0.000000 duration=166 duration_time=0.166000 -pkt_pos=651 +pkt_pos=655 pkt_size=14428 width=512 height=256 @@ -44,7 +44,7 @@ best_effort_timestamp=167 best_effort_timestamp_time=0.167000 duration=166 duration_time=0.166000 -pkt_pos=15085 +pkt_pos=15089 pkt_size=11 width=512 height=256 @@ -78,7 +78,7 @@ best_effort_timestamp=333 best_effort_timestamp_time=0.333000 duration=166 duration_time=0.166000 -pkt_pos=15102 +pkt_pos=15106 pkt_size=11 width=512 height=256 @@ -112,7 +112,7 @@ best_effort_timestamp=500 best_effort_timestamp_time=0.500000 duration=166 duration_time=0.166000 -pkt_pos=15119 +pkt_pos=15123 pkt_size=11 width=512 height=256 @@ -146,7 +146,7 @@ best_effort_timestamp=667 best_effort_timestamp_time=0.667000 duration=166 duration_time=0.166000 -pkt_pos=15136 +pkt_pos=15140 pkt_size=11 width=512 height=256 diff --git a/tests/ref/fate/matroska-encoding-delay b/tests/ref/fate/matroska-encoding-delay index ad1edad1e8..4a489e89b5 100644 --- a/tests/ref/fate/matroska-encoding-delay +++ b/tests/ref/fate/matroska-encoding-delay @@ -32,7 +32,7 @@ dts_time=-0.010000 duration=24 duration_time=0.024000 size=1152 -pos=1263 +pos=1267 flags=K__ [SIDE_DATA] side_data_type=Skip Samples @@ -52,7 +52,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=237628 -pos=2423 +pos=2427 flags=K__ [/PACKET] [PACKET] @@ -65,7 +65,7 @@ dts_time=0.014000 duration=24 duration_time=0.024000 size=1152 -pos=240058 +pos=240062 flags=K__ [/PACKET] [PACKET] @@ -78,7 +78,7 @@ dts_time=0.038000 duration=24 duration_time=0.024000 size=1152 -pos=241233 +pos=241237 flags=K__ [/PACKET] [PACKET] @@ -91,7 +91,7 @@ dts_time=0.040000 duration=40 duration_time=0.040000 size=238066 -pos=242393 +pos=242397 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-hdr10-plus-remux b/tests/ref/fate/matroska-hdr10-plus-remux index 9ed3cb00e7..ab9f6f4b32 100644 --- a/tests/ref/fate/matroska-hdr10-plus-remux +++ b/tests/ref/fate/matroska-hdr10-plus-remux @@ -16,7 +16,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=13350 -pos=435 +pos=439 flags=K__ [SIDE_DATA] side_data_type=HDR10+ Dynamic Metadata (SMPTE 2094-40) diff --git a/tests/ref/fate/matroska-ogg-opus-remux b/tests/ref/fate/matroska-ogg-opus-remux index 600083c134..05a587a73f 100644 --- a/tests/ref/fate/matroska-ogg-opus-remux +++ b/tests/ref/fate/matroska-ogg-opus-remux @@ -57,7 +57,7 @@ dts_time=-0.007000 duration=20 duration_time=0.020000 size=402 -pos=543 +pos=547 flags=K__ [SIDE_DATA] side_data_type=Skip Samples @@ -77,7 +77,7 @@ dts_time=0.013000 duration=20 duration_time=0.020000 size=216 -pos=952 +pos=956 flags=K__ [/PACKET] [PACKET] @@ -90,7 +90,7 @@ dts_time=0.033000 duration=20 duration_time=0.020000 size=215 -pos=1175 +pos=1179 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-opus-remux b/tests/ref/fate/matroska-opus-remux index 9af4250034..3244e52dd8 100644 --- a/tests/ref/fate/matroska-opus-remux +++ b/tests/ref/fate/matroska-opus-remux @@ -68,7 +68,7 @@ dts_time=-0.007000 duration=20 duration_time=0.020000 size=320 -pos=499 +pos=503 flags=K__ [SIDE_DATA] side_data_type=Skip Samples @@ -88,7 +88,7 @@ dts_time=0.014000 duration=20 duration_time=0.020000 size=159 -pos=826 +pos=830 flags=K__ [/PACKET] [PACKET] @@ -101,7 +101,7 @@ dts_time=0.034000 duration=20 duration_time=0.020000 size=148 -pos=992 +pos=996 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/webm-hdr10-plus-remux b/tests/ref/fate/webm-hdr10-plus-remux index 9180d39596..863f08a6d7 100644 --- a/tests/ref/fate/webm-hdr10-plus-remux +++ b/tests/ref/fate/webm-hdr10-plus-remux @@ -16,7 +16,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=13350 -pos=392 +pos=396 flags=K__ [SIDE_DATA] side_data_type=HDR10+ Dynamic Metadata (SMPTE 2094-40) diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index e327959058..40af3381ca 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 693 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 909 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292325 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292325 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 909 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320169 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146877 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 909 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292325 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 693 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320169 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146877 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 909 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292325 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 693 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 909 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292325 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292325 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 909 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320169 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146877 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 909 size: 27837 diff --git a/tests/ref/seek/mkv-codec-delay b/tests/ref/seek/mkv-codec-delay index 04561eb876..3a6667cf61 100644 --- a/tests/ref/seek/mkv-codec-delay +++ b/tests/ref/seek/mkv-codec-delay @@ -1,48 +1,48 @@ -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9306 size: 268 +ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9310 size: 268 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.794000 pts: 0.794000 pos: 7358 size: 154 +ret: 0 st: 0 flags:1 dts: 0.794000 pts: 0.794000 pos: 7362 size: 154 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9306 size: 268 +ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9310 size: 268 ret: 0 st: 0 flags:0 ts: 0.365000 -ret: 0 st: 0 flags:1 dts: 0.374000 pts: 0.374000 pos: 3963 size: 150 +ret: 0 st: 0 flags:1 dts: 0.374000 pts: 0.374000 pos: 3967 size: 150 ret: 0 st: 0 flags:1 ts:-0.741000 -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9306 size: 268 +ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9310 size: 268 ret: 0 st: 0 flags:0 ts:-0.058000 -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 ret: 0 st: 0 flags:1 ts: 2.836000 -ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9306 size: 268 +ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9310 size: 268 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.614000 pts: 0.614000 pos: 5903 size: 159 +ret: 0 st: 0 flags:1 dts: 0.614000 pts: 0.614000 pos: 5907 size: 159 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9306 size: 268 +ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9310 size: 268 ret:-1 st:-1 flags:0 ts: 1.306672 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.194000 pts: 0.194000 pos: 2512 size: 159 +ret: 0 st: 0 flags:1 dts: 0.194000 pts: 0.194000 pos: 2516 size: 159 ret: 0 st: 0 flags:0 ts:-0.905000 -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 ret: 0 st: 0 flags:1 ts: 1.989000 -ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9306 size: 268 +ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9310 size: 268 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.894000 pts: 0.894000 pos: 8154 size: 155 +ret: 0 st: 0 flags:1 dts: 0.894000 pts: 0.894000 pos: 8158 size: 155 ret: 0 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 ret:-1 st: 0 flags:0 ts: 2.672000 ret: 0 st: 0 flags:1 ts: 1.566000 -ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9306 size: 268 +ret: 0 st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos: 9310 size: 268 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.474000 pts: 0.474000 pos: 4768 size: 153 +ret: 0 st: 0 flags:1 dts: 0.474000 pts: 0.474000 pos: 4772 size: 153 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 748 size: 320 +ret: 0 st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos: 752 size: 320 -- 2.50.1 (Apple Git-155) _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
