david/librubberband
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce study/process/retrieve with n and offset (easier to handle in Java).

Browse Source 
Also restore threading option, since threading is not necessarily disabled in
the backend
This commit is contained in:
Chris Cannam
2012-09-10 09:29:48 +01:00
parent 0e2b395ed2
commit f43288911d
2 changed files with 54 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
com/breakfastquay/rubberband/RubberBandStretcher.java
View File

@@ -37,15 +37,24 @@ public class RubberBandStretcher
public native int getSamplesRequired();
//!!! setKeyFrameMap
//!!! todo: setKeyFrameMap
//!!! we should check, for example, that the samples arrays have the right number of channels
//!!! extracting subset of array in java is a pain, this should take array + offset and there should be an interleaved alternative
public native void study(float[][] input, boolean finalBlock);
public native void process(float[][] input, boolean finalBlock);
public native void study(float[][] input, int offset, int n, boolean finalBlock);
public void study(float[][] input, boolean finalBlock) {
study(input, 0, input[0].length, finalBlock);
}
public native void process(float[][] input, int offset, int n, boolean finalBlock);
public void process(float[][] input, boolean finalBlock) {
process(input, 0, input[0].length, finalBlock);
}
public native int available();
public native int retrieve(float[][] output);
public native int retrieve(float[][] output, int offset, int n);
public int retrieve(float[][] output) {
return retrieve(output, 0, output[0].length);
}
private native void initialise(int sampleRate, int channels, int options,
double initialTimeRatio,
@@ -68,6 +77,10 @@ public class RubberBandStretcher
public static final int OptionPhaseLaminar = 0x00000000;
public static final int OptionPhaseIndependent = 0x00002000;
public static final int OptionThreadingAuto = 0x00000000;
public static final int OptionThreadingNever = 0x00010000;
public static final int OptionThreadingAlways = 0x00020000;
public static final int OptionWindowStandard = 0x00000000;
public static final int OptionWindowShort = 0x00100000;

72
src/jni/RubberBandStretcherJNI.cpp
View File

@@ -145,7 +145,7 @@ JNIEXPORT jint JNICALL Java_com_breakfastquay_rubberband_RubberBandStretcher_get
* Signature: ([[FZ)V
*/
JNIEXPORT void JNICALL Java_com_breakfastquay_rubberband_RubberBandStretcher_study
(JNIEnv *, jobject, jobjectArray, jboolean);
(JNIEnv *, jobject, jobjectArray, jint, jint, jboolean);
/*
* Class: com_breakfastquay_rubberband_RubberBandStretcher
@@ -153,7 +153,7 @@ JNIEXPORT void JNICALL Java_com_breakfastquay_rubberband_RubberBandStretcher_stu
* Signature: ([[FZ)V
*/
JNIEXPORT void JNICALL Java_com_breakfastquay_rubberband_RubberBandStretcher_process
(JNIEnv *, jobject, jobjectArray, jboolean);
(JNIEnv *, jobject, jobjectArray, jint, jint, jboolean);
/*
* Class: com_breakfastquay_rubberband_RubberBandStretcher
@@ -169,7 +169,7 @@ JNIEXPORT jint JNICALL Java_com_breakfastquay_rubberband_RubberBandStretcher_ava
* Signature: (I)[[F
*/
JNIEXPORT jint JNICALL Java_com_breakfastquay_rubberband_RubberBandStretcher_retrieve
(JNIEnv *, jobject, jobjectArray);
(JNIEnv *, jobject, jobjectArray, jint, jint);
/*
* Class: com_breakfastquay_rubberband_RubberBandStretcher
@@ -298,45 +298,48 @@ Java_com_breakfastquay_rubberband_RubberBandStretcher_getSamplesRequired(JNIEnv
}
void
Java_com_breakfastquay_rubberband_RubberBandStretcher_study(JNIEnv *env, jobject obj, jobjectArray data, jboolean final)
{
int channels = env->GetArrayLength(data);
float **input = new float *[channels];
int samples = 0;
for (int c = 0; c < channels; ++c) {
jfloatArray cdata = (jfloatArray)env->GetObjectArrayElement(data, c);
samples = env->GetArrayLength(cdata);
input[c] = env->GetFloatArrayElements(cdata, 0);
}
getStretcher(env, obj)->study(input, samples, final);
for (int c = 0; c < channels; ++c) {
jfloatArray cdata = (jfloatArray)env->GetObjectArrayElement(data, c);
env->ReleaseFloatArrayElements(cdata, input[c], 0);
}
}
void
Java_com_breakfastquay_rubberband_RubberBandStretcher_process(JNIEnv *env, jobject obj, jobjectArray data, jboolean final)
Java_com_breakfastquay_rubberband_RubberBandStretcher_study(JNIEnv *env, jobject obj, jobjectArray data, jint offset, jint n, jboolean final)
{
int channels = env->GetArrayLength(data);
float **arr = allocate<float *>(channels);
float **input = allocate<float *>(channels);
int samples = 0;
for (int c = 0; c < channels; ++c) {
jfloatArray cdata = (jfloatArray)env->GetObjectArrayElement(data, c);
samples = env->GetArrayLength(cdata);
input[c] = env->GetFloatArrayElements(cdata, 0);
arr[c] = env->GetFloatArrayElements(cdata, 0);
input[c] = arr[c] + offset;
}
getStretcher(env, obj)->process(input, samples, final);
getStretcher(env, obj)->study(input, n, final);
for (int c = 0; c < channels; ++c) {
jfloatArray cdata = (jfloatArray)env->GetObjectArrayElement(data, c);
env->ReleaseFloatArrayElements(cdata, input[c], 0);
env->ReleaseFloatArrayElements(cdata, arr[c], 0);
}
}
void
Java_com_breakfastquay_rubberband_RubberBandStretcher_process(JNIEnv *env, jobject obj, jobjectArray data, jint offset, jint n, jboolean final)
{
int channels = env->GetArrayLength(data);
float **arr = allocate<float *>(channels);
float **input = allocate<float *>(channels);
int samples = 0;
for (int c = 0; c < channels; ++c) {
jfloatArray cdata = (jfloatArray)env->GetObjectArrayElement(data, c);
arr[c] = env->GetFloatArrayElements(cdata, 0);
input[c] = arr[c] + offset;
}
getStretcher(env, obj)->process(input, n, final);
for (int c = 0; c < channels; ++c) {
jfloatArray cdata = (jfloatArray)env->GetObjectArrayElement(data, c);
env->ReleaseFloatArrayElements(cdata, arr[c], 0);
}
deallocate(input);
deallocate(arr);
}
jint
@@ -346,22 +349,17 @@ Java_com_breakfastquay_rubberband_RubberBandStretcher_available(JNIEnv *env, job
}
jint
Java_com_breakfastquay_rubberband_RubberBandStretcher_retrieve(JNIEnv *env, jobject obj, jobjectArray output)
Java_com_breakfastquay_rubberband_RubberBandStretcher_retrieve(JNIEnv *env, jobject obj, jobjectArray output, jint offset, jint n)
{
RubberBandStretcher *stretcher = getStretcher(env, obj);
size_t channels = stretcher->getChannelCount();
jfloatArray first = (jfloatArray)env->GetObjectArrayElement(output, 0);
int space = env->GetArrayLength(first);
env->DeleteLocalRef(first);
float **outbuf = allocate_channels<float>(channels, space);
size_t retrieved = stretcher->retrieve(outbuf, space);
float **outbuf = allocate_channels<float>(channels, n);
size_t retrieved = stretcher->retrieve(outbuf, n);
for (int c = 0; c < channels; ++c) {
jfloatArray cdata = (jfloatArray)env->GetObjectArrayElement(output, c);
env->SetFloatArrayRegion(cdata, 0, retrieved, outbuf[c]);
env->DeleteLocalRef(cdata);
env->SetFloatArrayRegion(cdata, offset, retrieved, outbuf[c]);
}
deallocate_channels(outbuf, channels);