Changeset 290
- Timestamp:
- 01/16/07 23:31:11 (2 years ago)
- Files:
-
- trunk/ColorConversions.c (modified) (2 diffs)
- trunk/Perian.xcodeproj/project.pbxproj (modified) (8 diffs)
- trunk/createStaticLibs.sh (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ColorConversions.c
r288 r290 116 116 vUInt8 *uv = (vUInt8 *)uc, *vv = (vUInt8 *)vc, *yv = (vUInt8 *)yc; 117 117 118 for (x = 0,x2 = 0,x4 =0; x < vWidth; x++, x2 += 2, x4 += 4) { 118 for (x = 0; x < vWidth; x++) { 119 x2 = x*2; x4 = x*4; 120 // ldl/stl = mark data as least recently used in cache so they will be flushed out 119 121 __builtin_prefetch(&yv[x+1], 0, 0); __builtin_prefetch(&yv2[x+1], 0, 0); 120 122 __builtin_prefetch(&uv[x+1], 0, 0); __builtin_prefetch(&vv[x+1], 0, 0); … … 123 125 tmp_y3 = vec_ldl(16, &yv[x2]), tmp_y4 = vec_ldl(16, &yv2[x2]), chromal = vec_mergel(tmp_u, tmp_v); 124 126 125 ov[x4] = vec_mergeh(chroma, tmp_y); 126 ov[x4+1] = vec_mergel(chroma, tmp_y); 127 ov[x4+2] = vec_mergeh(chromal, tmp_y3); 128 ov[x4+3] = vec_mergel(chromal, tmp_y3); 129 ov2[x4] = vec_mergeh(chroma, tmp_y2); 130 ov2[x4+1] = vec_mergel(chroma, tmp_y2); 131 ov2[x4+2] = vec_mergeh(chromal, tmp_y4); 132 ov2[x4+3] = vec_mergel(chromal, tmp_y4); 127 vec_stl(vec_mergeh(chroma, tmp_y), 0, &ov[x4]); 128 vec_stl(vec_mergel(chroma, tmp_y), 16, &ov[x4]); 129 vec_stl(vec_mergeh(chromal, tmp_y3), 32, &ov[x4]); 130 vec_stl(vec_mergel(chromal, tmp_y3), 48, &ov[x4]); 131 132 vec_stl(vec_mergeh(chroma, tmp_y2), 0, &ov2[x4]); 133 vec_stl(vec_mergel(chroma, tmp_y2), 16, &ov2[x4]); 134 vec_stl(vec_mergeh(chromal, tmp_y4), 32, &ov2[x4]); 135 vec_stl(vec_mergel(chromal, tmp_y4), 48, &ov2[x4]); 133 136 } 134 137 trunk/Perian.xcodeproj/project.pbxproj
r284 r290 1753 1753 FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; 1754 1754 FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; 1755 GCC_DYNAMIC_NO_PIC = NO;1755 GCC_DYNAMIC_NO_PIC = YES; 1756 1756 GCC_ENABLE_FIX_AND_CONTINUE = YES; 1757 1757 GCC_GENERATE_DEBUGGING_SYMBOLS = YES; 1758 GCC_MODEL_TUNING = G 4;1758 GCC_MODEL_TUNING = G5; 1759 1759 GCC_OPTIMIZATION_LEVEL = 0; 1760 1760 GCC_PRECOMPILE_PREFIX_HEADER = YES; … … 1810 1810 FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; 1811 1811 GCC_ALTIVEC_EXTENSIONS = YES; 1812 GCC_DYNAMIC_NO_PIC = YES; 1812 1813 GCC_ENABLE_FIX_AND_CONTINUE = NO; 1813 1814 GCC_GENERATE_DEBUGGING_SYMBOLS = NO; 1815 GCC_MODEL_TUNING = G5; 1814 1816 GCC_PRECOMPILE_PREFIX_HEADER = YES; 1815 1817 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; … … 1861 1863 FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; 1862 1864 FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; 1865 GCC_DYNAMIC_NO_PIC = YES; 1863 1866 GCC_ENABLE_FIX_AND_CONTINUE = YES; 1864 GCC_MODEL_TUNING = G 4;1867 GCC_MODEL_TUNING = G5; 1865 1868 GCC_PRECOMPILE_PREFIX_HEADER = YES; 1866 1869 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; … … 1930 1933 DEBUG_INFORMATION_FORMAT = dwarf; 1931 1934 GCC_ALTIVEC_EXTENSIONS = YES; 1935 GCC_MODEL_TUNING = G5; 1932 1936 }; 1933 1937 name = Development; … … 1937 1941 buildSettings = { 1938 1942 DEBUG_INFORMATION_FORMAT = dwarf; 1943 GCC_MODEL_TUNING = G5; 1939 1944 STRIP_INSTALLED_PRODUCT = NO; 1940 1945 }; … … 1945 1950 buildSettings = { 1946 1951 DEBUG_INFORMATION_FORMAT = dwarf; 1952 GCC_MODEL_TUNING = G5; 1947 1953 }; 1948 1954 name = Default; … … 2015 2021 FRAMEWORK_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks\""; 2016 2022 GCC_ALTIVEC_EXTENSIONS = YES; 2023 GCC_DYNAMIC_NO_PIC = YES; 2017 2024 GCC_ENABLE_FIX_AND_CONTINUE = NO; 2025 GCC_MODEL_TUNING = G5; 2018 2026 GCC_PRECOMPILE_PREFIX_HEADER = YES; 2019 2027 GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; … … 2183 2191 COPY_PHASE_STRIP = NO; 2184 2192 DEBUG_INFORMATION_FORMAT = dwarf; 2193 GCC_MODEL_TUNING = G5; 2185 2194 STRIP_INSTALLED_PRODUCT = NO; 2186 2195 }; trunk/createStaticLibs.sh
r289 r290 3 3 buildid_ffmpeg="r`svn info ffmpeg | grep -F Revision | awk '{print $2}'`" 4 4 5 generalConfigureOptions="--disable-encoders --disable-muxers --disable-strip --enable-pthreads --disable-opts" 5 generalConfigureOptions="--disable-encoders --disable-muxers --disable-strip --enable-pthreads" 6 7 if [ "$BUILD_STYLE" = "Development" ] ; then 8 generalConfigureOptions="$generalConfigureOptions --disable-opts" 9 fi 6 10 7 11 OUTPUT_FILE="$BUILT_PRODUCTS_DIR/Universal/buildid" … … 30 34 mkdir "$BUILDDIR" 31 35 32 #we override ffmpeg's optimization settings for slightly better ones 33 #this seems to cause spurious gcc errors... 34 export optCFlags="-O3 -march=nocona -mtune=nocona -fomit-frame-pointer -mdynamic-no-pic" 35 if [ "$BUILD_STYLE" = "Development" ] ; then 36 export optCFlags="" 37 fi 36 export optCFlags="-mtune=nocona" 38 37 39 38 cd "$BUILDDIR" … … 63 62 mkdir "$BUILDDIR" 64 63 65 export optCFlags="-fastf -mcpu=G3 -mmultiple" 66 if [ "$BUILD_STYLE" = "Development" ] ; then 67 export optCFlags="" 68 fi 64 export optCFlags="-mcpu=G3 -mtune=G5 -mmultiple" 65 69 66 cd "$BUILDDIR" 70 67 if [ `arch` = ppc ] ; then
