Skip to content

Commit

Permalink
ループロス検出方法の変更
Browse files Browse the repository at this point in the history 
win32ビルドの追加

git-svn-id: http://picopicose.com/svn/XMSNES@7 757cc8f5-cbd0-45c0-83b3-c5697cf1bda9
  • Loading branch information
osoumen committed Jun 17, 2012
1 parent 8ffc771 commit 337827c
Show file tree
Hide file tree
Showing 5 changed files with 230 additions and 93 deletions.
Binary file modified Converter/xm2snes
View file
Binary file not shown.
8 changes: 6 additions & 2 deletions Source/Converter/brr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

// SPECIAL THANKS TO DMV47 AND MADBRAIN!!

#define looploss_tolerance 30000 // tweak? :O
#define looploss_tolerance 10000 // tweak? :O

#include "mglobal.h"
#include "simpmath.h"
Expand Down Expand Up @@ -179,7 +179,11 @@ int BRR_AutoFilter( XMS_SAMPLE* samp, byte* fb, int file_offset, XMS_HEAD* head,
lc_range = (fb[w_loop] & SAMPHEAD_RANGE) >> 4;
lc_value = fb[w_loop+1] >> 4;
lc_value <<= lc_range;
lc_value += ComputeFilter( sbuffer[15], sbuffer[14], lc_filter );
lc_value >>= 1;
lc_value += ComputeFilter( sbuffer[1], sbuffer[0], lc_filter );
lc_value = (signed short int)(lc_value << 1 );
lc_value >>= 1;
//printf("looploss=%d\n",abs( lc_value - loop_v1 ));
if( abs( lc_value - loop_v1 ) > looploss_tolerance )
{
// redo compression...
Expand Down
86 changes: 46 additions & 40 deletions Source/Converter/xm2snes.xcodeproj/osoumen.mode1v3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,13 @@
<string>08FB7794FE84155DC02AAC07</string>
<string>08FB7795FE84155DC02AAC07</string>
<string>1AB674ADFE9D54B511CA2CBB</string>
<string>1C37FBAC04509CD000000102</string>
<string>1C37FABC05509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>23</integer>
<integer>24</integer>
<integer>22</integer>
<integer>0</integer>
</array>
Expand All @@ -321,7 +322,7 @@
<real>186</real>
</array>
<key>RubberWindowFrame</key>
<string>399 55 1072 973 0 0 1680 1028 </string>
<string>373 55 1072 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
Expand All @@ -332,26 +333,24 @@
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>patterns.cpp</string>
<string>brr.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>patterns.cpp</string>
<string>brr.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>F599E150158C8199008A9B61</string>
<string>F5723713158E415E007A6BCB</string>
<key>history</key>
<array>
<string>F5741E0C157B2A2C002B4DF0</string>
Expand All @@ -366,13 +365,13 @@
<string>F5741E23157B2A7D002B4DF0</string>
<string>F5666C84157B361C009CF9F3</string>
<string>F55184E6157B46D10019957F</string>
<string>F58DB7BD157BBF20004E1FC8</string>
<string>F58DB7BE157BBF20004E1FC8</string>
<string>F58DB7BF157BBF20004E1FC8</string>
<string>F59B1FBC1580E71D00686414</string>
<string>F59B1FBD1580E71D00686414</string>
<string>F59B1FBE1580E71D00686414</string>
<string>F5A0A8021582EC5000183824</string>
<string>F5858F09158DF07800C272AA</string>
<string>F5858F0A158DF07800C272AA</string>
<string>F56A6B81158E3D58006D00CC</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -384,16 +383,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {864, 927}}</string>
<string>{{0, 0}, {864, 630}}</string>
<key>RubberWindowFrame</key>
<string>399 55 1072 973 0 0 1680 1028 </string>
<string>373 55 1072 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>927pt</string>
<string>630pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand All @@ -404,14 +405,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 932}, {864, 0}}</string>
<string>{{0, 635}, {864, 297}}</string>
<key>RubberWindowFrame</key>
<string>399 55 1072 973 0 0 1680 1028 </string>
<string>373 55 1072 973 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
<string>0pt</string>
<string>297pt</string>
</dict>
</array>
<key>Proportion</key>
Expand All @@ -430,9 +431,9 @@
</array>
<key>TableOfContents</key>
<array>
<string>F599E14D158C8149008A9B61</string>
<string>F57236C0158E3F35007A6BCB</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>F599E14E158C8149008A9B61</string>
<string>F57236C1158E3F35007A6BCB</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
Expand Down Expand Up @@ -553,7 +554,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
<real>361529753.589957</real>
<real>361644382.223481</real>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
<key>ToolbarDisplayMode</key>
Expand All @@ -570,11 +571,12 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>F5A9BC11156B32E200227239</string>
<string>/Users/osoumen/XMSNES/Source/Converter/xm2snes.xcodeproj</string>
</array>
<key>WindowString</key>
<string>399 55 1072 973 0 0 1680 1028 </string>
<string>373 55 1072 973 0 0 1680 1028 </string>
<key>WindowToolsV3</key>
<array>
<dict>
Expand Down Expand Up @@ -602,16 +604,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {500, 218}}</string>
<string>{{0, 0}, {921, 381}}</string>
<key>RubberWindowFrame</key>
<string>440 387 500 500 0 0 1680 1028 </string>
<string>440 224 921 663 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>218pt</string>
<string>381pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand All @@ -626,9 +630,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 223}, {500, 236}}</string>
<string>{{0, 386}, {921, 236}}</string>
<key>RubberWindowFrame</key>
<string>440 387 500 500 0 0 1680 1028 </string>
<string>440 224 921 663 0 0 1680 1028 </string>
</dict>
<key>Module</key>
<string>PBXBuildResultsModule</string>
Expand All @@ -637,7 +641,7 @@
</dict>
</array>
<key>Proportion</key>
<string>459pt</string>
<string>622pt</string>
</dict>
</array>
<key>Name</key>
Expand All @@ -651,7 +655,7 @@
<key>TableOfContents</key>
<array>
<string>F5A9BC11156B32E200227239</string>
<string>F599E14F158C8149008A9B61</string>
<string>F57236C2158E3F35007A6BCB</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
Expand All @@ -660,7 +664,7 @@
<key>WindowContentMinSize</key>
<string>486 300</string>
<key>WindowString</key>
<string>440 387 500 500 0 0 1680 1028 </string>
<string>440 224 921 663 0 0 1680 1028 </string>
<key>WindowToolGUID</key>
<string>F5A9BC11156B32E200227239</string>
<key>WindowToolIsVisible</key>
Expand Down Expand Up @@ -773,13 +777,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>F59B1F9F1580E18F00686414</string>
<string>F57236E0158E3FB2007A6BCB</string>
<string>1C162984064C10D400B95A72</string>
<string>F59B1FA01580E18F00686414</string>
<string>F59B1FA11580E18F00686414</string>
<string>F59B1FA21580E18F00686414</string>
<string>F59B1FA31580E18F00686414</string>
<string>F59B1FA41580E18F00686414</string>
<string>F57236E1158E3FB2007A6BCB</string>
<string>F57236E2158E3FB2007A6BCB</string>
<string>F57236E3158E3FB2007A6BCB</string>
<string>F57236E4158E3FB2007A6BCB</string>
<string>F57236E5158E3FB2007A6BCB</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
Expand All @@ -806,6 +810,8 @@
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand All @@ -832,8 +838,6 @@
<string>651pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand Down Expand Up @@ -869,8 +873,8 @@
<key>TableOfContents</key>
<array>
<string>1C530D57069F1CE1000CFCEE</string>
<string>F58DB7BB157BBF1F004E1FC8</string>
<string>F58DB7BC157BBF1F004E1FC8</string>
<string>F5858ED0158DEDF600C272AA</string>
<string>F5858ED1158DEDF600C272AA</string>
<string>1CDD528C0622207200134675</string>
<string>1CD0528E0623707200166675</string>
</array>
Expand Down Expand Up @@ -898,6 +902,8 @@
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
Expand Down Expand Up @@ -933,7 +939,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
<string>F59B1FA51580E18F00686414</string>
<string>F5858F64158DF98000C272AA</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
Expand All @@ -943,7 +949,7 @@
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
<false/>
<true/>
</dict>
<dict>
<key>Identifier</key>
Expand Down
Loading

0 comments on commit 337827c

Please sign in to comment.