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

r33145 - trunk/gui/skin/skin.c
by ib 29 Mar '11

29 Mar '11

Author: ib Date: Tue Mar 29 13:17:01 2011 New Revision: 33145 Log: Replace macro by function. The check whether a command is forbidden within a specific window is now performed by function in_window(). Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Tue Mar 29 12:47:07 2011 (r33144) +++ trunk/gui/skin/skin.c Tue Mar 29 13:17:01 2011 (r33145) @@ -80,15 +80,16 @@ static int window_cmd(char *cmd) return 1; } -#define CHECK(name) \ - { \ - if (!strcmp(currWinName, name)) \ - { \ - skin_error(MSGTR_SKIN_ERROR_IN_WINDOW, name); \ - return 1; \ - } \ +static int in_window(char *name) +{ + if (strcmp(currWinName, name) == 0) { + skin_error(MSGTR_SKIN_ERROR_IN_WINDOW, name); + return 1; } + return 0; +} + int skinBPRead(char *fname, txSample *bf) { int i = bpRead(fname, bf); @@ -339,8 +340,10 @@ static int cmd_background(char *in) if (!window_cmd("background")) return 1; - CHECK("menu"); - CHECK("main"); + if (in_window("main")) + return 1; + if (in_window("menu")) + return 1; currWin->R = cutItemToInt(in, ',', 0); currWin->G = cutItemToInt(in, ',', 1); @@ -362,8 +365,10 @@ static int cmd_button(char *in) if (!window_cmd("button")) return 1; - CHECK("sub"); - CHECK("menu"); + if (in_window("sub")) + return 1; + if (in_window("menu")) + return 1; cutItem(in, fname, ',', 0); x = cutItemToInt(in, ',', 1); @@ -420,9 +425,12 @@ static int cmd_selected(char *in) if (!window_cmd("selected")) return 1; - CHECK("main"); - CHECK("sub"); - CHECK("playbar"); + if (in_window("main")) + return 1; + if (in_window("sub")) + return 1; + if (in_window("playbar")) + return 1; cutItem(in, fname, ',', 0); @@ -453,9 +461,12 @@ static int cmd_menu(char *in) if (!window_cmd("menu")) return 1; - CHECK("main"); - CHECK("sub"); - CHECK("playbar"); + if (in_window("main")) + return 1; + if (in_window("sub")) + return 1; + if (in_window("playbar")) + return 1; x = cutItemToInt(in, ',', 0); y = cutItemToInt(in, ',', 1); @@ -495,8 +506,10 @@ static int cmd_hpotmeter(char *in) if (!window_cmd("h/v potmeter")) return 1; - CHECK("sub"); - CHECK("menu"); + if (in_window("sub")) + return 1; + if (in_window("menu")) + return 1; cutItem(in, pfname, ',', 0); pwidth = cutItemToInt(in, ',', 1); @@ -584,8 +597,10 @@ static int cmd_potmeter(char *in) if (!window_cmd("potmeter")) return 1; - CHECK("sub"); - CHECK("menu"); + if (in_window("sub")) + return 1; + if (in_window("menu")) + return 1; cutItem(in, phfname, ',', 0); ph = cutItemToInt(in, ',', 1); @@ -636,8 +651,10 @@ static int cmd_font(char *in) if (!window_cmd("font")) return 1; - CHECK("sub"); - CHECK("menu"); + if (in_window("sub")) + return 1; + if (in_window("menu")) + return 1; cutItem(in, name, ',', 0); @@ -680,8 +697,10 @@ static int cmd_slabel(char *in) if (!window_cmd("slabel")) return 1; - CHECK("sub"); - CHECK("menu"); + if (in_window("sub")) + return 1; + if (in_window("menu")) + return 1; x = cutItemToInt(in, ',', 0); y = cutItemToInt(in, ',', 1); @@ -730,8 +749,10 @@ static int cmd_dlabel(char *in) if (!window_cmd("dlabel")) return 1; - CHECK("sub"); - CHECK("menu"); + if (in_window("sub")) + return 1; + if (in_window("menu")) + return 1; x = cutItemToInt(in, ',', 0); y = cutItemToInt(in, ',', 1); @@ -781,9 +802,12 @@ static int cmd_decoration(char *in) if (!window_cmd("decoration")) return 1; - CHECK("sub"); - CHECK("menu"); - CHECK("playbar"); + if (in_window("sub")) + return 1; + if (in_window("playbar")) + return 1; + if (in_window("menu")) + return 1; cutItem(strlower(in), tmp, ',', 0);

1 0

r33144 - trunk/gui/skin/skin.c
by ib 29 Mar '11

29 Mar '11

Author: ib Date: Tue Mar 29 12:47:07 2011 New Revision: 33144 Log: Cosmetic: Adjust indent. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Tue Mar 29 12:45:13 2011 (r33143) +++ trunk/gui/skin/skin.c Tue Mar 29 12:47:07 2011 (r33144) @@ -566,8 +566,8 @@ static int cmd_vpotmeter(char *in) r = cmd_hpotmeter(in); if (r == 0) { - item = &currWinItems[*currWinItemIdx]; - item->type = itVPotmeter; + item = &currWinItems[*currWinItemIdx]; + item->type = itVPotmeter; } return r;

1 0

r33143 - trunk/gui/skin/skin.c
by ib 29 Mar '11

29 Mar '11

Author: ib Date: Tue Mar 29 12:45:13 2011 New Revision: 33143 Log: Prevent a segmentation fault. If hpotmeter couldn't be created, a further item processing must not take place. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Tue Mar 29 12:31:03 2011 (r33142) +++ trunk/gui/skin/skin.c Tue Mar 29 12:45:13 2011 (r33143) @@ -560,11 +560,15 @@ static int cmd_hpotmeter(char *in) // vpotmeter=button,bwidth,bheight,phases,numphases,default,x,y,width,height,message static int cmd_vpotmeter(char *in) { - int r = cmd_hpotmeter(in); + int r; wItem *item; + r = cmd_hpotmeter(in); + + if (r == 0) { item = &currWinItems[*currWinItemIdx]; item->type = itVPotmeter; + } return r; }

1 0

r33142 - trunk/gui/skin/skin.c
by ib 29 Mar '11

29 Mar '11

Author: ib Date: Tue Mar 29 12:31:03 2011 New Revision: 33142 Log: Make use of return value of strlower(). Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Tue Mar 29 12:21:39 2011 (r33141) +++ trunk/gui/skin/skin.c Tue Mar 29 12:31:03 2011 (r33142) @@ -133,10 +133,9 @@ int skinBPRead(char *fname, txSample *bf // section=movieplayer static int cmd_section(char *in) { - strlower(in); skin = NULL; - if (!strcmp(in, "movieplayer")) + if (!strcmp(strlower(in), "movieplayer")) skin = &appMPlayer; mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] section: %s\n", in); @@ -782,8 +781,7 @@ static int cmd_decoration(char *in) CHECK("menu"); CHECK("playbar"); - strlower(in); - cutItem(in, tmp, ',', 0); + cutItem(strlower(in), tmp, ',', 0); if (strcmp(tmp, "enable") != 0 && strcmp(tmp, "disable") != 0) { skin_error(MSGTR_SKIN_UnknownParameter, tmp);

1 0

r33141 - trunk/gui/skin/skin.c
by ib 29 Mar '11

29 Mar '11

Author: ib Date: Tue Mar 29 12:21:39 2011 New Revision: 33141 Log: Replace macros to check whether a command is allowed by functions. Additionally, add checks for commands 'window' and 'end'. Modified: trunk/gui/skin/skin.c Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Tue Mar 29 10:53:07 2011 (r33140) +++ trunk/gui/skin/skin.c Tue Mar 29 12:21:39 2011 (r33141) @@ -60,24 +60,26 @@ static void skin_error(const char *forma gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_ERRORMESSAGE, linenumber, p); } -#define CHECKDEFLIST(str) \ - { \ - if (skin == NULL) \ - { \ - skin_error(MSGTR_SKIN_ERROR_SECTION, str); \ - return 1; \ - } \ +static int section_cmd(char *cmd) +{ + if (!skin) { + skin_error(MSGTR_SKIN_ERROR_SECTION, cmd); + return 0; } -#define CHECKWINLIST(str) \ - { \ - if (!currWinName[0]) \ - { \ - skin_error(MSGTR_SKIN_ERROR_WINDOW, str); \ - return 1; \ - } \ + return 1; +} + +static int window_cmd(char *cmd) +{ + if (!currWinName[0]) { + skin_error(MSGTR_SKIN_ERROR_WINDOW, cmd); + return 0; } + return 1; +} + #define CHECK(name) \ { \ if (!strcmp(currWinName, name)) \ @@ -159,6 +161,9 @@ static int cmd_end(char *in) (void)in; + if (!section_cmd("end")) + return 1; + mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] %send (%s)\n", space, name); if (currWinName[0]) { @@ -175,7 +180,13 @@ static int cmd_end(char *in) // window=main|sub|playbar|menu static int cmd_window(char *in) { - CHECKDEFLIST("window"); + if (!section_cmd("window")) + return 1; + + if (currWinName[0]) { + skin_error(MSGTR_SKIN_ERROR_IN_WINDOW, "window"); + return 1; + } av_strlcpy(currWinName, strlower(in), sizeof(currWinName)); @@ -209,8 +220,8 @@ static int cmd_base(char *in) int x, y; int sx = 0, sy = 0; - CHECKDEFLIST("base"); - CHECKWINLIST("base"); + if (!window_cmd("base")) + return 1; cutItem(in, fname, ',', 0); x = cutItemToInt(in, ',', 1); @@ -326,8 +337,8 @@ static int cmd_base(char *in) // background=R,G,B static int cmd_background(char *in) { - CHECKDEFLIST("background"); - CHECKWINLIST("background"); + if (!window_cmd("background")) + return 1; CHECK("menu"); CHECK("main"); @@ -349,8 +360,8 @@ static int cmd_button(char *in) int x, y, sx, sy; char msg[32]; - CHECKDEFLIST("button"); - CHECKWINLIST("button"); + if (!window_cmd("button")) + return 1; CHECK("sub"); CHECK("menu"); @@ -407,8 +418,8 @@ static int cmd_selected(char *in) unsigned char fname[512]; unsigned char tmp[512]; - CHECKDEFLIST("selected"); - CHECKWINLIST("selected"); + if (!window_cmd("selected")) + return 1; CHECK("main"); CHECK("sub"); @@ -440,8 +451,8 @@ static int cmd_menu(char *in) int x, y, sx, sy, message; unsigned char tmp[64]; - CHECKDEFLIST("menu"); - CHECKWINLIST("menu"); + if (!window_cmd("menu")) + return 1; CHECK("main"); CHECK("sub"); @@ -482,8 +493,8 @@ static int cmd_hpotmeter(char *in) unsigned char phfname[512]; wItem *item; - CHECKDEFLIST("hpotmeter"); - CHECKWINLIST("hpotmeter"); + if (!window_cmd("h/v potmeter")) + return 1; CHECK("sub"); CHECK("menu"); @@ -567,8 +578,8 @@ static int cmd_potmeter(char *in) unsigned char phfname[512]; wItem *item; - CHECKDEFLIST("potmeter"); - CHECKWINLIST("potmeter"); + if (!window_cmd("potmeter")) + return 1; CHECK("sub"); CHECK("menu"); @@ -619,8 +630,8 @@ static int cmd_font(char *in) char name[512]; wItem *item; - CHECKDEFLIST("font"); - CHECKWINLIST("font"); + if (!window_cmd("font")) + return 1; CHECK("sub"); CHECK("menu"); @@ -663,8 +674,8 @@ static int cmd_slabel(char *in) int x, y, id; wItem *item; - CHECKDEFLIST("slabel"); - CHECKWINLIST("slabel"); + if (!window_cmd("slabel")) + return 1; CHECK("sub"); CHECK("menu"); @@ -713,8 +724,8 @@ static int cmd_dlabel(char *in) int x, y, sx, id, a; wItem *item; - CHECKDEFLIST("dlabel"); - CHECKWINLIST("dlabel"); + if (!window_cmd("dlabel")) + return 1; CHECK("sub"); CHECK("menu"); @@ -764,8 +775,8 @@ static int cmd_decoration(char *in) { char tmp[512]; - CHECKDEFLIST("decoration"); - CHECKWINLIST("decoration"); + if (!window_cmd("decoration")) + return 1; CHECK("sub"); CHECK("menu");

1 0

r33140 - in trunk/gui: interface.c skin/font.c skin/skin.c util/bitmap.c util/cut.c
by ib 29 Mar '11

29 Mar '11

Author: ib Date: Tue Mar 29 10:53:07 2011 New Revision: 33140 Log: Cosmetic: Separate return statement with newline. Modified: trunk/gui/interface.c trunk/gui/skin/font.c trunk/gui/skin/skin.c trunk/gui/util/bitmap.c trunk/gui/util/cut.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Tue Mar 29 10:28:11 2011 (r33139) +++ trunk/gui/interface.c Tue Mar 29 10:53:07 2011 (r33140) @@ -1112,6 +1112,7 @@ void *gtkSet(int cmd, float fparam, void } list(); + return NULL; // add item into playlist after current @@ -1150,6 +1151,7 @@ void *gtkSet(int cmd, float fparam, void // } return plCurrent; } + return NULL; case gtkGetPrevPlItem: @@ -1158,6 +1160,7 @@ void *gtkSet(int cmd, float fparam, void // if ( !plCurrent && plList ) plCurrent=plList; return plCurrent; } + return NULL; // set current item @@ -1193,6 +1196,7 @@ void *gtkSet(int cmd, float fparam, void } mplCurr(); // instead of using mplNext && mplPrev + return plCurrent; // delete list @@ -1221,6 +1225,7 @@ void *gtkSet(int cmd, float fparam, void plList = NULL; plCurrent = NULL; } + return NULL; // handle url @@ -1244,6 +1249,7 @@ void *gtkSet(int cmd, float fparam, void url_item->next = NULL; URLList = url_item; } + return NULL; // subtitle @@ -1333,6 +1339,7 @@ void *gtkSet(int cmd, float fparam, void mp_cmd->args[1].v.i = 1; mp_input_queue_cmd(mp_cmd); } + return NULL; case gtkSetAutoq: Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Tue Mar 29 10:28:11 2011 (r33139) +++ trunk/gui/skin/font.c Tue Mar 29 10:53:07 2011 (r33140) @@ -164,6 +164,7 @@ int fntRead(char *path, char *fname) } fclose(f); + return 0; } Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Tue Mar 29 10:28:11 2011 (r33139) +++ trunk/gui/skin/skin.c Tue Mar 29 10:53:07 2011 (r33140) @@ -469,6 +469,7 @@ static int cmd_menu(char *in) mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin] message: %s (#%d)\n", tmp, skin->menuItems[skin->IndexOfMenuItems].message); skin->menuItems[skin->IndexOfMenuItems].Bitmap.Image = NULL; + return 0; } @@ -554,6 +555,7 @@ static int cmd_vpotmeter(char *in) item = &currWinItems[*currWinItemIdx]; item->type = itVPotmeter; + return r; } Modified: trunk/gui/util/bitmap.c ============================================================================== --- trunk/gui/util/bitmap.c Tue Mar 29 10:28:11 2011 (r33139) +++ trunk/gui/util/bitmap.c Tue Mar 29 10:53:07 2011 (r33140) @@ -203,6 +203,7 @@ int bpRead(char *fname, txSample *bf) return -8; Normalize(bf); + return 0; } Modified: trunk/gui/util/cut.c ============================================================================== --- trunk/gui/util/cut.c Tue Mar 29 10:28:11 2011 (r33139) +++ trunk/gui/util/cut.c Tue Mar 29 10:53:07 2011 (r33140) @@ -44,5 +44,6 @@ int cutItemToInt(char *in, char sep, int char tmp[64]; cutItem(in, tmp, sep, num); + return atoi(tmp); }

1 0

r33139 - in trunk/gui: skin/skin.c util/string.c util/string.h
by ib 29 Mar '11

29 Mar '11

Author: ib Date: Tue Mar 29 10:28:11 2011 New Revision: 33139 Log: Move strlower() into auxiliary string function file. Modified: trunk/gui/skin/skin.c trunk/gui/util/string.c trunk/gui/util/string.h Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Tue Mar 29 10:15:01 2011 (r33138) +++ trunk/gui/skin/skin.c Tue Mar 29 10:28:11 2011 (r33139) @@ -87,20 +87,6 @@ static void skin_error(const char *forma } \ } -static char *strlower(char *in) -{ - char *p = in; - - while (*p) { - if (*p >= 'A' && *p <= 'Z') - *p += 'a' - 'A'; - - p++; - } - - return in; -} - int skinBPRead(char *fname, txSample *bf) { int i = bpRead(fname, bf); Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Tue Mar 29 10:15:01 2011 (r33138) +++ trunk/gui/util/string.c Tue Mar 29 10:28:11 2011 (r33139) @@ -18,6 +18,20 @@ #include "string.h" +char *strlower(char *in) +{ + char *p = in; + + while (*p) { + if (*p >= 'A' && *p <= 'Z') + *p += 'a' - 'A'; + + p++; + } + + return in; +} + char *strswap(char *in, char from, char to) { char *p = in; Modified: trunk/gui/util/string.h ============================================================================== --- trunk/gui/util/string.h Tue Mar 29 10:15:01 2011 (r33138) +++ trunk/gui/util/string.h Tue Mar 29 10:28:11 2011 (r33139) @@ -19,6 +19,7 @@ #ifndef MPLAYER_GUI_STRING_H #define MPLAYER_GUI_STRING_H +char *strlower(char *in); char *strswap(char *in, char from, char to); char *trim(char *in);

1 0

r33138 - trunk/gui/util/string.c
by ib 29 Mar '11

29 Mar '11

Author: ib Date: Tue Mar 29 10:15:01 2011 New Revision: 33138 Log: Simplify trim(). (A special return value for empty strings isn't needed.) Modified: trunk/gui/util/string.c Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Tue Mar 29 00:18:56 2011 (r33137) +++ trunk/gui/util/string.c Tue Mar 29 10:15:01 2011 (r33138) @@ -16,9 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <stddef.h> -#include <string.h> - #include "string.h" char *strswap(char *in, char from, char to) @@ -37,23 +34,22 @@ char *strswap(char *in, char from, char char *trim(char *in) { - int c = 0, id = 0, i; + char *src, *dest; + int freeze = 0; - if (!*in) - return NULL; + src = dest = in; - while (c != (int)strlen(in)) { - if (in[c] == '"') - id = !id; + while (*src) { + if (*src == '"') + freeze = !freeze; - if ((in[c] == ' ') && (!id)) { - for (i = 0; i < (int)strlen(in) - c; i++) - in[c + i] = in[c + i + 1]; - continue; - } + if (freeze || (*src != ' ')) + *dest++ = *src; - c++; + src++; } + *dest = 0; + return in; }

1 0

r33137 - trunk/configure
by cehoyos 28 Mar '11

28 Mar '11

Author: cehoyos Date: Tue Mar 29 00:18:56 2011 New Revision: 33137 Log: Fix CrystalHD autodetection: Make sure old library versions will not be detected. Patch by Philip Langdale, philipl overt org Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Mar 28 18:03:26 2011 (r33136) +++ trunk/configure Tue Mar 29 00:18:56 2011 (r33137) @@ -6968,7 +6968,7 @@ echores "$_libdv" echocheck "CrystalHD" if test "$crystalhd" = auto ; then crystalhd=no - statement_check_broken libcrystalhd/bc_dts_types.h libcrystalhd/libcrystalhd_if.h 'DtsGetVersion(0, 0, 0)' -lcrystalhd $_ld_lm && crystalhd=yes + statement_check_broken libcrystalhd/bc_dts_types.h libcrystalhd/libcrystalhd_if.h 'DtsCrystalHDVersion(0, 0)' -lcrystalhd $_ld_lm && crystalhd=yes fi if test "$crystalhd" = yes ; then

1 0

r33136 - trunk/gui/util/string.c
by ib 28 Mar '11

28 Mar '11

Author: ib Date: Mon Mar 28 18:03:26 2011 New Revision: 33136 Log: Simplify strswap(). (A special return value for empty strings isn't needed.) Modified: trunk/gui/util/string.c Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Mon Mar 28 17:51:20 2011 (r33135) +++ trunk/gui/util/string.c Mon Mar 28 18:03:26 2011 (r33136) @@ -23,14 +23,14 @@ char *strswap(char *in, char from, char to) { - int i; + char *p = in; - if (!*in) - return NULL; + while (*p) { + if (*p == from) + *p = to; - for (i = 0; in[i]; i++) - if (in[i] == from) - in[i] = to; + p++; + } return in; }

1 0

r33135 - in trunk: Makefile gui/skin/font.c gui/skin/skin.c gui/skin/skin.h gui/util/string.c gui/util/string.h
by ib 28 Mar '11

28 Mar '11

Author: ib Date: Mon Mar 28 17:51:20 2011 New Revision: 33135 Log: Move auxiliary string functions into separate file. (Besides, name parameters more intelligibly.) Added: trunk/gui/util/string.c trunk/gui/util/string.h Modified: trunk/Makefile trunk/gui/skin/font.c trunk/gui/skin/skin.c trunk/gui/skin/skin.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Mon Mar 28 15:46:50 2011 (r33134) +++ trunk/Makefile Mon Mar 28 17:51:20 2011 (r33135) @@ -541,6 +541,7 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app. gui/skin/font.c \ gui/skin/skin.c \ gui/util/cut.c \ + gui/util/string.c \ gui/wm/ws.c \ gui/wm/wsxdnd.c \ Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Mon Mar 28 15:46:50 2011 (r33134) +++ trunk/gui/skin/font.c Mon Mar 28 17:51:20 2011 (r33135) @@ -24,6 +24,7 @@ #include "font.h" #include "gui/interface.h" #include "gui/util/cut.h" +#include "gui/util/string.h" #include "skin.h" #include "libavutil/avstring.h" Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Mon Mar 28 15:46:50 2011 (r33134) +++ trunk/gui/skin/skin.c Mon Mar 28 17:51:20 2011 (r33135) @@ -25,6 +25,7 @@ #include "gui/interface.h" #include "gui/mplayer/widgets.h" #include "gui/util/cut.h" +#include "gui/util/string.h" #include "config.h" #include "help_mp.h" @@ -818,43 +819,6 @@ static _item skinItem[] = { { "menu", cmd_menu } }; -char *strswap(char *in, char what, char whereof) -{ - int i; - - if (!*in) - return NULL; - - for (i = 0; in[i]; i++) - if (in[i] == what) - in[i] = whereof; - - return in; -} - -char *trim(char *in) -{ - int c = 0, id = 0, i; - - if (!*in) - return NULL; - - while (c != (int)strlen(in)) { - if (in[c] == '"') - id = !id; - - if ((in[c] == ' ') && (!id)) { - for (i = 0; i < (int)strlen(in) - c; i++) - in[c + i] = in[c + i + 1]; - continue; - } - - c++; - } - - return in; -} - static char *setname(char *item1, char *item2) { static char fn[512]; Modified: trunk/gui/skin/skin.h ============================================================================== --- trunk/gui/skin/skin.h Mon Mar 28 15:46:50 2011 (r33134) +++ trunk/gui/skin/skin.h Mon Mar 28 17:51:20 2011 (r33135) @@ -23,7 +23,5 @@ int skinBPRead(char *fname, txSample *bf); int skinRead(char *dname); -char *strswap(char *in, char what, char whereof); -char *trim(char *in); #endif /* MPLAYER_GUI_SKIN_H */ Added: trunk/gui/util/string.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/util/string.c Mon Mar 28 17:51:20 2011 (r33135) @@ -0,0 +1,59 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <stddef.h> +#include <string.h> + +#include "string.h" + +char *strswap(char *in, char from, char to) +{ + int i; + + if (!*in) + return NULL; + + for (i = 0; in[i]; i++) + if (in[i] == from) + in[i] = to; + + return in; +} + +char *trim(char *in) +{ + int c = 0, id = 0, i; + + if (!*in) + return NULL; + + while (c != (int)strlen(in)) { + if (in[c] == '"') + id = !id; + + if ((in[c] == ' ') && (!id)) { + for (i = 0; i < (int)strlen(in) - c; i++) + in[c + i] = in[c + i + 1]; + continue; + } + + c++; + } + + return in; +} Added: trunk/gui/util/string.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/util/string.h Mon Mar 28 17:51:20 2011 (r33135) @@ -0,0 +1,25 @@ +/* + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_GUI_STRING_H +#define MPLAYER_GUI_STRING_H + +char *strswap(char *in, char from, char to); +char *trim(char *in); + +#endif /* MPLAYER_GUI_STRING_H */

1 0

r33134 - in trunk/gui: app.c win32/skinload.c
by ib 28 Mar '11

28 Mar '11

Author: ib Date: Mon Mar 28 15:46:50 2011 New Revision: 33134 Log: Remove misspelled GUI message 'evEqualeaser'. This is a legacy message. The correct one is 'evEqualizer' which also exists. Modified: trunk/gui/app.c trunk/gui/win32/skinload.c Modified: trunk/gui/app.c ============================================================================== --- trunk/gui/app.c Mon Mar 28 14:37:48 2011 (r33133) +++ trunk/gui/app.c Mon Mar 28 15:46:50 2011 (r33134) @@ -34,7 +34,6 @@ static const evName evNames[] = { { evNext, "evNext" }, { evLoad, "evLoad" }, { evEqualizer, "evEqualizer" }, - { evEqualizer, "evEqualeaser" }, // NOTE TO MYSELF: any skin using this? { evPlayList, "evPlaylist" }, { evExit, "evExit" }, { evIconify, "evIconify" }, Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Mon Mar 28 14:37:48 2011 (r33133) +++ trunk/gui/win32/skinload.c Mon Mar 28 15:46:50 2011 (r33134) @@ -52,7 +52,6 @@ static const evName evNames[] = { evNext, "evNext" }, { evLoad, "evLoad" }, { evEqualizer, "evEqualizer" }, - { evEqualizer, "evEqualeaser" }, { evPlayList, "evPlaylist" }, { evExit, "evExit" }, { evIconify, "evIconify" },

1 0

r33133 - in trunk: Makefile gui/app.h gui/bitmap.c gui/bitmap.h gui/skin/cut.c gui/skin/cut.h gui/skin/font.c gui/skin/font.h gui/skin/skin.c gui/skin/skin.h gui/util gui/util/bitmap.c gui/util/bit...
by ib 28 Mar '11

28 Mar '11

Author: ib Date: Mon Mar 28 14:37:48 2011 New Revision: 33133 Log: Move files with auxiliary functions to own directory. Added: trunk/gui/util/ trunk/gui/util/bitmap.c - copied unchanged from r33113, trunk/gui/bitmap.c trunk/gui/util/bitmap.h - copied unchanged from r33113, trunk/gui/bitmap.h trunk/gui/util/cut.c - copied unchanged from r33113, trunk/gui/skin/cut.c trunk/gui/util/cut.h - copied unchanged from r33113, trunk/gui/skin/cut.h Deleted: trunk/gui/bitmap.c trunk/gui/bitmap.h trunk/gui/skin/cut.c trunk/gui/skin/cut.h Modified: trunk/Makefile trunk/gui/app.h trunk/gui/skin/font.c trunk/gui/skin/font.h trunk/gui/skin/skin.c trunk/gui/skin/skin.h trunk/gui/win32/skinload.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Mar 27 23:25:58 2011 (r33132) +++ trunk/Makefile Mon Mar 28 14:37:48 2011 (r33133) @@ -517,7 +517,7 @@ SRCS_MPLAYER-$(GL_SDL) += libvo/sd SRCS_MPLAYER-$(GL_WIN32) += libvo/w32_common.c SRCS_MPLAYER-$(GL_X11) += libvo/x11_common.c SRCS_MPLAYER-$(MATRIXVIEW) += libvo/vo_matrixview.c libvo/matrixview.c -SRCS_MPLAYER-$(GUI) += gui/bitmap.c +SRCS_MPLAYER-$(GUI) += gui/util/bitmap.c SRCS_MPLAYER-$(GUI_GTK) += gui/app.c \ gui/cfg.c \ gui/interface.c \ @@ -538,9 +538,9 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app. gui/mplayer/gtk/opts.c \ gui/mplayer/gtk/pl.c \ gui/mplayer/gtk/sb.c \ - gui/skin/cut.c \ gui/skin/font.c \ gui/skin/skin.c \ + gui/util/cut.c \ gui/wm/ws.c \ gui/wm/wsxdnd.c \ Modified: trunk/gui/app.h ============================================================================== --- trunk/gui/app.h Sun Mar 27 23:25:58 2011 (r33132) +++ trunk/gui/app.h Mon Mar 28 14:37:48 2011 (r33133) @@ -19,7 +19,7 @@ #ifndef MPLAYER_GUI_APP_H #define MPLAYER_GUI_APP_H -#include "bitmap.h" +#include "util/bitmap.h" #include "wm/ws.h" // User events Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Sun Mar 27 23:25:58 2011 (r33132) +++ trunk/gui/skin/font.c Mon Mar 28 14:37:48 2011 (r33133) @@ -22,8 +22,8 @@ #include <string.h> #include "font.h" -#include "cut.h" #include "gui/interface.h" +#include "gui/util/cut.h" #include "skin.h" #include "libavutil/avstring.h" Modified: trunk/gui/skin/font.h ============================================================================== --- trunk/gui/skin/font.h Sun Mar 27 23:25:58 2011 (r33132) +++ trunk/gui/skin/font.h Mon Mar 28 14:37:48 2011 (r33133) @@ -20,7 +20,7 @@ #define MPLAYER_GUI_FONT_H #include "gui/app.h" -#include "gui/bitmap.h" +#include "gui/util/bitmap.h" #define ASCII_CHRS 128 // number of ASCII characters #define EXTRA_CHRS 128 // (arbitrary) number of non-ASCII characters Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Sun Mar 27 23:25:58 2011 (r33132) +++ trunk/gui/skin/skin.c Mon Mar 28 14:37:48 2011 (r33133) @@ -20,11 +20,11 @@ #include <string.h> #include "skin.h" -#include "cut.h" #include "font.h" #include "gui/app.h" #include "gui/interface.h" #include "gui/mplayer/widgets.h" +#include "gui/util/cut.h" #include "config.h" #include "help_mp.h" Modified: trunk/gui/skin/skin.h ============================================================================== --- trunk/gui/skin/skin.h Sun Mar 27 23:25:58 2011 (r33132) +++ trunk/gui/skin/skin.h Mon Mar 28 14:37:48 2011 (r33133) @@ -19,7 +19,7 @@ #ifndef MPLAYER_GUI_SKIN_H #define MPLAYER_GUI_SKIN_H -#include "gui/bitmap.h" +#include "gui/util/bitmap.h" int skinBPRead(char *fname, txSample *bf); int skinRead(char *dname); Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Sun Mar 27 23:25:58 2011 (r33132) +++ trunk/gui/win32/skinload.c Mon Mar 28 14:37:48 2011 (r33133) @@ -31,7 +31,7 @@ #include "libswscale/swscale.h" #include "libavutil/imgutils.h" #include "gui.h" -#include "gui/bitmap.h" +#include "gui/util/bitmap.h" #define MAX_LINESIZE 256

1 0

r33132 - trunk/libmpcodecs/ae_lavc.c
by cehoyos 27 Mar '11

27 Mar '11

Author: cehoyos Date: Sun Mar 27 23:25:58 2011 New Revision: 33132 Log: Cosmetics: Fix typo. Modified: trunk/libmpcodecs/ae_lavc.c Modified: trunk/libmpcodecs/ae_lavc.c ============================================================================== --- trunk/libmpcodecs/ae_lavc.c Sun Mar 27 16:17:48 2011 (r33131) +++ trunk/libmpcodecs/ae_lavc.c Sun Mar 27 23:25:58 2011 (r33132) @@ -190,7 +190,7 @@ int mpae_init_lavc(audio_encoder_t *enco lavc_actx->sample_fmt = lavc_acodec->sample_fmts ? lavc_acodec->sample_fmts[0] : AV_SAMPLE_FMT_S16; if (lavc_actx->sample_fmt != AV_SAMPLE_FMT_S16) mp_msg(MSGT_MENCODER, MSGL_ERR, "Encoder requires input not properly supported." - "Try using e.g. 'ac3_fixed' instead if 'ac3' as codec\n"); + "Try using e.g. 'ac3_fixed' instead of 'ac3' as codec\n"); encoder->input_format = samplefmt2affmt(lavc_actx->sample_fmt); lavc_actx->channels = encoder->params.channels; lavc_actx->sample_rate = encoder->params.sample_rate;

1 0

r33126 - trunk/libmpcodecs/ae_lavc.c
by reimar 27 Mar '11

27 Mar '11

Author: reimar Date: Sun Mar 27 12:24:11 2011 New Revision: 33126 Log: Warn when audio encoder requires an input format different from S16, it is not working correctly currently. Modified: trunk/libmpcodecs/ae_lavc.c Modified: trunk/libmpcodecs/ae_lavc.c ============================================================================== --- trunk/libmpcodecs/ae_lavc.c Sun Mar 27 09:16:38 2011 (r33125) +++ trunk/libmpcodecs/ae_lavc.c Sun Mar 27 12:24:11 2011 (r33126) @@ -188,6 +188,9 @@ int mpae_init_lavc(audio_encoder_t *enco lavc_actx->codec_id = lavc_acodec->id; // put sample parameters lavc_actx->sample_fmt = lavc_acodec->sample_fmts ? lavc_acodec->sample_fmts[0] : AV_SAMPLE_FMT_S16; + if (lavc_actx->sample_fmt != AV_SAMPLE_FMT_S16) + mp_msg(MSGT_MENCODER, MSGL_ERR, "Encoder requires input not properly supported." + "Try using e.g. 'ac3_fixed' instead if 'ac3' as codec\n"); encoder->input_format = samplefmt2affmt(lavc_actx->sample_fmt); lavc_actx->channels = encoder->params.channels; lavc_actx->sample_rate = encoder->params.sample_rate;

2 1

r33131 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 27 Mar '11

27 Mar '11

Author: reimar Date: Sun Mar 27 16:17:48 2011 New Revision: 33131 Log: Add condition that lets us switch FFmpeg XvMC decoder back from hwaccel to normal decoding. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 16:02:32 2011 (r33130) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 16:17:48 2011 (r33131) @@ -250,6 +250,8 @@ static void set_format_params(struct AVC avctx->draw_horiz_band = draw_slice; mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedMPEG2); avctx->slice_flags = SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; + } else { + avctx->slice_flags &= ~(SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD); } }

1 0

r33130 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 27 Mar '11

27 Mar '11

Author: reimar Date: Sun Mar 27 16:02:32 2011 New Revision: 33130 Log: Always use get_format, reduces usage of CODEC_CAP_HWACCEL* conditions. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 15:19:32 2011 (r33129) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 16:02:32 2011 (r33130) @@ -303,10 +303,7 @@ static int init(sh_video_t *sh){ avctx->codec_type = AVMEDIA_TYPE_VIDEO; avctx->codec_id = lavc_codec->id; -#if CONFIG_VDPAU || CONFIG_XVMC - if(lavc_codec->capabilities & (CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_HWACCEL)) - avctx->get_format = get_format; -#endif /* CONFIG_VDPAU */ + avctx->get_format = get_format; if(ctx->do_dr1){ avctx->flags|= CODEC_FLAG_EMU_EDGE; avctx->get_buffer= get_buffer; @@ -975,7 +972,6 @@ static mp_image_t *decode(sh_video_t *sh return mpi; } -#if CONFIG_XVMC || CONFIG_VDPAU static enum PixelFormat get_format(struct AVCodecContext *avctx, const enum PixelFormat *fmt){ enum PixelFormat selected_format; @@ -992,7 +988,8 @@ static enum PixelFormat get_format(struc } } selected_format = fmt[i]; + if (selected_format == PIX_FMT_NONE) + selected_format = avcodec_default_get_format(avctx, fmt); set_format_params(avctx, selected_format); return selected_format; } -#endif /* CONFIG_XVMC || CONFIG_VDPAU */

1 0

r33129 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 27 Mar '11

27 Mar '11

Author: reimar Date: Sun Mar 27 15:19:32 2011 New Revision: 33129 Log: Change | to ||. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 15:18:59 2011 (r33128) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 15:19:32 2011 (r33129) @@ -303,7 +303,7 @@ static int init(sh_video_t *sh){ avctx->codec_type = AVMEDIA_TYPE_VIDEO; avctx->codec_id = lavc_codec->id; -#if CONFIG_VDPAU | CONFIG_XVMC +#if CONFIG_VDPAU || CONFIG_XVMC if(lavc_codec->capabilities & (CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_HWACCEL)) avctx->get_format = get_format; #endif /* CONFIG_VDPAU */

1 0

r33128 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 27 Mar '11

27 Mar '11

Author: reimar Date: Sun Mar 27 15:18:59 2011 New Revision: 33128 Log: Attempt to fix crashes with VDPAU and threads. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 15:09:27 2011 (r33127) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 15:18:59 2011 (r33128) @@ -238,7 +238,12 @@ static void set_format_params(struct AVC vd_ffmpeg_ctx *ctx = sh->context; ctx->do_dr1 = 1; ctx->do_slices = 1; + // HACK: FFmpeg thread handling is a major mess and + // hinders any attempt to decide on hwaccel after the + // codec is open. We really want this to change, so + // just beat it until it's dead avctx->thread_count = 1; + avctx->active_thread_type = 0; avctx->get_buffer = get_buffer; avctx->release_buffer = release_buffer; avctx->reget_buffer = get_buffer;

1 0

r33127 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 27 Mar '11

27 Mar '11

Author: reimar Date: Sun Mar 27 15:09:27 2011 New Revision: 33127 Log: Fix XVMC decoding (avcodec_open would fail if thread_count is set) and simplify code a bit in the process. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 12:24:11 2011 (r33126) +++ trunk/libmpcodecs/vd_ffmpeg.c Sun Mar 27 15:09:27 2011 (r33127) @@ -298,19 +298,10 @@ static int init(sh_video_t *sh){ avctx->codec_type = AVMEDIA_TYPE_VIDEO; avctx->codec_id = lavc_codec->id; -#if CONFIG_VDPAU - if(lavc_codec->capabilities & CODEC_CAP_HWACCEL_VDPAU){ +#if CONFIG_VDPAU | CONFIG_XVMC + if(lavc_codec->capabilities & (CODEC_CAP_HWACCEL_VDPAU | CODEC_CAP_HWACCEL)) avctx->get_format = get_format; - } #endif /* CONFIG_VDPAU */ -#if CONFIG_XVMC - if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ - mp_msg(MSGT_DECVIDEO, MSGL_INFO, MSGTR_MPCODECS_XVMCAcceleratedCodec); - avctx->get_format= get_format;//for now only this decoder will use it - // HACK around badly placed checks in mpeg_mc_decode_init - set_format_params(avctx, PIX_FMT_XVMC_MPEG2_IDCT); - } -#endif /* CONFIG_XVMC */ if(ctx->do_dr1){ avctx->flags|= CODEC_FLAG_EMU_EDGE; avctx->get_buffer= get_buffer; @@ -443,6 +434,10 @@ static int init(sh_video_t *sh){ avctx->thread_count = lavc_param_threads; avctx->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE; + if(lavc_codec->capabilities & CODEC_CAP_HWACCEL) + // HACK around badly placed checks in mpeg_mc_decode_init + set_format_params(avctx, PIX_FMT_XVMC_MPEG2_IDCT); + /* open it */ if (avcodec_open(avctx, lavc_codec) < 0) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantOpenCodec);

1 0

r33125 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by cehoyos 27 Mar '11

27 Mar '11

Author: cehoyos Date: Sun Mar 27 09:16:38 2011 New Revision: 33125 Log: FFmpeg Bitmap Brothers JV decoder. Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Mar 27 04:15:38 2011 (r33124) +++ trunk/etc/codecs.conf Sun Mar 27 09:16:38 2011 (r33125) @@ -3163,6 +3163,14 @@ videocodec fffraps dll "fraps" out BGR24,YV12,I420 +videocodec ffjv + info "FFmpeg Bitmap Brothers JV" + status working + fourcc FFJV ; internal MPlayer FourCC + driver ffmpeg + dll "jv" + out BGR8 + videocodec fftiertexseq info "FFmpeg Tiertex SEQ" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Sun Mar 27 04:15:38 2011 (r33124) +++ trunk/libmpdemux/mp_taglists.c Sun Mar 27 09:16:38 2011 (r33125) @@ -101,6 +101,7 @@ static const AVCodecTag mp_bmp_tags[] = { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, + { CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V')}, { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')},

1 0

r33122 - trunk/stream/stream.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 22:02:34 2011 New Revision: 33122 Log: Add ugly hack to compensate DVDNAV's ugly hacks and fix seeking. Modified: trunk/stream/stream.c Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c Sat Mar 26 21:22:43 2011 (r33121) +++ trunk/stream/stream.c Sat Mar 26 22:02:34 2011 (r33122) @@ -306,7 +306,9 @@ int stream_read_internal(stream_t *s, vo len= s->fill_buffer ? s->fill_buffer(s, buf, len) : 0; } if(len<=0){ - if (!s->eof) { + // dvdnav has some horrible hacks to "suspend" reads, + // we need to skip this code or seeks will hang. + if (!s->eof && s->type != STREAMTYPE_DVDNAV) { // just in case this is an error e.g. due to network // timeout reset and retry // Seeking is used as a hack to make network streams

1 0

r33121 - trunk/stream/stream_dvdnav.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 21:22:43 2011 New Revision: 33121 Log: Use fewer () to make code more readable. Modified: trunk/stream/stream_dvdnav.c Modified: trunk/stream/stream_dvdnav.c ============================================================================== --- trunk/stream/stream_dvdnav.c Sat Mar 26 21:04:47 2011 (r33120) +++ trunk/stream/stream_dvdnav.c Sat Mar 26 21:22:43 2011 (r33121) @@ -464,7 +464,7 @@ static int control(stream_t *stream, int } case STREAM_CTRL_SEEK_TO_TIME: { - uint64_t tm = (uint64_t) (*((double*)arg) * 90000); + uint64_t tm = *(double *)arg * 90000; if(dvdnav_time_search(priv->dvdnav, tm) == DVDNAV_STATUS_OK) return 1; break;

1 0

r33120 - trunk/stream/cache2.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 21:04:47 2011 New Revision: 33120 Log: Ensure we always pass a buffer of at least sector size to the read function. This is never an issue with streams that have actual sectors, the reads will always return a multiple of sector size and the cache is always used in blocks of sector size. However the rtp protocol misuses this so it can just assume it always has a sufficiently large buffer available and thus fails without this extra hack. Modified: trunk/stream/cache2.c Modified: trunk/stream/cache2.c ============================================================================== --- trunk/stream/cache2.c Sat Mar 26 19:37:05 2011 (r33119) +++ trunk/stream/cache2.c Sat Mar 26 21:04:47 2011 (r33120) @@ -168,6 +168,7 @@ static int cache_fill(cache_vars_t *s) int back,back2,newb,space,len,pos; off_t read=s->read_filepos; int read_chunk; + int wraparound_copy = 0; if(read<s->min_filepos || read>s->max_filepos){ // seek... @@ -209,8 +210,16 @@ static int cache_fill(cache_vars_t *s) // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); - // reduce space if needed: - if(space>s->buffer_size-pos) space=s->buffer_size-pos; + // try to avoid wrap-around. If not possible due to sector size + // do an extra copy. + if(space>s->buffer_size-pos) { + if (s->buffer_size-pos >= s->sector_size) { + space=s->buffer_size-pos; + } else { + space = s->sector_size; + wraparound_copy = 1; + } + } // limit one-time block size read_chunk = s->stream->read_chunk; @@ -225,6 +234,13 @@ static int cache_fill(cache_vars_t *s) s->min_filepos=read-back; // avoid seeking-back to temp area... #endif + if (wraparound_copy) { + int to_copy; + len = stream_read_internal(s->stream, s->stream->buffer, space); + to_copy = FFMIN(len, s->buffer_size-pos); + memcpy(s->buffer + pos, s->stream->buffer, to_copy); + memcpy(s->buffer, s->stream->buffer + to_copy, len - to_copy); + } else len = stream_read_internal(s->stream, &s->buffer[pos], space); s->eof= !len;

1 0

r33119 - in trunk/libmpcodecs: vd.c vd_ffmpeg.c
by reimar 26 Mar '11

26 Mar '11

Author: reimar Date: Sat Mar 26 19:37:05 2011 New Revision: 33119 Log: Disable the combination of slices and multithreaded decode by default, it usually results in a fully black picture. Modified: trunk/libmpcodecs/vd.c trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd.c ============================================================================== --- trunk/libmpcodecs/vd.c Sat Mar 26 17:11:18 2011 (r33118) +++ trunk/libmpcodecs/vd.c Sat Mar 26 19:37:05 2011 (r33119) @@ -128,7 +128,7 @@ int opt_screen_size_y = 0; float screen_size_xy = 0; float movie_aspect = -1.0; int vo_flags = 0; -int vd_use_slices = 1; +int vd_use_slices = -1; /** global variables for gamma, brightness, contrast, saturation and hue modified by mplayer.c and gui/mplayer/gtk/eq.c: Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat Mar 26 17:11:18 2011 (r33118) +++ trunk/libmpcodecs/vd_ffmpeg.c Sat Mar 26 19:37:05 2011 (r33119) @@ -265,6 +265,9 @@ static int init(sh_video_t *sh){ AVCodec *lavc_codec; int lowres_w=0; int do_vis_debug= lavc_param_vismv || (lavc_param_debug&(FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP)); + // slice is rather broken with threads, so disable that combination unless + // explicitly requested + int use_slices = vd_use_slices > 0 || (vd_use_slices < 0 && lavc_param_threads <= 1); init_avcodec(); @@ -280,7 +283,7 @@ static int init(sh_video_t *sh){ return 0; } - if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) + if(use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) ctx->do_slices=1; if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264 && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_ROQ && lavc_codec->id != CODEC_ID_VP8 && lavc_codec->id != CODEC_ID_LAGARITH)

1 0