jamie/ptulsconv
1
0
Fork 0
mirror of https://github.com/iluvcapra/ptulsconv.git synced 2026-01-01 09:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

More typing, removed dead code in tc convert

Browse Source
This commit is contained in:
Jamie Hardt
2021-05-27 20:32:24 -07:00
parent 859a427fc4
commit d1bb5990b2
4 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ptulsconv/broadcast_timecode.py
View File

@@ -3,8 +3,7 @@ import re
import math
def smpte_to_frame_count(smpte_rep_string: str, frames_per_logical_second: int, drop_frame_hint=False,
include_fractional=False) -> object:
def smpte_to_frame_count(smpte_rep_string: str, frames_per_logical_second: int, drop_frame_hint=False) -> int:
"""
Convert a string with a SMPTE timecode representation into a frame count.
@@ -40,10 +39,10 @@ def smpte_to_frame_count(smpte_rep_string: str, frames_per_logical_second: int,
dropped_frames = frames_dropped_per_inst * inst_count
frames = raw_frames - dropped_frames
if include_fractional:
return frames, frac
else:
return frames
# if include_fractional:
# return frames, frac
# else:
return frames
def frame_count_to_smpte(frame_count: int, frames_per_logical_second: int, drop_frame: bool = False,

26
ptulsconv/docparser/doc_entity.py
View File

@@ -4,6 +4,13 @@ from typing import Tuple, List
class SessionDescriptor:
header: "HeaderDescriptor"
files: List["FileDescriptor"]
clips: List["ClipDescriptor"]
plugins: List["PluginDescriptor"]
tracks: List["TrackDescriptor"]
markers: List["MarkerDescriptor"]
def __init__(self, **kwargs):
self.header = kwargs['header']
self.files = kwargs['files']
@@ -38,8 +45,7 @@ class HeaderDescriptor:
def convert_timecode(self, tc_string) -> Fraction:
frame_count = smpte_to_frame_count(tc_string,
self.logical_fps,
self.timecode_drop_frame,
include_fractional=False)
self.timecode_drop_frame)
return self.frame_duration * frame_count
@@ -53,20 +59,20 @@ class HeaderDescriptor:
@property
def logical_fps(self) -> int:
return self._get_tcformat_params[0]
return self._get_tc_format_params[0]
@property
def frame_duration(self) -> Fraction:
return self._get_tcformat_params[1]
return self._get_tc_format_params[1]
@property
def _get_tcformat_params(self) -> Tuple[int, Fraction]:
def _get_tc_format_params(self) -> Tuple[int, Fraction]:
frame_rates = {"23.976": (24, Fraction(1001, 24_000)),
"24": (24, Fraction(1, 24)),
"29.97": (30, Fraction(1001, 30_000)),
"30": (30, Fraction(1, 30)),
"59.94": (60, Fraction(1001, 60_000)),
"60": (60, Fraction(1, 60))
"24": (24, Fraction(1, 24)),
"29.97": (30, Fraction(1001, 30_000)),
"30": (30, Fraction(1, 30)),
"59.94": (60, Fraction(1001, 60_000)),
"60": (60, Fraction(1, 60))
}
if self.timecode_format in frame_rates.keys():