Merge branch 'NCS-1.0_candidate_fix_issue_3' into 'NCS-1.0_candidate'

Fix issue #4

See merge request jvet-ahg-nnvc/VVCSoftware_VTM!7

training/example/sample_test.sh

@@ -4,9 +4,9 @@
 # for encoding, it assumes that --Verbosity=6 has been used during encoding and that the encoding logs are put in a file.
 LISTDIR_BS="bs/BVI bs/UVG bs/DIV2K";
 
-
 DEC=bin/DecoderAppStatic;
-CREATE_DB=training/tools/concatenate_dataset.py
+CREATE_DB=training/tools/concatenate_dataset.py;
+LOG_EXT="log";
 EXAMPLE=training/example/create_unified_dataset.py;
 DISPLAYPATCH=training/example/display_patches_dataset.py;
 DB_DIR=db; # put all files in the same directory, assume no name clash
@@ -29,18 +29,18 @@ done
 
 echo "Process 1 dataset";
 python3 ${CREATE_DB} --input_dir_json db --output_json pre_db.json
-echo "Consolidate with encoder info";
-python3 ${CREATE_DB} --input_dir_encoder ${LISTDIR_BS} --input_json pre_db.json --output_json db.json
 
+echo "Consolidate with encoder info";
+python3 ${CREATE_DB} --input_dir_encoder ${LISTDIR_BS} --input_json pre_db.json --output_json db.json --log_extension ${LOG_EXT}
 
 echo "Generate a binary dataset using luma info"
-python3 $EXAMPLE --input_json db.json --output_file patches_luma.bin --nb_patches 4  --components "org_Y,pred_Y,rec_before_dbf_Y,rec_after_dbf_Y,bs_Y,partition_cu_average_Y,qp_slice,qp_base" --border_size 8
+python3 $EXAMPLE --input_json db.json --output_file patches_luma.bin --nb_patches 4  --components "org_Y,pred_Y,rec_before_dbf_Y,bs_Y,partition_cu_average_Y,qp_slice,qp_base" --border_size 8 --generate_type 1
 
 echo "Display the result"
 python3 $DISPLAYPATCH patches_luma.bin.json 
 
 echo "Generate a binary dataset using chroma info"
-python3 $EXAMPLE --input_json db.json --output_file patches_chroma.bin --nb_patches 4  --components "org_U,org_V,pred_U,pred_V,rec_after_dbf_U,rec_after_dbf_V,bs_U,bs_V,partition_cu_average_U" --border_size 8
+python3 $EXAMPLE --input_json db.json --output_file patches_chroma.bin --nb_patches 4  --components "org_U,org_V,pred_U,pred_V,rec_before_dbf_U,rec_before_dbf_V,bs_U,bs_V,partition_cu_average_U,partition_cu_average_V" --border_size 8 --generate_type 1
 
 echo "Display the result"
 python3 $DISPLAYPATCH patches_chroma.bin.json