Skip to content
Snippets Groups Projects
Commit c7ad7a19 authored by Martin Kocour's avatar Martin Kocour
Browse files

Support multi channel supervisions

parent 7a7ff2f6
No related branches found
No related tags found
No related merge requests found
...@@ -306,7 +306,7 @@ function timit_supervisions(dir) ...@@ -306,7 +306,7 @@ function timit_supervisions(dir)
dur = end_ts - start_ts dur = end_ts - start_ts
supervisions[id] = Supervision( supervisions[id] = Supervision(
id, id, start_ts, dur, 1, id, id, start_ts, dur, [1],
Dict( Dict(
"text" => join(words, " "), "text" => join(words, " "),
"dialect" => dialect, "dialect" => dialect,
......
...@@ -62,7 +62,7 @@ function Base.show(io::IO, m::MIME"application/json", s::Supervision) ...@@ -62,7 +62,7 @@ function Base.show(io::IO, m::MIME"application/json", s::Supervision)
printfn(io, repeat(" ", indent), "\"recording_id\": \"", s.recording_id, "\", ") printfn(io, repeat(" ", indent), "\"recording_id\": \"", s.recording_id, "\", ")
printfn(io, repeat(" ", indent), "\"start\": ", s.start, ", ") printfn(io, repeat(" ", indent), "\"start\": ", s.start, ", ")
printfn(io, repeat(" ", indent), "\"duration\": ", s.duration, ", ") printfn(io, repeat(" ", indent), "\"duration\": ", s.duration, ", ")
printfn(io, repeat(" ", indent), "\"channel\": ", s.channel, ", ") printfn(io, repeat(" ", indent), "\"channels\": ", s.channels |> json, ", ")
printfn(io, repeat(" ", indent), "\"data\": ", s.data |> json) printfn(io, repeat(" ", indent), "\"data\": ", s.data |> json)
print(io, "}") print(io, "}")
end end
...@@ -101,7 +101,7 @@ Supervision(d::Dict) = Supervision( ...@@ -101,7 +101,7 @@ Supervision(d::Dict) = Supervision(
d["recording_id"], d["recording_id"],
d["start"], d["start"],
d["duration"], d["duration"],
d["channel"], d["channels"],
d["data"] d["data"]
) )
...@@ -129,8 +129,8 @@ manifestname(::Type{<:Recording}, name) = "recordings-$name.jsonl" ...@@ -129,8 +129,8 @@ manifestname(::Type{<:Recording}, name) = "recordings-$name.jsonl"
manifestname(::Type{<:Supervision}, name) = "supervisions-$name.jsonl" manifestname(::Type{<:Supervision}, name) = "supervisions-$name.jsonl"
""" """
load(Supervision, path) load(Supervision, path)
load(Recording, path) load(Recording, path)
Load Recording/Supervision manifest from `path`. Load Recording/Supervision manifest from `path`.
""" """
......
...@@ -74,12 +74,12 @@ struct Supervision <: ManifestItem ...@@ -74,12 +74,12 @@ struct Supervision <: ManifestItem
recording_id::AbstractString recording_id::AbstractString
start::Float64 start::Float64
duration::Float64 duration::Float64
channel::Int channels::Vector{Integer}
data::Dict data::Dict
end end
Supervision(id, recid; channel = missing, start = -1, duration = -1, data = missing) = Supervision(id, recid; channels = missing, start = -1, duration = -1, data = missing) =
Supervision(id, recid, start, duration, channel, data) Supervision(id, recid, start, duration, channels, data)
""" """
load(recording[; start = -1, duration = -1, channels = recording.channels]) load(recording[; start = -1, duration = -1, channels = recording.channels])
...@@ -108,5 +108,5 @@ function load(r::Recording; start = -1, duration = -1, channels = r.channels) ...@@ -108,5 +108,5 @@ function load(r::Recording; start = -1, duration = -1, channels = r.channels)
end end
load(r::Recording, s::Supervision) = load(r::Recording, s::Supervision) =
load(r; start = s.start, duration = s.duration, channels = [s.channel]) load(r; start = s.start, duration = s.duration, channels = s.channels)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment