![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 2617 for pjproject/trunk
- Timestamp:
- Apr 18, 2009 3:15:34 PM (16 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 5 edited
-
pjmedia/build/Makefile (modified) (1 diff)
-
pjproject-vs8.sln (modified) (4 diffs)
-
third_party/build/g7221/Makefile (modified) (1 diff)
-
third_party/build/g7221/libg7221codec.vcproj (modified) (14 diffs)
-
third_party/g7221/common/stl-files/count.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/build/Makefile
r2614 r2617 105 105 export PJMEDIA_TEST_SRCDIR = ../src/test 106 106 export PJMEDIA_TEST_OBJS += codec_vectors.o jbuf_test.o main.o mips_test.o rtp_test.o test.o 107 #export PJMEDIA_TEST_OBJS += sdp_neg_test.o107 export PJMEDIA_TEST_OBJS += sdp_neg_test.o 108 108 export PJMEDIA_TEST_CFLAGS += $(_CFLAGS) 109 109 export PJMEDIA_TEST_LDFLAGS += $(_LDFLAGS) -
pjproject/trunk/pjproject-vs8.sln
r2584 r2617 13 13 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_util_test", "pjlib-util\build\pjlib_util_test.vcproj", "{ED02BE13-8297-4770-8097-27DC2CCABF9A}" 14 14 ProjectSection(ProjectDependencies) = postProject 15 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 15 16 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 16 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}17 17 EndProjectSection 18 18 EndProject … … 29 29 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua", "pjsip-apps\build\pjsua.vcproj", "{8310649E-A25E-4AF0-91E8-9E3CC659BB89}" 30 30 ProjectSection(ProjectDependencies) = postProject 31 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} 32 {4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D} 33 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} 34 {4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA} 35 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 36 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E} 37 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} 38 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} 39 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} 40 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} 41 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} 42 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21} 43 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 44 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} 45 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} 46 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} 47 {2A3F241E-682C-47E1-9543-DC28708B406A} = {2A3F241E-682C-47E1-9543-DC28708B406A} 31 48 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} 32 {2A3F241E-682C-47E1-9543-DC28708B406A} = {2A3F241E-682C-47E1-9543-DC28708B406A}33 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D}34 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}35 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}36 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}37 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}38 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}39 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}40 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}41 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}42 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}43 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}44 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}45 {4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA}46 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}47 {4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D}48 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}49 49 EndProjectSection 50 50 EndProject … … 53 53 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_debug", "pjsip-apps\build\sample_debug.vcproj", "{A0F1AA62-0F6F-420D-B09A-AC04B6862821}" 54 54 ProjectSection(ProjectDependencies) = postProject 55 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} 56 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} 57 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} 58 {4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA} 59 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 60 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E} 61 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} 62 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} 63 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} 64 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} 65 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} 66 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21} 67 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 68 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} 69 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} 55 70 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} 56 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}57 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}58 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}59 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}60 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}61 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}62 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}63 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}64 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}65 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}66 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}67 {4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA}68 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}69 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}70 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}71 71 EndProjectSection 72 72 EndProject 73 73 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "samples", "pjsip-apps\build\samples.vcproj", "{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}" 74 74 ProjectSection(ProjectDependencies) = postProject 75 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} 76 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} 77 {4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D} 78 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} 79 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 80 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E} 81 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} 82 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} 83 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} 84 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} 85 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} 86 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21} 87 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 88 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} 89 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} 75 90 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} 76 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}77 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}78 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}79 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}80 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}81 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}82 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}83 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}84 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}85 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}86 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}87 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}88 {4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D}89 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}90 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}91 91 EndProjectSection 92 92 EndProject 93 93 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_pjsip", "pjsip\build\test_pjsip.vcproj", "{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}" 94 94 ProjectSection(ProjectDependencies) = postProject 95 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031} 96 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 97 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} 98 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} 99 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} 100 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21} 101 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 95 102 {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} 96 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}97 {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}98 {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}99 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}100 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}101 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}102 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}103 103 EndProjectSection 104 104 EndProject … … 123 123 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjnath_test", "pjnath\build\pjnath_test.vcproj", "{553C094C-F581-4A80-9540-D5D7B398A2C6}" 124 124 ProjectSection(ProjectDependencies) = postProject 125 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} 126 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 125 127 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 126 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}127 {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}128 128 EndProjectSection 129 129 EndProject 130 130 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjmedia_test", "pjmedia\build\pjmedia_test.vcproj", "{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}" 131 131 ProjectSection(ProjectDependencies) = postProject 132 {2A3F241E-682C-47E1-9543-DC28708B406A} = {2A3F241E-682C-47E1-9543-DC28708B406A} 133 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} 134 {4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D} 135 {4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA} 136 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} 137 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E} 138 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} 139 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} 140 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} 141 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} 142 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} 143 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} 132 144 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} 133 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}134 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}135 {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}136 {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}137 {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}138 {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}139 {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}140 {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}141 {4281CA5E-1D48-45D4-A991-2718A454B4BA} = {4281CA5E-1D48-45D4-A991-2718A454B4BA}142 {4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D}143 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}144 145 EndProjectSection 145 146 EndProject -
pjproject/trunk/third_party/build/g7221/Makefile
r2601 r2617 22 22 export G7221_CODEC_SRCDIR = ../../g7221 23 23 export G7221_CODEC_OBJS = common/common.o common/huff_tab.o common/tables.o \ 24 common/stl-files/basop32.o common/stl-files/count.o\24 common/stl-files/basop32.o \ 25 25 decode/coef2sam.o decode/dct4_s.o decode/decoder.o \ 26 26 encode/dct4_a.o encode/sam2coef.o encode/encoder.o -
pjproject/trunk/third_party/build/g7221/libg7221codec.vcproj
r2584 r2617 20 20 <Configuration 21 21 Name="Release|Win32" 22 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName) "22 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\" 23 23 IntermediateDirectory="$(OutDir)" 24 24 ConfigurationType="4" … … 47 47 InlineFunctionExpansion="1" 48 48 FavorSizeOrSpeed="2" 49 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files "49 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include" 50 50 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 51 51 StringPooling="true" … … 94 94 </Configuration> 95 95 <Configuration 96 Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" 97 OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)" 98 IntermediateDirectory="$(OutDir)" 99 ConfigurationType="1" 100 > 101 <Tool 102 Name="VCPreBuildEventTool" 103 /> 104 <Tool 105 Name="VCCustomBuildTool" 106 /> 107 <Tool 108 Name="VCXMLDataGeneratorTool" 109 /> 110 <Tool 111 Name="VCWebServiceProxyGeneratorTool" 112 /> 113 <Tool 114 Name="VCMIDLTool" 115 /> 116 <Tool 117 Name="VCCLCompilerTool" 118 ExecutionBucket="7" 119 Optimization="3" 120 /> 121 <Tool 122 Name="VCManagedResourceCompilerTool" 123 /> 124 <Tool 125 Name="VCResourceCompilerTool" 126 /> 127 <Tool 128 Name="VCPreLinkEventTool" 129 /> 130 <Tool 131 Name="VCLinkerTool" 132 /> 133 <Tool 134 Name="VCALinkTool" 135 /> 136 <Tool 137 Name="VCXDCMakeTool" 138 /> 139 <Tool 140 Name="VCBscMakeTool" 141 /> 142 <Tool 143 Name="VCCodeSignTool" 144 /> 145 <Tool 146 Name="VCPostBuildEventTool" 147 /> 148 <DeploymentTool 149 ForceDirty="-1" 150 RemoteDirectory="" 151 RegisterOutput="0" 152 AdditionalFiles="" 153 /> 154 <DebuggerTool 155 /> 156 </Configuration> 157 <Configuration 96 158 Name="Debug|Win32" 97 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName) "159 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\" 98 160 IntermediateDirectory="$(OutDir)" 99 161 ConfigurationType="4" … … 120 182 Name="VCCLCompilerTool" 121 183 Optimization="0" 122 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files "184 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include" 123 185 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" 124 186 MinimalRebuild="true" … … 168 230 </Configuration> 169 231 <Configuration 232 Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" 233 OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)" 234 IntermediateDirectory="$(OutDir)" 235 ConfigurationType="1" 236 > 237 <Tool 238 Name="VCPreBuildEventTool" 239 /> 240 <Tool 241 Name="VCCustomBuildTool" 242 /> 243 <Tool 244 Name="VCXMLDataGeneratorTool" 245 /> 246 <Tool 247 Name="VCWebServiceProxyGeneratorTool" 248 /> 249 <Tool 250 Name="VCMIDLTool" 251 /> 252 <Tool 253 Name="VCCLCompilerTool" 254 ExecutionBucket="7" 255 /> 256 <Tool 257 Name="VCManagedResourceCompilerTool" 258 /> 259 <Tool 260 Name="VCResourceCompilerTool" 261 /> 262 <Tool 263 Name="VCPreLinkEventTool" 264 /> 265 <Tool 266 Name="VCLinkerTool" 267 /> 268 <Tool 269 Name="VCALinkTool" 270 /> 271 <Tool 272 Name="VCXDCMakeTool" 273 /> 274 <Tool 275 Name="VCBscMakeTool" 276 /> 277 <Tool 278 Name="VCCodeSignTool" 279 /> 280 <Tool 281 Name="VCPostBuildEventTool" 282 /> 283 <DeploymentTool 284 ForceDirty="-1" 285 RemoteDirectory="" 286 RegisterOutput="0" 287 AdditionalFiles="" 288 /> 289 <DebuggerTool 290 /> 291 </Configuration> 292 <Configuration 170 293 Name="Release-Dynamic|Win32" 171 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName) "294 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\" 172 295 IntermediateDirectory="$(OutDir)" 173 296 ConfigurationType="4" … … 196 319 InlineFunctionExpansion="1" 197 320 FavorSizeOrSpeed="2" 198 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files "321 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include" 199 322 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 200 323 StringPooling="true" … … 243 366 </Configuration> 244 367 <Configuration 368 Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" 369 OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)" 370 IntermediateDirectory="$(OutDir)" 371 ConfigurationType="1" 372 > 373 <Tool 374 Name="VCPreBuildEventTool" 375 /> 376 <Tool 377 Name="VCCustomBuildTool" 378 /> 379 <Tool 380 Name="VCXMLDataGeneratorTool" 381 /> 382 <Tool 383 Name="VCWebServiceProxyGeneratorTool" 384 /> 385 <Tool 386 Name="VCMIDLTool" 387 /> 388 <Tool 389 Name="VCCLCompilerTool" 390 ExecutionBucket="7" 391 Optimization="3" 392 /> 393 <Tool 394 Name="VCManagedResourceCompilerTool" 395 /> 396 <Tool 397 Name="VCResourceCompilerTool" 398 /> 399 <Tool 400 Name="VCPreLinkEventTool" 401 /> 402 <Tool 403 Name="VCLinkerTool" 404 /> 405 <Tool 406 Name="VCALinkTool" 407 /> 408 <Tool 409 Name="VCXDCMakeTool" 410 /> 411 <Tool 412 Name="VCBscMakeTool" 413 /> 414 <Tool 415 Name="VCCodeSignTool" 416 /> 417 <Tool 418 Name="VCPostBuildEventTool" 419 /> 420 <DeploymentTool 421 ForceDirty="-1" 422 RemoteDirectory="" 423 RegisterOutput="0" 424 AdditionalFiles="" 425 /> 426 <DebuggerTool 427 /> 428 </Configuration> 429 <Configuration 245 430 Name="Release-Static|Win32" 246 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName) "431 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\" 247 432 IntermediateDirectory="$(OutDir)" 248 433 ConfigurationType="4" … … 271 456 InlineFunctionExpansion="1" 272 457 FavorSizeOrSpeed="2" 273 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files "458 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include" 274 459 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 275 460 StringPooling="true" … … 318 503 </Configuration> 319 504 <Configuration 320 Name="Release |Windows Mobile 6 Standard SDK (ARMV4I)"505 Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)" 321 506 OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)" 322 507 IntermediateDirectory="$(OutDir)" … … 380 565 </Configuration> 381 566 <Configuration 382 Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"383 OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"384 IntermediateDirectory="$(OutDir)"385 ConfigurationType="1"386 >387 <Tool388 Name="VCPreBuildEventTool"389 />390 <Tool391 Name="VCCustomBuildTool"392 />393 <Tool394 Name="VCXMLDataGeneratorTool"395 />396 <Tool397 Name="VCWebServiceProxyGeneratorTool"398 />399 <Tool400 Name="VCMIDLTool"401 />402 <Tool403 Name="VCCLCompilerTool"404 ExecutionBucket="7"405 />406 <Tool407 Name="VCManagedResourceCompilerTool"408 />409 <Tool410 Name="VCResourceCompilerTool"411 />412 <Tool413 Name="VCPreLinkEventTool"414 />415 <Tool416 Name="VCLinkerTool"417 />418 <Tool419 Name="VCALinkTool"420 />421 <Tool422 Name="VCXDCMakeTool"423 />424 <Tool425 Name="VCBscMakeTool"426 />427 <Tool428 Name="VCCodeSignTool"429 />430 <Tool431 Name="VCPostBuildEventTool"432 />433 <DeploymentTool434 ForceDirty="-1"435 RemoteDirectory=""436 RegisterOutput="0"437 AdditionalFiles=""438 />439 <DebuggerTool440 />441 </Configuration>442 <Configuration443 Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"444 OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"445 IntermediateDirectory="$(OutDir)"446 ConfigurationType="1"447 >448 <Tool449 Name="VCPreBuildEventTool"450 />451 <Tool452 Name="VCCustomBuildTool"453 />454 <Tool455 Name="VCXMLDataGeneratorTool"456 />457 <Tool458 Name="VCWebServiceProxyGeneratorTool"459 />460 <Tool461 Name="VCMIDLTool"462 />463 <Tool464 Name="VCCLCompilerTool"465 ExecutionBucket="7"466 Optimization="3"467 />468 <Tool469 Name="VCManagedResourceCompilerTool"470 />471 <Tool472 Name="VCResourceCompilerTool"473 />474 <Tool475 Name="VCPreLinkEventTool"476 />477 <Tool478 Name="VCLinkerTool"479 />480 <Tool481 Name="VCALinkTool"482 />483 <Tool484 Name="VCXDCMakeTool"485 />486 <Tool487 Name="VCBscMakeTool"488 />489 <Tool490 Name="VCCodeSignTool"491 />492 <Tool493 Name="VCPostBuildEventTool"494 />495 <DeploymentTool496 ForceDirty="-1"497 RemoteDirectory=""498 RegisterOutput="0"499 AdditionalFiles=""500 />501 <DebuggerTool502 />503 </Configuration>504 <Configuration505 Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"506 OutputDirectory=".\output\libg7221codec-armv4i-winmobilestd6-vc8-$(ConfigurationName)"507 IntermediateDirectory="$(OutDir)"508 ConfigurationType="1"509 >510 <Tool511 Name="VCPreBuildEventTool"512 />513 <Tool514 Name="VCCustomBuildTool"515 />516 <Tool517 Name="VCXMLDataGeneratorTool"518 />519 <Tool520 Name="VCWebServiceProxyGeneratorTool"521 />522 <Tool523 Name="VCMIDLTool"524 />525 <Tool526 Name="VCCLCompilerTool"527 ExecutionBucket="7"528 Optimization="3"529 />530 <Tool531 Name="VCManagedResourceCompilerTool"532 />533 <Tool534 Name="VCResourceCompilerTool"535 />536 <Tool537 Name="VCPreLinkEventTool"538 />539 <Tool540 Name="VCLinkerTool"541 />542 <Tool543 Name="VCALinkTool"544 />545 <Tool546 Name="VCXDCMakeTool"547 />548 <Tool549 Name="VCBscMakeTool"550 />551 <Tool552 Name="VCCodeSignTool"553 />554 <Tool555 Name="VCPostBuildEventTool"556 />557 <DeploymentTool558 ForceDirty="-1"559 RemoteDirectory=""560 RegisterOutput="0"561 AdditionalFiles=""562 />563 <DebuggerTool564 />565 </Configuration>566 <Configuration567 567 Name="Debug-Static|Win32" 568 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName) "568 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\" 569 569 IntermediateDirectory="$(OutDir)" 570 570 ConfigurationType="4" … … 591 591 Name="VCCLCompilerTool" 592 592 Optimization="0" 593 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files "593 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include" 594 594 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" 595 595 MinimalRebuild="true" … … 703 703 <Configuration 704 704 Name="Debug-Dynamic|Win32" 705 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName) "705 OutputDirectory=".\output\libg7221codec-i386-win32-vc8-$(ConfigurationName)\" 706 706 IntermediateDirectory="$(OutDir)" 707 707 ConfigurationType="4" … … 728 728 Name="VCCLCompilerTool" 729 729 Optimization="0" 730 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files "730 AdditionalIncludeDirectories="../..,../../g7221/common,../../g7221/common/stl-files,../../../pjlib/include" 731 731 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" 732 732 MinimalRebuild="true" … … 1101 1101 </File> 1102 1102 <File 1103 RelativePath="..\..\g7221\common\stl-files\count.c" 1104 > 1105 <FileConfiguration 1106 Name="Release|Win32" 1107 > 1108 <Tool 1109 Name="VCCLCompilerTool" 1110 AdditionalIncludeDirectories="" 1111 PreprocessorDefinitions="" 1112 /> 1113 </FileConfiguration> 1114 <FileConfiguration 1115 Name="Debug|Win32" 1116 > 1117 <Tool 1118 Name="VCCLCompilerTool" 1119 AdditionalIncludeDirectories="" 1120 PreprocessorDefinitions="" 1121 /> 1122 </FileConfiguration> 1123 <FileConfiguration 1124 Name="Release-Dynamic|Win32" 1125 > 1126 <Tool 1127 Name="VCCLCompilerTool" 1128 AdditionalIncludeDirectories="" 1129 PreprocessorDefinitions="" 1130 /> 1131 </FileConfiguration> 1132 <FileConfiguration 1133 Name="Release-Static|Win32" 1134 > 1135 <Tool 1136 Name="VCCLCompilerTool" 1137 AdditionalIncludeDirectories="" 1138 PreprocessorDefinitions="" 1139 /> 1140 </FileConfiguration> 1141 <FileConfiguration 1142 Name="Debug-Static|Win32" 1143 > 1144 <Tool 1145 Name="VCCLCompilerTool" 1146 AdditionalIncludeDirectories="" 1147 PreprocessorDefinitions="" 1148 /> 1149 </FileConfiguration> 1150 <FileConfiguration 1151 Name="Debug-Dynamic|Win32" 1152 > 1153 <Tool 1154 Name="VCCLCompilerTool" 1155 AdditionalIncludeDirectories="" 1156 PreprocessorDefinitions="" 1157 /> 1158 </FileConfiguration> 1103 RelativePath="..\..\g7221\common\stl-files\basop32_i.h" 1104 > 1159 1105 </File> 1160 1106 <File -
pjproject/trunk/third_party/g7221/common/stl-files/count.h
r2616 r2617 1 /* 2 =========================================================================== 3 COUNT.H 4 ~~~~~~~ 5 6 Prototypes and definitions for counting operations 7 8 These functions, and the ones in basop32.h, makes it possible to 9 measure the wMOPS of a codec. 10 11 All functions in this file, and in basop32.h, updates a structure 12 so that it will be possible the see how many calls to add, mul mulAdd 13 ... that the code made, and estimate the wMOPS (and MIPS) for a 14 sertain part of code 15 16 It is also possible to measure the wMOPS separatly for different 17 parts of the codec. 18 19 This is done by creating a counter group (getCounterId) for each part 20 of the code that one wants a separte measure for. Before a part of 21 the code is executed a call to the "setCounter" function is needed to 22 identify which counter group to use. 23 24 Currently there is a limit of 255 different counter groups. 25 26 In the end of this file there is a pice of code illustration how the 27 functions can be used. 28 29 History 30 ~~~~~~~ 31 09.Aug.1999 V1.0.0 Input to UGST from ETSI AMR (count.h); 32 26.Jan.2000 V1.1.0 Added counter entries for G.723.1's 33 L_mls(), div_l(), i_mult() [from basop32.c] 34 05.Jul.2000 V1.2.0 Added counter entries for 32bit shiftless 35 operators L_mult0(), L_mac0(), L_msu0() 36 =========================================================================== 37 */ 38 #if 0 1 /* $Id: config.h 2427 2009-01-22 20:30:32Z bennylp $ */ 2 /* 3 * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) 4 * 5 * This program is free software; you can redistribute it and/or modify 6 * it under the terms of the GNU General Public License as published by 7 * the Free Software Foundation; either version 2 of the License, or 8 * (at your option) any later version. 9 * 10 * This program is distributed in the hope that it will be useful, 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * GNU General Public License for more details. 14 * 15 * You should have received a copy of the GNU General Public License 16 * along with this program; if not, write to the Free Software 17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 18 */ 39 19 #ifndef COUNT_H 40 #define COUNT_H "$Id $" 41 42 #define MAXCOUNTERS 256 43 44 int getCounterId(char *objectName); 45 /* 46 * Create a counter group, the "objectname" will be used when printing 47 * statistics for this counter group. 48 * 49 * Returns 0 if no more counter groups are available. 50 */ 51 52 void setCounter(int counterId); 53 /* 54 * Defines which counter group to use, default is zero. 55 */ 56 57 void Init_WMOPS_counter (void); 58 /* 59 * Initiates the current counter group. 60 */ 61 62 void Reset_WMOPS_counter (void); 63 /* 64 * Resets the current counter group. 65 */ 66 67 void WMOPS_output (Word16 notPrintWorstWorstCase); 68 /* 69 * Prints the statistics to the screen, if the argument if non zero 70 * the statistics for worst worst case will not be printed. This is typically 71 * done for dtx frames. 72 * 73 */ 74 75 PJ_INLINE(Word32) fwc (void) 76 { 77 #if WMOPS 78 Word32 tot; 79 80 tot = DeltaWeightedOperation (); 81 if (tot > wc[currCounter][funcid[currCounter]]) 82 wc[currCounter][funcid[currCounter]] = tot; 83 84 funcid[currCounter]++; 85 86 return (tot); 87 #else 88 return 0; /* Dummy */ 89 #endif 90 } 91 92 /* 93 * worst worst case counter. 94 * 95 * This function calculates the worst possible case that can be reached. 96 * 97 * This is done by calling this function for each subpart of the calculations 98 * for a frame. This function then stores the maximum wMOPS for each part. 99 * 100 * The WMOPS_output function add together all parts and presents the sum. 101 */ 102 PJ_INLINE(void) move16 (void) 103 { 104 #if WMOPS 105 multiCounter[currCounter].DataMove16++; 106 #endif 107 } 108 109 PJ_INLINE(void) move32 (void) 110 { 111 #if WMOPS 112 multiCounter[currCounter].DataMove32++; 113 #endif 114 } 115 116 PJ_INLINE(void )logic16 (void) 117 { 118 #if WMOPS 119 multiCounter[currCounter].Logic16++; 120 #endif 121 } 122 123 PJ_INLINE(void) logic32 (void) 124 { 125 #if WMOPS 126 multiCounter[currCounter].Logic32++; 127 #endif 128 } 129 130 PJ_INLINE(void) test (void) 131 { 132 #if WMOPS 133 multiCounter[currCounter].Test++; 134 #endif 135 } 136 137 138 /* 139 * The functions above increases the corresponding operation counter for 140 * the current counter group. 141 */ 142 143 typedef struct 144 { 145 Word32 add; /* Complexity Weight of 1 */ 146 Word32 sub; 147 Word32 abs_s; 148 Word32 shl; 149 Word32 shr; 150 Word32 extract_h; 151 Word32 extract_l; 152 Word32 mult; 153 Word32 L_mult; 154 Word32 negate; 155 Word32 round; 156 Word32 L_mac; 157 Word32 L_msu; 158 Word32 L_macNs; 159 Word32 L_msuNs; 160 Word32 L_add; /* Complexity Weight of 2 */ 161 Word32 L_sub; 162 Word32 L_add_c; 163 Word32 L_sub_c; 164 Word32 L_negate; 165 Word32 L_shl; 166 Word32 L_shr; 167 Word32 mult_r; 168 Word32 shr_r; 169 Word32 shift_r; 170 Word32 mac_r; 171 Word32 msu_r; 172 Word32 L_deposit_h; 173 Word32 L_deposit_l; 174 Word32 L_shr_r; /* Complexity Weight of 3 */ 175 Word32 L_shift_r; 176 Word32 L_abs; 177 Word32 L_sat; /* Complexity Weight of 4 */ 178 Word32 norm_s; /* Complexity Weight of 15 */ 179 Word32 div_s; /* Complexity Weight of 18 */ 180 Word32 norm_l; /* Complexity Weight of 30 */ 181 Word32 DataMove16; /* Complexity Weight of 1 */ 182 Word32 DataMove32; /* Complexity Weight of 2 */ 183 Word32 Logic16; /* Complexity Weight of 1 */ 184 Word32 Logic32; /* Complexity Weight of 2 */ 185 Word32 Test; /* Complexity Weight of 2 */ 186 /* Counters for G.723.1 basic operators*/ 187 Word32 L_mls; /* Complexity Weight of 1 */ 188 Word32 div_l; /* Complexity Weight of 1 */ 189 Word32 i_mult; /* Complexity Weight of 1 */ 190 Word32 L_mult0; /* Complexity Weight of 1 */ 191 Word32 L_mac0; /* Complexity Weight of 1 */ 192 Word32 L_msu0; /* Complexity Weight of 1 */ 193 /* Counters for G.722.1 basic operators*/ 194 Word32 LU_shl; /* Complexity Weight of 1 */ 195 Word32 LU_shr; /* Complexity Weight of 1 */ 196 } 197 BASIC_OP; 198 199 #ifdef THISISANEXAMPLE_0123456789 200 /* 201 ----------------------------------------------------------------------- 202 Example of how count.h could be used. 203 204 In the example below it is assumed that the init_OBJECT functions 205 does not use any calls to counter.h or basic_op.h. If this is the 206 case a call to the function Reset_WMOPS_counter() must be done after 207 each call to init_OBJECT if these operations is not to be included 208 in the statistics. 209 ----------------------------------------------------------------------- 210 */ 211 212 int main() 213 { 214 int spe1Id,spe2Id,cheId; 215 216 /* initiate counters and objects */ 217 spe1Id=getCounterId("Spe 5k8"); 218 setCounter(spe1Id); 219 Init_WMOPS_counter (); 220 init_spe1(...); 221 222 spe2Id=getCounterId("Spe 12k2"); 223 setCounter(spe2Id); 224 Init_WMOPS_counter (); 225 init_spe2(...); 226 227 cheId=getCounterId("Channel encoder"); 228 setCounter(cheId); 229 Init_WMOPS_counter (); 230 init_che(...); 231 ... 232 233 while(data) 234 { 235 test(); /* Note this call to test(); */ 236 if(useSpe1) 237 setCounter(spe1Id); 238 else 239 setCounter(spe2Id); 240 Reset_WMOPS_counter(); 241 speEncode(...); 242 WMOPS_output(0); /* Normal routine for displaying WMOPS info */ 243 244 setCounter(cheId); 245 Reset_WMOPS_counter(); 246 preChannelInter(...); fwc(); /* Note the call to fwc() for each part */ 247 convolve(...); fwc(); /* of the channel encoder. */ 248 interleave(...); fwc(); 249 WMOPS_output(0); /* Normal routine for displaying WMOPS info */ 250 } 251 } 252 #endif /* Example */ 253 254 #endif /* COUNT_H */ 255 #else 20 #define COUNT_H 256 21 257 22 #define move16()
Note: See TracChangeset
for help on using the changeset viewer.
