Revision: 39640
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39640
Author: nexyon
Date: 2011-08-22 20:53:00 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
Merging pepper up to r39639.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39639
Modified Paths:
--------------
branches/soc-2011-salad/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.h
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
branches/soc-2011-salad/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2011-salad/release/scripts/modules/mocap_tools.py
branches/soc-2011-salad/release/scripts/modules/retarget.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-salad/release/scripts/startup/ui_mocap.py
branches/soc-2011-salad/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2011-salad/source/blender/blenkernel/intern/nla.c
branches/soc-2011-salad/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-salad/source/blender/collada/AnimationExporter.h
branches/soc-2011-salad/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-salad/source/blender/collada/AnimationImporter.h
branches/soc-2011-salad/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-salad/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-salad/source/blender/collada/ArmatureImporter.h
branches/soc-2011-salad/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-salad/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-salad/source/blender/collada/GeometryExporter.h
branches/soc-2011-salad/source/blender/collada/TransformWriter.cpp
branches/soc-2011-salad/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-salad/source/blender/editors/armature/poselib.c
branches/soc-2011-salad/source/blender/editors/screen/screen_ops.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-salad/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-salad/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2011-salad/source/gameengine/Converter/KX_IpoConvert.h
branches/soc-2011-salad/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/BL_Action.h
branches/soc-2011-salad/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/KX_SoundActuator.cpp
Property Changed:
----------------
branches/soc-2011-salad/
branches/soc-2011-salad/build_files/cmake/config/blender_headless.cmake
branches/soc-2011-salad/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-salad/build_files/cmake/config/bpy_module.cmake
branches/soc-2011-salad/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39479
/branches/soc-2011-tomato:36831-39545
/trunk/blender:36834-39637
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39639
/branches/soc-2011-tomato:36831-39545
/trunk/blender:36834-39637
Property changes on:
branches/soc-2011-salad/build_files/cmake/config/blender_headless.cmake
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-salad/build_files/cmake/config/blender_lite.cmake
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on:
branches/soc-2011-salad/build_files/cmake/config/bpy_module.cmake
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: branches/soc-2011-salad/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/intern/AUD_C-API.cpp
2011-08-22 20:31:46 UTC (rev 39639)
+++ branches/soc-2011-salad/intern/audaspace/intern/AUD_C-API.cpp
2011-08-22 20:53:00 UTC (rev 39640)
@@ -967,7 +967,10 @@
{
AUD_AnimateableProperty* prop = (*entry)->getAnimProperty(type);
if(animated)
- prop->write(data, frame, 1);
+ {
+ if(frame >= 0)
+ prop->write(data, frame, 1);
+ }
else
prop->write(data);
}
@@ -976,7 +979,10 @@
{
AUD_AnimateableProperty* prop =
dynamic_cast<AUD_SequencerFactory*>(sequencer->get())->getAnimProperty(type);
if(animated)
- prop->write(data, frame, 1);
+ {
+ if(frame >= 0)
+ prop->write(data, frame, 1);
+ }
else
prop->write(data);
}
Modified:
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.cpp
2011-08-22 20:31:46 UTC (rev 39639)
+++ branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.cpp
2011-08-22 20:53:00 UTC (rev 39640)
@@ -100,7 +100,7 @@
// then check if afterwards the length is enough for the maximum rate
if(len + size < num_samples * AUD_RATE_MAX)
- len = size - num_samples * AUD_RATE_MAX;
+ len = num_samples * AUD_RATE_MAX - size;
if(m_n > len)
{
@@ -130,58 +130,101 @@
\
for(unsigned int t = 0; t < length; t++)\
{\
- factor = (m_last_factor * (length - t) + target_factor * t) /
length;\
+ factor = (m_last_factor * (length - t - 1) + target_factor * (t
+ 1)) / length;\
\
+ memset(sums, 0, sizeof(double) * m_channels);\
+\
if(factor >= 1)\
- f_increment = m_L;\
- else\
- f_increment = factor * m_L;\
+ {\
+ P = double_to_fp(m_P * m_L);\
\
- P_increment = double_to_fp(f_increment);\
- P = double_to_fp(m_P * f_increment);\
+ end = floor(m_len / double(m_L) - m_P) - 1;\
+ if(m_n < end)\
+ end = m_n;\
\
- end = (int_to_fp(m_len) - P) / P_increment - 1;\
- if(m_n < end)\
- end = m_n;\
+ data = buf + (m_n - end) * m_channels;\
+ l = fp_to_int(P);\
+ eta = fp_rest_to_double(P);\
+ l += m_L * end;\
\
- memset(sums, 0, sizeof(double) * m_channels);\
+ for(i = 0; i <= end; i++)\
+ {\
+ v = coeff[l] + eta * (coeff[l+1] - coeff[l]);\
+ l -= m_L;\
+ left\
+ }\
\
- P += P_increment * end;\
- data = buf + (m_n - end) * m_channels;\
- l = fp_to_int(P);\
+ P = int_to_fp(m_L) - P;\
\
- for(i = 0; i <= end; i++)\
- {\
+ end = floor((m_len - 1) / double(m_L) + m_P) - 1;\
+ if(m_cache_valid - m_n - 2 < end)\
+ end = m_cache_valid - m_n - 2;\
+\
+ data = buf + (m_n + 2 + end) * m_channels - 1;\
+ l = fp_to_int(P);\
eta = fp_rest_to_double(P);\
- v = coeff[l] + eta * (coeff[l+1] - coeff[l]);\
- P -= P_increment;\
- l = fp_to_int(P);\
- left\
+ l += m_L * end;\
+\
+ for(i = 0; i <= end; i++)\
+ {\
+ v = coeff[l] + eta * (coeff[l+1] - coeff[l]);\
+ l -= m_L;\
+ right\
+ }\
+\
+ for(channel = 0; channel < m_channels; channel++)\
+ {\
+ *buffer = sums[channel];\
+ buffer++;\
+ }\
}\
+ else\
+ {\
+ f_increment = factor * m_L;\
+ P_increment = double_to_fp(f_increment);\
+ P = double_to_fp(m_P * f_increment);\
\
- P = -P;\
+ end = (int_to_fp(m_len) - P) / P_increment - 1;\
+ if(m_n < end)\
+ end = m_n;\
\
- end = (int_to_fp(m_len) - P) / P_increment - 1;\
- if(m_cache_valid - m_n - 2 < end)\
- end = m_cache_valid - m_n - 2;\
+ P += P_increment * end;\
+ data = buf + (m_n - end) * m_channels;\
+ l = fp_to_int(P);\
\
- P += P_increment * end;\
- data = buf + (m_n + 2 + end) * m_channels - 1;\
- l = fp_to_int(P);\
+ for(i = 0; i <= end; i++)\
+ {\
+ eta = fp_rest_to_double(P);\
+ v = coeff[l] + eta * (coeff[l+1] - coeff[l]);\
+ P -= P_increment;\
+ l = fp_to_int(P);\
+ left\
+ }\
\
- for(i = 0; i <= end; i++)\
- {\
- eta = fp_rest_to_double(P);\
- v = coeff[l] + eta * (coeff[l+1] - coeff[l]);\
- P -= P_increment;\
+ P = -P;\
+\
+ end = (int_to_fp(m_len) - P) / P_increment - 1;\
+ if(m_cache_valid - m_n - 2 < end)\
+ end = m_cache_valid - m_n - 2;\
+\
+ P += P_increment * end;\
+ data = buf + (m_n + 2 + end) * m_channels - 1;\
l = fp_to_int(P);\
- right\
- }\
\
- for(channel = 0; channel < m_channels; channel++)\
- {\
- *buffer = f_increment / m_L * sums[channel];\
- buffer++;\
+ for(i = 0; i <= end; i++)\
+ {\
+ eta = fp_rest_to_double(P);\
+ v = coeff[l] + eta * (coeff[l+1] - coeff[l]);\
+ P -= P_increment;\
+ l = fp_to_int(P);\
+ right\
+ }\
+\
+ for(channel = 0; channel < m_channels; channel++)\
+ {\
+ *buffer = f_increment / m_L * sums[channel];\
+ buffer++;\
+ }\
}\
\
m_P += fmod(1.0 / factor, 1.0);\
Modified:
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.h
===================================================================
--- branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.h
2011-08-22 20:31:46 UTC (rev 39639)
+++ branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReader.h
2011-08-22 20:53:00 UTC (rev 39640)
@@ -46,12 +46,12 @@
/**
* The half filter length.
*/
- static const int m_len = 292874;
+ static const int m_len;
/**
* The sample step size for the filter.
*/
- static const int m_L = 2048;
+ static const int m_L;
/**
* The filter coefficients.
Modified:
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
===================================================================
---
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
2011-08-22 20:31:46 UTC (rev 39639)
+++
branches/soc-2011-salad/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
2011-08-22 20:53:00 UTC (rev 39640)
@@ -1,29295 +1,32517 @@
#include "AUD_JOSResampleReader.h"
-// sinc filter coefficients, Nz = 138, L = 2048, freq = 0.965, Kaiser Window B
= 16
+// sinc filter coefficients, Nz = 136, L = 2304, freq = 0.963904, Kaiser
Window B = 16
+const int AUD_JOSResampleReader::m_len = 325078;
+const int AUD_JOSResampleReader::m_L = 2304;
+
const float AUD_JOSResampleReader::m_coeff[] = {
- 9.650000000e-01f, 9.649996475e-01f, 9.649985899e-01f, 9.649968274e-01f,
9.649943598e-01f, 9.649911871e-01f, 9.649873095e-01f, 9.649827268e-01f,
9.649774392e-01f, 9.649714465e-01f,
- 9.649647489e-01f, 9.649573462e-01f, 9.649492386e-01f, 9.649404260e-01f,
9.649309085e-01f, 9.649206860e-01f, 9.649097586e-01f, 9.648981263e-01f,
9.648857891e-01f, 9.648727470e-01f,
- 9.648590001e-01f, 9.648445483e-01f, 9.648293917e-01f, 9.648135302e-01f,
9.647969640e-01f, 9.647796931e-01f, 9.647617174e-01f, 9.647430369e-01f,
9.647236518e-01f, 9.647035620e-01f,
- 9.646827676e-01f, 9.646612685e-01f, 9.646390649e-01f, 9.646161567e-01f,
9.645925440e-01f, 9.645682268e-01f, 9.645432051e-01f, 9.645174791e-01f,
9.644910486e-01f, 9.644639137e-01f,
- 9.644360745e-01f, 9.644075311e-01f, 9.643782833e-01f, 9.643483314e-01f,
9.643176753e-01f, 9.642863151e-01f, 9.642542508e-01f, 9.642214824e-01f,
9.641880100e-01f, 9.641538336e-01f,
- 9.641189534e-01f, 9.640833693e-01f, 9.640470813e-01f, 9.640100896e-01f,
9.639723941e-01f, 9.639339950e-01f, 9.638948922e-01f, 9.638550858e-01f,
9.638145760e-01f, 9.637733626e-01f,
- 9.637314459e-01f, 9.636888257e-01f, 9.636455023e-01f, 9.636014756e-01f,
9.635567458e-01f, 9.635113128e-01f, 9.634651767e-01f, 9.634183376e-01f,
9.633707956e-01f, 9.633225507e-01f,
- 9.632736029e-01f, 9.632239524e-01f, 9.631735992e-01f, 9.631225434e-01f,
9.630707850e-01f, 9.630183241e-01f, 9.629651608e-01f, 9.629112952e-01f,
9.628567272e-01f, 9.628014571e-01f,
- 9.627454848e-01f, 9.626888104e-01f, 9.626314341e-01f, 9.625733558e-01f,
9.625145757e-01f, 9.624550939e-01f, 9.623949103e-01f, 9.623340252e-01f,
9.622724385e-01f, 9.622101504e-01f,
- 9.621471609e-01f, 9.620834702e-01f, 9.620190782e-01f, 9.619539852e-01f,
9.618881911e-01f, 9.618216961e-01f, 9.617545002e-01f, 9.616866036e-01f,
9.616180063e-01f, 9.615487084e-01f,
- 9.614787100e-01f, 9.614080113e-01f, 9.613366122e-01f, 9.612645129e-01f,
9.611917135e-01f, 9.611182140e-01f, 9.610440147e-01f, 9.609691155e-01f,
9.608935166e-01f, 9.608172180e-01f,
- 9.607402200e-01f, 9.606625225e-01f, 9.605841256e-01f, 9.605050296e-01f,
9.604252344e-01f, 9.603447402e-01f, 9.602635472e-01f, 9.601816553e-01f,
9.600990647e-01f, 9.600157755e-01f,
- 9.599317879e-01f, 9.598471019e-01f, 9.597617176e-01f, 9.596756352e-01f,
9.595888548e-01f, 9.595013764e-01f, 9.594132003e-01f, 9.593243264e-01f,
9.592347550e-01f, 9.591444862e-01f,
- 9.590535200e-01f, 9.589618566e-01f, 9.588694961e-01f, 9.587764387e-01f,
9.586826844e-01f, 9.585882334e-01f, 9.584930858e-01f, 9.583972417e-01f,
9.583007013e-01f, 9.582034646e-01f,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
