address minor issues from #13

README.md

@@ -4,12 +4,24 @@
 
 This repository provides the information and scripts to generate the CTA Wave Test Content.
 
+#Romain: clean up the FTP
+
+#Conformance: ok
+#Mapping parameters ok
+#database = { } # Romain: contains single track only
+#Mapping of input/output with naming convention/wave web page: being done
+#Then pushing streams
+#Then encryption: document + https://github.com/cta-wave/dpctf-tests/issues/12   for i in $(find . -type d) ; do /opt/bin/gpac -i $i/stream.mpd:forward=mani cecrypt:cfile=DRM.xml @ -o $i-cenc/stream.mpd:pssh=mv ; done
+#Tests
+#=> date/checksums
+#Then we'll probably talk again
+
 The ```run-all.py``` script gathers the data and content from input tables/parameters. Then it sends them for processing. Then it uploads the result.
 TODO: continue to map input parameters. => csv
 TODO: rename uploaded content according to https://github.com/cta-wave/Test-Content-Generation/issues/22
 TODO: add a validation phase. Romain; map to issue
 
-The ```encode_dash.py```script is primarily about the usage of GPAC leveraging libavcodec with x264 and x265 to encode the content.
+The ```encode_dash.py``` script is primarily about the usage of GPAC leveraging libavcodec with x264 and x265 to encode the content.
 The intent is to keep the size of the post-processing as small as possible.
 TODO: split and rename script as it does several things at once.
 TODO: support encryption.

run-all.py

@@ -23,7 +23,7 @@
     csv_reader = csv.reader(csv_file, delimiter=',')
     csv_line_index = 0
 
-    switching_set_X1_IDs = [ "1", "20", "23", "24", "25", "28", "32", "34" ] # keep ordered
+    switching_set_X1_IDs = [ "20", "23", "24", "25", "28", "32", "34" ] # keep ordered
     switching_set_X1_command = ""
     switching_set_X1_reps = []
 

switching_sets_single_track.csv

@@ -1,21 +1,18 @@
 Stream ID,mezzanine prefix,pic timing,VUI timing,sample entry,CMAF frag dur,init constraints,frag_type,resolution,framerate,bitrate
-1,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1920x1080,0.5,5100
-2,tos_L1_1920x1080@30_60.mp4,FALSE,TRUE,avc1,5,single,pframes,1920x1080,0.5,5000
-3,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1+3,2,regular,every_frame,1920x1080,0.5,4900
 10,tos_L1_1920x1080@30_60.mp4,FALSE,FALSE,avc1+3,2,regular,duration,1920x1080,0.5,4800
-11,tos_L1_1920x1080@30_60.mp4,TRUE,TRUE,avc1,2,regular,duration,1920x1080,0.5,4700
-12,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1920x1080,0.5,4600
-13,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc3,2,regular,duration,1920x1080,0.5,4500
+11,tos_L1_1920x1080@30_60.mp4,TRUE,TRUE,avc1,2,regular,duration,1920x1080,0.5,4100
+12,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1920x1080,0.5,4200
+13,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc3,2,regular,duration,1920x1080,0.5,4300
 14,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1+3,5,regular,duration,1920x1080,0.5,4400
-15,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,single,pframes,1920x1080,0.5,4300
-16,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,regular,every_frame,1920x1080,0.5,4200
-17,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1920x1080,0.5,4100
-20,tos_L2_1920x1080@60_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1920x1080,1,6000
+15,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,single,pframes,1920x1080,0.5,4500
+16,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,regular,every_frame,1920x1080,0.5,4600
+17,tos_L1_1920x1080@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1920x1080,0.5,4700
+20,tos_L1_1920x1080@60_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1920x1080,1,6000
 21,tos_K1_1600x900@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1600x900,0.5,3000
 22,tos_J1_1280x720@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1280x720,0.5,2000
 23,tos_J1_1280x720@60_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1280x720,1,3000
-24,tos_I1_1024x576@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1024x576,0.5,1500
-25,tos_I2_1024x576@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1024x576,0.5,1200
+24,tos_I1_1024x576@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1024x576,0.5,1200
+25,tos_I2_1024x576@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,1024x576,0.5,1500
 26,tos_H1_960x540@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,960x540,0.5,1100
 27,tos_G1_852x480@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,852x480,0.5,1000
 28,tos_F1_768x432@30_60.mp4,TRUE,FALSE,avc1,2,regular,duration,768x432,0.5,900