Commit b96a88ed authored by Ondřej Pavlica's avatar Ondřej Pavlica
Browse files

Minor cleanup, WIP Volume variation detection

parent e0db3a67

AudioGrader.sln

+11 −1
Original line number Diff line number Diff line
@@ -45,7 +45,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoiceCutoffByEnergy", "src\ 
EndProject

Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Silence", "Silence", "{9E3C8AB8-E5DA-40C9-8DC2-6851EDCC1DF0}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilenceRunsFromVAD", "src\Graders\Silence\SilenceRunsFromVAD\SilenceRunsFromVAD.csproj", "{5DAE2AB5-C626-4EAF-8BE7-8DA78F7E72F3}"

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SilenceRunsFromVAD", "src\Graders\Silence\SilenceRunsFromVAD\SilenceRunsFromVAD.csproj", "{5DAE2AB5-C626-4EAF-8BE7-8DA78F7E72F3}"

EndProject

Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Volume", "Volume", "{619692AA-0525-4AC4-9849-41627B36A2CE}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VolumeHistogram", "src\Graders\Volume\VolumeHistogram\VolumeHistogram.csproj", "{FBDA07BD-E7BC-40C3-975F-D42A13A5EC34}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -113,6 +117,10 @@ Global 
		{5DAE2AB5-C626-4EAF-8BE7-8DA78F7E72F3}.Debug|Any CPU.Build.0 = Debug|Any CPU

		{5DAE2AB5-C626-4EAF-8BE7-8DA78F7E72F3}.Release|Any CPU.ActiveCfg = Release|Any CPU

		{5DAE2AB5-C626-4EAF-8BE7-8DA78F7E72F3}.Release|Any CPU.Build.0 = Release|Any CPU

		{FBDA07BD-E7BC-40C3-975F-D42A13A5EC34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

		{FBDA07BD-E7BC-40C3-975F-D42A13A5EC34}.Debug|Any CPU.Build.0 = Debug|Any CPU

		{FBDA07BD-E7BC-40C3-975F-D42A13A5EC34}.Release|Any CPU.ActiveCfg = Release|Any CPU

		{FBDA07BD-E7BC-40C3-975F-D42A13A5EC34}.Release|Any CPU.Build.0 = Release|Any CPU

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE
@@ -131,6 +139,8 @@ Global 
		{7739514D-6FC1-45FF-A036-B32B99ED2ADF} = {1A51A710-DBC0-4855-9A41-739A1D60412C}

		{9E3C8AB8-E5DA-40C9-8DC2-6851EDCC1DF0} = {D8C46879-1A50-45C8-8906-CE7618FB4E14}

		{5DAE2AB5-C626-4EAF-8BE7-8DA78F7E72F3} = {9E3C8AB8-E5DA-40C9-8DC2-6851EDCC1DF0}

		{619692AA-0525-4AC4-9849-41627B36A2CE} = {D8C46879-1A50-45C8-8906-CE7618FB4E14}

		{FBDA07BD-E7BC-40C3-975F-D42A13A5EC34} = {619692AA-0525-4AC4-9849-41627B36A2CE}

	EndGlobalSection

	GlobalSection(ExtensibilityGlobals) = postSolution

		SolutionGuid = {C61DF5E0-ECCC-4FB8-84F7-F7C4B8FAAA4F}

fiddles/Test.Forms/AudioPlot.cs

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ namespace Test.Forms 
            var fft = new Fft(2048);



            BaseThresholds baseThresholds = BaseThresholds.Default;

            baseThresholds.energy = 500;

            baseThresholds.energy = 350;

            baseThresholds.dominantFrequencyComponent = 180;

            baseThresholds.spectralFlatness = 3;

            var voice = VoiceActivityDetector.Detect(signals.DownmixToMono(), baseThresholds);



            plotFilter.plt.PlotSignal(voice.Select(x => x ? 1d : 0d).ToArray(), 44100);

libs/NWaves/MODIFICATIONS.md

+1 −2
Original line number Diff line number Diff line 
* Made WaveFile.SupportedBitDepths static readonly

* DiscreteSignal.Enery returns the signal's actual energy instead of its average
 
 No newline at end of file
 
* Made WaveFile.SupportedBitDepths static readonly
 
 No newline at end of file

src/Api/Configuration/ApiConfiguration.cs

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ namespace AudioGrader.Api.Configuration 
        public List<string> Decoders { get; private set; } = new List<string>();



        /// <summary>

        /// The time after which a rading request times out and the client is returned an operation progress opbject isntead.

        /// The time after which a rating request times out and the client is returned an operation progress object instead.

        /// </summary>

        [JsonProperty]

        public TimeSpan Timeout { get; } = TimeSpan.FromSeconds(60);

src/Api/Configuration/ApiConfigurationBinder.cs

+0 −15
Original line number Diff line number Diff line
@@ -35,20 +35,5 @@ namespace AudioGrader.Api.Configuration 


            return Task.CompletedTask;

        }



        /*public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)

        {

            if (sourceType == typeof(string))

                return true;



            return base.CanConvertFrom(context, sourceType);

        }



        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)

        {

            var deserialized = JsonSerializer.Deserialize<ApiConfiguration>(value as string); 

            return JsonSerializer.Deserialize<ApiConfiguration>(value as string);

        }*/



    }

}