From bdd91d570e25022579ba85f42f6c7e1b6cb74ae3 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 13 Feb 2012 01:14:56 +0000 Subject: [PATCH] small mods to octave scripts git-svn-id: https://svn.code.sf.net/p/freetel/code@315 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/octave/phase2.m | 8 ++------ codec2-dev/octave/pllsp.m | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/codec2-dev/octave/phase2.m b/codec2-dev/octave/phase2.m index ea58dcbe..fc9462b5 100644 --- a/codec2-dev/octave/phase2.m +++ b/codec2-dev/octave/phase2.m @@ -7,21 +7,17 @@ function phase2(samname, png) N = 16000; f=45; - model = load("../src/hts1a_model.txt"); + model = load("../src/hts1a_phase_model.txt"); phase = load("../src/hts1a_phase_phase.txt"); Wo = model(f,1); P=2*pi/Wo; L = model(f,2); A = model(f,3:(L+2)); phi = phase(f,1:L); - phi = zeros(1,L); - for m=L/2:L - phi(m) = 2*pi*rand(1,1); - end s = zeros(1,N); - for m=1:L + for m=1:L/2 s_m = A(m)*cos(m*Wo*(0:(N-1)) + phi(m)); s = s + s_m; endfor diff --git a/codec2-dev/octave/pllsp.m b/codec2-dev/octave/pllsp.m index 15da6748..0606d3ca 100644 --- a/codec2-dev/octave/pllsp.m +++ b/codec2-dev/octave/pllsp.m @@ -31,16 +31,16 @@ function pllsp(rawfile, figure(1); clf; - %subplot(211); + subplot(211); sp = s((start_f-2)*80:(end_f-2)*80); plot(sp); - %subplot(212); - %plot(lpc10_snr((start_f+1):end_f)-lsp_snr((start_f+1):end_f)); + subplot(212); + plot(lpc10_snr((start_f+1):end_f)-lsp_snr((start_f+1):end_f)); figure(2); plot((4000/pi)*lsp((start_f+1):end_f,:)); hold on; - plot((4000/pi)*lsp_((start_f+1):end_f,:)); + plot((4000/pi)*lsp_((start_f+1):end_f,:),'+-'); hold off; endfunction -- 2.25.1