Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chad 2022.01.29 #698

Merged
merged 5 commits into from
Jan 30, 2022
Merged

Chad 2022.01.29 #698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7e9a3c
Tighten audio filter for #697, add --audio_filterwidth to play with t…
happycube Jan 30, 2022
6ff69ae
fix default handling in new option (oops\!)
happycube Jan 30, 2022
041d9e2
fix the rest of #649
happycube Jan 30, 2022
7356ddb
clean up the dropout detection a bit
happycube Jan 30, 2022
9b74cb5
tweak end-of-hsync dropout timing
happycube Jan 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ld-decode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,14 @@ parser.add_argument(
default=-1,
help="Video low-pass filter order",
)
parser.add_argument(
"--audio_filterwidth",
dest="audio_filterwidth",
metavar="FREQ",
type=parse_frequency,
default=None,
help="Analog audio filter width",
)
parser.add_argument(
"--new-audio",
dest="newaudio",
Expand Down Expand Up @@ -276,6 +284,7 @@ extra_options = {
"write_pre_efm": args.prefm,
"deemp_mult": (args.deemp_adjust, args.deemp_adjust),
"deemp_coeff": (args.deemp_low, args.deemp_high),
"audio_filterwidth": args.audio_filterwidth,
}

if vid_standard == "NTSC" and args.NTSC_color_notch_filter:
Expand Down
77 changes: 59 additions & 18 deletions lddecode/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,9 @@ def calclinelen(SP, mult, mhz):
# used to detect rot
"video_hpf_freq": 10000000,
"video_hpf_order": 4,
"audio_filterwidth": 150000,
"audio_filterorder": 800,
# audio filter parameters
"audio_filterwidth": 130000,
"audio_filterorder": 900,
}

# Settings for use with noisier disks
Expand All @@ -185,8 +186,8 @@ def calclinelen(SP, mult, mhz):
# used to detect rot
"video_hpf_freq": 10000000,
"video_hpf_order": 4,
"audio_filterwidth": 150000,
"audio_filterorder": 800,
"audio_filterwidth": 100000,
"audio_filterorder": 900,
}

RFParams_PAL = {
Expand All @@ -207,8 +208,8 @@ def calclinelen(SP, mult, mhz):
# used to detect rot
"video_hpf_freq": 10000000,
"video_hpf_order": 4,
"audio_filterwidth": 150000,
"audio_filterorder": 800,
"audio_filterwidth": 100000,
"audio_filterorder": 900,
}

RFParams_PAL_lowband = {
Expand All @@ -229,8 +230,8 @@ def calclinelen(SP, mult, mhz):
# used to detect rot
"video_hpf_freq": 10000000,
"video_hpf_order": 4,
"audio_filterwidth": 150000,
"audio_filterorder": 800,
"audio_filterwidth": 100000,
"audio_filterorder": 900,
}


Expand Down Expand Up @@ -324,6 +325,10 @@ def __init__(

self.SysParams["analog_audio"] = has_analog_audio

fw = extra_options.get("audio_filterwidth", 0)
if fw is not None and fw > 0:
self.DecoderParams['audio_filterwidth'] = fw

self.deemp_mult = extra_options.get("deemp_mult", (1.0, 1.0))

deemp = list(self.DecoderParams["video_deemp"])
Expand Down Expand Up @@ -1417,6 +1422,8 @@ def downscale_audio(

failed = True

#print(rms(output[::2]), rms(output[1::2]))

np.clip(output, -32766, 32766, out=output16)

return output16, arange[-1] - frametime
Expand Down Expand Up @@ -2565,6 +2572,27 @@ def compute_syncconf(self):
self.sync_confidence = min(self.sync_confidence, newconf)
return int(self.sync_confidence)

def get_vsync_area(self):
""" return beginning, length in lines, and end of vsync area """
vsync_begin = int(self.linelocs[0])
vsync_end_line = int(self.getBlankLength(self.isFirstField) + 0.6)
vsync_end = int(self.linelocs[vsync_end_line]) + 1

return vsync_begin, vsync_end_line, vsync_end

def get_vsync_lines(self):
rv = []
end = 10 if self.isFirstField else 9
for i in range(1, end):
rv.append(i)

if self.rf.system == 'PAL':
start2 = 311 if self.isFirstField else 310
for i in range(start2, 318):
rv.append(i)

return rv

def dropout_detect_demod(self):
# current field
f = self
Expand Down Expand Up @@ -2595,24 +2623,37 @@ def dropout_detect_demod(self):
f.data["video"]["demod"], f.rf.iretohz(150 if isPAL else 160)
)

iserr2 = f.data["video"]["demod"] < valid_min
iserr2 |= f.data["video"]["demod"] > valid_max

# Look for slightly longer dropouts...
valid_min05 = np.full_like(f.data["video"]["demod_05"], f.rf.iretohz(-30))
valid_max05 = np.full_like(f.data["video"]["demod_05"], f.rf.iretohz(115))

# Account for sync pulses when checking demod

hsync_len = int(f.get_timings()['hsync'][1])
vsync_ire = f.rf.SysParams['vsync_ire']
vsync_lines = self.get_vsync_lines()

# In sync areas the minimum IRE is vsync - pilot/burst
sync_min = f.rf.iretohz(vsync_ire - 60 if isPAL else vsync_ire - 25)
sync_min_05 = f.rf.iretohz(vsync_ire - 10)

for l in range(1, len(f.linelocs)):
if l in vsync_lines:
valid_min[int(f.linelocs[l]):int(f.linelocs[l+1])] = sync_min
valid_min05[int(f.linelocs[l]):int(f.linelocs[l+1])] = sync_min_05
else:
valid_min[int(f.linelocs[l]):int(f.linelocs[l]) + hsync_len] = sync_min
valid_min05[int(f.linelocs[l]):int(f.linelocs[l]) + hsync_len] = sync_min_05

iserr2 = f.data["video"]["demod"] < valid_min
iserr2 |= f.data["video"]["demod"] > valid_max

iserr3 = f.data["video"]["demod_05"] < valid_min05
iserr3 |= f.data["video"]["demod_05"] > valid_max05

iserr = iserr1 | iserr2 | iserr3 | iserr_rf

# Each valid pulse is definitely *not* an error, so exclude it here at the end
for v in self.validpulses:
iserr[
int(v[1].start - self.rf.freq) : int(
v[1].start + v[1].len + self.rf.freq
)
] = False
#print(iserr1.sum(), iserr2.sum(), iserr3.sum(), iserr_rf.sum(), iserr.sum())

return iserr

Expand Down