Merge branch 'test_fix_issue_20' into 'VTM-11.0_nnvc'

Fix for issue #20.

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

training/training_intra_prediction/generating_data_intra.py

@@ -333,7 +333,7 @@ class GeneratorDataPart(object):
                     elif input_chroma_format == '444':
                         dict_input['data_add_basic'][:, :, 1].flatten().tofile(file)
                         dict_input['data_add_basic'][:, :, 2].flatten().tofile(file)
-            args_encoding = [dict_picked['path_to_exe_encoder'],'-c',dict_picked['path_to_cfg'],'-i',dict_chr_own['pbfe'],'-b',dict_picked['path_to_bitstream'],'-wdt',str(width_video),'-hgt',str(height_video),'--InputBitDepth={}'.format(input_bit_depth),'--OutputBitDepth={}'.format(input_bit_depth),'--InputChromaFormat={}'.format(input_chroma_format),'--SEIDecodedPictureHash=1','--ReconFile=','--FramesToBeEncoded={}'.format(nb_frames),'--FrameSkip={}'.format(nb_fixed),'--QP={}'.format(numpy.random.choice(dict_picked['qps_int']).item())]
+            args_encoding = [dict_picked['path_to_exe_encoder'],'-c',dict_picked['path_to_cfg'],'-i',dict_chr_own['pbfe'],'-b',dict_picked['path_to_bitstream'],'-wdt',str(width_video),'-hgt',str(height_video),'--InputBitDepth={}'.format(input_bit_depth),'--OutputBitDepth={}'.format(input_bit_depth),'--InputChromaFormat={}'.format(input_chroma_format),'--SEIDecodedPictureHash=1','--UpscaledOutput=0','--ReconFile=','--FramesToBeEncoded={}'.format(nb_frames),'--FrameSkip={}'.format(nb_fixed),'--QP={}'.format(numpy.random.choice(dict_picked['qps_int']).item())]
             if dict_picked['descr_stacked_up']:
                 args_encoding.append('--DescriptionPairHeightWidthPathToGraphOutput={}'.format(dict_picked['descr_stacked_up']))
                 args_encoding.append('--PrefixAbsolutePathsToGraphsOutput=')
@@ -351,7 +351,7 @@ class GeneratorDataPart(object):
             if are_orgf_definitely[1]:
                 args_encoding.append('--AreOriginalFh=1')
             del are_orgf_definitely
-            args_decoding = [dict_picked['path_to_exe_decoder'],'-b',dict_picked['path_to_bitstream'],'-o',dict_picked['path_provided_2'],'--OutputBitDepth={}'.format(input_bit_depth)]
+            args_decoding = [dict_picked['path_to_exe_decoder'],'-b',dict_picked['path_to_bitstream'],'-o',dict_picked['path_provided_2'],'--OutputBitDepth={}'.format(input_bit_depth),'--UpscaledOutput=0']
             if dict_picked['descr_stacked_up']:
                 args_decoding.append('--DescriptionPairHeightWidthPathToGraphOutput={}'.format(dict_picked['descr_stacked_up']))
                 args_decoding.append('--PrefixAbsolutePathsToGraphsOutput=')