mirror of
https://github.com/lubosz/overte.git
synced 2025-08-13 03:27:33 +02:00
some cleanup in audio library
This commit is contained in:
parent
4077a76e46
commit
7f2baa056e
5 changed files with 15 additions and 14 deletions
|
@ -14,6 +14,8 @@
|
||||||
|
|
||||||
#include <typeinfo>
|
#include <typeinfo>
|
||||||
|
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
template< typename T >
|
template< typename T >
|
||||||
class AudioFrameBuffer {
|
class AudioFrameBuffer {
|
||||||
|
|
||||||
|
@ -150,13 +152,13 @@ inline void AudioFrameBuffer< T >::copyFrames(uint32_t channelCount, const uint3
|
||||||
_channelCount = channelCount;
|
_channelCount = channelCount;
|
||||||
} else {
|
} else {
|
||||||
qDebug() << "Audio framing error: _channelCount="
|
qDebug() << "Audio framing error: _channelCount="
|
||||||
<< _channelCount
|
<< _channelCount
|
||||||
<< "channelCountMax="
|
<< "channelCountMax="
|
||||||
<< _channelCountMax
|
<< _channelCountMax
|
||||||
<< "_frameCount="
|
<< "_frameCount="
|
||||||
<< _frameCount
|
<< _frameCount
|
||||||
<< "frameCountMax="
|
<< "frameCountMax="
|
||||||
<< _frameCountMax;
|
<< _frameCountMax;
|
||||||
|
|
||||||
_channelCount = std::min(_channelCount,_channelCountMax);
|
_channelCount = std::min(_channelCount,_channelCountMax);
|
||||||
_frameCount = std::min(_frameCount,_frameCountMax);
|
_frameCount = std::min(_frameCount,_frameCountMax);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//
|
//
|
||||||
// AudioFilterBank.cpp
|
// AudioFilterBank.cpp
|
||||||
// hifi
|
// libraries/audio/src
|
||||||
//
|
//
|
||||||
// Created by Craig Hansen-Sturm on 8/10/14.
|
// Created by Craig Hansen-Sturm on 8/10/14.
|
||||||
// Copyright 2014 High Fidelity, Inc.
|
// Copyright 2014 High Fidelity, Inc.
|
||||||
|
@ -12,7 +12,6 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <SharedUtil.h>
|
#include <SharedUtil.h>
|
||||||
#include "AudioRingBuffer.h"
|
|
||||||
#include "AudioFormat.h"
|
#include "AudioFormat.h"
|
||||||
#include "AudioBuffer.h"
|
#include "AudioBuffer.h"
|
||||||
#include "AudioFilter.h"
|
#include "AudioFilter.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//
|
//
|
||||||
// AudioFilterBank.h
|
// AudioFilterBank.h
|
||||||
// hifi
|
// libraries/audio/src
|
||||||
//
|
//
|
||||||
// Created by Craig Hansen-Sturm on 8/23/14.
|
// Created by Craig Hansen-Sturm on 8/23/14.
|
||||||
// Copyright 2014 High Fidelity, Inc.
|
// Copyright 2014 High Fidelity, Inc.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//
|
//
|
||||||
// AudioGain.cpp
|
// AudioGain.cpp
|
||||||
// hifi
|
// libraries/audio/src
|
||||||
//
|
//
|
||||||
// Created by Craig Hansen-Sturm on 9/10/14.
|
// Created by Craig Hansen-Sturm on 9/10/14.
|
||||||
// Copyright 2014 High Fidelity, Inc.
|
// Copyright 2014 High Fidelity, Inc.
|
||||||
|
@ -10,9 +10,9 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <algorithm>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <SharedUtil.h>
|
|
||||||
#include "AudioRingBuffer.h"
|
|
||||||
#include "AudioFormat.h"
|
#include "AudioFormat.h"
|
||||||
#include "AudioBuffer.h"
|
#include "AudioBuffer.h"
|
||||||
#include "AudioGain.h"
|
#include "AudioGain.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
//
|
//
|
||||||
// AudioGain.h
|
// AudioGain.h
|
||||||
// hifi
|
// libraries/audio/src
|
||||||
//
|
//
|
||||||
// Created by Craig Hansen-Sturm on 9/1/14.
|
// Created by Craig Hansen-Sturm on 9/1/14.
|
||||||
// Copyright 2014 High Fidelity, Inc.
|
// Copyright 2014 High Fidelity, Inc.
|
||||||
|
|
Loading…
Reference in a new issue