Skip to content

Commit e46adb5

Browse files
richardssamapetrynet
richardssam
and
apetrynet
authored
Adding a couple of extra metadata fields for filenaming. (#79)
* Adding a couple of extra metadata fields for filenaming. This helps define exactly how the output filename is defined, which then helps with the log files, and general template generation. Signed-off-by: [email protected] <[email protected]> * Update enctests/testframework/encoders/ffmpeg_encoder.py Fixing return Co-authored-by: Daniel Flehner Heen <[email protected]> Signed-off-by: Sam Richards <[email protected]> * Fixing return values for get-output-filename Signed-off-by: [email protected] <[email protected]> * Fixing template. Signed-off-by: [email protected] <[email protected]> * Update enctests/testframework/encoders/ffmpeg_encoder.py Converting the return type to a Tuple Co-authored-by: Daniel Flehner Heen <[email protected]> Signed-off-by: Sam Richards <[email protected]> --------- Signed-off-by: [email protected] <[email protected]> Signed-off-by: Sam Richards <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: Daniel Flehner Heen <[email protected]>
1 parent 32d6cef commit e46adb5

File tree

7 files changed

+20
-16
lines changed

7 files changed

+20
-16
lines changed

‎enctests/testframework/encoders/ffmpeg_encoder.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def run_wedges(self) -> dict:
4848
for wedge_name, wedge in self.test_config.get('wedges', {}).items():
4949
# Test name is based on main test name and wedge name
5050
test_name = f"{self.test_config.get('name')}-{wedge_name}"
51-
out_file = self.get_output_filename(test_name)
51+
out_file, testbasename = self.get_output_filename(test_name)
5252

5353
# Remove it, so if the new run fails to create anything
5454
# we are not accidently using the old one.
@@ -101,7 +101,8 @@ def run_wedges(self) -> dict:
101101
test_meta['command'] = cmd
102102
test_meta['encode_arguments'] = wedge
103103
test_meta['description'] = self.test_config.get('description')
104-
104+
test_meta['outputfile'] = str(out_file)
105+
test_meta['testbasename'] = testbasename
105106
result_meta = test_meta.setdefault('results', {})
106107
result_meta['completed_utc'] = \
107108
datetime.now(timezone.utc).isoformat()
@@ -172,15 +173,17 @@ def get_source_path(self) -> Tuple[pathlib.Path, str]:
172173

173174
return path, symbol
174175

175-
def get_output_filename(self, test_name: str) -> pathlib.Path:
176+
def get_output_filename(self, test_name: str) -> Tuple[pathlib.Path, str]:
176177
source_path, symbol = self.get_source_path()
177178
stem = source_path.stem.replace(symbol, '')
178179
if stem[-1] == ".":
179180
stem = stem[:-1]
180181

182+
testbasename = f"{stem}-{test_name}"
183+
181184
out_file = self.destination.absolute().joinpath(
182-
f"{stem}-{test_name}{self.test_config.get('suffix')}"
185+
f"{testbasename}{self.test_config.get('suffix')}"
183186
)
184187

185-
return out_file
188+
return out_file, testbasename
186189

‎enctests/testframework/templates/basic.html.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
</TR>
4949
{% for enc_info in test.results %}
5050
<TR>
51-
<TH><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</a></TH>
52-
<td align=right><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}_tests.log">Test {{ enc_info.testresult}}</A> </TD>
51+
<TH><A target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</a></TH>
52+
<td align=right><A target="_blank" HREF="{{ enc_info.testbasename|e }}_tests.log">Test {{ enc_info.testresult}}</A> </TD>
5353
<td align=right>{{ enc_info.encode_time}} </TD>
5454
<td align=right>{{ enc_info.filesize}} </TD>
5555
<TD align=right>{{enc_info.vmaf_harmonic_mean |e }}</TD>

‎enctests/testframework/templates/basicmovie.html.jinja

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
</TR>
5151
{% for enc_info in test.results %}
5252
<TR>
53-
<TH><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</a></TH>
54-
<td align=right><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}_tests.log">Result - {{ enc_info.testresult }}</A> </TD>
53+
<TH><A target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</a></TH>
54+
<td align=right><A target="_blank" HREF="{{ enc_info.testbasename|e }}_tests.log">Result - {{ enc_info.testresult }}</A> </TD>
5555
<td align=right>{{ enc_info.encode_time}} </TD>
5656
<td align=right>{{ "{:,}".format(enc_info.filesize) }} </TD>
5757
<TD align=right>{{enc_info.vmaf_harmonic_mean |e }}</TD>
@@ -90,7 +90,7 @@
9090
</TR>
9191
{% for enc_info in test.results %}
9292
<TR>
93-
<TH><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</A></TH>
93+
<TH><A target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</A></TH>
9494
<td align=right><video width="500px" controls <source type='video/mp4' src="{{ enc_info.output_media | e }}"/> </video></TD>
9595
<TD>{{enc_info.encode_arguments | e}}</TD>
9696
</TR>

‎enctests/testframework/templates/basicpictures.html.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</TR>
4848
{% for enc_info in test.results %}
4949
<TR>
50-
<TH><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</A></TH>
50+
<TH><A target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</A></TH>
5151
<td align=right>{{ enc_info.encode_time}} </TD>
5252
<td align=right>{{ "{:,}".format(enc_info.filesize) }} </TD>
5353
<TD align=right>{{enc_info.vmaf.harmonic_mean |e }}</TD>

‎enctests/testframework/templates/colorweb.html.jinja

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</TR>
4848
{% for enc_info in test.results %}
4949
<TR>
50-
<TH><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</A></TH>
51-
<td align=right><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}_tests.log">{{ enc_info.testresult }}</A> </TD>
50+
<TH><A target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</A></TH>
51+
<td align=right><A target="_blank" HREF="{{ enc_info.testbasename|e }}_tests.log">{{ enc_info.testresult }}</A> </TD>
5252
<td align=right>{{ enc_info.mean_error}} </TD>
5353
<td align=right>{{ enc_info.max_error}} </TD>
5454
<td align=right>{{ enc_info.encode_time}} </TD>

‎enctests/testframework/templates/doctests.html.jinja

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
</TR>
4444
{% for enc_info in test.results %}
4545
<TR>
46-
<TH><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}.log">{{ enc_info.name|e }}</A></TH>
47-
<td align=right><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}_tests.log">{{ enc_info.testresult}}</A> </TD>
46+
<TH><A target="_blank" HREF="{{ enc_info.testbasename|e }}.log">{{ enc_info.name|e }}</A></TH>
47+
<td align=right><A target="_blank" HREF="{{ enc_info.testbasename|e }}_tests.log">{{ enc_info.testresult}}</A> </TD>
4848
<td align=right>{{ enc_info.mean_error}} </TD>
49-
<td align=right><A target="_blank" HREF="{{ test.default_media.basename }}-{{ enc_info.name|e }}-x20diff.png">{{ enc_info.max_error}} </A></TD>
49+
<td align=right><A target="_blank" HREF="{{ enc_info.testbasename|e }}-x20diff.png">{{ enc_info.max_error}} </A></TD>
5050
<td align=right>{{ enc_info.encode_time}} </TD>
5151
<td align=right>{{ "{:,}".format(enc_info.filesize) }} </TD>
5252
<TD>{{enc_info.command | e}}</TD>

‎enctests/testframework/utils/outputTemplate.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def processTemplate(config, timeline):
7272
continue
7373
merge_test_info = test_info.metadata['aswf_enctests']['results']
7474
merge_test_info['name'] = ref_name
75+
merge_test_info['testbasename'] = test_info.metadata['aswf_enctests']['testbasename']
7576
merge_test_info['wedge'] = ref_name.replace(track.metadata.get('source_test_name', '')+"-", "")
7677
if 'description' in test_info.metadata['aswf_enctests']:
7778
merge_test_info['test_description'] = test_info.metadata['aswf_enctests']['description']

0 commit comments

Comments
 (0)