diff options
| author | kinddragon <kinddragon@users.sourceforge.net> | 2010-05-09 05:01:27 +0400 |
|---|---|---|
| committer | kinddragon <kinddragon@users.sourceforge.net> | 2010-05-09 05:01:27 +0400 |
| commit | 7b6b0c551b34ffc5da173e05bdb57875cffa24f1 (patch) | |
| tree | 258df80d6d72ed132bd6bc02943600b2418e9b10 /src/filters/switcher | |
| parent | 1318e0ef1212b7491b948d736fbc81d10e3a5cfc (diff) | |
Implemented drag and drop folders with sub-folders (ticket #208)
Minor AudioSwitcher optimizations
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/videorenderslib@1869 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/switcher')
| -rw-r--r-- | src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp index 833677cb0..687785c43 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp @@ -135,7 +135,7 @@ HRESULT CAudioSwitcherFilter::CheckMediaType(const CMediaType* pmt) }
template<class T, class U, int Umin, int Umax>
-void mix(DWORD mask, int ch, int bps, BYTE* src, BYTE* dst)
+__forceinline void mix(DWORD mask, int ch, int bps, BYTE* src, BYTE* dst)
{
U sum = 0;
@@ -154,7 +154,7 @@ void mix(DWORD mask, int ch, int bps, BYTE* src, BYTE* dst) }
template<>
-void mix<int, INT64, (-1<<24), (+1<<24)-1>(DWORD mask, int ch, int bps, BYTE* src, BYTE* dst)
+__forceinline void mix<int, INT64, (-1<<24), (+1<<24)-1>(DWORD mask, int ch, int bps, BYTE* src, BYTE* dst)
{
INT64 sum = 0;
@@ -174,7 +174,7 @@ void mix<int, INT64, (-1<<24), (+1<<24)-1>(DWORD mask, int ch, int bps, BYTE* sr }
template<class T, class U, int Umin, int Umax>
-void mix4(DWORD mask, BYTE* src, BYTE* dst)
+__forceinline void mix4(DWORD mask, BYTE* src, BYTE* dst)
{
U sum = 0;
int bps = sizeof T;
@@ -301,7 +301,7 @@ HRESULT CAudioSwitcherFilter::Transform(IMediaSample* pIn, IMediaSample* pOut) mix<short, INT64, SHRT_MIN, SHRT_MAX>(mask, channels, bps, src, dst);
}
}
- else
+ else // most popular channels count
{
for(int k = 0; k < len; k++, src += srcstep, dst += dststep)
{
|