History

fftools/ffmpeg: stop injecting stream side data in packets

This is no longer needed as the side data is available for decoders in the AVCodecContext. The tests affected reflect the removal of useless CPB and Stereo 3D side data in packets.

James Almer committed 3 years ago

Commit d372c2f1 parent ae2227115 files · +21 −43Browse files

Unified · Split

15 files
  1. fftools/ffmpeg_demux.c +0 −22
  2. tests/ref/fate/autorotate +2 −2
  3. tests/ref/fate/copy-trac3074 +1 −1
  4. tests/ref/fate/matroska-avoid-negative-ts +1 −1
  5. tests/ref/fate/matroska-dovi-write-config7 +1 −1
  6. tests/ref/fate/matroska-dovi-write-config8 +1 −1
  7. tests/ref/fate/matroska-encoding-delay +1 −1
  8. tests/ref/fate/matroska-mastering-display-metadata +2 −2
  9. tests/ref/fate/matroska-spherical-mono-remux +2 −2
  10. tests/ref/fate/matroska-stereo_mode +4 −4
  11. tests/ref/fate/matroska-vp8-alpha-remux +1 −1
  12. tests/ref/fate/mov-mp4-disposition-mpegts-remux +2 −2
  13. tests/ref/fate/mxf-d10-user-comments +1 −1
  14. tests/ref/fate/mxf-remux-applehdr10 +1 −1
  15. tests/ref/fate/vp9-superframe-bsf +1 −1
fftools/ffmpeg_demux.c+0−22
@@ -480,28 +480,6 @@ static int input_packet_process(Demuxer *d, DemuxMsg *msg, AVPacket *src) · 479 unmodified lines
480480 ds->data_size += pkt->size;
481481 ds->nb_packets++;
482482
483− /* add the stream-global side data to the first packet */
484− if (ds->nb_packets == 1) {
485− for (int i = 0; i < ist->st->codecpar->nb_coded_side_data; i++) {
486− AVPacketSideData *src_sd = &ist->st->codecpar->coded_side_data[i];
487− uint8_t *dst_data;
488−
489− if (src_sd->type == AV_PKT_DATA_DISPLAYMATRIX)
490− continue;
491−
492− if (av_packet_get_side_data(pkt, src_sd->type, NULL))
493− continue;
494−
495− dst_data = av_packet_new_side_data(pkt, src_sd->type, src_sd->size);
496− if (!dst_data) {
497− ret = AVERROR(ENOMEM);
498− goto fail;
499− }
500−
501− memcpy(dst_data, src_sd->data, src_sd->size);
502− }
503− }
504−
505483 if (debug_ts) {
506484 av_log(NULL, AV_LOG_INFO, "demuxer+ffmpeg -> ist_index:%d:%d type:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s duration:%s duration_time:%s off:%s off_time:%s\n",
507485 f->index, pkt->stream_index,
tests/ref/fate/autorotate+2−2
@@ -11,8 +11,8 @@ · 10 unmodified lines
1111 #codec_id 1: ac3
1212 #sample_rate 1: 44100
1313 #channel_layout_name 1: mono
14−0, -512, 0, 512, 6997, 0x55c700f6, S=1, 40
15−1, -256, -256, 1536, 416, 0x92ddc529, S=2, 10, 4
14+0, -512, 0, 512, 6997, 0x55c700f6
15+1, -256, -256, 1536, 416, 0x92ddc529, S=1, 10
1616 0, 0, 512, 512, 4847, 0xe74f522e, F=0x0
1717 1, 1280, 1280, 1536, 418, 0x0a7fcd2d
1818 0, 512, 1024, 512, 5281, 0xbd4a5dac, F=0x0
tests/ref/fate/copy-trac3074+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 #codec_id 0: eac3
66 #sample_rate 0: 48000
77 #channel_layout_name 0: stereo
8−0, 0, 0, 1536, 512, 0x2beaf79f, S=1, 4
8+0, 0, 0, 1536, 512, 0x2beaf79f
99 0, 1536, 1536, 1536, 512, 0x29ddf9d6
1010 0, 3072, 3072, 1536, 512, 0xba0afa79
1111 0, 4608, 4608, 1536, 512, 0xe019f394
tests/ref/fate/matroska-avoid-negative-ts+1−1
@@ -11,7 +11,7 @@ fb4e7a969ef65f61c4c45d5976188aa2 *tests/data/fate/matroska-avoid-negative-ts.mat · 10 unmodified lines
1111 #codec_id 1: mp3
1212 #sample_rate 1: 44100
1313 #channel_layout_name 1: mono
14−0, -37, 43, 40, 9156, 0xe5bd034a, S=1, 40
14+0, -37, 43, 40, 9156, 0xe5bd034a
1515 1, 0, 0, 26, 417, 0x7198c15e
1616 0, 3, 3, 40, 1740, 0x29ac4480, F=0x0
1717 1, 26, 26, 26, 417, 0x3c67c32d
tests/ref/fate/matroska-dovi-write-config7+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #dimensions 1: 1920x1080
1414 #sar 1: 0/1
1515 0, -83, 0, 41, 699, 0x728548f1
16−1, -83, 0, 41, 1085, 0xfb2dba82, S=1, 8
16+1, -83, 0, 41, 1085, 0xfb2dba82
1717 0, -42, 167, 41, 95, 0xc0312044, F=0x0
1818 1, -42, 167, 41, 481, 0xf23f91d5, F=0x0
1919 0, 0, 83, 41, 99, 0x5e0a2221, F=0x0
tests/ref/fate/matroska-dovi-write-config8+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 #codec_id 1: aac
1313 #sample_rate 1: 44100
1414 #channel_layout_name 1: stereo
15−0, -67, 0, 33, 63375, 0xc76606ab, S=1, 8
15+0, -67, 0, 33, 63375, 0xc76606ab
1616 0, -34, 133, 33, 46706, 0x0e08a7e5, F=0x0
1717 0, 0, 67, 33, 29766, 0x753c031a, F=0x0
1818 1, 0, 0, 23, 6, 0x031e0108
tests/ref/fate/matroska-encoding-delay+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 #sample_rate 1: 48000
1313 #channel_layout_name 1: stereo
1414 1, -10, -10, 24, 1152, 0x724077b8
15−0, 0, 0, 40, 237628, 0xeff25579, S=1, 40
15+0, 0, 0, 40, 237628, 0xeff25579
1616 1, 14, 14, 24, 1152, 0x80625572
1717 1, 38, 38, 24, 1152, 0x7d7f4dce
1818 0, 40, 40, 40, 238066, 0xb2265f41
tests/ref/fate/matroska-mastering-display-metadata+2−2
@@ -22,9 +22,9 @@ · 21 unmodified lines
2222 #codec_id 3: ffv1
2323 #dimensions 3: 1280x720
2424 #sar 3: 1/1
25−0, 0, 0, 16, 57008, 0x43416399, S=2, 8, 88
25+0, 0, 0, 16, 57008, 0x43416399
2626 1, 0, 0, 16, 2403, 0xaa818522
27−3, 0, 0, 16, 274117, 0xc439610f, S=2, 8, 88
27+3, 0, 0, 16, 274117, 0xc439610f
2828 0, 17, 17, 16, 57248, 0xa06cd7b5
2929 1, 17, 17, 16, 2403, 0xe1a991e5
3030 2, 17, 17, 16, 1602, 0x5d868171
tests/ref/fate/matroska-spherical-mono-remux+2−2
@@ -12,8 +12,8 @@ fddfea5f05a7a9a0d187df9a72900055 *tests/data/fate/matroska-spherical-mono-remux. · 11 unmodified lines
1212 #codec_id 1: h264
1313 #dimensions 1: 1920x1080
1414 #sar 1: 0/1
15−0, -80, 0, 40, 69118, 0x73cb52f0, S=2, 12, 36
16−1, -80, 0, 40, 69118, 0x73cb52f0, S=2, 12, 36
15+0, -80, 0, 40, 69118, 0x73cb52f0
16+1, -80, 0, 40, 69118, 0x73cb52f0
1717 0, -40, 160, 40, 1103, 0x082a059f, F=0x0
1818 1, -40, 160, 40, 1103, 0x082a059f, F=0x0
1919 [STREAM]
tests/ref/fate/matroska-stereo_mode+4−4
@@ -43,10 +43,10 @@ a7a220a77001e81685ec807ce5ac3bc6 *tests/data/fate/matroska-stereo_mode.matroska · 42 unmodified lines
4343 #dimensions 6: 512x512
4444 #sar 6: 2/1
4545 0, 0, 0, 1000, 206173, 0x95af7455
46−1, 0, 0, 1000, 206173, 0x95af7455, S=1, 12
47−2, 0, 0, 1000, 206173, 0x95af7455, S=1, 12
48−3, 0, 0, 1000, 206173, 0x95af7455, S=1, 12
49−4, 0, 0, 1000, 206173, 0x95af7455, S=1, 12
46+1, 0, 0, 1000, 206173, 0x95af7455
47+2, 0, 0, 1000, 206173, 0x95af7455
48+3, 0, 0, 1000, 206173, 0x95af7455
49+4, 0, 0, 1000, 206173, 0x95af7455
5050 5, 0, 0, 1000, 206173, 0x95af7455
5151 6, 0, 0, 1000, 206173, 0x95af7455
5252 0, 1000, 1000, 1000, 36, 0x34891010, F=0x0
tests/ref/fate/matroska-vp8-alpha-remux+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55 #codec_id 0: vp8
66 #dimensions 0: 320x213
77 #sar 0: 1/1
8−0, 0, 0, 33, 2108, 0x59b92a34, S=2, 1900, 12
8+0, 0, 0, 33, 2108, 0x59b92a34, S=1, 1900
99 0, 32, 32, 33, 142, 0x2f2a3fed, F=0x0, S=1, 160
1010 0, 65, 65, 33, 157, 0x17804767, F=0x0, S=1, 209
1111 0, 99, 99, 33, 206, 0x537262ca, F=0x0, S=1, 317
tests/ref/fate/mov-mp4-disposition-mpegts-remux+2−2
@@ -10,9 +10,9 @@ adb3b95c07a5f3e0c86641dd62f01dae *tests/data/fate/mov-mp4-disposition-mpegts-rem · 9 unmodified lines
1010 #codec_id 1: ac3
1111 #sample_rate 1: 48000
1212 #channel_layout_name 1: stereo
13−1, 0, 0, 1536, 768, 0xa63778d4, S=1, 4
13+1, 0, 0, 1536, 768, 0xa63778d4
1414 1, 1536, 1536, 1536, 768, 0x7d577f3f
15−0, 3072, 3072, 1536, 768, 0xc2867884, S=1, 4
15+0, 3072, 3072, 1536, 768, 0xc2867884
1616 1, 3072, 3072, 1536, 768, 0xd86b7c8f
1717 0, 4608, 4608, 1536, 690, 0xa2714bf3
1818 1, 4608, 4608, 1536, 626, 0x09f4382f
tests/ref/fate/mxf-d10-user-comments+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 #codec_id 0: mpeg2video
77 #dimensions 0: 1280x720
88 #sar 0: 3/4
9−0, -1, 0, 1, 150000, 0x0547870d, S=1, 40
9+0, -1, 0, 1, 150000, 0x0547870d
1010 0, 0, 1, 1, 150000, 0xe80a1612, F=0x0
1111 0, 1, 2, 1, 150000, 0xc5c50e2f, F=0x0
1212 0, 2, 3, 1, 150000, 0x51e28a04, F=0x0
tests/ref/fate/mxf-remux-applehdr10+1−1
@@ -10,7 +10,7 @@ · 9 unmodified lines
1010 #codec_id 1: pcm_s24le
1111 #sample_rate 1: 48000
1212 #channel_layout_name 1: mono
13−0, 0, 0, 1, 57008, 0x43416399, S=1, 88
13+0, 0, 0, 1, 57008, 0x43416399
1414 1, 0, 0, 801, 2403, 0x00000000
1515 0, 1, 1, 1, 57248, 0xa06cd7b5
1616 1, 801, 801, 801, 2403, 0x00000000
tests/ref/fate/vp9-superframe-bsf+1−1
@@ -3,7 +3,7 @@ · 2 unmodified lines
33 #codec_id 0: vp9
44 #dimensions 0: 352x288
55 #sar 0: 1/1
6−0, 0, 0, 33, 6958, 0x38e58ee6, S=1, 12
6+0, 0, 0, 33, 6958, 0x38e58ee6
77 0, 33, 33, 33, 852, 0x3edf9ed0, F=0x0
88 0, 66, 66, 33, 27, 0x62d007e5, F=0x0
99 0, 100, 100, 33, 25, 0x51980749, F=0x0

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t