ffmpeg: rewrite setting the stream disposition

Currently, the code doing this is spread over several places and may
behave in unexpected ways. E.g. automatic 'default' marking is only done
for streams fed by complex filtergraphs. It is also applied in the order
in which the output streams are initialized, which is effectively
random.

Move processing the dispositions at the end of open_output_file(), when
we already have all the necessary information.

Apply the automatic default marking only if no explicit -disposition
options were supplied by the user, and apply it to the first stream of
each type (excluding attached pics) when there is more than one stream
of that type and no default markings were copied from the input streams.

Explicitly document the new behavior.

Changes the results of some tests, where the output file gets a default
disposition, while it previously did not.

1 files changed, 31 insertions, 31 deletions

diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default
index 54e992c406..d3d90fa5d6 100644
--- a/tests/ref/fate/ffprobe_default
+++ b/tests/ref/fate/ffprobe_default
@@ -8,7 +8,7 @@ dts_time=0.000000
 duration=1024
 duration_time=0.023220
 size=2048
-pos=647
+pos=669
 flags=K_
 [/PACKET]
 [FRAME]
@@ -23,7 +23,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=647
+pkt_pos=669
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -40,7 +40,7 @@ dts_time=0.000000
 duration=2048
 duration_time=0.040000
 size=230400
-pos=2722
+pos=2744
 flags=K_
 [/PACKET]
 [FRAME]
@@ -55,7 +55,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=2722
+pkt_pos=2744
 pkt_size=230400
 width=320
 height=240
@@ -83,7 +83,7 @@ dts_time=0.000000
 duration=2048
 duration_time=0.040000
 size=30000
-pos=233143
+pos=233165
 flags=K_
 [/PACKET]
 [FRAME]
@@ -98,7 +98,7 @@ best_effort_timestamp=0
 best_effort_timestamp_time=0.000000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=233143
+pkt_pos=233165
 pkt_size=30000
 width=100
 height=100
@@ -126,7 +126,7 @@ dts_time=0.023220
 duration=1024
 duration_time=0.023220
 size=2048
-pos=263148
+pos=263170
 flags=K_
 [/PACKET]
 [FRAME]
@@ -141,7 +141,7 @@ best_effort_timestamp=1024
 best_effort_timestamp_time=0.023220
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=263148
+pkt_pos=263170
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -158,7 +158,7 @@ dts_time=0.040000
 duration=2048
 duration_time=0.040000
 size=230400
-pos=265226
+pos=265248
 flags=K_
 [/PACKET]
 [FRAME]
@@ -173,7 +173,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=265226
+pkt_pos=265248
 pkt_size=230400
 width=320
 height=240
@@ -201,7 +201,7 @@ dts_time=0.040000
 duration=2048
 duration_time=0.040000
 size=30000
-pos=495650
+pos=495672
 flags=K_
 [/PACKET]
 [FRAME]
@@ -216,7 +216,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.040000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=495650
+pkt_pos=495672
 pkt_size=30000
 width=100
 height=100
@@ -244,7 +244,7 @@ dts_time=0.046440
 duration=1024
 duration_time=0.023220
 size=2048
-pos=525655
+pos=525677
 flags=K_
 [/PACKET]
 [FRAME]
@@ -259,7 +259,7 @@ best_effort_timestamp=2048
 best_effort_timestamp_time=0.046440
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=525655
+pkt_pos=525677
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -276,7 +276,7 @@ dts_time=0.069660
 duration=1024
 duration_time=0.023220
 size=2048
-pos=527726
+pos=527748
 flags=K_
 [/PACKET]
 [FRAME]
@@ -291,7 +291,7 @@ best_effort_timestamp=3072
 best_effort_timestamp_time=0.069660
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=527726
+pkt_pos=527748
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -308,7 +308,7 @@ dts_time=0.080000
 duration=2048
 duration_time=0.040000
 size=230400
-pos=529804
+pos=529826
 flags=K_
 [/PACKET]
 [FRAME]
@@ -323,7 +323,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=529804
+pkt_pos=529826
 pkt_size=230400
 width=320
 height=240
@@ -351,7 +351,7 @@ dts_time=0.080000
 duration=2048
 duration_time=0.040000
 size=30000
-pos=760228
+pos=760250
 flags=K_
 [/PACKET]
 [FRAME]
@@ -366,7 +366,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.080000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=760228
+pkt_pos=760250
 pkt_size=30000
 width=100
 height=100
@@ -394,7 +394,7 @@ dts_time=0.092880
 duration=1024
 duration_time=0.023220
 size=2048
-pos=790233
+pos=790255
 flags=K_
 [/PACKET]
 [FRAME]
@@ -409,7 +409,7 @@ best_effort_timestamp=4096
 best_effort_timestamp_time=0.092880
 pkt_duration=1024
 pkt_duration_time=0.023220
-pkt_pos=790233
+pkt_pos=790255
 pkt_size=2048
 sample_fmt=s16
 nb_samples=1024
@@ -426,7 +426,7 @@ dts_time=0.116100
 duration=393
 duration_time=0.008912
 size=786
-pos=792304
+pos=792326
 flags=K_
 [/PACKET]
 [FRAME]
@@ -441,7 +441,7 @@ best_effort_timestamp=5120
 best_effort_timestamp_time=0.116100
 pkt_duration=393
 pkt_duration_time=0.008912
-pkt_pos=792304
+pkt_pos=792326
 pkt_size=786
 sample_fmt=s16
 nb_samples=393
@@ -458,7 +458,7 @@ dts_time=0.120000
 duration=2048
 duration_time=0.040000
 size=230400
-pos=793120
+pos=793142
 flags=K_
 [/PACKET]
 [FRAME]
@@ -473,7 +473,7 @@ best_effort_timestamp=6144
 best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=793120
+pkt_pos=793142
 pkt_size=230400
 width=320
 height=240
@@ -501,7 +501,7 @@ dts_time=0.120000
 duration=2048
 duration_time=0.040000
 size=30000
-pos=1023544
+pos=1023566
 flags=K_
 [/PACKET]
 [FRAME]
@@ -516,7 +516,7 @@ best_effort_timestamp=6144
 best_effort_timestamp_time=0.120000
 pkt_duration=2048
 pkt_duration_time=0.040000
-pkt_pos=1023544
+pkt_pos=1023566
 pkt_size=30000
 width=100
 height=100
@@ -619,7 +619,7 @@ bits_per_raw_sample=N/A
 nb_frames=N/A
 nb_read_frames=4
 nb_read_packets=4
-DISPOSITION:default=0
+DISPOSITION:default=1
 DISPOSITION:dub=0
 DISPOSITION:original=0
 DISPOSITION:comment=0
@@ -705,8 +705,8 @@ nb_programs=0
 format_name=nut
 start_time=0.000000
 duration=0.120000
-size=1053624
-bit_rate=70241600
+size=1053646
+bit_rate=70243066
 probe_score=100
 TAG:title=ffprobe test file
 TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x">