WebSVN – Kolibri OS – Diff – /kernel/trunk/drivers/mixer.asm

            mov [ebx+STREAM.work_write], edi
 .m2:
            mov esi, [ebx+STREAM.curr_seg]
-           mov edi, [ebx+STREAM.work_write]
-           mov edx, [ebx+STREAM.r_buff]
+           mov edi, [ebx+STREAM.work_write]
-           stdcall [ebx+STREAM.resample], edi, esi, edx,\
+           stdcall [ebx+STREAM.resample], edi, esi, \
            [ebx+STREAM.r_dt],[ebx+STREAM.r_size],[ebx+STREAM.r_end]
            mov eax, [ebx+STREAM.curr_seg]
            add eax, [ebx+STREAM.r_size]
            cmp eax, [ebx+STREAM.lim_0]
            jb @f
+           mov esi, [ebx+STREAM.seg_0]
+           lea edi, [esi-128]
+           add esi, 0x7F80
+           mov ecx, 128/4
+           cld
+           rep movsd
            mov eax, [ebx+STREAM.seg_0]
            mov ecx, [ebx+STREAM.lim_0]
            xchg eax, [ebx+STREAM.seg_1]
            xchg ecx, [ebx+STREAM.lim_1]
 @@:
 	   ret
 endp
 align 4
-proc resample_1 stdcall, dest:dword,src:dword,r_buff:dword,\
+proc resample_1 stdcall, dest:dword,src:dword,\
 		       r_dt:dword, r_size:dword,r_end:dword
-	   mov edi, [r_buff]
+; dest equ esp+8
-	   add edi, 32*2
+; src  equ esp+12
-	   mov esi, [src]
+; r_dt equ esp+16
-	   mov ecx, [r_size]
-	   shr ecx, 2
+; r_size equ esp+20
-	   rep movsd
+;r_end equ esp+24
            mov edi, [dest]
-	   mov edi, [dest]
+           mov edx, [src]
-	   mov edx, [r_buff]
+           sub edx, 32*2
-	   mov eax, 16
+           mov eax, 16
 	   shl ebx, 16
 	   mov bx, cx
 	   mov [edi], ebx
 	   add edi, 4
-	   add eax, [esp+20]  ;rdt
+    add eax, [esp+16]
-	   cmp eax, [esp+28]  ;r_end
+    cmp eax, [esp+24]
 	   jb .l1
-	   mov ebp, esp
-	   mov esi, [src]
-	   add esi, [r_size]
-	   sub esi, 32*2
-	   mov edx, [r_buff]
-	   mov ecx, 16
-@@:
-	   mov ebx, [esi]
-	   mov [edx], ebx
-	   add esi, 4
-	   add edx, 4
 	   dec ecx
-	   jnz @B
+	   mov ebp, esp
 	   sub edi, [dest]
 	   mov eax, edi
 	   ret
 endp
-align 4
-proc resample_18 stdcall, dest:dword,src:dword,r_buff:dword,\
-		       r_dt:dword, r_size:dword,r_end:dword
-	   mov edi, [r_buff]
 	   add edi, 32
-	   mov esi, [src]
+align 4
+proc resample_18 stdcall, dest:dword,src:dword,\
+		       r_dt:dword, r_size:dword,r_end:dword
 	   mov ecx, [r_size]
 	   shr ecx, 2
-	   rep movsd
+	   mov edi, [dest]
            mov edx, [src]
 	   shl ebx, 16
 	   mov bx, cx
 	   mov [edi], ebx
 	   add edi, 4
-	   add esi, [esp+20]  ;rdt
+    add esi, [esp+16]
-	   cmp esi, [esp+28]  ;r_end
+    cmp esi, [esp+24]
 	   jb .l1
-	   mov ebp, esp
-	   mov esi, [src]
-	   add esi, [r_size]
-	   sub esi, 32
-	   mov edx, [r_buff]
-	   mov ecx, 8
-@@:
-	   mov ebx, [esi]
-	   mov [edx], ebx
-	   add esi, 4
-	   add edx, 4
-	   dec ecx
 	   jnz @B
 	   mov ebp, esp
 	   sub edi, [dest]
 	   mov eax, edi
 	   ret
 endp
 align 4
-proc copy_stream stdcall, dest:dword,src:dword,r_buff:dword,\
+proc copy_stream stdcall, dest:dword,src:dword,\
 		       r_dt:dword, r_size:dword,r_end:dword
            mov eax, 16384
            ret
 endp
 align 4
-proc resample_2 stdcall, dest:dword,src:dword,r_buff:dword,\
+proc resample_2 stdcall, dest:dword,src:dword,\
-		       r_dt:dword, r_size:dword,r_end:dword
-	   mov edi, [r_buff]
+		       r_dt:dword, r_size:dword,r_end:dword
-	   add edi, 32*4
-	   mov esi, [src]
-	   mov ecx, [r_size]
-	   shr ecx, 2
-	   rep movsd	  ;call memcpy
            mov edx, [src]
-	   mov edx, [r_buff]
+           sub edx, 32*4
-	   mov edi, [dest]
+           mov edi, [dest]
-	   mov ebx, [r_dt]
+           mov ebx, [r_dt]
-	   movq mm0, [esi]
+           movq mm0, [esi]
-	   movq mm1, mm0
+           movq mm1, mm0
-	   movd mm2, ecx
+           movd mm2, ecx
-	   punpcklwd mm2, mm2
+           punpcklwd mm2, mm2
-	   movq mm3, qword [m7] ;                  // 0x8000
+           movq mm3, qword [m7]    ;0x8000
-	   psubw mm3, mm2	;         // 0x8000 - iconst
+           psubw mm3, mm2 ;        ;0x8000 - iconst
-	   punpckldq mm3, mm2
+           punpckldq mm3, mm2
-	   add eax, ebx
+           add eax, ebx
-	   cmp eax, [r_end]
+           cmp eax, [r_end]
-	   jb .l1
+           jb .l1
-	   emms
+           emms
-	   mov esi, [src]
-	   add esi, [r_size]
-	   sub esi, 32*4
-	   mov edx, [r_buff]
-	   mov ecx, 32
-@@:
-	   mov ebx, [esi]
-	   mov [edx], ebx
-	   add esi, 4
-	   add edx, 4
-	   dec ecx
-	   jnz @B
-	   sub edi, [dest]
+           sub edi, [dest]
-	   mov eax, edi
+           mov eax, edi
-	   ret
+           ret
 endp
 align 4
-proc resample_28 stdcall, dest:dword,src:dword,r_buff:dword,\
-		       r_dt:dword, r_size:dword,r_end:dword
+proc resample_28 stdcall, dest:dword,src:dword,\
-	   mov edi, [r_buff]
-	   add edi, 32*2
+		       r_dt:dword, r_size:dword,r_end:dword
-	   mov esi, [src]
-	   mov ecx, [r_size]
-	   shr ecx, 2
 	   rep movsd	  ;call memcpy
            mov edx, [src]
-	   mov edx, [r_buff]
+           sub edx, 32*2
-	   mov edi, [dest]
+           mov edi, [dest]
-	   mov ebx, [r_dt]
+           mov ebx, [r_dt]
 	   add eax, ebx
 	   cmp eax, [r_end]
 	   jb .l1
 	   emms
-	   mov esi, [src]
-	   add esi, [r_size]
-	   sub esi, 32*2
-	   mov edx, [r_buff]
-	   mov ecx, 16
-@@:
-	   mov ebx, [esi]
-	   mov [edx], ebx
-	   add esi, 4
-	   add edx, 4
-	   dec ecx
 	   jnz @B
 	   sub edi, [dest]
 	   mov eax, edi
 	   ret
 endp
-proc m16_stereo stdcall, dest:dword,src:dword,r_buff:dword,\
+proc m16_stereo stdcall, dest:dword,src:dword,\
 	   add eax, eax
 	   ret
 endp
 align 4
-proc s8_stereo stdcall, dest:dword,src:dword,r_buff:dword,\
+proc s8_stereo stdcall, dest:dword,src:dword,\
 		       r_dt:dword, r_size:dword,r_end:dword
            mov esi, [src]
            mov eax, [r_size]
            add eax, eax
            ret
 endp
-proc m8_stereo stdcall, dest:dword,src:dword,r_buff:dword,\
+proc m8_stereo stdcall, dest:dword,src:dword,\
 		       r_dt:dword, r_size:dword,r_end:dword
            mov esi, [src]

Subversion Repositories Kolibri OS

(root)/kernel/trunk/drivers/mixer.asm @ 378 – Rev 281 → 285