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

r37527 - trunk/libmpdemux/demux_audio.c
by rtogni 27 Sep '15

27 Sep '15

Author: rtogni Date: Sun Sep 27 16:50:37 2015 New Revision: 37527 Log: Skip over flac metadata instead of sending it to the audio decoder Fixes Chelsea%20Wolfe%20-%20Pain%20Is%20Beauty%20-%2001%20-%20Feral%20Love.flac from http://samples.ffmpeg.org/flac Modified: trunk/libmpdemux/demux_audio.c Modified: trunk/libmpdemux/demux_audio.c ============================================================================== --- trunk/libmpdemux/demux_audio.c Wed Sep 16 20:37:00 2015 (r37526) +++ trunk/libmpdemux/demux_audio.c Sun Sep 27 16:50:37 2015 (r37527) @@ -261,6 +261,21 @@ get_flac_metadata (demuxer_t* demuxer) } #endif +static void skip_flac_metadata(demuxer_t *demuxer) +{ + stream_t *s = demuxer->stream; + unsigned char blk_type; + + mp_msg(MSGT_DEMUX,MSGL_V,"demux_audio: skipping flac metadata\n"); + do { + int blk_len; + blk_type = stream_read_char (s); + blk_len = stream_read_int24(s); + mp_msg(MSGT_DEMUX,MSGL_DBG2,"Blk type %2x, size = %6x\n",blk_type, blk_len); + stream_skip (s, blk_len); + } while (!(blk_type & 0x80)); +} + /** * @brief Determine the number of frames of a file encoded with * variable bitrate mode (VBR). @@ -595,7 +610,8 @@ static int demux_audio_open(demuxer_t* d sh_audio->needs_parsing = 1; stream_seek(s,demuxer->movi_start); } break; - case fLaC: + case fLaC: { + int have_metadata = 0; sh_audio->format = mmioFOURCC('f', 'L', 'a', 'C'); demuxer->movi_start = stream_tell(s) - 4; demuxer->movi_end = s->end_pos; @@ -604,19 +620,29 @@ static int demux_audio_open(demuxer_t* d int64_t size = demuxer->movi_end - demuxer->movi_start; int64_t num_samples; int32_t srate; - stream_skip(s, 14); + int header_size; + have_metadata = !(stream_read_char(s) & 0x80); + header_size = stream_read_int24(s); + if (header_size != 0x22) + mp_msg(MSGT_DEMUX,MSGL_WARN,"demux_audio: unexpected flac header size: 0x%x\n", header_size); + stream_skip(s, 10); srate = stream_read_int24(s) >> 4; num_samples = stream_read_char(s) & 0xf; num_samples <<= 32; num_samples |= stream_read_dword(s); if (num_samples && srate) sh_audio->i_bps = size * srate / num_samples; + stream_skip(s, 16); } if (sh_audio->i_bps < 1) // guess value to prevent crash sh_audio->i_bps = 64 * 1024; sh_audio->needs_parsing = 1; + if (have_metadata) { // Remove this block if reenabling get_metadata + skip_flac_metadata(demuxer); + demuxer->movi_start = stream_tell(s); + } // get_flac_metadata (demuxer); - break; + } break; } priv = malloc(sizeof(da_priv_t));

1 0

r37526 - in branches/1.2: . stream/tvi_bsdbt848.c
by rtogni 16 Sep '15

16 Sep '15

Author: rtogni Date: Wed Sep 16 20:37:00 2015 New Revision: 37526 Log: Port kfreeBSD compilation fix from r37525 Modified: branches/1.2/ (props changed) branches/1.2/stream/tvi_bsdbt848.c Modified: branches/1.2/stream/tvi_bsdbt848.c ============================================================================== --- branches/1.2/stream/tvi_bsdbt848.c Wed Sep 16 20:34:19 2015 (r37525) +++ branches/1.2/stream/tvi_bsdbt848.c Wed Sep 16 20:37:00 2015 (r37526) @@ -27,6 +27,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#define _BSD_SOURCE + #include "config.h" #define RINGSIZE 8

1 0

r37525 - trunk/stream/tvi_bsdbt848.c
by rtogni 16 Sep '15

16 Sep '15

Author: rtogni Date: Wed Sep 16 20:34:19 2015 New Revision: 37525 Log: Fix build failure in kfreeBSD Patch by Miguel A. Colón Vélez debian.micove gmail Modified: trunk/stream/tvi_bsdbt848.c Modified: trunk/stream/tvi_bsdbt848.c ============================================================================== --- trunk/stream/tvi_bsdbt848.c Sat Sep 12 17:27:47 2015 (r37524) +++ trunk/stream/tvi_bsdbt848.c Wed Sep 16 20:34:19 2015 (r37525) @@ -27,6 +27,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#define _BSD_SOURCE + #include "config.h" #define RINGSIZE 8

1 0

r37524 - in branches/1.2: . libmpcodecs/vf_screenshot.c
by rtogni 12 Sep '15

12 Sep '15

Author: rtogni Date: Sat Sep 12 17:27:47 2015 New Revision: 37524 Log: Merge screenshot fix from r37523 Modified: branches/1.2/ (props changed) branches/1.2/libmpcodecs/vf_screenshot.c Modified: branches/1.2/libmpcodecs/vf_screenshot.c ============================================================================== --- branches/1.2/libmpcodecs/vf_screenshot.c Sat Sep 12 17:18:48 2015 (r37523) +++ branches/1.2/libmpcodecs/vf_screenshot.c Sat Sep 12 17:27:47 2015 (r37524) @@ -110,6 +110,9 @@ static void write_png(struct vf_priv_s * av_init_packet(&pkt); pkt.data = priv->outbuffer; pkt.size = priv->outbuffer_size; + priv->pic->width = priv->avctx->width; + priv->pic->height = priv->avctx->height; + priv->pic->format = priv->avctx->pix_fmt; res = avcodec_encode_video2(priv->avctx, &pkt, priv->pic, &got_pkt); if (res < 0 || !got_pkt || pkt.size <= 0) { mp_msg(MSGT_VFILTER,MSGL_ERR,"\nFailed to encode screenshot %s!\n", fname);

1 0

r37523 - trunk/libmpcodecs/vf_screenshot.c
by rtogni 12 Sep '15

12 Sep '15

Author: rtogni Date: Sat Sep 12 17:18:48 2015 New Revision: 37523 Log: Fix screenshot generation Modified: trunk/libmpcodecs/vf_screenshot.c Modified: trunk/libmpcodecs/vf_screenshot.c ============================================================================== --- trunk/libmpcodecs/vf_screenshot.c Sat Sep 12 16:25:31 2015 (r37522) +++ trunk/libmpcodecs/vf_screenshot.c Sat Sep 12 17:18:48 2015 (r37523) @@ -110,6 +110,9 @@ static void write_png(struct vf_priv_s * av_init_packet(&pkt); pkt.data = priv->outbuffer; pkt.size = priv->outbuffer_size; + priv->pic->width = priv->avctx->width; + priv->pic->height = priv->avctx->height; + priv->pic->format = priv->avctx->pix_fmt; res = avcodec_encode_video2(priv->avctx, &pkt, priv->pic, &got_pkt); if (res < 0 || !got_pkt || pkt.size <= 0) { mp_msg(MSGT_VFILTER,MSGL_ERR,"\nFailed to encode screenshot %s!\n", fname);

1 0

r37522 - in branches/1.2: . help/help_mp-zh_CN.h
by ib 12 Sep '15

12 Sep '15

Author: ib Date: Sat Sep 12 16:25:31 2015 New Revision: 37522 Log: Merge r37521 from trunk: Sync help_mp-zh_CN.h with help_mp-en.h. Modified: branches/1.2/ (props changed) branches/1.2/help/help_mp-zh_CN.h Modified: branches/1.2/help/help_mp-zh_CN.h ============================================================================== --- branches/1.2/help/help_mp-zh_CN.h Sat Sep 12 03:58:42 2015 (r37521) +++ branches/1.2/help/help_mp-zh_CN.h Sat Sep 12 16:25:31 2015 (r37522) @@ -1,4 +1,4 @@ -// Synced with help_mp-en.h rev. 37272 +// Synced with help_mp-en.h rev. 37475 // // Translated by JRaSH <jrash06(a)gmail.com> @@ -651,6 +651,10 @@ static const char help_text[] = MSGTR_He #define MSGTR_GUI_FilterFontBitmap "位图字体文件（*.desc）" #define MSGTR_GUI_FilterFontTTF "TrueType 字体文件（*.ttf）" #define MSGTR_GUI_FilterFontType1 "Type1 字体文件（*.pfb）" +#define MSGTR_GUI_FilterImageCD "CD 镜像索引表" +#define MSGTR_GUI_FilterImageCue "CD/VCD/SVCD 镜像索引表" +#define MSGTR_GUI_FilterImageDVD "DVD 镜像/拷贝" +#define MSGTR_GUI_FilterImageVCD "VCD/SVCD 镜像索引表" #define MSGTR_GUI_FilterMediumMatroska "Matroska 媒体文件" #define MSGTR_GUI_FilterMediumOgg "Ogg 媒体文件" #define MSGTR_GUI_FilterMediumQuickTime "QuickTime 媒体文件" @@ -679,6 +683,7 @@ static const char help_text[] = MSGTR_He #define MSGTR_GUI_FrontRight "前右" #define MSGTR_GUI_HideVideoWindow "播放后隐藏视频窗口" #define MSGTR_GUI_Hue "色调" +#define MSGTR_GUI_Image "镜像" #define MSGTR_GUI_Information "信息" #define MSGTR_GUI_Lavc "lavc（实时 mpeg1 编码）" #define MSGTR_GUI_MaximumUsageSpareCPU "空闲 CPU 时间的最大使用量" @@ -784,6 +789,7 @@ static const char help_text[] = MSGTR_He #define MSGTR_GUI_SelectedFiles "所选文件" #define MSGTR_GUI_SelectFile "选择文件" #define MSGTR_GUI_SelectFont "选择字体" +#define MSGTR_GUI_SelectImage "选择镜像" #define MSGTR_GUI_SelectSubtitle "选择字幕" #define MSGTR_GUI_SizeDouble "双倍尺寸" #define MSGTR_GUI_SizeFullscreen "全屏" @@ -1831,7 +1837,8 @@ static const char help_text[] = MSGTR_He #define MSGTR_MPDEMUX_CDDB_NoCDInDrive "驱动器里没有 CD。\n" // stream_cue.c -#define MSGTR_MPDEMUX_CUEREAD_UnexpectedCuefileLine "[bincue] cue 文件中不应出现的一行内容：%s\n" +#define MSGTR_MPDEMUX_CUEREAD_UnexpectedCuefileLine "[bincue] cue 文件中有内容异常的一行：%s" +#define MSGTR_MPDEMUX_CUEREAD_BinFilenameFound "[bincue] 未找到文件描述内容：%s" #define MSGTR_MPDEMUX_CUEREAD_BinFilenameTested "[bincue] 已测试 bin 文件名：%s\n" #define MSGTR_MPDEMUX_CUEREAD_CannotFindBinFile "[bincue] 无法找到 bin 文件 - 正在放弃尝试。\n" #define MSGTR_MPDEMUX_CUEREAD_UsingBinFile "[bincue] 正在使用 bin 文件 %s。\n"

1 0

r37520 - in branches/1.2: . gui/interface.c gui/ui/actions.c
by ib 08 Sep '15

08 Sep '15

Author: ib Date: Tue Sep 8 23:02:40 2015 New Revision: 37520 Log: Merge r37504 from trunk: Set guiInfo.Track information in uiSetFileFromPlaylist(). Modified: branches/1.2/ (props changed) branches/1.2/gui/interface.c branches/1.2/gui/ui/actions.c Modified: branches/1.2/gui/interface.c ============================================================================== --- branches/1.2/gui/interface.c Tue Sep 8 23:02:37 2015 (r37519) +++ branches/1.2/gui/interface.c Tue Sep 8 23:02:40 2015 (r37520) @@ -600,7 +600,6 @@ int gui(int what, void *data) } else { next = listMgr(PLAYLIST_ITEM_GET_CURR, 0); uiSetFileFromPlaylist(next); - guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next); } } break; @@ -1023,7 +1022,6 @@ int gui(int what, void *data) if (next) { uiSetFileFromPlaylist(next); guiInfo.MediumChanged = GUI_MEDIUM_NEW; - guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next); } else { if (guiInfo.MediumChanged == GUI_MEDIUM_NEW) break; Modified: branches/1.2/gui/ui/actions.c ============================================================================== --- branches/1.2/gui/ui/actions.c Tue Sep 8 23:02:37 2015 (r37519) +++ branches/1.2/gui/ui/actions.c Tue Sep 8 23:02:40 2015 (r37520) @@ -726,6 +726,7 @@ void uiSetFileFromPlaylist(plItem *item) guiInfo.Start = item->start; guiInfo.Stop = item->stop; guiInfo.Title = gstrdup(item->title); + guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, item); } /** @@ -820,7 +821,6 @@ void uiCurr(void) if (curr) { uiSetFileFromPlaylist(curr); guiInfo.PlaylistNext = False; - guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, curr); break; } @@ -899,7 +899,6 @@ void uiPrev(void) if (prev) { uiSetFileFromPlaylist(prev); guiInfo.PlaylistNext = !guiInfo.Playing; - guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, prev); break; } @@ -968,7 +967,6 @@ void uiNext(void) if (next) { uiSetFileFromPlaylist(next); guiInfo.PlaylistNext = !guiInfo.Playing; - guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next); break; }

1 0

r37519 - in branches/1.2: . gui/interface.c
by ib 08 Sep '15

08 Sep '15

Author: ib Date: Tue Sep 8 23:02:37 2015 New Revision: 37519 Log: Merge r37503 from trunk: Cosmetic: Adjust indent. Modified: branches/1.2/ (props changed) branches/1.2/gui/interface.c Modified: branches/1.2/gui/interface.c ============================================================================== --- branches/1.2/gui/interface.c Tue Sep 8 23:02:35 2015 (r37518) +++ branches/1.2/gui/interface.c Tue Sep 8 23:02:37 2015 (r37519) @@ -590,13 +590,13 @@ int gui(int what, void *data) } if (guiInfo.StreamType == STREAMTYPE_BINCUE) { - colon = strrchr(fname, ':'); + colon = strrchr(fname, ':'); - if (colon) - *colon = 0; + if (colon) + *colon = 0; - snprintf(tmp, sizeof(tmp), "cue://%s:%d", fname, guiInfo.Track); - uiSetFile(NULL, tmp, SAME_STREAMTYPE); + snprintf(tmp, sizeof(tmp), "cue://%s:%d", fname, guiInfo.Track); + uiSetFile(NULL, tmp, SAME_STREAMTYPE); } else { next = listMgr(PLAYLIST_ITEM_GET_CURR, 0); uiSetFileFromPlaylist(next);

1 0

r37518 - in branches/1.2: . Changelog gui/dialog/fileselect.c gui/interface.c
by ib 08 Sep '15

08 Sep '15

Author: ib Date: Tue Sep 8 23:02:35 2015 New Revision: 37518 Log: Merge r37502 from trunk: Add support for arbitrary cue sheet playlists to the GUI. Modified: branches/1.2/ (props changed) branches/1.2/Changelog branches/1.2/gui/dialog/fileselect.c branches/1.2/gui/interface.c Modified: branches/1.2/Changelog ============================================================================== --- branches/1.2/Changelog Tue Sep 8 23:02:32 2015 (r37517) +++ branches/1.2/Changelog Tue Sep 8 23:02:35 2015 (r37518) @@ -58,6 +58,8 @@ MPlayer * Support for audio and video bin/cue image playback * Support for Audio CD / (Super) Video CD / DVD image and DVD copy playback through the respective scheme (cd://, vcd://, dvd://) + * Support for arbitrary non-binary data file cue sheets (i.e. cue sheets + describing playlists for data files containing multiple titles) 1.1: "We gave up on 1.0" Modified: branches/1.2/gui/dialog/fileselect.c ============================================================================== --- branches/1.2/gui/dialog/fileselect.c Tue Sep 8 23:02:32 2015 (r37517) +++ branches/1.2/gui/dialog/fileselect.c Tue Sep 8 23:02:35 2015 (r37518) @@ -488,9 +488,7 @@ static void fs_Ok_released(GtkButton *bu switch (fsType) { case FILESELECT_VIDEO_AUDIO: - if (strcmp(fsVideoAudioFilterNames[fsLastVideoAudioFilterSelected][0], MSGTR_GUI_FilterImageCue) == 0) - type = STREAMTYPE_BINCUE; - else if (strcmp(fsVideoAudioFilterNames[fsLastVideoAudioFilterSelected][0], MSGTR_GUI_FilterFilePlaylist) == 0) + if (strcmp(fsVideoAudioFilterNames[fsLastVideoAudioFilterSelected][0], MSGTR_GUI_FilterFilePlaylist) == 0) type = STREAMTYPE_PLAYLIST; uiSetFile(fsSelectedDirectory, fsSelectedFile, type); Modified: branches/1.2/gui/interface.c ============================================================================== --- branches/1.2/gui/interface.c Tue Sep 8 23:02:32 2015 (r37517) +++ branches/1.2/gui/interface.c Tue Sep 8 23:02:35 2015 (r37518) @@ -32,6 +32,7 @@ #include "ui/ui.h" #include "util/list.h" #include "util/mem.h" +#include "util/misc.h" #include "util/string.h" #include "wm/ws.h" #include "wm/wsxdnd.h" @@ -445,6 +446,9 @@ int gui(int what, void *data) wsMouseAutohide(); gtkEvents(); + if (guiInfo.Stop && (guiInfo.ElapsedTime >= guiInfo.Stop)) + guiInfo.MediumChanged = GUI_MEDIUM_NEW; + break; case GUI_RUN_COMMAND: @@ -503,6 +507,9 @@ int gui(int what, void *data) force_fps = 0; } + if (gstrcmp(strrchr(guiInfo.Filename, '.'), ".cue") == 0) + guiInfo.StreamType = STREAMTYPE_BINCUE; + switch (guiInfo.StreamType) { case STREAMTYPE_FILE: case STREAMTYPE_STREAM: @@ -559,6 +566,30 @@ int gui(int what, void *data) if (strncmp(guiInfo.Filename, "cue://", 6) == 0) fname += 6; + if (fname == guiInfo.Filename) { // no scheme, so check for playlist + plItem **playlist = cue_playlist(guiInfo.Filename); + + if (playlist) { + plItem *curr = listMgr(PLAYLIST_ITEM_GET_CURR, 0); + + while (*playlist) { + if (*(playlist + 1)) + (*playlist)->stop = (*(playlist + 1))->start; + else + (*playlist)->stop = 0; + + listMgr(PLAYLIST_ITEM_INSERT, *playlist); + playlist++; + } + + listMgr(PLAYLIST_ITEM_SET_CURR, curr); + listMgr(PLAYLIST_ITEM_DEL_CURR, 0); + + guiInfo.StreamType = STREAMTYPE_FILE; + } + } + + if (guiInfo.StreamType == STREAMTYPE_BINCUE) { colon = strrchr(fname, ':'); if (colon) @@ -566,6 +597,11 @@ int gui(int what, void *data) snprintf(tmp, sizeof(tmp), "cue://%s:%d", fname, guiInfo.Track); uiSetFile(NULL, tmp, SAME_STREAMTYPE); + } else { + next = listMgr(PLAYLIST_ITEM_GET_CURR, 0); + uiSetFileFromPlaylist(next); + guiInfo.Track = (uintptr_t)listMgr(PLAYLIST_ITEM_GET_POS, next); + } } break; } @@ -898,6 +934,9 @@ int gui(int what, void *data) } } + if (guiInfo.Start) + uiAbsSeek(guiInfo.Start); + // These must be done here (in the last call from MPlayer before // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because...

1 0

r37517 - in branches/1.2: . DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/ui/render.c
by ib 08 Sep '15

08 Sep '15

Author: ib Date: Tue Sep 8 23:02:32 2015 New Revision: 37517 Log: Merge r37501 from trunk: Add new dynamic label variable $O (title name or file name). Modified: branches/1.2/ (props changed) branches/1.2/DOCS/xml/de/skin.xml branches/1.2/DOCS/xml/en/skin.xml branches/1.2/gui/ui/render.c Modified: branches/1.2/DOCS/xml/de/skin.xml ============================================================================== --- branches/1.2/DOCS/xml/de/skin.xml Tue Sep 8 23:02:29 2015 (r37516) +++ branches/1.2/DOCS/xml/de/skin.xml Tue Sep 8 23:02:32 2015 (r37517) @@ -736,6 +736,13 @@ end <entry>Dateiname</entry> </row> <row> + <entry>$O</entry> + <entry> + Dateiname (falls kein Titelname verfügbar), ansonsten + der Titel + </entry> + </row> + <row> <entry>$f</entry> <entry>Dateiname in Kleinbuchstaben</entry> </row> Modified: branches/1.2/DOCS/xml/en/skin.xml ============================================================================== --- branches/1.2/DOCS/xml/en/skin.xml Tue Sep 8 23:02:29 2015 (r37516) +++ branches/1.2/DOCS/xml/en/skin.xml Tue Sep 8 23:02:32 2015 (r37517) @@ -606,6 +606,10 @@ blocks. <entry>filename</entry> </row> <row> + <entry>$O</entry> + <entry>filename (if no title name available) otherwise title</entry> + </row> + <row> <entry>$f</entry> <entry>filename in lower case</entry> </row> Modified: branches/1.2/gui/ui/render.c ============================================================================== --- branches/1.2/gui/ui/render.c Tue Sep 8 23:02:29 2015 (r37516) +++ branches/1.2/gui/ui/render.c Tue Sep 8 23:02:32 2015 (r37517) @@ -51,7 +51,8 @@ * * @param how 0 (cut file path and extension), * 1 (additionally, convert lower case) or - * 2 (additionally, convert upper case) + * 2 (additionally, convert upper case) or + * 4 (unaltered title if available, otherwise like 0) * @param fname memory location of a buffer to receive the converted Filename * @param maxlen size of the @a fname buffer * @@ -66,7 +67,9 @@ static char *TranslateFilename(int how, switch (guiInfo.StreamType) { case STREAMTYPE_FILE: - if (guiInfo.Filename && *guiInfo.Filename) { + if ((how == 4) && guiInfo.Title) + av_strlcpy(fname, guiInfo.Title, maxlen); + else if (guiInfo.Filename && *guiInfo.Filename) { p = strrchr(guiInfo.Filename, '/'); if (p) @@ -270,6 +273,11 @@ MMMM_SS: snprintf(trans, sizeof(t av_strlcat(translation, trans, sizeof(translation)); break; + case 'O': + TranslateFilename(4, trans, sizeof(trans)); + av_strlcat(translation, trans, sizeof(translation)); + break; + case 'l': // legacy case 'p': if (guiInfo.Playing == GUI_PLAY)

1 0