June 2015 - MPlayer-cvslog - lists.mplayerhq.hu

r37423 - in trunk: codec-cfg.c configure etc/codecs.conf libmpcodecs/img_format.c libmpcodecs/img_format.h libmpcodecs/vd_ffmpeg.c libvo/vo_vdpau.c
by michael 27 Jun '15

27 Jun '15

Author: michael Date: Sat Jun 27 20:35:28 2015 New Revision: 37423 Log: vo_vdpau: Add support for VDPAU accelerated HEVC decoding This change adds support for decoding HEVC content through VDPAU. Note that as things currently stand, the nvidia drivers are buggy and the output is not watcheable (its interlacing the top and bottom halves of each frame), but that should be fixed within the driver, hopefully without any further changes here. Author: Philip Langdale <philipl(a)overt.org> Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/codec-cfg.c trunk/configure trunk/etc/codecs.conf trunk/libmpcodecs/img_format.c trunk/libmpcodecs/img_format.h trunk/libmpcodecs/vd_ffmpeg.c trunk/libvo/vo_vdpau.c Modified: trunk/codec-cfg.c ============================================================================== --- trunk/codec-cfg.c Mon Jun 22 23:03:38 2015 (r37422) +++ trunk/codec-cfg.c Sat Jun 27 20:35:28 2015 (r37423) @@ -256,6 +256,7 @@ static const struct { {"VDPAU_WMV3", IMGFMT_VDPAU_WMV3}, {"VDPAU_VC1", IMGFMT_VDPAU_VC1}, {"VDPAU_MPEG4", IMGFMT_VDPAU_MPEG4}, + {"VDPAU_HEVC", IMGFMT_VDPAU_HEVC}, {NULL, 0} }; Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jun 22 23:03:38 2015 (r37422) +++ trunk/configure Sat Jun 27 20:35:28 2015 (r37423) @@ -4721,6 +4721,7 @@ if test "$_vdpau" = auto && test "$_x11" _vdpau=no if test "$_dl" = yes ; then return_statement_check vdpau/vdpau_x11.h 'vdp_device_create_x11(0, 0, 0, 0)' VDP_VIDEO_MIXER_FEATURE_HIGH_QUALITY_SCALING_L1 -lvdpau && _vdpau=yes + return_statement_check vdpau/vdpau_x11.h 'vdp_device_create_x11(0, 0, 0, 0)' VDP_DECODER_PROFILE_HEVC_MAIN -lvdpau && _vdpau_hevc=yes fi fi if test "$_vdpau" = yes ; then @@ -4728,6 +4729,9 @@ if test "$_vdpau" = yes ; then libs_mplayer="$libs_mplayer -lvdpau" vomodules="vdpau $vomodules" libavhwaccels="$libavhwaccels H263_VDPAU_HWACCEL H264_VDPAU_HWACCEL MPEG1_VDPAU_HWACCEL MPEG2_VDPAU_HWACCEL MPEG4_VDPAU_HWACCEL VC1_VDPAU_HWACCEL WMV3_VDPAU_HWACCEL" + if test "$_vdpau_hevc" = yes ; then + libavhwaccels="$libavhwaccels HEVC_VDPAU_HWACCEL" + fi else def_vdpau='#define CONFIG_VDPAU 0' novomodules="vdpau $novomodules" Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon Jun 22 23:03:38 2015 (r37422) +++ trunk/etc/codecs.conf Sat Jun 27 20:35:28 2015 (r37423) @@ -1398,6 +1398,16 @@ videocodec ffhevc out 422P,422P9,422P10,444P12 out 444P,444P9,444P10,444P12 +videocodec ffhevcvdpau + info "FFmpeg HEVC / H.265 (VDPAU)" + status buggy + fourcc HEVC + fourcc hvc1 + fourcc hev1 + driver ffmpeg + dll hevc + out VDPAU_HEVC + videocodec ffh264 info "FFmpeg H.264" status working Modified: trunk/libmpcodecs/img_format.c ============================================================================== --- trunk/libmpcodecs/img_format.c Mon Jun 22 23:03:38 2015 (r37422) +++ trunk/libmpcodecs/img_format.c Sat Jun 27 20:35:28 2015 (r37423) @@ -142,6 +142,7 @@ const char *vo_format_name(int format) case IMGFMT_VDPAU_MPEG4: return "MPEG-4 Part 2 VDPAU acceleration"; case IMGFMT_VDPAU_WMV3: return "WMV3 VDPAU acceleration"; case IMGFMT_VDPAU_VC1: return "VC1 VDPAU acceleration"; + case IMGFMT_VDPAU_HEVC: return "HEVC VDPAU acceleration"; } snprintf(unknown_format,20,"Unknown 0x%04x",format); return unknown_format; Modified: trunk/libmpcodecs/img_format.h ============================================================================== --- trunk/libmpcodecs/img_format.h Mon Jun 22 23:03:38 2015 (r37422) +++ trunk/libmpcodecs/img_format.h Sat Jun 27 20:35:28 2015 (r37423) @@ -290,6 +290,7 @@ static inline int normalize_yuvp16(int f #define IMGFMT_VDPAU_WMV3 (IMGFMT_VDPAU|0x04) #define IMGFMT_VDPAU_VC1 (IMGFMT_VDPAU|0x05) #define IMGFMT_VDPAU_MPEG4 (IMGFMT_VDPAU|0x06) +#define IMGFMT_VDPAU_HEVC (IMGFMT_VDPAU|0x07) #define IMGFMT_IS_HWACCEL(fmt) (IMGFMT_IS_VDPAU(fmt) || IMGFMT_IS_XVMC(fmt)) Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Mon Jun 22 23:03:38 2015 (r37422) +++ trunk/libmpcodecs/vd_ffmpeg.c Sat Jun 27 20:35:28 2015 (r37423) @@ -235,6 +235,7 @@ static int pixfmt2imgfmt2(enum AVPixelFo case AV_CODEC_ID_MPEG4: return IMGFMT_VDPAU_MPEG4; case AV_CODEC_ID_WMV3: return IMGFMT_VDPAU_WMV3; case AV_CODEC_ID_VC1: return IMGFMT_VDPAU_VC1; + case AV_CODEC_ID_HEVC: return IMGFMT_VDPAU_HEVC; } return pixfmt2imgfmt(fmt); } Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Mon Jun 22 23:03:38 2015 (r37422) +++ trunk/libvo/vo_vdpau.c Sat Jun 27 20:35:28 2015 (r37423) @@ -620,6 +620,12 @@ static int create_vdp_decoder(uint32_t f case IMGFMT_VDPAU_MPEG4: vdp_decoder_profile = VDP_DECODER_PROFILE_MPEG4_PART2_ASP; break; +#ifdef VDP_DECODER_PROFILE_HEVC_MAIN; + case IMGFMT_VDPAU_HEVC: + vdp_decoder_profile = VDP_DECODER_PROFILE_HEVC_MAIN; + mp_msg(MSGT_VO, MSGL_V, "[vdpau] Creating HEVC hardware decoder for %d reference frames.\n", max_refs); + break; +#endif default: goto err_out; } @@ -1028,7 +1034,17 @@ static int draw_slice(uint8_t *image[], { VdpStatus vdp_st; struct vdpau_frame_data *rndr = (struct vdpau_frame_data *)image[0]; - int max_refs = image_format == IMGFMT_VDPAU_H264 ? ((VdpPictureInfoH264 *)rndr->info)->num_ref_frames : 2; + int max_refs; + switch (image_format) { + case IMGFMT_VDPAU_H264: + max_refs = ((VdpPictureInfoH264 *)rndr->info)->num_ref_frames; + break; + case IMGFMT_VDPAU_HEVC: + max_refs = 16; + break; + default: + max_refs = 2; + } if (handle_preemption() < 0) return VO_TRUE; @@ -1151,6 +1167,7 @@ static int query_format(uint32_t format) case IMGFMT_VDPAU_WMV3: case IMGFMT_VDPAU_VC1: case IMGFMT_VDPAU_MPEG4: + case IMGFMT_VDPAU_HEVC: // Note: this will break the current decoder // Not all implementations support safely instantiating // a second decoder, so this is the "lesser evil"

1 0

r37422 - trunk/configure
by michael 22 Jun '15

22 Jun '15

Author: michael Date: Mon Jun 22 23:03:38 2015 New Revision: 37422 Log: Disable HAP encoder and enable CONFIG_SNAPPY to avoid breaking build HAP-encoder needs libsnappy to be linked in Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jun 22 21:39:29 2015 (r37421) +++ trunk/configure Mon Jun 22 23:03:38 2015 (r37422) @@ -1581,7 +1581,7 @@ libavprotocols=$(echo $libavprotocols_al libavfilters=$(echo $libavfilters_all) libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* H264_QSV H264_MMAL') -libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* H264_QSV NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]*') +libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* H264_QSV NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR') libavmuxers=$(filter_out_component muxer 'LIB[A-Z0-9_]* RTP RTSP SAP') libavprotocols=$(filter_out_component protocol 'BLURAY FFRTMPCRYPT HTTPS LIB[A-Z0-9_]* TLS TLS_GNUTLS TLS_OPENSSL TLS_SECURETRANSPORT') @@ -8624,6 +8624,7 @@ CONFIG_RIFFDEC = yes CONFIG_RIFFENC = yes CONFIG_RTPENC_CHAIN = yes CONFIG_SINEWIN = yes +CONFIG_SNAPPY = yes CONFIG_STARTCODE = yes CONFIG_TEXTUREDSP = yes CONFIG_VIDEODSP = yes @@ -9265,6 +9266,7 @@ $def_gnutls #define CONFIG_RDFT 1 #define CONFIG_RIFFDEC 1 #define CONFIG_RIFFENC 1 +#define CONFIG_SNAPPY 1 #define CONFIG_STARTCODE 1 #define CONFIG_TEXTUREDSP 1 #define CONFIG_VIDEODSP 1

1 0

r37421 - trunk/configure
by michael 22 Jun '15

22 Jun '15

Author: michael Date: Mon Jun 22 21:39:29 2015 New Revision: 37421 Log: configure: Add CONFIG_TEXTUREDSP to avoid build failure Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jun 10 23:17:35 2015 (r37420) +++ trunk/configure Mon Jun 22 21:39:29 2015 (r37421) @@ -8625,6 +8625,7 @@ CONFIG_RIFFENC = yes CONFIG_RTPENC_CHAIN = yes CONFIG_SINEWIN = yes CONFIG_STARTCODE = yes +CONFIG_TEXTUREDSP = yes CONFIG_VIDEODSP = yes CONFIG_VP3DSP = yes CONFIG_WMA_FREQS = yes @@ -9265,6 +9266,7 @@ $def_gnutls #define CONFIG_RIFFDEC 1 #define CONFIG_RIFFENC 1 #define CONFIG_STARTCODE 1 +#define CONFIG_TEXTUREDSP 1 #define CONFIG_VIDEODSP 1 #define CONFIG_WMA_FREQS 1

1 0

r37420 - trunk/mplayer.c
by reimar 10 Jun '15

10 Jun '15

Author: reimar Date: Wed Jun 10 23:17:35 2015 New Revision: 37420 Log: Apply osd_duration also to progress bar. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Wed Jun 10 23:17:34 2015 (r37419) +++ trunk/mplayer.c Wed Jun 10 23:17:35 2015 (r37420) @@ -1521,7 +1521,7 @@ void set_osd_bar(int type, const char *n return; if (mpctx->sh_video) { - osd_visible = (GetTimerMS() + 1000) | 1; + osd_visible = (GetTimerMS() + osd_duration) | 1; vo_osd_progbar_type = type; vo_osd_progbar_value = 256 * (val - min) / (max - min); vo_osd_changed(OSDTYPE_PROGBAR);

1 0

r37419 - trunk/loader/win32.c
by reimar 10 Jun '15

10 Jun '15

Author: reimar Date: Wed Jun 10 23:17:34 2015 New Revision: 37419 Log: Support undefined (NULL) pure-ordinal-only exports. Add UNDEFORD macro for them. Modified: trunk/loader/win32.c Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Wed Jun 10 23:17:33 2015 (r37418) +++ trunk/loader/win32.c Wed Jun 10 23:17:34 2015 (r37419) @@ -5177,6 +5177,9 @@ struct libs #define UNDEFF(X, Y) \ {#X, Y, (void*)-1}, +#define UNDEFORD(Y) \ + {NULL, Y, (void*)-1}, + static const struct exports exp_kernel32[]= { FF(GetVolumeInformationA,-1) @@ -5751,6 +5754,8 @@ void* LookupExternal(const char* library if(ordinal!=libraries[i].exps[j].id) continue; //printf("Hit: 0x%p\n", libraries[i].exps[j].func); + if((unsigned int)(libraries[i].exps[j].func) == -1) + return NULL; //undefined func return libraries[i].exps[j].func; } } @@ -5813,7 +5818,7 @@ void* LookupExternalByName(const char* l continue; for(j=0; j<libraries[i].length; j++) { - if(strcmp(name, libraries[i].exps[j].name)) + if(libraries[i].exps[j].name && strcmp(name, libraries[i].exps[j].name)) continue; if((unsigned int)(libraries[i].exps[j].func) == -1) return NULL; //undefined func

1 0

r37418 - trunk/configure
by reimar 10 Jun '15

10 Jun '15

Author: reimar Date: Wed Jun 10 23:17:33 2015 New Revision: 37418 Log: Actually check linking for dvdnav/dvdread. This fixes incorrect enabling when pkg-config is missing, which then leads to errors during linking. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jun 10 14:24:28 2015 (r37417) +++ trunk/configure Wed Jun 10 23:17:33 2015 (r37418) @@ -6115,7 +6115,7 @@ if test "$_dvdread" = auto ; then _dvdread=no _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null) _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null) - if header_check dvdread/dvd_reader.h $_dvdreadcflags $_dvdreadlibs ; then + if statement_check dvdread/dvd_reader.h 'DVDOpen("test")' $_dvdreadcflags $_dvdreadlibs ; then _dvdread=yes extra_cflags="$extra_cflags $_dvdreadcflags" extra_ldflags="$extra_ldflags $_dvdreadlibs" @@ -8070,7 +8070,7 @@ if test "$_dvdnav" = auto ; then _dvdnav=no _dvdnavdir=$($_dvdnavconfig --cflags) _dvdnavlibs=$($_dvdnavconfig --libs) - statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0' $_dvdnavdir $_dvdnavlibs $ld_dl $ld_pthread && _dvdnav=yes + statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0; dvdnav_open(&dvd, 0)' $_dvdnavdir $_dvdnavlibs $ld_dl $ld_pthread && _dvdnav=yes fi if test "$_dvdnav" = yes ; then def_dvdnav='#define CONFIG_DVDNAV 1'

1 0

r37417 - trunk/libmpcodecs/ad_spdif.c
by ib 10 Jun '15

10 Jun '15

Author: ib Date: Wed Jun 10 14:24:28 2015 New Revision: 37417 Log: Don't depend on FFmpeg internal raw_packet_buffer_remaining_size. FFmpeg's avformat_alloc_context() now sets it, so MPlayer no longer has to do it. This is related to svn r37372 which was a quick hack at the time. Modified: trunk/libmpcodecs/ad_spdif.c Modified: trunk/libmpcodecs/ad_spdif.c ============================================================================== --- trunk/libmpcodecs/ad_spdif.c Mon Jun 8 14:11:22 2015 (r37416) +++ trunk/libmpcodecs/ad_spdif.c Wed Jun 10 14:24:28 2015 (r37417) @@ -23,7 +23,6 @@ #include "ad_internal.h" #include "av_helpers.h" #include "libavformat/avformat.h" -#include "libavformat/internal.h" #include "libavcodec/avcodec.h" #include "libavutil/opt.h" @@ -130,7 +129,6 @@ static int init(sh_audio_t *sh) break; } } - lavf_ctx->internal->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; if (AVERROR_PATCHWELCOME == lavf_ctx->oformat->write_header(lavf_ctx)) { mp_msg(MSGT_DECAUDIO,MSGL_INFO, "This codec is not supported by spdifenc.\n");

1 0

r37416 - trunk/gui/win32/gui.c
by ib 08 Jun '15

08 Jun '15

Author: ib Date: Mon Jun 8 14:11:22 2015 New Revision: 37416 Log: Fix segmentation fault. After the handlemsg() call there may be no longer a gui->activewidget due to a WM_CAPTURECHANGED. Modified: trunk/gui/win32/gui.c Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Sun Jun 7 14:53:22 2015 (r37415) +++ trunk/gui/win32/gui.c Mon Jun 8 14:11:22 2015 (r37416) @@ -864,7 +864,7 @@ static LRESULT CALLBACK EventProc(HWND h RedrawWindow(hWnd, NULL, NULL, RDW_INVALIDATE); handlemsg(hWnd, gui->activewidget->msg); - if(gui->activewidget->type == tyRpotmeter) + if(gui->activewidget && gui->activewidget->type == tyRpotmeter) { prev_point = appRadian(gui->activewidget, gui->mousewx, gui->mousewy) - gui->activewidget->zeropoint; if(prev_point < 0.0) prev_point += 2 * M_PI;

1 0

r37415 - trunk/gui/win32/interface.c
by ib 07 Jun '15

07 Jun '15

Author: ib Date: Sun Jun 7 14:53:22 2015 New Revision: 37415 Log: Handle X events in the Win32 GUI Wine build. It is possible to have an X11 video output driver then which will be sending events. Modified: trunk/gui/win32/interface.c Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Fri Jun 5 09:29:20 2015 (r37414) +++ trunk/gui/win32/interface.c Sun Jun 7 14:53:22 2015 (r37415) @@ -828,6 +828,13 @@ int gui(int what, void *data) gui(GUI_SET_STATE, (void *) GUI_STOP); break; } +#ifdef __WINE__ + // it's possible to have an X11 video output driver (sending events) + case GUI_HANDLE_X_EVENT: + { + break; + } +#endif default: mp_msg(MSGT_GPLAYER, MSGL_ERR, "[GUI] GOT UNHANDLED EVENT %i\n", what); }

1 0

r37414 - trunk/configure
by ib 05 Jun '15

05 Jun '15

Author: ib Date: Fri Jun 5 09:29:20 2015 New Revision: 37414 Log: Revert r37408. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Jun 4 18:06:17 2015 (r37413) +++ trunk/configure Fri Jun 5 09:29:20 2015 (r37414) @@ -544,7 +544,6 @@ Available values are: all $msg_lang_all Miscellaneous options: --enable-runtime-cpudetection enable runtime CPU detection [disable] - --disable-optimization disable compile time CPU code optimization [enable] --enable-cross-compile enable cross-compilation [autodetect] --cc=COMPILER C compiler to build MPlayer [gcc] --host-cc=COMPILER C compiler for tools needed while building [gcc] @@ -657,7 +656,6 @@ _as=auto _nm=auto _yasm=yasm _runtime_cpudetection=no -_optimization=yes _cross_compile=auto _prefix="/usr/local" ffmpeg_a=auto @@ -1006,8 +1004,6 @@ for ac_option do ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes ;; --disable-runtime-cpudetection) _runtime_cpudetection=no ;; - --enable-optimization) _optimization=yes ;; - --disable-optimization) _optimization=no ;; --enable-cross-compile) _cross_compile=yes ;; --disable-cross-compile) _cross_compile=no ;; --enable-mencoder) _mencoder=yes ;; @@ -2174,11 +2170,9 @@ case "$host_arch" in cpuopt=-mcpu fi - test "$_optimization" = "no" && proc=none - - echocheck "GCC & CPU optimization" + echocheck "GCC & CPU optimization abilities" if test "$_runtime_cpudetection" = no ; then - if test "$_optimization" = "yes" && test $cc_vendor != "intel" && test $cc_vendor != "clang" ; then + if test $cc_vendor != "intel" && test $cc_vendor != "clang" ; then cflag_check -march=native && proc=native fi if test "$proc" = "amdfam10"; then @@ -2224,13 +2218,13 @@ case "$host_arch" in cflag_check -march=$proc $cpuopt=$proc || proc=i386 fi if test "$proc" = "i386" ; then - cflag_check -march=$proc $cpuopt=$proc || proc=none + cflag_check -march=$proc $cpuopt=$proc || proc=error fi - if test "$proc" = "none" ; then - test "$_optimization" = "yes" && echores "CPU optimization disabled. CPU not recognized or your compiler is too old." + if test "$proc" = "error" ; then + echores "CPU optimization disabled. CPU not recognized or your compiler is too old." _mcpu="" _march="" - _optimizing="$proc" + _optimizing="" elif test "$proc" = "i586-i686"; then _march="-march=i586" _mcpu="$cpuopt=i686" @@ -2338,16 +2332,14 @@ case "$host_arch" in esac ;; *) - proc=none;; + proc=error;; esac fi # test "$_runtime_cpudetection" = no - test "$_optimization" = "no" && proc=none - - echocheck "GCC & CPU optimization" + echocheck "GCC & CPU optimization abilities" # This is a stripped-down version of the i386 fallback. if test "$_runtime_cpudetection" = no ; then - if test "$_optimization" = "yes" && test $cc_vendor != "intel" && test $cc_vendor != "clang" ; then + if test $cc_vendor != "intel" && test $cc_vendor != "clang" ; then cflag_check -march=native && proc=native fi # --- AMD processors --- @@ -2361,7 +2353,7 @@ case "$host_arch" in # versions don't really support 64-bit on amd64. # Is this a valid assumption? -Corey if test "$proc" = "athlon-xp"; then - cflag_check -march=$proc $cpuopt=$proc || proc=none + cflag_check -march=$proc $cpuopt=$proc || proc=error fi # --- Intel processors --- if test "$proc" = "atom" || test "$proc" = "corei7-avx" || test "$proc" = "corei7"; then @@ -2377,13 +2369,13 @@ case "$host_arch" in cflag_check -march=$proc $cpuopt=$proc || proc=pentium4 fi if test "$proc" = "pentium4"; then - cflag_check -march=$proc $cpuopt=$proc || proc=none + cflag_check -march=$proc $cpuopt=$proc || proc=error fi _march="-march=$proc" _mcpu="$cpuopt=$proc" - if test "$proc" = "none" ; then - test "$_optimization" = "yes" && echores "CPU optimization disabled. CPU not recognized or your compiler is too old." + if test "$proc" = "error" ; then + echores "CPU optimization disabled. CPU not recognized or your compiler is too old." _mcpu="" _march="" fi @@ -2511,9 +2503,7 @@ case "$host_arch" in echores "$proc" fi - test "$_optimization" = "no" && proc=none - - echocheck "GCC & CPU optimization" + echocheck "GCC & CPU optimization abilities" if test -n "$proc"; then case "$proc" in @@ -2606,16 +2596,14 @@ EOF esac echores "$proc" - test "$_optimization" = "no" && proc=none - - echocheck "GCC & CPU optimization" + echocheck "GCC & CPU optimization abilities" if test "$proc" = "ev68" ; then cc_check -mcpu=$proc || proc=ev67 fi if test "$proc" = "ev67" ; then cc_check -mcpu=$proc || proc=ev6 fi - test "$_optimization" = "yes" && _mcpu="-mcpu=$proc" + _mcpu="-mcpu=$proc" echores "$proc" test $_fast_clz = "auto" && _fast_clz=yes

1 0