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

r37893 - trunk/gui/skin/font.c
by ib 25 Aug '16

25 Aug '16

Author: ib Date: Thu Aug 25 14:39:03 2016 New Revision: 37893 Log: Lift the limitation of 256 characters in font description files. When the memory reserved for 8-bit characters has been used up, don't start skipping entries in the font description file, but dynamically allocate memory to process further. That way there is no longer any limitation (besides available memory) on the number of entries in a font description file. This closes Trac #2303. Modified: trunk/gui/skin/font.c Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Aug 25 14:31:49 2016 (r37892) +++ trunk/gui/skin/font.c Thu Aug 25 14:39:03 2016 (r37893) @@ -232,7 +232,13 @@ int fntRead(char *path, char *fname) cutStr(item, item, '"', 1); if (item[0] & 0x80) { - for (i = 0; i < Fonts[id]->extra_chrs; i++) { + for (i = 0;; i++) { + if (i == Fonts[id]->extra_chrs) { + if (!fntAllocChr(Fonts[id], EXTRA_CHRS) || + !fntAllocBit8Chr(Fonts[id], EXTRA_CHRS)) + break; + } + if (!(Fonts[id]->bit8_chr + i * UTF8LENGTH)[0]) { strncpy(Fonts[id]->bit8_chr + i * UTF8LENGTH, item, UTF8LENGTH); break;

1 0

r37892 - in trunk/gui/skin: font.c font.h
by ib 25 Aug '16

25 Aug '16

Author: ib Date: Thu Aug 25 14:31:49 2016 New Revision: 37892 Log: Add helper functions fntAllocChr() and fntAllocBit8Chr(). These functions don't simply call calloc(), but they use realloc() instead. This is (except for zero-initialization) the same when called with a NULL pointer the first time, but will allow dynamic growing with subsequent calls. Utilize the new helper functions when preparing to add a new font. Modified: trunk/gui/skin/font.c trunk/gui/skin/font.h Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Aug 25 14:27:58 2016 (r37891) +++ trunk/gui/skin/font.c Thu Aug 25 14:31:49 2016 (r37892) @@ -48,6 +48,74 @@ static bmpFont *Fonts[MAX_FONTS]; /** + * @brief Allocate and initialize memory for a #bmpFont::Chr array. + * + * @note If @a Font->Chr is not NULL, memory will be reallocated. + * + * @param Font pointer to a #Fonts element + * @param nmemb number of members the old array should grow by + * + * @return pointer to the newly allocated array or NULL (error) + * + * @note As a side effect, @a Font->Chr will point to the newly + * allocated memory and @a Font->chrs will be increased accordingly + * (if and only if memory could be allocated). + */ +static void *fntAllocChr(bmpFont *Font, size_t nmemb) +{ + void *ptr; + int i; + + ptr = realloc(Font->Chr, (Font->chrs + nmemb) * sizeof(*Font->Chr)); + + if (ptr) { + Font->Chr = ptr; + + for (i = Font->chrs + nmemb - 1; i >= Font->chrs; i--) { + Font->Chr[i].x = -1; + Font->Chr[i].y = -1; + Font->Chr[i].w = -1; + Font->Chr[i].h = -1; + } + + Font->chrs += nmemb; + } + + return ptr; +} + +/** + * @brief Allocate and initialize memory for a #bmpFont::bit8_chr array. + * + * @note If @a Font->bit8_chr is not NULL, memory will be reallocated. + * + * @param Font pointer to a #Fonts element + * @param nmemb number of members the old array should grow by + * + * @return pointer to the newly allocated array or NULL (error) + * + * @note As a side effect, @a Font->bit8_chr will point to the newly + * allocated memory and @a Font->extra_chrs will be increased accordingly + * (if and only if memory could be allocated). + */ +static void *fntAllocBit8Chr(bmpFont *Font, size_t nmemb) +{ + void *ptr; + + ptr = realloc(Font->bit8_chr, (Font->extra_chrs + nmemb) * UTF8LENGTH * sizeof(*Font->bit8_chr)); + + if (ptr) { + Font->bit8_chr = ptr; + + memset(Font->bit8_chr + Font->extra_chrs * UTF8LENGTH, 0, nmemb * UTF8LENGTH * sizeof(*Font->bit8_chr)); + + Font->extra_chrs += nmemb; + } + + return ptr; +} + +/** * @brief Add a font to #Fonts. * * @param name name of the font @@ -56,7 +124,7 @@ static bmpFont *Fonts[MAX_FONTS]; */ static int fntAddNewFont(char *name) { - int id, i; + int id; for (id = 0; id < MAX_FONTS; id++) if (!Fonts[id]) @@ -72,28 +140,16 @@ static int fntAddNewFont(char *name) av_strlcpy(Fonts[id]->name, name, MAX_FONT_NAME); - Fonts[id]->Chr = calloc(ASCII_CHRS + EXTRA_CHRS, sizeof(*Fonts[id]->Chr)); - - if (!Fonts[id]->Chr) { + if (!fntAllocChr(Fonts[id], ASCII_CHRS + EXTRA_CHRS)) { nfree(Fonts[id]); return -1; } - for (i = 0; i < ASCII_CHRS + EXTRA_CHRS; i++) { - Fonts[id]->Chr[i].x = -1; - Fonts[id]->Chr[i].y = -1; - Fonts[id]->Chr[i].w = -1; - Fonts[id]->Chr[i].h = -1; - } - - Fonts[id]->bit8_chr = calloc(EXTRA_CHRS * UTF8LENGTH, sizeof(*Fonts[id]->bit8_chr)); - - if (!Fonts[id]->bit8_chr) { + if (!fntAllocBit8Chr(Fonts[id], EXTRA_CHRS)) { nfree(Fonts[id]->Chr); nfree(Fonts[id]); return -1; - } else - Fonts[id]->extra_chrs = EXTRA_CHRS; + } return id; } Modified: trunk/gui/skin/font.h ============================================================================== --- trunk/gui/skin/font.h Thu Aug 25 14:27:58 2016 (r37891) +++ trunk/gui/skin/font.h Thu Aug 25 14:31:49 2016 (r37892) @@ -30,6 +30,7 @@ typedef struct { } fntChar; typedef struct { + int chrs; fntChar *Chr; int extra_chrs; unsigned char *bit8_chr;

1 0

r37891 - in trunk/gui/skin: font.c font.h
by ib 25 Aug '16

25 Aug '16

Author: ib Date: Thu Aug 25 14:27:58 2016 New Revision: 37891 Log: Use dynamic memory allocation when parsing a font description file. It still limits font description files to 256 characters, but prepares the lifting of this limitation. Additionally, rename bmpFont member nonASCIIidx bit8_chr. Modified: trunk/gui/skin/font.c trunk/gui/skin/font.h Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Aug 25 14:22:44 2016 (r37890) +++ trunk/gui/skin/font.c Thu Aug 25 14:27:58 2016 (r37891) @@ -35,6 +35,10 @@ #include "mp_msg.h" #include "libavutil/avstring.h" +#define ASCII_CHRS 128 // number of ASCII characters +#define EXTRA_CHRS 128 // (arbitrary) number of non-ASCII characters +#define UTF8LENGTH 4 // length of an UTF-8 encoding according to RFC 3629 + #define MAX_FONTS 25 #define fntAlignLeft 0 @@ -68,6 +72,13 @@ static int fntAddNewFont(char *name) av_strlcpy(Fonts[id]->name, name, MAX_FONT_NAME); + Fonts[id]->Chr = calloc(ASCII_CHRS + EXTRA_CHRS, sizeof(*Fonts[id]->Chr)); + + if (!Fonts[id]->Chr) { + nfree(Fonts[id]); + return -1; + } + for (i = 0; i < ASCII_CHRS + EXTRA_CHRS; i++) { Fonts[id]->Chr[i].x = -1; Fonts[id]->Chr[i].y = -1; @@ -75,6 +86,15 @@ static int fntAddNewFont(char *name) Fonts[id]->Chr[i].h = -1; } + Fonts[id]->bit8_chr = calloc(EXTRA_CHRS * UTF8LENGTH, sizeof(*Fonts[id]->bit8_chr)); + + if (!Fonts[id]->bit8_chr) { + nfree(Fonts[id]->Chr); + nfree(Fonts[id]); + return -1; + } else + Fonts[id]->extra_chrs = EXTRA_CHRS; + return id; } @@ -85,6 +105,8 @@ static int fntAddNewFont(char *name) */ static void fntFreeFont(int id) { + free(Fonts[id]->Chr); + free(Fonts[id]->bit8_chr); bpFree(&Fonts[id]->Bitmap); nfree(Fonts[id]); } @@ -154,14 +176,14 @@ int fntRead(char *path, char *fname) cutStr(item, item, '"', 1); if (item[0] & 0x80) { - for (i = 0; i < EXTRA_CHRS; i++) { - if (!Fonts[id]->nonASCIIidx[i][0]) { - strncpy(Fonts[id]->nonASCIIidx[i], item, UTF8LENGTH); + for (i = 0; i < Fonts[id]->extra_chrs; i++) { + if (!(Fonts[id]->bit8_chr + i * UTF8LENGTH)[0]) { + strncpy(Fonts[id]->bit8_chr + i * UTF8LENGTH, item, UTF8LENGTH); break; } } - if (i == EXTRA_CHRS) + if (i == Fonts[id]->extra_chrs) continue; i += ASCII_CHRS; @@ -250,14 +272,14 @@ static int fntGetCharIndex(int id, unsig *str += direction; } - for (i = 0; (i < EXTRA_CHRS) && Fonts[id]->nonASCIIidx[i][0]; i++) { - if (strncmp(Fonts[id]->nonASCIIidx[i], uchar, UTF8LENGTH) == 0) + for (i = 0; (i < Fonts[id]->extra_chrs) && (Fonts[id]->bit8_chr + i * UTF8LENGTH)[0]; i++) { + if (strncmp(Fonts[id]->bit8_chr + i * UTF8LENGTH, uchar, UTF8LENGTH) == 0) return i + ASCII_CHRS; if (!utf8 && - (Fonts[id]->nonASCIIidx[i][0] == (*uchar >> 6 | 0xc0) && - Fonts[id]->nonASCIIidx[i][1] == ((*uchar & 0x3f) | 0x80) && - Fonts[id]->nonASCIIidx[i][2] == 0)) + ((Fonts[id]->bit8_chr + i * UTF8LENGTH)[0] == (*uchar >> 6 | 0xc0) && + (Fonts[id]->bit8_chr + i * UTF8LENGTH)[1] == ((*uchar & 0x3f) | 0x80) && + (Fonts[id]->bit8_chr + i * UTF8LENGTH)[2] == 0)) c = i + ASCII_CHRS; } } else { Modified: trunk/gui/skin/font.h ============================================================================== --- trunk/gui/skin/font.h Thu Aug 25 14:22:44 2016 (r37890) +++ trunk/gui/skin/font.h Thu Aug 25 14:27:58 2016 (r37891) @@ -22,10 +22,6 @@ #include "gui/app/app.h" #include "gui/util/bitmap.h" -#define ASCII_CHRS 128 // number of ASCII characters -#define EXTRA_CHRS 128 // (arbitrary) number of non-ASCII characters -#define UTF8LENGTH 4 // length of an UTF-8 encoding according to RFC 3629 - #define MAX_FONT_NAME 128 typedef struct { @@ -34,8 +30,9 @@ typedef struct { } fntChar; typedef struct { - fntChar Chr[ASCII_CHRS + EXTRA_CHRS]; - unsigned char nonASCIIidx[EXTRA_CHRS][UTF8LENGTH]; + fntChar *Chr; + int extra_chrs; + unsigned char *bit8_chr; guiImage Bitmap; char name[MAX_FONT_NAME]; } bmpFont;

1 0

r37890 - trunk/gui/skin/font.c
by ib 25 Aug '16

25 Aug '16

Author: ib Date: Thu Aug 25 14:22:44 2016 New Revision: 37890 Log: Utilize fntFreeFont(). Call fntFreeFont() instead of freeing bmpFont members individually. (Until memory for Bitmap has been allocated, it points to NULL. So the call is always safe.) Modified: trunk/gui/skin/font.c Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Aug 25 14:21:00 2016 (r37889) +++ trunk/gui/skin/font.c Thu Aug 25 14:22:44 2016 (r37890) @@ -96,12 +96,9 @@ void fntFreeFonts(void) { int i; - for (i = 0; i < MAX_FONTS; i++) { - if (Fonts[i]) { - bpFree(&Fonts[i]->Bitmap); - nfree(Fonts[i]); - } - } + for (i = 0; i < MAX_FONTS; i++) + if (Fonts[i]) + fntFreeFont(i); } /** @@ -132,7 +129,7 @@ int fntRead(char *path, char *fname) file = fopen(buf, "rt"); if (!file) { - nfree(Fonts[id]); + fntFreeFont(id); return -3; } @@ -191,8 +188,7 @@ int fntRead(char *path, char *fname) mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[font] image file: %s\n", buf); if (skinImageRead(buf, &Fonts[id]->Bitmap) != 0) { - bpFree(&Fonts[id]->Bitmap); - nfree(Fonts[id]); + fntFreeFont(id); fclose(file); return -4; }

1 0

r37889 - trunk/gui/skin/font.c
by ib 25 Aug '16

25 Aug '16

Author: ib Date: Thu Aug 25 14:21:00 2016 New Revision: 37889 Log: Add fntFreeFont(). This opens up the possibility to free a specific font. Modified: trunk/gui/skin/font.c Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Aug 25 14:19:14 2016 (r37888) +++ trunk/gui/skin/font.c Thu Aug 25 14:21:00 2016 (r37889) @@ -79,6 +79,17 @@ static int fntAddNewFont(char *name) } /** + * @brief Free all memory allocated to a font. + * + * @param id font ID + */ +static void fntFreeFont(int id) +{ + bpFree(&Fonts[id]->Bitmap); + nfree(Fonts[id]); +} + +/** * @brief Free all memory allocated to fonts. */ void fntFreeFonts(void)

1 0

r37888 - in trunk/gui: app/app.c skin/font.c skin/font.h
by ib 25 Aug '16

25 Aug '16

Author: ib Date: Thu Aug 25 14:19:14 2016 New Revision: 37888 Log: Rename fntFreeFont() fntFreeFonts(). This makes room for a definition of fntFreeFont() freeing only one specific font. Modified: trunk/gui/app/app.c trunk/gui/skin/font.c trunk/gui/skin/font.h Modified: trunk/gui/app/app.c ============================================================================== --- trunk/gui/app/app.c Thu Aug 25 14:17:42 2016 (r37887) +++ trunk/gui/app/app.c Thu Aug 25 14:19:14 2016 (r37888) @@ -135,7 +135,7 @@ void appFreeStruct(void) guiApp.IndexOfPlaybarItems = -1; guiApp.IndexOfMenuItems = -1; - fntFreeFont(); + fntFreeFonts(); } /** Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Aug 25 14:17:42 2016 (r37887) +++ trunk/gui/skin/font.c Thu Aug 25 14:19:14 2016 (r37888) @@ -81,7 +81,7 @@ static int fntAddNewFont(char *name) /** * @brief Free all memory allocated to fonts. */ -void fntFreeFont(void) +void fntFreeFonts(void) { int i; Modified: trunk/gui/skin/font.h ============================================================================== --- trunk/gui/skin/font.h Thu Aug 25 14:17:42 2016 (r37887) +++ trunk/gui/skin/font.h Thu Aug 25 14:19:14 2016 (r37888) @@ -41,7 +41,7 @@ typedef struct { } bmpFont; int fntFindID(char *name); -void fntFreeFont(void); +void fntFreeFonts(void); int fntRead(char *path, char *fname); guiImage *fntTextRender(guiItem *item, int px, char *txt); int fntTextWidth(int id, char *str);

1 0

r37887 - in trunk/gui: app/app.c dialog/fileselect.c skin/font.c skin/skin.c
by ib 25 Aug '16

25 Aug '16

Author: ib Date: Thu Aug 25 14:17:42 2016 New Revision: 37887 Log: Check return value of strcmp() more recognizably. It may be a personal preference, but the !strcmp() notation somehow doesn't go well with the function's name. Modified: trunk/gui/app/app.c trunk/gui/dialog/fileselect.c trunk/gui/skin/font.c trunk/gui/skin/skin.c Modified: trunk/gui/app/app.c ============================================================================== --- trunk/gui/app/app.c Thu Aug 25 14:14:59 2016 (r37886) +++ trunk/gui/app/app.c Thu Aug 25 14:17:42 2016 (r37887) @@ -150,7 +150,7 @@ int appFindMessage(const char *name) unsigned int i; for (i = 0; i < FF_ARRAY_ELEMS(evNames); i++) - if (!strcmp(evNames[i].name, name)) + if (strcmp(evNames[i].name, name) == 0) return evNames[i].message; return -1; Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Thu Aug 25 14:14:59 2016 (r37886) +++ trunk/gui/dialog/fileselect.c Thu Aug 25 14:17:42 2016 (r37887) @@ -320,7 +320,7 @@ static void fs_fsFilterCombo_changed(Gtk case FILESELECT_VIDEO_AUDIO: for (i = 0; fsVideoAudioFilterNames[i][0]; i++) - if (!strcmp(str, fsVideoAudioFilterNames[i][0])) { + if (strcmp(str, fsVideoAudioFilterNames[i][0]) == 0) { fsFilter = fsVideoAudioFilterNames[i][1]; fsLastVideoAudioFilterSelected = i; break; @@ -331,7 +331,7 @@ static void fs_fsFilterCombo_changed(Gtk case FILESELECT_SUBTITLE: for (i = 0; fsSubtitleFilterNames[i][0]; i++) - if (!strcmp(str, fsSubtitleFilterNames[i][0])) { + if (strcmp(str, fsSubtitleFilterNames[i][0]) == 0) { fsFilter = fsSubtitleFilterNames[i][1]; fsLastSubtitleFilterSelected = i; break; @@ -342,7 +342,7 @@ static void fs_fsFilterCombo_changed(Gtk case FILESELECT_AUDIO: for (i = 0; fsAudioFileNames[i][0]; i++) - if (!strcmp(str, fsAudioFileNames[i][0])) { + if (strcmp(str, fsAudioFileNames[i][0]) == 0) { fsFilter = fsAudioFileNames[i][1]; fsLastAudioFilterSelected = i; break; @@ -353,7 +353,7 @@ static void fs_fsFilterCombo_changed(Gtk case FILESELECT_FONT: for (i = 0; fsFontFileNames[i][0]; i++) - if (!strcmp(str, fsFontFileNames[i][0])) { + if (strcmp(str, fsFontFileNames[i][0]) == 0) { fsFilter = fsFontFileNames[i][1]; fsLastFontFilterSelected = i; break; @@ -364,7 +364,7 @@ static void fs_fsFilterCombo_changed(Gtk case FILESELECT_IMAGE: for (i = 0; fsImageFilterNames[i][0]; i++) - if (!strcmp(str, fsImageFilterNames[i][0])) { + if (strcmp(str, fsImageFilterNames[i][0]) == 0) { fsFilter = fsImageFilterNames[i][1]; fsLastImageFilterSelected = i; break; Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Thu Aug 25 14:14:59 2016 (r37886) +++ trunk/gui/skin/font.c Thu Aug 25 14:17:42 2016 (r37887) @@ -173,7 +173,7 @@ int fntRead(char *path, char *fname) Fonts[id]->Chr[i].h = atoi(buf); mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[font] char: '%s' params: %d,%d %dx%d\n", item, Fonts[id]->Chr[i].x, Fonts[id]->Chr[i].y, Fonts[id]->Chr[i].w, Fonts[id]->Chr[i].h); - } else if (!strcmp(item, "image")) { + } else if (strcmp(item, "image") == 0) { av_strlcpy(buf, path, sizeof(buf)); av_strlcat(buf, param, sizeof(buf)); @@ -206,7 +206,7 @@ int fntFindID(char *name) for (i = 0; i < MAX_FONTS; i++) if (Fonts[i]) - if (!strcmp(name, Fonts[i]->name)) + if (strcmp(name, Fonts[i]->name) == 0) return i; return -1; Modified: trunk/gui/skin/skin.c ============================================================================== --- trunk/gui/skin/skin.c Thu Aug 25 14:14:59 2016 (r37886) +++ trunk/gui/skin/skin.c Thu Aug 25 14:17:42 2016 (r37887) @@ -188,7 +188,7 @@ static int item_section(char *in) return 1; } - if (!strcmp(strlower(in), "movieplayer")) + if (strcmp(strlower(in), "movieplayer") == 0) skin = &guiApp; else { skin_error(MSGTR_GUI_MSG_SkinUnknownName, in); @@ -1235,7 +1235,7 @@ int skinRead(char *sname) strlower(currItem); for (i = 0; i < FF_ARRAY_ELEMS(skinItem); i++) { - if (!strcmp(currItem, skinItem[i].name)) { + if (strcmp(currItem, skinItem[i].name) == 0) { if (skinItem[i].func(param) != 0) { fclose(skinfile); return -2;

1 0

r37886 - in trunk/gui/skin: font.c font.h
by ib 25 Aug '16

25 Aug '16

Author: ib Date: Thu Aug 25 14:14:59 2016 New Revision: 37886 Log: Rename bmpFont member Fnt. Rename it Chr for reasons of clarity. Modified: trunk/gui/skin/font.c trunk/gui/skin/font.h Modified: trunk/gui/skin/font.c ============================================================================== --- trunk/gui/skin/font.c Wed Aug 17 18:35:11 2016 (r37885) +++ trunk/gui/skin/font.c Thu Aug 25 14:14:59 2016 (r37886) @@ -69,10 +69,10 @@ static int fntAddNewFont(char *name) av_strlcpy(Fonts[id]->name, name, MAX_FONT_NAME); for (i = 0; i < ASCII_CHRS + EXTRA_CHRS; i++) { - Fonts[id]->Fnt[i].x = -1; - Fonts[id]->Fnt[i].y = -1; - Fonts[id]->Fnt[i].w = -1; - Fonts[id]->Fnt[i].h = -1; + Fonts[id]->Chr[i].x = -1; + Fonts[id]->Chr[i].y = -1; + Fonts[id]->Chr[i].w = -1; + Fonts[id]->Chr[i].h = -1; } return id; @@ -161,18 +161,18 @@ int fntRead(char *path, char *fname) i = item[0]; cutStr(param, buf, ',', 0); - Fonts[id]->Fnt[i].x = atoi(buf); + Fonts[id]->Chr[i].x = atoi(buf); cutStr(param, buf, ',', 1); - Fonts[id]->Fnt[i].y = atoi(buf); + Fonts[id]->Chr[i].y = atoi(buf); cutStr(param, buf, ',', 2); - Fonts[id]->Fnt[i].w = atoi(buf); + Fonts[id]->Chr[i].w = atoi(buf); cutStr(param, buf, ',', 3); - Fonts[id]->Fnt[i].h = atoi(buf); + Fonts[id]->Chr[i].h = atoi(buf); - mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[font] char: '%s' params: %d,%d %dx%d\n", item, Fonts[id]->Fnt[i].x, Fonts[id]->Fnt[i].y, Fonts[id]->Fnt[i].w, Fonts[id]->Fnt[i].h); + mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[font] char: '%s' params: %d,%d %dx%d\n", item, Fonts[id]->Chr[i].x, Fonts[id]->Chr[i].y, Fonts[id]->Chr[i].w, Fonts[id]->Chr[i].h); } else if (!strcmp(item, "image")) { av_strlcpy(buf, path, sizeof(buf)); av_strlcat(buf, param, sizeof(buf)); @@ -213,7 +213,7 @@ int fntFindID(char *name) } /** - * @brief Get the #bmpFont::Fnt index of the character @a str points to. + * @brief Get the #bmpFont::Chr index of the character @a str points to. * * Move pointer @a str to the character according to @a direction * afterwards. @@ -285,11 +285,11 @@ int fntTextWidth(int id, char *str) while (*p) { c = fntGetCharIndex(id, &p, utf8, 1); - if (c == -1 || Fonts[id]->Fnt[c].w == -1) + if (c == -1 || Fonts[id]->Chr[c].w == -1) c = ' '; - if (Fonts[id]->Fnt[c].w != -1) - size += Fonts[id]->Fnt[c].w; + if (Fonts[id]->Chr[c].w != -1) + size += Fonts[id]->Chr[c].w; } return size; @@ -315,10 +315,10 @@ static int fntTextHeight(int id, char *s while (*p) { c = fntGetCharIndex(id, &p, utf8, 1); - if (c == -1 || Fonts[id]->Fnt[c].w == -1) + if (c == -1 || Fonts[id]->Chr[c].w == -1) c = ' '; - h = Fonts[id]->Fnt[c].h; + h = Fonts[id]->Chr[c].h; if (h > max) max = h; @@ -407,18 +407,18 @@ guiImage *fntTextRender(guiItem *item, i c = fntGetCharIndex(id, &u, utf8, 1); if (c != -1) - fw = Fonts[id]->Fnt[c].w; + fw = Fonts[id]->Chr[c].w; if (c == -1 || fw == -1) { c = ' '; - fw = Fonts[id]->Fnt[c].w; + fw = Fonts[id]->Chr[c].w; } if (fw == -1) continue; - fh = Fonts[id]->Fnt[c].h; - fyc = Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x; + fh = Fonts[id]->Chr[c].h; + fyc = Fonts[id]->Chr[c].y * fbw + Fonts[id]->Chr[c].x; yc = dx; if (dx >= 0) { @@ -443,18 +443,18 @@ guiImage *fntTextRender(guiItem *item, i c = fntGetCharIndex(id, &u, utf8, -1); if (c != -1) - fw = Fonts[id]->Fnt[c].w; + fw = Fonts[id]->Chr[c].w; if (c == -1 || fw == -1) { c = ' '; - fw = Fonts[id]->Fnt[c].w; + fw = Fonts[id]->Chr[c].w; } if (fw == -1) continue; - fh = Fonts[id]->Fnt[c].h; - fyc = Fonts[id]->Fnt[c].y * fbw + Fonts[id]->Fnt[c].x; + fh = Fonts[id]->Chr[c].h; + fyc = Fonts[id]->Chr[c].y * fbw + Fonts[id]->Chr[c].x; dx -= fw; yc = dx; Modified: trunk/gui/skin/font.h ============================================================================== --- trunk/gui/skin/font.h Wed Aug 17 18:35:11 2016 (r37885) +++ trunk/gui/skin/font.h Thu Aug 25 14:14:59 2016 (r37886) @@ -34,7 +34,7 @@ typedef struct { } fntChar; typedef struct { - fntChar Fnt[ASCII_CHRS + EXTRA_CHRS]; + fntChar Chr[ASCII_CHRS + EXTRA_CHRS]; unsigned char nonASCIIidx[EXTRA_CHRS][UTF8LENGTH]; guiImage Bitmap; char name[MAX_FONT_NAME];

1 0

r37885 - trunk/etc/codecs.conf
by compn 17 Aug '16

17 Aug '16

Author: compn Date: Wed Aug 17 18:35:11 2016 New Revision: 37885 Log: codecs.conf add ffsheer video and ffylc, fix g264 Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon Aug 8 12:22:50 2016 (r37884) +++ trunk/etc/codecs.conf Wed Aug 17 18:35:11 2016 (r37885) @@ -209,7 +209,7 @@ videocodec geoh264 fourcc G264 driver vfw dll "GX264.dll" - out RGB24,RGB32,BGR32,BGR24 flip + out RGB24,RGB32,BGR32,BGR24 videocodec imm4 info "infinity cctv codec" @@ -394,6 +394,19 @@ videocodec blackmagic dll "BMDCodecLib.dll" out BGR32,RGB32 +videocodec ffsheer + info "ffmpeg sheervideo" + status working + fourcc Shr0,Shr1,Shr2 + fourcc Shr3,Shr4,Shr5 + fourcc Shr6,Shr7 + driver ffmpeg + dll "sheervideo" + out 444P,422P,444A + out 422A,RGBA,ARGB + out BGR24,BGR16,YUY2 + out 422P10,444P10 + videocodec qtsheer info "QuickTime sheervideo" status buggy @@ -1003,6 +1016,14 @@ videocodec ylc dll "ylc.vcm" out BGR24 flip +videocodec ffylc + info "YUY2 lossless codec" + status working + fourcc YLC0 + driver ffmpeg + dll "ylc" + out YV12 + videocodec smartsight info "Verint Video Manager" status working

1 0

r37884 - trunk/etc/codecs.conf
by ib 08 Aug '16

08 Aug '16

Author: ib Date: Mon Aug 8 12:22:50 2016 New Revision: 37884 Log: Remove incorrect comma. This stops MPlayer from compiling. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Mon Aug 8 00:17:13 2016 (r37883) +++ trunk/etc/codecs.conf Mon Aug 8 12:22:50 2016 (r37884) @@ -13,7 +13,7 @@ videocodec ffiff info "FFmpeg IFF ANIM/ILBM/PBM/RGB8/RGBN" status working fourcc ANIM - fourcc ILBM, + fourcc ILBM fourcc "PBM " fourcc RGB8,RGBN driver ffmpeg

1 0

r37883 - in trunk: Changelog codec-cfg.c etc/codecs.conf
by rtogni 07 Aug '16

07 Aug '16

Author: rtogni Date: Mon Aug 8 00:17:13 2016 New Revision: 37883 Log: Add FFmpeg IFF decoders Video: ANIM Image: ILBM, PBM, RGB8, RGBN Modified: trunk/Changelog trunk/codec-cfg.c trunk/etc/codecs.conf Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Sun Aug 7 23:44:47 2016 (r37882) +++ trunk/Changelog Mon Aug 8 00:17:13 2016 (r37883) @@ -13,6 +13,7 @@ MPlayer * FFmpeg audio decoders: g721, g732 * FFmpeg video decoders: more Matrox mpeg2 formats (M702-3-4-5), Truemotion RT, Matrox Uncompressed SD/HD + * FFmpeg IFF video/image decoders: ANIM, ILBM, PBM, RGB8, RGBN Fixes: * fix more issues reported by Coverity Modified: trunk/codec-cfg.c ============================================================================== --- trunk/codec-cfg.c Sun Aug 7 23:44:47 2016 (r37882) +++ trunk/codec-cfg.c Mon Aug 8 00:17:13 2016 (r37883) @@ -231,6 +231,7 @@ static const struct { {"BGR4", IMGFMT_BGR4}, {"BGR8", IMGFMT_BGR8}, {"BGR15LE", IMGFMT_BGR15LE}, + {"BGR12", IMGFMT_BGR12}, {"BGR15", IMGFMT_BGR15}, {"BGR16", IMGFMT_BGR16}, {"BGR24", IMGFMT_BGR24}, Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Aug 7 23:44:47 2016 (r37882) +++ trunk/etc/codecs.conf Mon Aug 8 00:17:13 2016 (r37883) @@ -9,6 +9,17 @@ release 20111012 ; VIDEO CODECS ;============================================================================= +videocodec ffiff + info "FFmpeg IFF ANIM/ILBM/PBM/RGB8/RGBN" + status working + fourcc ANIM + fourcc ILBM, + fourcc "PBM " + fourcc RGB8,RGBN + driver ffmpeg + dll iff + out BGR8,BGR32,Y8,RGBA,BGR12 + videocodec ffanm info "FFmpeg Deluxe Paint Animation" status working

1 0

r37882 - trunk/libvo/vo_png.c
by rtogni 07 Aug '16

07 Aug '16

Author: rtogni Date: Sun Aug 7 23:44:47 2016 New Revision: 37882 Log: Fix vo_png with recent ffmpeg avcodec_open2() now requires timebase to be always set, even for png images. The patch sets it to 1/1, since pictures do not have a framerate. Modified: trunk/libvo/vo_png.c Modified: trunk/libvo/vo_png.c ============================================================================== --- trunk/libvo/vo_png.c Tue Jul 26 00:31:21 2016 (r37881) +++ trunk/libvo/vo_png.c Sun Aug 7 23:44:47 2016 (r37882) @@ -136,6 +136,8 @@ config(uint32_t width, uint32_t height, avctx->pix_fmt = imgfmt2pixfmt(format); avctx->width = width; avctx->height = height; + avctx->time_base.num = 1; + avctx->time_base.den = 1; if (avcodec_open2(avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL) < 0) { uninit(); return -1;

1 0