Commit ad3f6de7 authored by Michael Kohnen's avatar Michael Kohnen

added metadata handling to itaHRTF

parents 9b2df9f3 2a77cc7c
...@@ -19,6 +19,11 @@ function cThis = interp(this,varargin) ...@@ -19,6 +19,11 @@ function cThis = interp(this,varargin)
% set to 1 if no range extrapolation is required % set to 1 if no range extrapolation is required
% order ... order of spherical harmonics matrix (default: 50) % order ... order of spherical harmonics matrix (default: 50)
% epsilon ... regularization coefficient (default: 1e-8) % epsilon ... regularization coefficient (default: 1e-8)
% shiftToEar to a shift to approximate ear position to
% improve sh transformation (see [2])
% shiftAxis shift along this axis ('x','y' (default),'z')
% shiftOffset shift ears (L - R) by these values
% (default: [-0.0725 0.0725])
% %
% OUTPUT: % OUTPUT:
% itaHRTF object % itaHRTF object
...@@ -26,28 +31,34 @@ function cThis = interp(this,varargin) ...@@ -26,28 +31,34 @@ function cThis = interp(this,varargin)
% .timeData: interpolated / range-extrapolated HRIRs for defined field points % .timeData: interpolated / range-extrapolated HRIRs for defined field points
% .dirCoord: itaCoordinates object % .dirCoord: itaCoordinates object
% %
% Required: SphericalHarmonics functions of ITA Toolbox %
% %
% [1] Pollow, Martin et al., "Calculation of Head-Related Transfer Functions % [1] Pollow, Martin et al., "Calculation of Head-Related Transfer Functions
% for Arbitrary Field Points Using Spherical Harmonics Decomposition", % for Arbitrary Field Points Using Spherical Harmonics Decomposition",
% Acta Acustica united with Acustica, Volume 98, Number 1, January/February 2012, % Acta Acustica united with Acustica, Volume 98, Number 1, January/February 2012,
% pp. 72-82(11) % pp. 72-82(11)
% %
% [2] Richter, Jan-Gerrit et al. "Spherical harmonics based hrtf datasets:
% Implementation and evaluation for real-time auralization",
% Acta Acustica united with Acustica, Volume 100, Number 4, July/August 2014,
% pp. 667-675(9)
%
%
%
% Author: Florian Pausch <fpa@akustik.rwth-aachen.de> % Author: Florian Pausch <fpa@akustik.rwth-aachen.de>
% Version: 2016-02-05 % Version: 2016-02-05
% TODO: check why this is still not working (coordinate assignment???) sArgs = struct('order',50,'eps',1e-5,'shiftToEar',false,'shiftAxis','y','shiftOffset',[-0.0725 0.0725]);
sArgs = struct('order',50,'eps',1e-5);
sArgs = ita_parse_arguments(sArgs,varargin,2); sArgs = ita_parse_arguments(sArgs,varargin,2);
if ~isa(varargin{1},'itaCoordinates'),error('itaHRTF:interp', ' An itaCoordinate object is needed!') if isempty(varargin) || ~isa(varargin{1},'itaCoordinates')
error('itaHRTF:interp', ' An itaCoordinate object is needed!')
end end
field_in = varargin{1}; field_in = varargin{1};
% only take unique direction coordinates (round to 0.01deg resolution) % only take unique direction coordinates (round to 0.01deg resolution)
tempfield = unique(round([field_in.phi_deg*100 field_in.theta_deg*100]),'rows'); % may cause problems with older Matlab versions (<=R2013)! tempfield = unique(round([field_in.phi_deg*100 field_in.theta_deg*100]),'rows'); % may cause problems with older Matlab versions (<=R2013)!
tempfield = tempfield./100; tempfield = tempfield./100;
temp_r = this.dirCoord.r(1); temp_r = field_in.r(1);
field = itaCoordinates(size(tempfield,1)); field = itaCoordinates(size(tempfield,1));
field.r = repmat(temp_r,size(tempfield,1),1); field.r = repmat(temp_r,size(tempfield,1),1);
field.phi_deg = tempfield(:,1); field.phi_deg = tempfield(:,1);
...@@ -67,46 +78,34 @@ if ~isequal(this.dirCoord.r(1),field.r(1)) ...@@ -67,46 +78,34 @@ if ~isequal(this.dirCoord.r(1),field.r(1))
kr0 = k*this.dirCoord.r(1); % measurement radius kr0 = k*this.dirCoord.r(1); % measurement radius
kr1 = k*field.r(1); % extrapolation radius kr1 = k*field.r(1); % extrapolation radius
hankel_r0 = ita_sph_besselh(1:Nmax,2,kr0); hankel_r0 = ita_sph_besselh(ita_sph_linear2degreeorder(1:Nmax),2,kr0);
hankel_r1 = ita_sph_besselh(1:Nmax,2,kr1); hankel_r1 = ita_sph_besselh(ita_sph_linear2degreeorder(1:Nmax),2,kr1);
hankel_div = hankel_r1 ./ hankel_r0; hankel_div = hankel_r1 ./ hankel_r0;
hankel_rep = hankel_div(:,1); hankel_rep = hankel_div(:,1);
end end
dweights = 1 + (0:Nmax).*((0:Nmax)+1); % calculate regularization weights nSH = (Nmax+1).^2;
I = sparse(eye(nSH));
n = ita_sph_linear2degreeorder(1:round(nSH)).';
dweights_rep = zeros(sum(2*(0:Nmax)'+1),1); %% move data from earcenter
dweights_rep(1)=dweights(1); copyData = this;
counter = 2; if sArgs.shiftToEar
for n=1:Nmax ear_d = sArgs.shiftOffset;
nTimes = 2*n+1; for ear=1:2
dweights_rep(counter:counter+nTimes-1)=dweights(n+1)*ones(nTimes,1); movedData = moveFullDataSet(this.ch(ear:2:this.nChannels),sArgs,ear_d(ear));
copyData.freqData(:,ear:2:copyData.nChannels) = movedData;
if ~isequal(this.dirCoord.r(1),field.r(1))
hankel_rep=[hankel_rep, repmat(hankel_div(:,n),1,2*n+1)];
end end
counter = counter + nTimes;
end end
%% move data from earcenter
ear_d = [-0.07 0.07];
%% Weights %% Weights
[~,w]= this.dirCoord.spherical_voronoi; % calculate weighting coefficients (Voronoi surfaces <-> measurement points) [~,w]= this.dirCoord.spherical_voronoi; % calculate weighting coefficients (Voronoi surfaces <-> measurement points)
% sG_full = ita_sph_sampling_equiangular(73,144,'theta_type','[]','phi_type','[)');
% % sG_full = ita_sph_sampling_gaussian(71);
% sG = sG_full;
% isOnArc = sG.theta < 2.75;
% sG.cart = sG.cart(isOnArc,:);
% sG.weights = sG.weights(isOnArc);
% % rescale the weights for the sum to be 4*pi again
% w = sG.weights .* 4.*pi ./ sum(sG.weights);
W = sparse(diag(w)); % diagonal matrix containing weights W = sparse(diag(w)); % diagonal matrix containing weights
D = sparse(diag(dweights_rep)); % decomposition order-dependent Tikhonov regularization D = I .* diag(1 + n.*(n+1)); % decomposition order-dependent Tikhonov regularization
Y = ita_sph_base(this.dirCoord,Nmax,'real'); % calculate real-valued SHs using the measurement grid Y = ita_sph_base(this.dirCoord,Nmax,'orthonormal',true); % calculate real-valued SHs using the measurement grid
%% Calculate HRTF data for field points %% Calculate HRTF data for field points
if Nmax > 25 if Nmax > 25
...@@ -117,73 +116,58 @@ end ...@@ -117,73 +116,58 @@ end
hrtf_arbi = zeros(this.nBins,2*field.nPoints); % columns: LRLRLR... hrtf_arbi = zeros(this.nBins,2*field.nPoints); % columns: LRLRLR...
for ear=1:2 for ear=1:2
freqData_temp = this.freqData(:,ear:2:end); % sh transformation
freqData_temp = copyData.freqData(:,ear:2:end);
a0 = (Y.'*W*Y + epsilon*D) \ Y.'*W * freqData_temp.';
% newCoords = this.dirCoord; % %% test the sh transformation results by plotting both spatial and sh data with surf
% newCoords.y = newCoords.y + ear_d(ear); % s = itaSamplingSph(field);
% % s.nmax = Nmax;
% data.channelCoordinates = newCoords; % figure
% data.freqData = freqData_temp; % surf(s,a0(:,10))
% data.freqVector = this.freqVector; % figure
% data.c_meas = 344; % surf(s,freqData_temp(10,:))
% data = process_result_delay_correction(data,this.dirCoord.r(1));
% % calculate weighted SH coefficients using a decomposition order-dependent Tikhonov regularization
%
% freqData_temp = data.freqData;
% Y = ita_sph_base(data.channelCoordinates,Nmax,'real');
a0 = (Y.'*W*Y + epsilon*D) \ Y.'*W * freqData_temp.';
%a0 = (Y.'*W*Y + epsilon*D) \ Y.' *
%this.freqData(:,ear:2:end).'; % fpa version
%a0 = pinv(Y)* this.freqData(:,ear:2:end).'; % jck version
% range extrapolation
if ~isequal(this.dirCoord.r(1),field.r(1)) if ~isequal(this.dirCoord.r(1),field.r(1))
% calculate range-extrapolated HRTFs % calculate range-extrapolated HRTFs
a1 = a0 .* hankel_rep.'; a1 = a0 .* hankel_rep.';
Yest = ita_sph_base(field,N,'real'); % use real-valued SH's %%% test here to see extrapolation results in spatial domain
% surf(s,a1(:,10))
% reconstruction to spatial data
Yest = ita_sph_base(field,N,'orthonormal',true); % use real-valued SH's
hrtf_arbi(:,ear:2:end) = (Yest*a1).'; % interpolated + range-extrapolated HRTFs hrtf_arbi(:,ear:2:end) = (Yest*a1).'; % interpolated + range-extrapolated HRTFs
else else
Yest = ita_sph_base(field,Nmax,'real'); % use real-valued SH's % reconstruction to spatial data
Yest = ita_sph_base(field,Nmax,'orthonormal',true); % use real-valued SH's
hrtf_arbi(:,ear:2:end) = (Yest*a0).'; % interpolated HRTFs hrtf_arbi(:,ear:2:end) = (Yest*a0).'; % interpolated HRTFs
end end
end end
%% move back to head center
% todo
% for ear=1:2
%
% newCoords = field;
% newCoords.y = newCoords.y - ear_d(ear);
%
% freqData = hrtf_arbi(:,ear:2:end);
%
%
% data.channelCoordinates = newCoords;
% data.freqData = freqData;
% data.freqVector = this.freqVector;
% data.c_meas = 344;
% data = process_result_delay_correction(data,this.dirCoord.r(1));
%
% hrtf_arbi(:,ear:2:end) = data.freqData;
%
% end
% set new direction coordinates % set new direction coordinates
sph = zeros(field.nPoints*2 ,3); sph = zeros(field.nPoints*2 ,3);
sph(1:2:end,:) = field.sph; sph(1:2:end,:) = field.sph;
sph(2:2:end,:) = field.sph; sph(2:2:end,:) = field.sph;
% write new HRTF data set % write new HRTF data set
cAudio = itaAudio(hrtf_arbi, 44100, 'freq'); cThis = this;
cAudio.channelCoordinates.sph= sph; cThis.freqData = hrtf_arbi;
cThis.channelCoordinates.sph= sph;
cThis = itaHRTF(cAudio);
cThis.freqData = hrtf_arbi; %% move back to head center
if sArgs.shiftToEar
ear_d_back = -ear_d;
% movedData = zeros(size(hrtf_arbi));
for ear=1:2
movedData = moveFullDataSet(cThis.ch(ear:2:cThis.nChannels),sArgs,ear_d_back(ear));
cThis.freqData(:,ear:2:cThis.nChannels) = movedData;
end
end
if ~isequal(cThis.dirCoord.r(1),field.r(1))%??? if ~isequal(cThis.dirCoord.r(1),field.r(1))%???
cThis.dirCoord.r = field.r; cThis.dirCoord.r = field.r;
...@@ -195,15 +179,44 @@ end ...@@ -195,15 +179,44 @@ end
end end
function result = process_result_delay_correction(result, target_d)
% shift every measurement point to target_d by applying a
% phase shift to the channel: (simplified!)
freq_L = result.freqVector;
add_phase_L = (result.channelCoordinates.r - target_d)* (freq_L./result.c_meas)' .* 2.*pi; function [ data ] = moveFullDataSet(data,options,offsetShift)
fullCoords = data.channelCoordinates;
freqVector = data.freqVector;
shiftedData = zeros(size(data.freqData));
axis = options.shiftAxis;
for index = 1:length(freqVector)
shiftedData(index,:) = moveHRTF(fullCoords,data.freqData(index,:),freqVector(index),axis,offsetShift);
end
data = shiftedData;
end
function [data] = moveHRTF(s, data, frequency, axis, offset)
% the offset is given in m
result.freqData = result.freqData .* exp(1i.*add_phase_L'); origAxis = s.r;
if (size(data,2) > size(data,1))
data = data.';
end
offset = real(offset); % ??
switch axis
case 'x'
s.x = s.x + offset;
case 'y'
s.y = s.y + offset;
case 'z'
s.z = s.z + offset;
end
result.channelCoordinates.r = target_d; newAxis = s.r;
k = 2*pi*frequency/340;
% the phase is moved by the difference of the axis points
data = data .* exp(1i*k*(newAxis - origAxis));
% amplitude manipulation did not yield better results
% data = data .* newAxis ./ origAxis;
end end
...@@ -117,10 +117,21 @@ classdef itaHRTF < itaAudio ...@@ -117,10 +117,21 @@ classdef itaHRTF < itaAudio
methods % Special functions that implement operations that are usually performed only on instances of the class methods % Special functions that implement operations that are usually performed only on instances of the class
%% Input %% Input
function this = itaHRTF(varargin) function this = itaHRTF(varargin)
iniAudio = [];
this = this@itaAudio(); % initialize itaHRTF with itaAudio properties (only for nargin == 1)
if nargin > 1 || (nargin == 1 && (ischar(varargin{1}) || isa(varargin{1},'itaAudio')))
iniAudio = [];
elseif nargin == 1 && isstruct(varargin{1})
fNames = {'domain','data','signalType','samplingRate'};
for idxFN = 1:numel(fNames)
iniAudio.(fNames{idxFN}) = varargin{1}.(fNames{idxFN});
end
end
this = this@itaAudio(iniAudio);
if nargin >1 if nargin >1
% itaAudio input % itaAudio input
TF_types = this.propertiesTF_type; TF_types = this.propertiesTF_type;
for iTF = 1:numel(TF_types) for iTF = 1:numel(TF_types)
...@@ -148,6 +159,7 @@ classdef itaHRTF < itaAudio ...@@ -148,6 +159,7 @@ classdef itaHRTF < itaAudio
end end
elseif nargin == 1 elseif nargin == 1
if isa(varargin{1},'itaHRTF') if isa(varargin{1},'itaHRTF')
this = varargin{1}; this = varargin{1};
...@@ -170,13 +182,17 @@ classdef itaHRTF < itaAudio ...@@ -170,13 +182,17 @@ classdef itaHRTF < itaAudio
this.dirCoord.sph = this.mCoordSave; this.dirCoord.sph = this.mCoordSave;
% saving channelNames in itaHRTF does not work at the % saving channelNames in itaHRTF does not work at the
% moment % moment
for iCh = 1:this.dimensions this.channelNames = cellstr(this.mChNames);
this.channelNames{iCh} = this.mChNames(iCh,:);
end
elseif isa(varargin{1},'itaAudio') elseif isa(varargin{1},'itaAudio')
this.itaAudio2itaHRTF = varargin{1}; this.itaAudio2itaHRTF = varargin{1};
end
elseif ischar(varargin{1}) % openDaff/ sofa/ hdf5 input
if strfind(lower(varargin{1}),'.daff'), this.openDAFF2itaHRTF = varargin{1};
elseif strfind(lower(varargin{1}),'.hdf5'), this.hdf2itaHRTF = varargin{1};
elseif strfind(lower(varargin{1}),'.sofa'), this.sofa2itaHRTF = varargin{1};
end
end
end end
end end
...@@ -373,7 +389,7 @@ classdef itaHRTF < itaAudio ...@@ -373,7 +389,7 @@ classdef itaHRTF < itaAudio
counter= counter+2; counter= counter+2;
end end
tempMetadata=DAFFv17('getMetadata', handleDaff); metadata = DAFFv17('getMetadata', handleDaff);
catch catch
disp( 'Could not read DAFF file right away, falling back to old version and retrying ...' ); disp( 'Could not read DAFF file right away, falling back to old version and retrying ...' );
...@@ -388,7 +404,27 @@ classdef itaHRTF < itaAudio ...@@ -388,7 +404,27 @@ classdef itaHRTF < itaAudio
counter = 1; counter = 1;
data = zeros(props.filterLength,props.numRecords*2,'double' ) ; data = zeros(props.filterLength,props.numRecords*2,'double' ) ;
coordDaff = zeros(props.numRecords,2) ; coordDaff = zeros(props.numRecords,2) ;
tempMetadata=DAFFv15('getMetadata', handleDaff);
tempMetadata = DAFFv15('getMetadata', handleDaff);
% Convert old-style metadata format to v17.
names = fieldnames( tempMetadata );
for k = 1:numel( tempMetadata )
switch class(tempMetadata.(names{k}))
case 'logical'
datatype='bool';
case 'char'
datatype='string';
case 'double'
if rem(tempMetadata.(names{k}),1)==0
datatype='int';
else
datatype='float';
end
end
metadata = daffv17_add_metadata( metadata,cell2mat(names(k)),datatype,tempMetadata.(names{k}) );
end
for iDir = 1:props.numRecords for iDir = 1:props.numRecords
data(:,[counter counter+1]) = DAFFv15( 'getRecordByIndex', handleDaff,iDir )'; data(:,[counter counter+1]) = DAFFv15( 'getRecordByIndex', handleDaff,iDir )';
coordDaff(iDir,:) = DAFFv15( 'getRecordCoords', handleDaff, 'data', iDir )'; coordDaff(iDir,:) = DAFFv15( 'getRecordCoords', handleDaff, 'data', iDir )';
...@@ -396,6 +432,7 @@ classdef itaHRTF < itaAudio ...@@ -396,6 +432,7 @@ classdef itaHRTF < itaAudio
end end
end end
<<<<<<< HEAD
% Proceed (version independent) % Proceed (version independent)
names=fieldnames(tempMetadata); names=fieldnames(tempMetadata);
for k=1:(numel(names)) for k=1:(numel(names))
...@@ -415,36 +452,36 @@ classdef itaHRTF < itaAudio ...@@ -415,36 +452,36 @@ classdef itaHRTF < itaAudio
end end
metadata=daffv17_add_metadata(metadata,cell2mat(names(k)),datatype,tempMetadata.(names{k})); metadata=daffv17_add_metadata(metadata,cell2mat(names(k)),datatype,tempMetadata.(names{k}));
end end
phiM = coordDaff(:,1)*pi/180; phiM = coordDaff(:,1)*pi/180;
%phiM = mod(coordDaff(:,1),360)*pi/180; %phiM = mod(coordDaff(:,1),360)*pi/180;
%if ~isempty(find(0<coordDaff(:,2),1,'first')) %if ~isempty(find(0<coordDaff(:,2),1,'first'))
thetaM = coordDaff(:,2)*pi/180; thetaM = coordDaff(:,2)*pi/180;
%thetaM = mod(180-(coordDaff(:,2)+90),180)*pi/180; %thetaM = mod(180-(coordDaff(:,2)+90),180)*pi/180;
%else %else
% thetaM = coordDaff(:,2)*pi/180; % thetaM = coordDaff(:,2)*pi/180;
%end %end
radius = ones(props.numRecords,1); radius = ones(props.numRecords,1);
chCoord = itaCoordinates; chCoord = itaCoordinates;
chCoord.sph = ones(size(data,2),3); chCoord.sph = ones(size(data,2),3);
chCoord.phi(1:2:2*props.numRecords) = phiM; chCoord.phi(1:2:2*props.numRecords) = phiM;
chCoord.phi(2:2:2*props.numRecords) = phiM; chCoord.phi(2:2:2*props.numRecords) = phiM;
chCoord.theta(1:2:2*props.numRecords) = thetaM; chCoord.theta(1:2:2*props.numRecords) = thetaM;
chCoord.theta(2:2:2*props.numRecords) = thetaM; chCoord.theta(2:2:2*props.numRecords) = thetaM;
this.mMetadata = metadata; this.mMetadata = metadata;
this.data = data; this.data = data;
this.mDirCoord = itaCoordinates([radius thetaM phiM],'sph'); this.mDirCoord = itaCoordinates([radius thetaM phiM],'sph');
this.channelCoordinates = chCoord; this.channelCoordinates = chCoord;
this.mEarSide = repmat(['L'; 'R'],props.numRecords, 1); this.mEarSide = repmat(['L'; 'R'],props.numRecords, 1);
this.signalType = 'energy'; this.signalType = 'energy';
% channelnames coordinates % channelnames coordinates
this.channelNames = ita_sprintf('%s ( %2.0f, \\theta= %2.0f)',... this.channelNames = ita_sprintf('%s ( %2.0f, \\theta= %2.0f)',...
this.mEarSide , this.channelCoordinates.theta_deg, this.channelCoordinates.phi_deg); this.mEarSide , this.channelCoordinates.theta_deg, this.channelCoordinates.phi_deg);
end end
function this = set.init(this,var) function this = set.init(this,var)
% TO DO !!!!!!!!!!!!!!!!!!!!!!!!!!! % TO DO !!!!!!!!!!!!!!!!!!!!!!!!!!!
...@@ -514,6 +551,7 @@ classdef itaHRTF < itaAudio ...@@ -514,6 +551,7 @@ classdef itaHRTF < itaAudio
% data % data
% the data is saved as positions x channel x filterdata % the data is saved as positions x channel x filterdata
this.samplingRate = handleSofa.Data.SamplingRate;
data = zeros(size(handleSofa.Data.IR,3),numPositions*2); data = zeros(size(handleSofa.Data.IR,3),numPositions*2);
data(:,1:2:numPositions*2) = squeeze(handleSofa.Data.IR(:,1,:)).'; data(:,1:2:numPositions*2) = squeeze(handleSofa.Data.IR(:,1,:)).';
...@@ -645,6 +683,10 @@ classdef itaHRTF < itaAudio ...@@ -645,6 +683,10 @@ classdef itaHRTF < itaAudio
%HRTFout = this.direction(idxCoord); %HRTFout = this.direction(idxCoord);
end end
function this = buildsearchdatabase(this)
this.dirCoord = this.dirCoord.build_search_database;
end
function obj = direction(this, idxCoord) function obj = direction(this, idxCoord)
idxDir = zeros(numel(idxCoord)*2,1); idxDir = zeros(numel(idxCoord)*2,1);
idxDir(1:2:numel(idxCoord)*2,:) = 2*idxCoord-1; idxDir(1:2:numel(idxCoord)*2,:) = 2*idxCoord-1;
...@@ -658,14 +700,14 @@ classdef itaHRTF < itaAudio ...@@ -658,14 +700,14 @@ classdef itaHRTF < itaAudio
end end
function thetaUni = theta_Unique(this,varargin) function thetaUni = theta_Unique(this,varargin)
thetaUni = unique(this.dirCoord.theta); thetaUni = uniquetol(this.dirCoord.theta,eps);
if nargin == 2 if nargin == 2