March 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34806 - trunk/libmpcodecs/vf_mcdeint.c
by reimar 10 Mar '12

10 Mar '12

Author: reimar Date: Sat Mar 10 19:45:59 2012 New Revision: 34806 Log: Ensure the AVDictionary is initialized. Modified: trunk/libmpcodecs/vf_mcdeint.c Modified: trunk/libmpcodecs/vf_mcdeint.c ============================================================================== --- trunk/libmpcodecs/vf_mcdeint.c Sat Mar 10 11:23:42 2012 (r34805) +++ trunk/libmpcodecs/vf_mcdeint.c Sat Mar 10 19:45:59 2012 (r34806) @@ -186,7 +186,7 @@ static int config(struct vf_instance *vf for(i=0; i<3; i++){ AVCodecContext *avctx_enc; - AVDictionary *opts; + AVDictionary *opts = NULL; #if 0 int is_chroma= !!i; int w= ((width + 31) & (~31))>>is_chroma;

1 0

r34805 - trunk/libmpcodecs/vf_uspp.c
by reimar 10 Mar '12

10 Mar '12

Author: reimar Date: Sat Mar 10 11:23:42 2012 New Revision: 34805 Log: Fix possible crash when using -vf uspp,format=y8 i.e. the destination format is Y8. Modified: trunk/libmpcodecs/vf_uspp.c Modified: trunk/libmpcodecs/vf_uspp.c ============================================================================== --- trunk/libmpcodecs/vf_uspp.c Fri Mar 9 13:21:51 2012 (r34804) +++ trunk/libmpcodecs/vf_uspp.c Sat Mar 10 11:23:42 2012 (r34805) @@ -201,6 +201,8 @@ static void filter(struct vf_priv_s *p, for(j=0; j<3; j++){ int is_chroma= !!j; + if (!dst[j]) + continue; // HACK avoid crash for Y8 colourspace store_slice_c(dst[j], p->temp[j], dst_stride[j], p->temp_stride[j], width>>is_chroma, height>>is_chroma, 8-p->log2_count); } }

1 0

r34802 - trunk/stream/stream.h
by ib 07 Mar '12

07 Mar '12

Author: ib Date: Wed Mar 7 21:37:11 2012 New Revision: 34802 Log: Fix header file after r34793. Patch by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/stream/stream.h Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Wed Mar 7 10:20:08 2012 (r34801) +++ trunk/stream/stream.h Wed Mar 7 21:37:11 2012 (r34802) @@ -193,7 +193,7 @@ void stream_capture_do(stream_t *s); #ifdef CONFIG_STREAM_CACHE int stream_enable_cache(stream_t *stream,int64_t size,int64_t min,int64_t prefill); int cache_stream_fill_buffer(stream_t *s); -int cache_stream_seek_long(stream_t *s,off_t pos); +int cache_stream_seek_long(stream_t *s,int64_t pos); #else // no cache, define wrappers: #define cache_stream_fill_buffer(x) stream_fill_buffer(x)

1 0

r34800 - trunk/libmpdemux/demux_rtp.cpp
by cehoyos 05 Mar '12

05 Mar '12

Author: cehoyos Date: Mon Mar 5 19:14:38 2012 New Revision: 34800 Log: Fix compilation with new LIVE555 libraries. Patch by Marty Jack, martyj19 comcast net Modified: trunk/libmpdemux/demux_rtp.cpp Modified: trunk/libmpdemux/demux_rtp.cpp ============================================================================== --- trunk/libmpdemux/demux_rtp.cpp Sun Mar 4 19:42:45 2012 (r34799) +++ trunk/libmpdemux/demux_rtp.cpp Mon Mar 5 19:14:38 2012 (r34800) @@ -19,6 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 + extern "C" { // on MinGW, we must include windows.h before the things it conflicts #ifdef __MINGW32__ // with. they are each protected from

1 0

r34799 - in trunk/osdep: shmem.c shmem.h
by ib 04 Mar '12

04 Mar '12

Author: ib Date: Sun Mar 4 19:42:45 2012 New Revision: 34799 Log: Correct r34798. The header only needs stdint.h while the C file needs inttypes.h. Modified: trunk/osdep/shmem.c trunk/osdep/shmem.h Modified: trunk/osdep/shmem.c ============================================================================== --- trunk/osdep/shmem.c Sun Mar 4 17:20:47 2012 (r34798) +++ trunk/osdep/shmem.c Sun Mar 4 19:42:45 2012 (r34799) @@ -36,6 +36,7 @@ #endif #include <sys/socket.h> #include <fcntl.h> +#include <inttypes.h> #include "mp_msg.h" #include "shmem.h" Modified: trunk/osdep/shmem.h ============================================================================== --- trunk/osdep/shmem.h Sun Mar 4 17:20:47 2012 (r34798) +++ trunk/osdep/shmem.h Sun Mar 4 19:42:45 2012 (r34799) @@ -19,7 +19,7 @@ #ifndef MPLAYER_SHMEM_H #define MPLAYER_SHMEM_H -#include <inttypes.h> +#include <stdint.h> void* shmem_alloc(int64_t size); void shmem_free(void* p,int64_t size);

1 0

r34798 - in trunk/osdep: shmem.c shmem.h
by ib 04 Mar '12

04 Mar '12

Author: ib Date: Sun Mar 4 17:20:47 2012 New Revision: 34798 Log: Put #include <inttypes.h> into the header file where it should be. Reported by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/osdep/shmem.c trunk/osdep/shmem.h Modified: trunk/osdep/shmem.c ============================================================================== --- trunk/osdep/shmem.c Sun Mar 4 16:42:16 2012 (r34797) +++ trunk/osdep/shmem.c Sun Mar 4 17:20:47 2012 (r34798) @@ -36,7 +36,6 @@ #endif #include <sys/socket.h> #include <fcntl.h> -#include <inttypes.h> #include "mp_msg.h" #include "shmem.h" Modified: trunk/osdep/shmem.h ============================================================================== --- trunk/osdep/shmem.h Sun Mar 4 16:42:16 2012 (r34797) +++ trunk/osdep/shmem.h Sun Mar 4 17:20:47 2012 (r34798) @@ -19,6 +19,8 @@ #ifndef MPLAYER_SHMEM_H #define MPLAYER_SHMEM_H +#include <inttypes.h> + void* shmem_alloc(int64_t size); void shmem_free(void* p,int64_t size);

3 2

r34797 - trunk/gui/win32/preferences.c
by ib 04 Mar '12

04 Mar '12

Author: ib Date: Sun Mar 4 16:42:16 2012 New Revision: 34797 Log: Increase width of control for cache size in Win32 GUI. Modified: trunk/gui/win32/preferences.c Modified: trunk/gui/win32/preferences.c ============================================================================== --- trunk/gui/win32/preferences.c Sun Mar 4 16:38:45 2012 (r34796) +++ trunk/gui/win32/preferences.c Sun Mar 4 16:42:16 2012 (r34797) @@ -310,7 +310,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN edit1 = CreateWindowEx(WS_EX_CLIENTEDGE, "edit", "cache", WS_CHILD | WS_VISIBLE | WS_DISABLED | ES_LEFT | ES_AUTOHSCROLL, - 105, 225, 40, 20, hwnd, + 105, 225, 60, 20, hwnd, (HMENU) ID_EDIT1, ((LPCREATESTRUCT) lParam) -> hInstance, NULL); @@ -319,7 +319,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN updown1 = CreateUpDownControl(WS_CHILD | WS_VISIBLE | WS_DISABLED | UDS_SETBUDDYINT | UDS_ARROWKEYS | UDS_NOTHOUSANDS, - 145, 225, 20, 20, hwnd, + 165, 225, 20, 20, hwnd, ID_UPDOWN1, ((LPCREATESTRUCT) lParam) -> hInstance, (HWND)edit1, 0, 0, 0);

1 0

r34796 - trunk/gui/cfg.c
by ib 04 Mar '12

04 Mar '12

Author: ib Date: Sun Mar 4 16:38:45 2012 New Revision: 34796 Log: Cosmetic: Adjust indent. Modified: trunk/gui/cfg.c Modified: trunk/gui/cfg.c ============================================================================== --- trunk/gui/cfg.c Sun Mar 4 16:37:30 2012 (r34795) +++ trunk/gui/cfg.c Sun Mar 4 16:38:45 2012 (r34796) @@ -104,55 +104,55 @@ static const char gui_playlist[] = static const char gui_urllist[] = "gui.url"; static const m_option_t gui_opts[] = { - { "cache", &gtkCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "cache", &gtkCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, 32, 0x7fffffff, NULL }, - { "vf_pp", &gtkVfPP, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "vf_pp", &gtkVfPP, CONF_TYPE_FLAG, 0, 0, 1, NULL }, #ifdef CONFIG_DXR3 - { "vf_lavc", &gtkVfLAVC, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "vo_dxr3_device", &gtkDXR3Device, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "vf_lavc", &gtkVfLAVC, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "vo_dxr3_device", &gtkDXR3Device, CONF_TYPE_STRING, 0, 0, 0, NULL }, #endif - { "autosync", &gtkAutoSyncOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "autosync_size", &gtkAutoSync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL }, + { "autosync", &gtkAutoSyncOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "autosync_size", &gtkAutoSync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL }, - { "ao_volnorm", &gtkAONorm, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ao_surround", &gtkAOSurround, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ao_extra_stereo", &gtkAOExtraStereo, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ao_extra_stereo_coefficient", &gtkAOExtraStereoMul, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL }, + { "ao_volnorm", &gtkAONorm, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "ao_surround", &gtkAOSurround, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "ao_extra_stereo", &gtkAOExtraStereo, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "ao_extra_stereo_coefficient", &gtkAOExtraStereoMul, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL }, #ifdef CONFIG_ALSA - { "ao_alsa_mixer", &gtkAOALSAMixer, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "ao_alsa_mixer_channel", &gtkAOALSAMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "ao_alsa_device", &gtkAOALSADevice, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "ao_alsa_mixer", &gtkAOALSAMixer, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "ao_alsa_mixer_channel", &gtkAOALSAMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "ao_alsa_device", &gtkAOALSADevice, CONF_TYPE_STRING, 0, 0, 0, NULL }, #endif #ifdef CONFIG_OSS_AUDIO - { "ao_oss_mixer", &gtkAOOSSMixer, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "ao_oss_mixer_channel", &gtkAOOSSMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "ao_oss_device", &gtkAOOSSDevice, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "ao_oss_mixer", &gtkAOOSSMixer, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "ao_oss_mixer_channel", &gtkAOOSSMixerChannel, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "ao_oss_device", &gtkAOOSSDevice, CONF_TYPE_STRING, 0, 0, 0, NULL }, #endif #ifdef CONFIG_ESD - { "ao_esd_device", &gtkAOESDDevice, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "ao_esd_device", &gtkAOESDDevice, CONF_TYPE_STRING, 0, 0, 0, NULL }, #endif #ifdef CONFIG_SDL - { "ao_sdl_subdriver", &gtkAOSDLDriver, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "ao_sdl_subdriver", &gtkAOSDLDriver, CONF_TYPE_STRING, 0, 0, 0, NULL }, #endif - { "enable_audio_equ", &gtkEnableAudioEqualizer, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "enable_audio_equ", &gtkEnableAudioEqualizer, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "equ_channel_1", &gtkEquChannel1, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "equ_channel_2", &gtkEquChannel2, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "equ_channel_3", &gtkEquChannel3, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "equ_channel_4", &gtkEquChannel4, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "equ_channel_5", &gtkEquChannel5, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "equ_channel_6", &gtkEquChannel6, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "equ_channel_1", &gtkEquChannel1, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "equ_channel_2", &gtkEquChannel2, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "equ_channel_3", &gtkEquChannel3, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "equ_channel_4", &gtkEquChannel4, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "equ_channel_5", &gtkEquChannel5, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "equ_channel_6", &gtkEquChannel6, CONF_TYPE_STRING, 0, 0, 0, NULL }, #define audio_equ_row(i, j) \ - { "equ_band_" # i # j, &gtkEquChannels[i][j], CONF_TYPE_FLOAT, CONF_RANGE, -15.0, 15.0, NULL } + { "equ_band_" # i # j, &gtkEquChannels[i][j], CONF_TYPE_FLOAT, CONF_RANGE, -15.0, 15.0, NULL } audio_equ_row(0, 0), audio_equ_row(0, 1), audio_equ_row(0, 2), audio_equ_row(0, 3), audio_equ_row(0, 4), audio_equ_row(0, 5), audio_equ_row(0, 6), audio_equ_row(0, 7), audio_equ_row(0, 8), audio_equ_row(0, 9), audio_equ_row(1, 0), audio_equ_row(1, 1), audio_equ_row(1, 2), audio_equ_row(1, 3), audio_equ_row(1, 4), audio_equ_row(1, 5), audio_equ_row(1, 6), audio_equ_row(1, 7), audio_equ_row(1, 8), audio_equ_row(1, 9), audio_equ_row(2, 0), audio_equ_row(2, 1), audio_equ_row(2, 2), audio_equ_row(2, 3), audio_equ_row(2, 4), audio_equ_row(2, 5), audio_equ_row(2, 6), audio_equ_row(2, 7), audio_equ_row(2, 8), audio_equ_row(2, 9), @@ -161,75 +161,75 @@ static const m_option_t gui_opts[] = { audio_equ_row(5, 0), audio_equ_row(5, 1), audio_equ_row(5, 2), audio_equ_row(5, 3), audio_equ_row(5, 4), audio_equ_row(5, 5), audio_equ_row(5, 6), audio_equ_row(5, 7), audio_equ_row(5, 8), audio_equ_row(5, 9), #undef audio_equ_row - { "playbar", &gtkEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "load_fullscreen", &gtkLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "show_videowin", &gtkShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "playbar", &gtkEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "load_fullscreen", &gtkLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "show_videowin", &gtkShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, - { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, - { "gui_video_out_pos_x", &gui_video_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, - { "gui_video_out_pos_y", &gui_video_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, + { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "gui_main_pos_x", &gui_main_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, + { "gui_main_pos_y", &gui_main_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, + { "gui_video_out_pos_x", &gui_video_pos_x, CONF_TYPE_INT, 0, 0, 0, NULL }, + { "gui_video_out_pos_y", &gui_video_pos_y, CONF_TYPE_INT, 0, 0, 0, NULL }, - { "idle", &player_idle_mode, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL }, + { "idle", &player_idle_mode, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL }, // NOTE TO MYSELF: Do we really need all/any non-gtkOptions, i.e. override mplayer options? - { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "stopxscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "stopxscreensaver", &stop_xscreensaver, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, + { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, - { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "v_vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "vo_driver", &video_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "v_vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "vf_autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL }, - { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "vo_panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL }, + { "vf_autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL }, + { "vo_direct_render", &vo_directrendering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "vo_doublebuffering", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "vo_panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL }, - { "v_flip", &flip, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL }, - { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL }, - { "v_idx", &index_mode, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL }, - { "v_ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "v_flip", &flip, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL }, + { "v_framedrop", &frame_dropping, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL }, + { "v_idx", &index_mode, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL }, + { "v_ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "a_afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "ao_driver", &audio_driver_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, + { "a_afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL }, - { "softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "softvol", &soft_vol, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "sub_auto_load", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "sub_auto_load", &sub_auto, CONF_TYPE_FLAG, 0, 0, 1, NULL }, #ifdef CONFIG_ICONV - { "sub_cp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "sub_cp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL }, #endif - { "sub_overlap", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL }, - { "sub_pos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL }, - { "sub_unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "sub_overlap", &suboverlap_enabled, CONF_TYPE_FLAG, 0, 0, 0, NULL }, + { "sub_pos", &sub_pos, CONF_TYPE_INT, CONF_RANGE, 0, 200, NULL }, + { "sub_unicode", &sub_unicode, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "font_factor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL }, - { "font_name", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "font_factor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0, NULL }, + { "font_name", &font_name, CONF_TYPE_STRING, 0, 0, 0, NULL }, #ifdef CONFIG_FREETYPE - { "font_encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "font_text_scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL }, - { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL }, - { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL }, - { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL }, - { "font_autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, + { "font_encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "font_text_scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL }, + { "font_osd_scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 100.0, NULL }, + { "font_blur", &subtitle_font_radius, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL }, + { "font_outline", &subtitle_font_thickness, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 8.0, NULL }, + { "font_autoscale", &subtitle_autoscale, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, #endif #ifdef CONFIG_ASS - { "ass_enabled", &ass_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ass_use_margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "ass_top_margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL }, - { "ass_bottom_margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL }, + { "ass_enabled", &ass_enabled, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "ass_use_margins", &ass_use_margins, CONF_TYPE_FLAG, 0, 0, 1, NULL }, + { "ass_top_margin", &ass_top_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL }, + { "ass_bottom_margin", &ass_bottom_margin, CONF_TYPE_INT, CONF_RANGE, 0, 512, NULL }, #endif - { NULL, NULL, 0, 0, 0, 0, NULL } + { NULL, NULL, 0, 0, 0, 0, NULL } }; int cfg_gui_include(m_option_t *conf, const char *filename)

1 0

r34795 - in trunk/gui: cfg.c ui/gtk/preferences.c win32/preferences.c win32/wincfg.c
by ib 04 Mar '12

04 Mar '12

Author: ib Date: Sun Mar 4 16:37:30 2012 New Revision: 34795 Log: Update GUI code after r34792. Allow using a cache size of up to 4 TB. Modified: trunk/gui/cfg.c trunk/gui/ui/gtk/preferences.c trunk/gui/win32/preferences.c trunk/gui/win32/wincfg.c Modified: trunk/gui/cfg.c ============================================================================== --- trunk/gui/cfg.c Sun Mar 4 16:11:50 2012 (r34794) +++ trunk/gui/cfg.c Sun Mar 4 16:37:30 2012 (r34795) @@ -105,7 +105,7 @@ static const char gui_urllist[] = static const m_option_t gui_opts[] = { { "cache", &gtkCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, 32, 1048576, NULL }, + { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, 32, 0x7fffffff, NULL }, { "vf_pp", &gtkVfPP, CONF_TYPE_FLAG, 0, 0, 1, NULL }, Modified: trunk/gui/ui/gtk/preferences.c ============================================================================== --- trunk/gui/ui/gtk/preferences.c Sun Mar 4 16:11:50 2012 (r34794) +++ trunk/gui/ui/gtk/preferences.c Sun Mar 4 16:37:30 2012 (r34795) @@ -1248,7 +1248,7 @@ GtkWidget * create_Preferences( void ) AddLabel( MSGTR_PREFERENCES_CacheSize,hbox5 ); - SBCacheadj=GTK_ADJUSTMENT( gtk_adjustment_new( gtkCacheSize,32,1048576,1,32,0 ) ); + SBCacheadj=GTK_ADJUSTMENT( gtk_adjustment_new( gtkCacheSize,32,0x7fffffff,1,32,0 ) ); SBCache=gtk_spin_button_new( GTK_ADJUSTMENT( SBCacheadj ),1,0 ); gtk_widget_show( SBCache ); gtk_box_pack_start( GTK_BOX( hbox5 ),SBCache,TRUE,TRUE,0 ); Modified: trunk/gui/win32/preferences.c ============================================================================== --- trunk/gui/win32/preferences.c Sun Mar 4 16:11:50 2012 (r34794) +++ trunk/gui/win32/preferences.c Sun Mar 4 16:37:30 2012 (r34795) @@ -323,7 +323,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN ID_UPDOWN1, ((LPCREATESTRUCT) lParam) -> hInstance, (HWND)edit1, 0, 0, 0); - SendDlgItemMessage(hwnd, ID_UPDOWN1, UDM_SETRANGE32, (WPARAM)0, (LPARAM)65535); + SendDlgItemMessage(hwnd, ID_UPDOWN1, UDM_SETRANGE32, (WPARAM)32, (LPARAM)0x7fffffff); /* autosync */ edit2 = CreateWindowEx(WS_EX_CLIENTEDGE, "edit", "autosync", Modified: trunk/gui/win32/wincfg.c ============================================================================== --- trunk/gui/win32/wincfg.c Sun Mar 4 16:11:50 2012 (r34794) +++ trunk/gui/win32/wincfg.c Sun Mar 4 16:37:30 2012 (r34795) @@ -74,7 +74,7 @@ static const m_option_t gui_opts[] = { "delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -100.0, 100.0, NULL}, { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, { "cache", &gtkCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, - { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL }, + { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, 32, 0x7fffffff, NULL }, { "autosync", &gtkAutoSyncOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "autosync_size", &gtkAutoSync, CONF_TYPE_INT, CONF_RANGE, 0, 10000, NULL }, { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL },

1 0

r34794 - trunk/stream/cache2.c
by reimar 04 Mar '12

04 Mar '12

Author: reimar Date: Sun Mar 4 16:11:50 2012 New Revision: 34794 Log: Remove casts that are no longer necessary. Modified: trunk/stream/cache2.c Modified: trunk/stream/cache2.c ============================================================================== --- trunk/stream/cache2.c Sun Mar 4 15:49:29 2012 (r34793) +++ trunk/stream/cache2.c Sun Mar 4 16:11:50 2012 (r34794) @@ -180,7 +180,7 @@ static int cache_fill(cache_vars_t *s) if(read<s->min_filepos || read>s->max_filepos){ // seek... - mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%"PRIX64" \n",(int64_t)read); + mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%"PRIX64" \n",read); // drop cache contents only if seeking backward or too much fwd. // This is also done for on-disk files, since it loses the backseek cache. // That in turn can cause major bandwidth increase and performance @@ -503,11 +503,11 @@ int stream_enable_cache(stream_t *stream } // wait until cache is filled at least prefill_init % mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%"PRId64" eof:%d \n", - (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof); + s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof); while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){ mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill, 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size), - (int64_t)s->max_filepos-s->read_filepos + s->max_filepos-s->read_filepos ); if(s->eof) break; // file is smaller than prefill size if(stream_check_interrupt(PREFILL_SLEEP_TIME)) { @@ -606,7 +606,7 @@ int cache_stream_seek_long(stream_t *str // stream->buf_pos=stream->buf_len=0; // return 1; - mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); + mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",pos+newpos); return 0; }

1 0