Fix

Author: dk949

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "examples"]
-	path = examples
-	url = https://github.com/JumpCutter/JC-examples.git
+[submodule "JC-examples"]
+	path = JC-examples
+	url = git@github.com:JumpCutter/JC-examples

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [0.0.3](https://github.com/JumpCutter/JC-render/compare/v0.0.2...v0.0.3) (04-01-2021)
+
+### Bug Fixes
+- __Pixel Aspect Ratio__: added pixel aspect ratio for xml
+
+
 ## [0.0.2](https://github.com/JumpCutter/JC-render/compare/v0.0.1...v0.0.2) (03-22-2021)
 
 ### Bug Fixes

examples

@@ -105,6 +105,8 @@ class Render:
     """the current logging socket"""
     thread_alloc = 0
     """the number of treads to allocate where 0=all"""
+    pixel_aspect_ratio = 1.0
+    """the calculated pixel aspect ratio"""
 
     def __init__(self,  # NOQA
                  json_file: str,
@@ -278,6 +280,15 @@ def has_stream(self, file_name, stream='v'):  # NOQA
                                          select_streams=stream)
             if stream == 'v':
                 self._handle_video_detection(probe_streams)
+                display_aspect_ratio = probe_all['streams'][0].get('display_aspect_ratio')
+                sample_aspect_ratio = probe_all['streams'][0].get('sample_aspect_ratio')
+                if display_aspect_ratio and sample_aspect_ratio:
+                    dar = display_aspect_ratio.split(":")
+                    sar = sample_aspect_ratio.split(":")
+                    res = self.resolution.split("x")
+                    x_pixel_ratio = float(res[1]) * float(dar[0]) / float(sar[0])
+                    y_pixel_ratio = float(res[0]) * float(dar[1]) / float(sar[1])
+                    self.pixel_aspect_ratio = x_pixel_ratio / y_pixel_ratio
             if probe_streams['streams']:
                 hasit = True
         except Exception as e:
@@ -1051,6 +1062,8 @@ def export(self, name: str = None):  # NOQA
                         xml_height.text = height
                         xml_width = ET.Element("width")
                         xml_width.text = width
+                        xml_pixel_aspect_ratio = ET.Element("pixelaspectratio")
+                        xml_pixel_aspect_ratio.text = str(self.pixel_aspect_ratio)
                         xml_chars = ET.Element(
                             "samplecharacteristics",
                         )
@@ -1060,6 +1073,9 @@ def export(self, name: str = None):  # NOQA
                         xml_chars.append(
                             xml_width
                         )
+                        xml_chars.append(
+                            xml_pixel_aspect_ratio
+                        )
                         #              )
                         xml_format = ET.Element(
                             "format"

render.py

@@ -5,11 +5,12 @@
 # import threading
 import json
 
+JSON_EXAMPLE = 'JC-examples/yoga.json'
 
 @pytest.mark.render
 @pytest.mark.ffmpeg
 def test_render():
-    r = Render('output.json', './tmp',
+    r = Render(JSON_EXAMPLE, './tmp',
                no_clean=True,
                silent_log=True,
                thread_alloc=2,
@@ -28,7 +29,7 @@ def test_render():
 @pytest.mark.ffmpeg
 @pytest.mark.xml
 def test_export_xml():
-    r = Render('output.json', './tmp',
+    r = Render(JSON_EXAMPLE, './tmp',
                no_clean=True,
                # markers=True,
                # readable=True,
@@ -40,7 +41,7 @@ def test_export_xml():
 @pytest.mark.ffmpeg
 @pytest.mark.fcpxml
 def test_export_fcpxml():
-    r = Render('output.json', './tmp',
+    r = Render(JSON_EXAMPLE, './tmp',
                no_clean=True,
                # markers=True,
                # readable=True,
@@ -52,7 +53,7 @@ def test_export_fcpxml():
 @pytest.mark.ffmpeg
 @pytest.mark.edl
 def test_export_edl():
-    r = Render('output.json', './tmp',
+    r = Render(JSON_EXAMPLE, './tmp',
                no_clean=True,
                # readable=True,
                verbose=False, vcodec='edl')
@@ -63,7 +64,7 @@ def test_export_edl():
 @pytest.mark.ffmpeg
 @pytest.mark.otio
 def test_export_otio():
-    r = Render('output.json', './tmp',
+    r = Render(JSON_EXAMPLE, './tmp',
                no_clean=True,
                # readable=True,
                verbose=False, vcodec='otio')
@@ -74,7 +75,7 @@ def test_export_otio():
 @pytest.mark.ffmpeg
 @pytest.mark.aaf
 def test_export_aaf():
-    r = Render('output.json', './tmp',
+    r = Render(JSON_EXAMPLE, './tmp',
                no_clean=True,
                # readable=True,
                verbose=False, vcodec='aaf')
@@ -84,7 +85,7 @@ def test_export_aaf():
 @pytest.mark.probe
 @pytest.mark.ffmpeg
 def test_probe():
-    r = Render('output.json', './tmp', True, vcodec='h264')
+    r = Render(JSON_EXAMPLE, './tmp', True, vcodec='h264')
     input_data = r.get_json(r.json_file)
     probe_res = ffprobe(input_data['layers'][0][0]['sourceFile'])
     print(json.dumps(probe_res, indent=2))
@@ -93,7 +94,7 @@ def test_probe():
 @pytest.mark.probe_audio
 @pytest.mark.ffmpeg
 def test_audio():
-    r = Render('output.json', './tmp', True, vcodec='h264')
+    r = Render(JSON_EXAMPLE, './tmp', True, vcodec='h264')
     input_data = r.get_json(r.json_file)
     layer = input_data['layers'][0][0]['sourceFile']
     probe_res = ffprobe(layer, select_streams='a')