aabc2/KOS_qrcodes
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

update 'exif.obj':

Browse Source 
1) optimize code
2) add documentation

git-svn-id: svn://kolibrios.org@5007 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2014-07-18 17:43:40 +00:00
parent 55b3e99585
commit f787c9d578
3 changed files with 420 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

294
programs/develop/libraries/exif/trunk/exif.asm
View File

@@ -9,10 +9,8 @@ include '../../../../proc32.inc'
;---------
offs_m_or_i equ 8 ;ᬥ饭<E1ACA5><E9A5AD> <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> 'MM' <20><><EFBFBD> 'II' (Motorola, Intel)
offs_tag_count equ 16 ;ᬥ饭<E1ACA5><E9A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⢠ ⥣<><EFBFBD>
offs_tag_0 equ 18 ;ᬥ饭<E1ACA5><E9A5AD> 0-<2D><> ⥣<>
offs_tag_0 equ 2 ;ᬥ饭<E1ACA5><E9A5AD> 0-<EFBFBD><EFBFBD> ⥣<>
tag_size equ 12 ;ࠧ<><E0A0A7><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥣<>
offs_tag_child_0 equ 2 ;ᬥ饭<E1ACA5><E9A5AD> 0-<2D><> <20><><EFBFBD><EFBFBD>୥<EFBFBD><E0ADA5> ⥣<>
;<3B><>ଠ<EFBFBD><E0ACA0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
tag_format_ui1b equ 1 ;unsigned integer 1 byte
tag_format_text equ 2 ;ascii string
@@ -466,7 +464,9 @@ db 0xfe,0x56,'Sharpness',0
db 0xfe,0x57,'Smoothness',0
db 0xfe,0x58,'Moire filter',0
dw 0
db 0x00,0x00,'GPS version ID',0
dd 0
;input:
; bof - 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> 䠩<><E4A0A9>
@@ -496,8 +496,16 @@ proc exif_get_app1 uses eax ebx edi, bof:dword, app1:dword
cmp word[eax],0xe1ff
jne .no_exif
add eax,2
xor ebx,ebx
cmp word[eax+10],'II'
je @f
inc ebx ;if 'MM' edx=1
@@:
mov [edi+offs_m_or_i],ebx
add eax,18
mov [edi],eax
sub eax,8
mov [edi+4],eax
jmp @f
.no_exif:
@@ -520,130 +528,15 @@ pushad
xor edx,edx
mov byte[edi],dl
cmp eax,edx
cmp [eax],edx
je .end_f ;<3B>᫨ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> exif.app1
cmp ecx,edx
jle .end_f ;<3B>᫨ <20><><EFBFBD>浪<EFBFBD><EFA4AA><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ⥣<> <= 0
cmp word[eax+offs_m_or_i],'II'
je @f
inc edx ;if 'MM' edx=1
@@:
movzx edx,word[eax+offs_m_or_i] ;if 'MM' edx=1
;<3B>஢<EFBFBD><E0AEA2>塞 <20><>᫮ ⥣<><E2A5A3>
movzx ebx,word[eax+offs_tag_count]
bt edx,0
jnc @f
ror bx,8
@@:
cmp ecx,ebx
jg .end_f ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD> ⥣<> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 祬 <20><> <20><><EFBFBD><EFBFBD> <20> 䠩<><E4A0A9>
;<3B><><EFBFBD><EFBFBD>室<EFBFBD><E5AEA4> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥣
dec ecx
imul ecx,tag_size
add eax,offs_tag_0
add eax,ecx
stdcall read_tag_value,[app1],[t_max]
.end_f:
popad
ret
endp
;input:
; app1 - 㪠<><E3AAA0>⥫<EFBFBD> <20><> exif.app1
; child - 㪠<><E3AAA0>⥫<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>砫<EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<><E2A5A3> exif.app1.child
; c_tag - ⥣ <20><><EFBFBD> <20><><EFBFBD><EFBFBD>ண<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD>
;output:
; child - 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<><E2A5A3>
align 4
proc exif_get_app1_child, app1:dword, child:dword , c_tag:dword
pushad
mov eax,[app1]
mov edi,[child]
xor edx,edx
mov dword[edi],edx
cmp eax,edx
je .end_f ;<3B>᫨ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> exif.app1
cmp word[eax+offs_m_or_i],'II'
je @f
inc edx ;if 'MM' edx=1
@@:
;<3B><>砫<EFBFBD> <20><><EFBFBD>᪠
mov ebx,[c_tag]
bt edx,0
jnc @f
ror bx,8
@@:
;<3B>஢<EFBFBD><E0AEA2>塞 <20><>᫮ ⥣<><E2A5A3>
movzx ecx,word[eax+offs_tag_count]
bt edx,0
jnc @f
ror cx,8
@@:
cmp ecx,1
jl .end_f ;<3B>᫨ <20><>᫮ ⥣<><E2A5A3> <1
;<3B><><EFBFBD><EFBFBD>室<EFBFBD><E5AEA4> <20><> 1-<2D> ⥣
add eax,offs_tag_0
@@:
cmp word[eax],bx
je @f
add eax,tag_size
loop @b
jmp .end_f ;<3B>᫨ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@: ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mov ebx,dword[eax+8]
bt edx,0
jnc @f
ror bx,8
ror ebx,16
ror bx,8
@@:
add ebx,[app1]
add ebx,offs_m_or_i
mov dword[edi],ebx
.end_f:
popad
ret
endp
;input:
; app1 - 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> exif.app1
; child - 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<><E2A5A3> exif.app1.child
; num - <20><><EFBFBD>浪<EFBFBD><EFA4AA><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ⥣<> (<28><>稭<EFBFBD><E7A8AD><EFBFBD><EFBFBD><EFBFBD> <20> 1)
; txt - 㪠<><E3AAA0>⥫<EFBFBD> <20><> ⥪<><E2A5AA>, <20>㤠 <20>㤥<EFBFBD> <20><><EFBFBD><EFBFBD>ᠭ<EFBFBD> <20><><EFBFBD>祭<EFBFBD><E7A5AD>
; t_max - <20><><EFBFBD>ᨬ<EFBFBD><E1A8AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD> ⥪<><E2A5AA><EFBFBD>
align 4
proc exif_get_app1_child_tag, app1:dword, child:dword, num:dword, txt:dword, t_max:dword
pushad
mov eax,[app1]
mov edi,[txt]
mov ecx,[num]
xor edx,edx
mov byte[edi],dl
cmp eax,edx
je .end_f ;<3B>᫨ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> exif.app1
cmp ecx,edx
jle .end_f ;<3B>᫨ <20><><EFBFBD>浪<EFBFBD><EFA4AA><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ⥣<> <= 0
cmp word[eax+offs_m_or_i],'II'
je @f
inc edx ;if 'MM' edx=1
@@:
mov eax,[child]
cmp eax,0
je .end_f ;<3B>᫨ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> exif.app1.child
;<3B>஢<EFBFBD><E0AEA2>塞 <20><>᫮ ⥣<><E2A5A3>
mov eax,[eax]
movzx ebx,word[eax]
bt edx,0
jnc @f
@@ -655,7 +548,7 @@ pushad
;<3B><><EFBFBD><EFBFBD>室<EFBFBD><E5AEA4> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥣
dec ecx
imul ecx,tag_size
add eax,offs_tag_child_0
add eax,offs_tag_0
add eax,ecx
stdcall read_tag_value,[app1],[t_max]
@@ -665,6 +558,71 @@ popad
ret
endp
;input:
; app1 - 㪠<><E3AAA0>⥫<EFBFBD> <20><> exif.app1 <20><><EFBFBD> <20><> exif.app1.child
; child - 㪠<><E3AAA0>⥫<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>砫<EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<><E2A5A3> exif.app1.child
; c_tag - ⥣ <20><><EFBFBD> <20><><EFBFBD><EFBFBD>ண<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD>
;output:
; child - 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> <20><><EFBFBD><EFBFBD>୨<EFBFBD> ⥣<><E2A5A3>
align 4
proc exif_get_app1_child, app1:dword, child:dword , c_tag:dword
pushad
mov eax,[app1]
mov edi,[child]
xor edx,edx
cmp [eax],edx
je .no_found ;<3B>᫨ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><>砫<EFBFBD> exif.app1
movzx edx,word[eax+offs_m_or_i] ;if 'MM' edx=1
;<3B><>砫<EFBFBD> <20><><EFBFBD>᪠
mov ebx,[c_tag]
bt edx,0
jnc @f
ror bx,8
@@:
;<3B>஢<EFBFBD><E0AEA2>塞 <20><>᫮ ⥣<><E2A5A3>
mov eax,[eax]
movzx ecx,word[eax]
bt edx,0
jnc @f
ror cx,8
@@:
cmp ecx,1
jl .no_found ;<3B>᫨ <20><>᫮ ⥣<><E2A5A3> <1
;<3B><><EFBFBD><EFBFBD>室<EFBFBD><E5AEA4> <20><> 1-<2D> ⥣
add eax,offs_tag_0
@@:
cmp word[eax],bx
je @f
add eax,tag_size
loop @b
jmp .no_found ;<3B>᫨ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@: ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mov ebx,dword[eax+8]
bt edx,0
jnc @f
ror bx,8
ror ebx,16
ror bx,8
@@:
mov eax,[app1]
add ebx,[eax+4]
mov dword[edi],ebx
m2m dword[edi+4],dword[eax+4]
mov dword[edi+offs_m_or_i],edx
jmp .end_f
.no_found:
mov dword[edi],0
.end_f:
popad
ret
endp
;description:
; <20>ᯮ<EFBFBD><E1AFAE><EFBFBD><EFBFBD>⥫쭠<E2A5AB> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD> <20>⥭<EFBFBD><E2A5AD> <20><><EFBFBD><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD> ⥣<><E2A5A3>
;input:
@@ -677,7 +635,11 @@ proc read_tag_value, app1:dword, t_max:dword
.next_tag:
mov bx,word[esi]
cmp bx,0
je .tag_unknown ;⥣ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
jne @f
cmp dword[esi],0
jne @f
jmp .tag_unknown ;⥣ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@:
bt edx,0
jc @f
ror bx,8
@@ -729,8 +691,9 @@ proc read_tag_value, app1:dword, t_max:dword
ror esi,16
ror si,8
@@:
add esi,offs_m_or_i
add esi,[app1]
mov eax,[app1]
mov eax,[eax+4]
add esi,eax
stdcall str_n_cat,edi,esi,[t_max]
jmp .end_f
.tag_02:
@@ -809,8 +772,9 @@ proc read_tag_value, app1:dword, t_max:dword
@@:
stdcall str_len,edi
add edi,eax
add ebx,offs_m_or_i
add ebx,[app1]
mov eax,[app1]
mov eax,[eax+4]
add ebx,eax
mov eax,[ebx]
bt edx,0
jnc @f
@@ -832,9 +796,77 @@ proc read_tag_value, app1:dword, t_max:dword
call convert_int_to_str ;<3B>⠢<EFBFBD><E2A0A2> 2-<2D> <20><>᫮
;.over4b_05:
;...
;jmp .end_f
jmp .end_f
.tag_05:
mov bx,tag_format_si2b
bt edx,0
jnc @f
ror bx,8
@@:
cmp word[eax+2],bx
jne .tag_08
stdcall str_n_cat,edi,txt_dp,[t_max]
call get_tag_data_size
cmp ebx,1
jg .over4b_08
;<3B>᫨ <20><><EFBFBD><EFBFBD> 2 <20><><EFBFBD>⮢<EFBFBD><E2AEA2> <20><>᫮
movzx ebx,word[eax+8]
bt edx,0
jnc @f
ror bx,8
@@:
stdcall str_len,edi
add edi,eax
bt bx,15
jnc @f
mov byte[edi],'-'
inc edi
neg bx
inc bx
@@:
mov eax,ebx
call convert_int_to_str ;[t_max]
.over4b_08:
;...
jmp .end_f
.tag_08:
mov bx,tag_format_si4b
bt edx,0
jnc @f
ror bx,8
@@:
cmp word[eax+2],bx
jne .tag_09
stdcall str_n_cat,edi,txt_dp,[t_max]
call get_tag_data_size
cmp ebx,1
jg .over4b_09
;<3B>᫨ <20><><EFBFBD><EFBFBD> 4 <20><><EFBFBD>⮢<EFBFBD><E2AEA2> <20><>᫮
mov ebx,dword[eax+8]
bt edx,0
jnc @f
ror bx,8
ror ebx,16
ror bx,8
@@:
stdcall str_len,edi
add edi,eax
bt ebx,31
jnc @f
mov byte[edi],'-'
inc edi
neg ebx
inc ebx
@@:
mov eax,ebx
call convert_int_to_str ;[t_max]
.over4b_09:
;...
jmp .end_f
.tag_09:
.end_f:
ret
endp
@@ -920,9 +952,7 @@ EXPORTS:
dd sz_exif_get_app1, exif_get_app1
dd sz_exif_get_app1_tag, exif_get_app1_tag
dd sz_exif_get_app1_child, exif_get_app1_child
dd sz_exif_get_app1_child_tag, exif_get_app1_child_tag
dd 0,0
sz_exif_get_app1 db 'exif_get_app1',0
sz_exif_get_app1_tag db 'exif_get_app1_tag',0
sz_exif_get_app1_child db 'exif_get_app1_child',0
sz_exif_get_app1_child_tag db 'exif_get_app1_child_tag',0