August 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r37251 - trunk/libmpdemux/demux_lavf.c
by reimar 11 Aug '14

11 Aug '14

Author: reimar Date: Mon Aug 11 19:58:18 2014 New Revision: 37251 Log: Make sure AVProbeData is initialized. This avoids crashes due to the newly added mime field not being initialized. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sat Aug 9 06:14:21 2014 (r37250) +++ trunk/libmpdemux/demux_lavf.c Mon Aug 11 19:58:18 2014 (r37251) @@ -148,7 +148,7 @@ static void list_formats(void) { } static int lavf_check_file(demuxer_t *demuxer){ - AVProbeData avpd; + AVProbeData avpd = { 0 }; lavf_priv_t *priv; int probe_data_size = 0; int read_size = INITIAL_PROBE_SIZE;

1 0

r37250 - trunk/stream/stream_ffmpeg.c
by compn 09 Aug '14

09 Aug '14

Author: compn Date: Sat Aug 9 06:14:21 2014 New Revision: 37250 Log: stream: force https url to ffmpeg:// Modified: trunk/stream/stream_ffmpeg.c Modified: trunk/stream/stream_ffmpeg.c ============================================================================== --- trunk/stream/stream_ffmpeg.c Wed Aug 6 18:37:13 2014 (r37249) +++ trunk/stream/stream_ffmpeg.c Sat Aug 9 06:14:21 2014 (r37250) @@ -157,7 +157,7 @@ const stream_info_t stream_info_ffmpeg = "", "", open_f, - { "ffmpeg", "rtmp", "rtsp", NULL }, + { "ffmpeg", "rtmp", "rtsp", "https", NULL }, NULL, 1 // Urls are an option string };

1 0

r37249 - trunk/gui/win32/interface.c
by ib 06 Aug '14

06 Aug '14

Author: ib Date: Wed Aug 6 18:37:13 2014 New Revision: 37249 Log: Fix message. It's "unbalanced" audio that isn't supported, "balanced" audio is the working default. Modified: trunk/gui/win32/interface.c Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Wed Aug 6 18:36:30 2014 (r37248) +++ trunk/gui/win32/interface.c Wed Aug 6 18:37:13 2014 (r37249) @@ -333,7 +333,7 @@ static void guiSetEvent(int event) mixer_getvolume(mixer, &l, &r); if (r == l) { - mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] Mixer doesn't support balanced audio\n"); + mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] Mixer doesn't support unbalanced audio\n"); mixer_setvolume(mixer, guiInfo.Volume, guiInfo.Volume); guiInfo.Balance = 50.0f; }

1 0

r37248 - trunk/gui/win32/interface.c
by ib 06 Aug '14

06 Aug '14

Author: ib Date: Wed Aug 6 18:36:30 2014 New Revision: 37248 Log: Remove pointless code. Volume will be set exactly like this by the code just following. Reported by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/gui/win32/interface.c Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Wed Aug 6 18:35:38 2014 (r37247) +++ trunk/gui/win32/interface.c Wed Aug 6 18:36:30 2014 (r37248) @@ -321,9 +321,6 @@ static void guiSetEvent(int event) if (guiInfo.Playing == GUI_STOP) break; - if (guiInfo.Balance == 50.0f) - mixer_setvolume(mixer, guiInfo.Volume, guiInfo.Volume); - l = guiInfo.Volume * (100.0 - guiInfo.Balance) / 50.0; r = guiInfo.Volume * guiInfo.Balance / 50.0;

1 0

r37247 - in trunk/gui/win32: gui.c gui.h interface.c
by ib 06 Aug '14

06 Aug '14

Author: ib Date: Wed Aug 6 18:35:38 2014 New Revision: 37247 Log: Apply skin defaults in Win32 GUI. The starting defaults for volume, balance and movie position are defined in the skin used by the GUI. So far, the Win32 GUI has completely ignored these. Based on a patch by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/gui/win32/gui.c trunk/gui/win32/gui.h trunk/gui/win32/interface.c Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Wed Aug 6 15:03:22 2014 (r37246) +++ trunk/gui/win32/gui.c Wed Aug 6 18:35:38 2014 (r37247) @@ -237,6 +237,20 @@ static int get_windowtype(HWND hwnd) return -1; } +static void get_widgetvalue(skin_t *skin, int event, float *value) +{ + unsigned int i; + + if (!skin) return; + + for (i=0; i<skin->widgetcount; i++) + if (skin->widgets[i]->msg == event) + { + *value = skin->widgets[i]->value; + return; + } +} + static void uninit(gui_t *gui) { if(gui->skin) destroy_window(gui); @@ -1659,6 +1673,17 @@ int create_window(gui_t *gui, char *skin /* enable drag and drop support */ DragAcceptFiles(gui->mainwindow, TRUE); + /* set defaults */ + gui->default_volume = 50.0f; + gui->default_balance = 50.0f; + + /* get defaults from skin */ + get_widgetvalue(gui->skin, evSetVolume, &gui->default_volume); + get_widgetvalue(gui->skin, evSetBalance, &gui->default_balance); + get_widgetvalue(gui->skin, evSetMoviePosition, &guiInfo.Position); + + if (guiInfo.Position) gui->playercontrol(evSetMoviePosition); + updatedisplay(gui, gui->mainwindow); /* display */ Modified: trunk/gui/win32/gui.h ============================================================================== --- trunk/gui/win32/gui.h Wed Aug 6 15:03:22 2014 (r37246) +++ trunk/gui/win32/gui.h Wed Aug 6 18:35:38 2014 (r37247) @@ -85,6 +85,9 @@ struct gui_t int playlistwindow; int aboutwindow; + float default_volume; + float default_balance; + skin_t *skin; playlist_t *playlist; Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Wed Aug 6 15:03:22 2014 (r37246) +++ trunk/gui/win32/interface.c Wed Aug 6 18:35:38 2014 (r37247) @@ -537,6 +537,9 @@ void guiInit(void) /* Wait until the gui is created */ while(!mygui) Sleep(100); mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] GUI thread started.\n"); + + guiInfo.Volume = mygui->default_volume; + guiInfo.Balance = mygui->default_balance; } void guiDone(void) @@ -636,6 +639,8 @@ int gui(int what, void *data) guiInfo.AudioChannels = 0; guiInfo.AudioPassthrough = FALSE; } + guiSetEvent(evSetVolume); + guiSetEvent(evSetBalance); if(IsWindowVisible(mygui->videowindow) && !guiInfo.VideoWindow) ShowWindow(mygui->videowindow, SW_HIDE); break;

1 0

r37246 - trunk/etc/codecs.conf
by compn 06 Aug '14

06 Aug '14

Author: compn Date: Wed Aug 6 15:03:22 2014 New Revision: 37246 Log: codecs.conf : map lsvm h263 fourcc, V-codecs/LSV for sample Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Aug 5 13:12:59 2014 (r37245) +++ trunk/etc/codecs.conf Wed Aug 6 15:03:22 2014 (r37246) @@ -2293,6 +2293,7 @@ videocodec ffh263 fourcc L263 ; Lead H263 fourcc ILVR ; ITU H263+ fourcc VX1K ; Agora Labs VX1000S H263 + fourcc lsvm ; lsv h263 driver ffmpeg dll h263 out YV12,I420,IYUV

1 0

r37245 - trunk/configure
by michael 05 Aug '14

05 Aug '14

Author: michael Date: Tue Aug 5 13:12:59 2014 New Revision: 37245 Log: configure: add CONFIG_STARTCODE to prevent build failure Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Jul 29 21:45:19 2014 (r37244) +++ trunk/configure Tue Aug 5 13:12:59 2014 (r37245) @@ -8700,6 +8700,7 @@ CONFIG_RIFFDEC = yes CONFIG_RIFFENC = yes CONFIG_RTPENC_CHAIN = yes CONFIG_SINEWIN = yes +CONFIG_STARTCODE = yes CONFIG_VIDEODSP = yes CONFIG_VP3DSP = yes @@ -9330,6 +9331,7 @@ $def_truncf #define CONFIG_RDFT 1 #define CONFIG_RIFFDEC 1 #define CONFIG_RIFFENC 1 +#define CONFIG_STARTCODE 1 #define CONFIG_VIDEODSP 1 /* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */

1 0