April 2008 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] Fixed-point WMA decoder adapted from ROckbox
by Matt Campbell 30 Apr '08

30 Apr '08

Hello: Attached is a patch for MPlayer which adds a fixed-point WMA decoder that I adapted from Rockbox. Rockbox's fixed-point WMA decoder was in turn adapted from the one in libavcodec, so it would seem that the best approach is to port the modifications from the Rockbox WMA decoder back to libavcodec. But I didn't want to break libavcodec. So instead, I turned the libwma library from ROckbox into a stand-alone library which can run outside of Rockbox, then added it to the MPlayer build system and wrote an audio decoder plug-in for libwma (based on ad_ffmpeg.c). The attached patch also includes some changes to etc/codecs.conf. Once you apply the patch, you'll need to pass "--enable-libwma" to configure to enable this codec. However, there's a problem: the codec's output isn't always correct. I've found that the codec works fine for relatively high bit-rate WMA files stored locally or streamed over HTTP. But I had problems with a couple of streams using the MMS protocol. For instance, if you play this stream: mms://crista.streamguys.com/kcms you'll hear frequent high-pitch noises. This doesn't happen with Windows Media Player. I don't know nearly enough about codecs, or fixed-point math for that matter, to debug this; I only knew enough to get the WMA decoder from ROckbox to work in MPlayer. So I would really appreciate it if someone would spend some time debugging this, or at least give me some hints on how to go about it myself. Thanks, Matt

4 5

Fix NULL pointer dereference when audio filter fails
by Lasse Kärkkäinen 29 Apr '08

29 Apr '08

sh_audio->afilter being NULL will cause segfault in the playback loop. Workaround by setting sh_audio and d_audio->sh to NULL if the afilter init fails, so that audio decoding is disabled entirely. Index: mplayer.c =================================================================== --- mplayer.c (revision 26472) +++ mplayer.c (working copy) @@ -1636,6 +1636,8 @@ // mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n"); // uninit_player(INITIALIZED_ACODEC|INITIALIZED_AO); // close codec & ao // sh_audio=mpctx->d_audio->sh=NULL; // -> nosound + // FIXME: Possible leak: should something be uninitialized first? + mpctx->sh_audio=mpctx->d_audio->sh=NULL; // failed to init :( } #endif }

4 6

[PATCH] Following ASF redirections and detecting ASX playlist
by bl4 29 Apr '08

29 Apr '08

Hi, I've made a patch that fixes problems with ASF streaming I came across when streaming Yahoo Launchcast. In response to an HTTP request, server replies with an ASF content-type and a single URL in the content. Instead of following this URL and making another request, mplayer wants to stream the original URL and fails. Before I made this patch, I had to write a Perl script that followed these redirections until it received an MMS URL. Then the script passed the URL to mplayer. With this patch, when an HTTP response is received with an ASF content-type, mplayer checks if the content starts with `http://` or `mms://`. If it does, it makes another HTTP request (if http) or changes the current URL to the new one (if mms). The second problem is ASX playlist detection. If mplayer is started with -playlist option, everything is fine, but I think it should be the player, not the user, that checks if the URL is a playlist. Especially if one uses mplayer plugin in a web browser and doesn't have chance to modify mplayer command line. mplayer only checks the content-type. If it's an ASX content-type, the URL is treated as playlist. But if it's an ASF content-type, the URL is always treated as stream. mplayer doesn't check the content, even if it contains a playlist. With this patch, when the content-type of an HTTP response indicates ASF, mplayer checks if the content starts with `<asx`. bl4

2 3

Can't compile latest svn
by Robert Ramiega 29 Apr '08

29 Apr '08

Hi! Today i tried to compile new mplayer. As ususal i did svn update, make distclean; configure ; make It failed miserably but the error left me stunned make[1]: Entering directory `/home/stuff/src/mplayer/loader' cc -MM -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -I. -I.. -I../libavutil -Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DHAVE_CONFIG_H -I/usr/include/directfb -I/usr/include/ -I/usr/include/SDL -D_REENTRANT -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer driver.c afl.c vfl.c dshow/DS_AudioDecoder.c dshow/DS_Filter.c dshow/DS_VideoDecoder.c dshow/allocator.c dshow/mediatype.c dshow/cmediasample.c dshow/guids.c dshow/inputpin.c dshow/outputpin.c dmo/DMO_AudioDecoder.c dmo/DMO_VideoDecoder.c dmo/buffer.c dmo/dmo.c dmo/dmo_guids.c | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," > .depend In file included from wine/winbase.h:5, from win32.h:12, from driver.c:18: wine/winnt.h:623:2: error: #error You need to define a CONTEXT for your CPU wine/winnt.h:750:2: error: #error You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU wine/winnt.h:761:3: error: #error You must define GET_IP for this CPU In file included from wine/winbase.h:5, I'm using Debian Unstable/x86_64 on Dell Inspiron 1720 laptop (Core2Duo CPU T7700(a)2.40GHz) Why it is even looking at wine/winnt.h ? Also my CPU is not some new kid on the block and i guess should be recognized =o))) TIA -- Just a friendly Jedi Knight | I find your lack of faith Robert Ramiega jedi(a)plukwa.net | disturbing http://nlj.plukwa.net/

6 11

[PATCH] dshow audio subtype is "capped" to 16bit
by Gianluigi Tiesi 26 Apr '08

26 Apr '08

While testing mmamr.ax I've discovered that the dshow audio filter setup uses the fourcc/format from WAVEFORMATEX struct that is a WORD thus 16bit while creating the filter graph the audio filter gets: 0x6173 instead of 0x726D6173 and the filter fails with source format not accepted Attached patch solve this problem, perhaps I'm not aware of side effects with other dshow audio filters I'm using "format" field from sh_audio_t I'm not aware of a less intrusive method mmamr.ax still produces weird audio but at least the filter chain is done if you want to play with, here the codecs.conf entry: audiocodec mmamrnb info "Monogram amr filter" comment "http://www.hydrogenaudio.org/forums/index.php?showtopic=61947" status buggy fourcc samr ; format 0x726D6173 driver dshow dll "mmamr.ax" guid 0x50dda33e, 0xc529, 0x4343, 0x96, 0x89, 0x33, 0x8a, 0xdc, 0x79, 0x3b, 0xb5 the binary can be found at the link in the comment Regards -- Gianluigi Tiesi <sherpya(a)netfarm.it> EDP Project Leader Netfarm S.r.l. - http://www.netfarm.it/ Free Software: http://oss.netfarm.it/

1 0

[PATCH] consistent precision in fps printing
by Corey Hickey 23 Apr '08

23 Apr '08

Hello, "mplayer -v <file>" can currently prints two adjacent lines like this: VIDEO: [XVID] 720x416 12bpp 23.976 fps 795.2 kbps (97.1 kbyte/s) [V] filefmt:3 fourcc:0x44495658 size:720x416 fps:23.98 ftime:=0.0417 The attached patch changes the precision for the second line so it would print 23.976 instead of 23.98; likewise for another occurrence I found. Three digits of precision seems to be conventional for fps; I don't know of any common values that are usually represented with more precision. If nobody cares, I'll apply this in two days. -Corey Index: help_mp-fr.h =================================================================== --- help_mp-fr.h (revision 26473) +++ help_mp-fr.h (working copy) @@ -393,7 +393,7 @@ #define MSGTR_ConfigfileError "Erreur du fichier de configuration" #define MSGTR_ErrorParsingCommandLine "Erreur en analysant la ligne de commande" #define MSGTR_VideoStreamRequired "La présence d'un flux vidéo est obligatoire !\n" -#define MSGTR_ForcingInputFPS "Le fps d'entrée sera plutôt interprété comme %5.2f\n" +#define MSGTR_ForcingInputFPS "Le fps d'entrée sera plutôt interprété comme %5.3f\n" #define MSGTR_RawvideoDoesNotSupportAudio "Le format de sortie RAWVIDEO ne supporte pas l'audio - audio désactivé\n" #define MSGTR_DemuxerDoesntSupportNosound "Ce demuxer ne supporte pas encore l'option -nosound.\n" #define MSGTR_MemAllocFailed "Une allocation mémoire a échoué\n" Index: help_mp-es.h =================================================================== --- help_mp-es.h (revision 26473) +++ help_mp-es.h (working copy) @@ -412,7 +412,7 @@ #define MSGTR_ConfigFileError "error en archivo de configuración" #define MSGTR_ErrorParsingCommandLine "error en parametros de la línea de comando" #define MSGTR_VideoStreamRequired "¡El flujo de video es obligatorio!\n" -#define MSGTR_ForcingInputFPS "en su lugar el fps de entrada será interpretado como %5.2f\n" +#define MSGTR_ForcingInputFPS "en su lugar el fps de entrada será interpretado como %5.3f\n" #define MSGTR_RawvideoDoesNotSupportAudio "El formato de archivo de salida RAWVIDEO no soporta audio - desactivando audio\n" #define MSGTR_DemuxerDoesntSupportNosound "Este demuxer todavía no soporta -nosound.\n" #define MSGTR_MemAllocFailed "falló la asignación de memoria" @@ -605,7 +605,7 @@ #define MSGTR_InvalidMPEGES "Stream MPEG-ES inválido? Contacta con el autor, podría ser un fallo.\n" #define MSGTR_FormatNotRecognized "Este formato no está soportado o reconocido. Si este archivo es un AVI, ASF o MPEG, por favor contacte con el autor.\n" #define MSGTR_SettingProcessPriority "Estableciendo la prioridad del proceso: %s\n" -#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X tamaño:%dx%d fps:%5.2f ftime:=%6.4f\n" +#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X tamaño:%dx%d fps:%5.3f ftime:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "No se puede inicializar el muxer." #define MSGTR_MissingVideoStream "¡No se encontró stream de video!\n" #define MSGTR_MissingAudioStream "No se encontró el stream de audio, no se reproducirá sonido.\n" Index: help_mp-nl.h =================================================================== --- help_mp-nl.h (revision 26473) +++ help_mp-nl.h (working copy) @@ -318,7 +318,7 @@ #define MSGTR_ConfigFileError "Fout in het configuratie bestand of configuratie bestand ontbreekt" #define MSGTR_ErrorParsingCommandLine "Fout bij het analyseren van de commandoregel" #define MSGTR_VideoStreamRequired "Een Video stream is verplicht!\n" -#define MSGTR_ForcingInputFPS "input fps zal geinterpreteerd worden als %5.2f \n" +#define MSGTR_ForcingInputFPS "input fps zal geinterpreteerd worden als %5.3f \n" #define MSGTR_RawvideoDoesNotSupportAudio "Het output bestandsformaat RAWVIDEO ondersteunt geen audio - geluid \n" #define MSGTR_DemuxerDoesntSupportNosound "Deze demuxer ondersteunt -nosound nog niet.\n" #define MSGTR_MemAllocFailed "geheugentoewijzing gefaald" Index: help_mp-pl.h =================================================================== --- help_mp-pl.h (revision 26473) +++ help_mp-pl.h (working copy) @@ -388,7 +388,7 @@ #define MSGTR_ConfigFileError "błąd pliku konfiguracyjnego" #define MSGTR_ErrorParsingCommandLine "błąd w przetwarzaniu wiersza poleceń" #define MSGTR_VideoStreamRequired "Wymagany jest strumień video!\n" -#define MSGTR_ForcingInputFPS "Wejściowa wartość FPS zostanie zinterpretowana jako %5.2f.\n" +#define MSGTR_ForcingInputFPS "Wejściowa wartość FPS zostanie zinterpretowana jako %5.3f.\n" #define MSGTR_RawvideoDoesNotSupportAudio "Wyjściowy format RAWVIDEO nie obsługuje dźwięku - wyłączam dźwięk.\n" #define MSGTR_DemuxerDoesntSupportNosound "Ten demuxer jeszcze nie obsługuje opcji -nosound.\n" #define MSGTR_MemAllocFailed "Alokacja pamięci nie powiodła się.\n" Index: help_mp-it.h =================================================================== --- help_mp-it.h (revision 26473) +++ help_mp-it.h (working copy) @@ -407,7 +407,7 @@ #define MSGTR_ConfigFileError "errore file di configurazione" #define MSGTR_ErrorParsingCommandLine "errore leggendo la riga comando" #define MSGTR_VideoStreamRequired "Il flusso video è obbligatorio!\n" -#define MSGTR_ForcingInputFPS "i fps saranno interpretati come %5.2f.\n" +#define MSGTR_ForcingInputFPS "i fps saranno interpretati come %5.3f.\n" #define MSGTR_RawvideoDoesNotSupportAudio "Il formato output RAWVIDEO non supporta l'audio - lo disabilito.\n" #define MSGTR_DemuxerDoesntSupportNosound "Questo demuxer non supporta ancora -nosound.\n" #define MSGTR_MemAllocFailed "Allocazione memoria non riuscita.\n" Index: help_mp-hu.h =================================================================== --- help_mp-hu.h (revision 26473) +++ help_mp-hu.h (working copy) @@ -410,7 +410,7 @@ #define MSGTR_ConfigFileError "konfigurációs fájl hibája" #define MSGTR_ErrorParsingCommandLine "hiba a parancssor értelmezésekor" #define MSGTR_VideoStreamRequired "Video stream szükséges!\n" -#define MSGTR_ForcingInputFPS "Az input fps inkább %5.2f-ként lesz értelmezve.\n" +#define MSGTR_ForcingInputFPS "Az input fps inkább %5.3f-ként lesz értelmezve.\n" #define MSGTR_RawvideoDoesNotSupportAudio "A RAWVIDEO kimeneti fájl formátum nem támogatja a hangot - audió letiltva.\n" #define MSGTR_DemuxerDoesntSupportNosound "Ez a demuxer még nem támogatja a -nosound kapcsolót.\n" #define MSGTR_MemAllocFailed "Nem sikerült a memóriafoglalás.\n" @@ -603,7 +603,7 @@ #define MSGTR_FormatNotRecognized "========= Sajnos ez a fájlformátum ismeretlen vagy nem támogatott ===========\n"\ "= Ha ez egy AVI, ASF vagy MPEG fájl, lépj kapcsolatba a készítőkkel (hiba)! =\n" #define MSGTR_SettingProcessPriority "Folyamat priorításának beállítása: %s\n" -#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X méret:%dx%d fps:%5.2f ftime:=%6.4f\n" +#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X méret:%dx%d fps:%5.3f ftime:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "A muxer nem inicializálható." #define MSGTR_MissingVideoStream "Nincs képfolyam!\n" #define MSGTR_MissingAudioStream "Nincs hangfolyam... -> hang nélkül\n" Index: help_mp-sk.h =================================================================== --- help_mp-sk.h (revision 26473) +++ help_mp-sk.h (working copy) @@ -382,7 +382,7 @@ #define MSGTR_ConfigFileError "chyba konfiguračného súboru" #define MSGTR_ErrorParsingCommandLine "chyba pri spracovávaní príkazového riadku" #define MSGTR_VideoStreamRequired "Video prúd je povinný!\n" -#define MSGTR_ForcingInputFPS "vstupné fps bude interpretované ako %5.2f\n" +#define MSGTR_ForcingInputFPS "vstupné fps bude interpretované ako %5.3f\n" #define MSGTR_RawvideoDoesNotSupportAudio "Výstupný formát súboru RAWVIDEO nepodporuje zvuk - vypínam ho\n" #define MSGTR_DemuxerDoesntSupportNosound "Tento demuxer zatiaľ nepodporuje -nosound.\n" #define MSGTR_MemAllocFailed "Alokácia pamäte zlyhala\n" Index: help_mp-tr.h =================================================================== --- help_mp-tr.h (revision 26473) +++ help_mp-tr.h (working copy) @@ -386,7 +386,7 @@ #define MSGTR_ConfigFileError "ayar dosyası hatası" #define MSGTR_ErrorParsingCommandLine "komutsatırı ayrıştırma hatası" #define MSGTR_VideoStreamRequired "Video yayını(stream) zorunlu!\n" -#define MSGTR_ForcingInputFPS "girdi fps değeri %5.2f olarak yorumlanacak\n" +#define MSGTR_ForcingInputFPS "girdi fps değeri %5.3f olarak yorumlanacak\n" #define MSGTR_RawvideoDoesNotSupportAudio "Çıktı dosyası RAWVIDEO biçimi sesi desteklemiyor - ses devre dışı bırakılıyor\n" #define MSGTR_DemuxerDoesntSupportNosound "Ayrıştırıcı -nosound seçeneğini henüz desteklemiyor.\n" #define MSGTR_MemAllocFailed "Bellek atanamadı\n" Index: help_mp-ru.h =================================================================== --- help_mp-ru.h (revision 26473) +++ help_mp-ru.h (working copy) @@ -406,7 +406,7 @@ #define MSGTR_ConfigFileError "ошибка в конфигурационном файле" #define MSGTR_ErrorParsingCommandLine "ошибка анализа командной строки" #define MSGTR_VideoStreamRequired "Наличие видеопотока обязательно!\n" -#define MSGTR_ForcingInputFPS "входные кадры/сек будут заменены на %5.2f\n" +#define MSGTR_ForcingInputFPS "входные кадры/сек будут заменены на %5.3f\n" #define MSGTR_RawvideoDoesNotSupportAudio "Выходной формат файла RAWVIDEO не поддерживает аудио - отключаю аудио\n" #define MSGTR_DemuxerDoesntSupportNosound "Этот демультиплексор пока что не поддерживает -nosound.\n" #define MSGTR_MemAllocFailed "не могу выделить память" @@ -599,7 +599,7 @@ #define MSGTR_FormatNotRecognized "======= Извините, формат этого файла не распознан/не поддерживается ==========\n"\ "===== Если это AVI, ASF или MPEG поток, пожалуйста свяжитесь с автором! ======\n" #define MSGTR_SettingProcessPriority "Устанавливаю приоритет процесса: %s\n" -#define MSGTR_FilefmtFourccSizeFpsFtime "[V] формат:%d fourcc:0x%X размер:%dx%d fps:%5.2f ftime:=%6.4f\n" +#define MSGTR_FilefmtFourccSizeFpsFtime "[V] формат:%d fourcc:0x%X размер:%dx%d fps:%5.3f ftime:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "Невозможно инициализировать мультиплексор." #define MSGTR_MissingVideoStream "Видеопоток не найден!\n" #define MSGTR_MissingAudioStream "Аудиопоток не найден -> без звука\n" Index: help_mp-bg.h =================================================================== --- help_mp-bg.h (revision 26473) +++ help_mp-bg.h (working copy) @@ -331,7 +331,7 @@ #define MSGTR_ConfigFileError "грешка в конфигурационния файл" #define MSGTR_ErrorParsingCommandLine "грешка при обработката на командния ред" #define MSGTR_VideoStreamRequired "Задължително е да има видео поток!\n" -#define MSGTR_ForcingInputFPS "Входящите кадри в секунда ще се интерпретират като %5.2f\n" +#define MSGTR_ForcingInputFPS "Входящите кадри в секунда ще се интерпретират като %5.3f\n" #define MSGTR_RawvideoDoesNotSupportAudio "Изходния формат RAWVIDEO не поддържа аудио - звука се премахва\n" #define MSGTR_DemuxerDoesntSupportNosound "Tози разпределител все още не поддържа -nosound .\n" #define MSGTR_MemAllocFailed "не може да задели памет" Index: help_mp-de.h =================================================================== --- help_mp-de.h (revision 26473) +++ help_mp-de.h (working copy) @@ -412,7 +412,7 @@ #define MSGTR_ConfigFileError "Konfigurationsdatei-Fehler" #define MSGTR_ErrorParsingCommandLine "Fehler beim Parsen der Kommandozeile" #define MSGTR_VideoStreamRequired "Videostream zwingend notwendig!\n" -#define MSGTR_ForcingInputFPS "Input-Framerate wird als statt dessen als %5.2f interpretiert.\n" +#define MSGTR_ForcingInputFPS "Input-Framerate wird als statt dessen als %5.3f interpretiert.\n" #define MSGTR_RawvideoDoesNotSupportAudio "Ausgabedateiformat RAWVIDEO unterstützt kein Audio - Audio wird deaktiviert.\n" #define MSGTR_DemuxerDoesntSupportNosound "Dieser Demuxer unterstützt -nosound noch nicht.\n" #define MSGTR_MemAllocFailed "Speicherreservierung fehlgeschlagen." @@ -612,7 +612,7 @@ "============== Sollte dies ein AVI, ASF oder MPEG Stream sein, ===============\n"\ "====================== dann kontaktiere bitte den Autor. =====================\n" #define MSGTR_SettingProcessPriority "Setze Prozesspriorität: %s\n" -#define MSGTR_FilefmtFourccSizeFpsFtime "[V] Dateiformat:%d fourcc:0x%X Größe:%dx%d fps:%5.2f ftime:=%6.4f\n" +#define MSGTR_FilefmtFourccSizeFpsFtime "[V] Dateiformat:%d fourcc:0x%X Größe:%dx%d fps:%5.3f ftime:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "Cannot initialize muxer." #define MSGTR_MissingVideoStream "Kein Videostream gefunden.\n" #define MSGTR_MissingAudioStream "Kein Audiostream gefunden. -> kein Ton.\n" Index: help_mp-sv.h =================================================================== --- help_mp-sv.h (revision 26473) +++ help_mp-sv.h (working copy) @@ -327,7 +327,7 @@ #define MSGTR_ConfigFileError "konfigurationsfilsfel" #define MSGTR_ErrorParsingCommandLine "fel vid tolkning av cmdline" #define MSGTR_VideoStreamRequired "Videoström är obligatoriskt!\n" -#define MSGTR_ForcingInputFPS "'input fps' kommer att bli tolkad som %5.2f istället\n" +#define MSGTR_ForcingInputFPS "'input fps' kommer att bli tolkad som %5.3f istället\n" #define MSGTR_RawvideoDoesNotSupportAudio "Ut-filformat RAWVIDEO stödjer inte audio - deaktiverar audio\n" #define MSGTR_DemuxerDoesntSupportNosound "Denna demuxer stödjer inte -nosound ännu.\n" #define MSGTR_MemAllocFailed "minnesallokering misslyckades" Index: help_mp-zh_TW.h =================================================================== --- help_mp-zh_TW.h (revision 26473) +++ help_mp-zh_TW.h (working copy) @@ -389,7 +389,7 @@ #define MSGTR_ConfigFileError "配置文件錯誤" #define MSGTR_ErrorParsingCommandLine "解析命令行錯誤" #define MSGTR_VideoStreamRequired "視頻流是必須的!\n" -#define MSGTR_ForcingInputFPS "輸入幀率將被替換為 %5.2f。\n" +#define MSGTR_ForcingInputFPS "輸入幀率將被替換為 %5.3f。\n" #define MSGTR_RawvideoDoesNotSupportAudio "RAWVIDEO 輸出文件格式不支持音頻 - 停用音頻。\n" #define MSGTR_DemuxerDoesntSupportNosound "目前此分路器還不支持 -nosound。\n" #define MSGTR_MemAllocFailed "内存分配失敗。\n" @@ -582,7 +582,7 @@ #define MSGTR_FormatNotRecognized "============= 抱歉, 此文件格式無法辨認或支持 ===============\n"\ "=== 如果此文件是一個 AVI, ASF 或 MPEG 流, 請聯係作者! ===\n" #define MSGTR_SettingProcessPriority "設置進程優先級: %s\n" -#define MSGTR_FilefmtFourccSizeFpsFtime "[V] 文件格式:%d fourcc:0x%X 大小:%dx%d 幀速:%5.2f 幀時間:=%6.4f\n" +#define MSGTR_FilefmtFourccSizeFpsFtime "[V] 文件格式:%d fourcc:0x%X 大小:%dx%d 幀速:%5.3f 幀時間:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "不能初始化muxer。" #define MSGTR_MissingVideoStream "未找到視頻流。\n" #define MSGTR_MissingAudioStream "未找到音頻流... -> 没聲音。\n" Index: help_mp-zh_CN.h =================================================================== --- help_mp-zh_CN.h (revision 26473) +++ help_mp-zh_CN.h (working copy) @@ -405,7 +405,7 @@ #define MSGTR_ConfigFileError "配置文件错误" #define MSGTR_ErrorParsingCommandLine "解析命令行错误" #define MSGTR_VideoStreamRequired "视频流是必须的!\n" -#define MSGTR_ForcingInputFPS "输入帧率将被替换为 %5.2f。\n" +#define MSGTR_ForcingInputFPS "输入帧率将被替换为 %5.3f。\n" #define MSGTR_RawvideoDoesNotSupportAudio "RAWVIDEO 输出文件格式不支持音频 - 停用音频。\n" #define MSGTR_DemuxerDoesntSupportNosound "目前此分路器还不支持 -nosound。\n" #define MSGTR_MemAllocFailed "内存分配失败。\n" @@ -598,7 +598,7 @@ #define MSGTR_FormatNotRecognized "============= 抱歉, 此文件格式无法辨认或支持 ===============\n"\ "=== 如果此文件是一个 AVI, ASF 或 MPEG 流, 请联系作者! ===\n" #define MSGTR_SettingProcessPriority "设置进程优先级: %s\n" -#define MSGTR_FilefmtFourccSizeFpsFtime "[V] 文件格式:%d fourcc:0x%X 大小:%dx%d 帧速:%5.2f 帧时间:=%6.4f\n" +#define MSGTR_FilefmtFourccSizeFpsFtime "[V] 文件格式:%d fourcc:0x%X 大小:%dx%d 帧速:%5.3f 帧时间:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "不能初始化muxer。" #define MSGTR_MissingVideoStream "未找到视频流。\n" #define MSGTR_MissingAudioStream "未找到音频流... -> 没声音。\n" Index: help_mp-en.h =================================================================== --- help_mp-en.h (revision 26473) +++ help_mp-en.h (working copy) @@ -411,7 +411,7 @@ #define MSGTR_ConfigFileError "config file error" #define MSGTR_ErrorParsingCommandLine "error parsing command line" #define MSGTR_VideoStreamRequired "Video stream is mandatory!\n" -#define MSGTR_ForcingInputFPS "Input fps will be interpreted as %5.2f instead.\n" +#define MSGTR_ForcingInputFPS "Input fps will be interpreted as %5.3f instead.\n" #define MSGTR_RawvideoDoesNotSupportAudio "Output file format RAWVIDEO does not support audio - disabling audio.\n" #define MSGTR_DemuxerDoesntSupportNosound "This demuxer doesn't support -nosound yet.\n" #define MSGTR_MemAllocFailed "Memory allocation failed.\n" @@ -604,7 +604,7 @@ #define MSGTR_FormatNotRecognized "============ Sorry, this file format is not recognized/supported =============\n"\ "=== If this file is an AVI, ASF or MPEG stream, please contact the author! ===\n" #define MSGTR_SettingProcessPriority "Setting process priority: %s\n" -#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n" +#define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "Cannot initialize muxer." #define MSGTR_MissingVideoStream "No video stream found.\n" #define MSGTR_MissingAudioStream "No audio stream found -> no sound.\n" Index: help_mp-cs.h =================================================================== --- help_mp-cs.h (revision 26473) +++ help_mp-cs.h (working copy) @@ -396,7 +396,7 @@ #define MSGTR_ConfigFileError "chyba konfiguračního souboru" #define MSGTR_ErrorParsingCommandLine "chyba při zpracovávání příkazového řádku" #define MSGTR_VideoStreamRequired "Videoproud je povinný!\n" -#define MSGTR_ForcingInputFPS "Vstupní fps bude interpretováno jako %5.2f\n" +#define MSGTR_ForcingInputFPS "Vstupní fps bude interpretováno jako %5.3f\n" #define MSGTR_RawvideoDoesNotSupportAudio "Výstupní formát souboru RAWVIDEO nepodporuje zvuk - vypínám ho.\n" #define MSGTR_DemuxerDoesntSupportNosound "Tento demuxer zatím nepodporuje -nosound.\n" #define MSGTR_MemAllocFailed "Alokace paměti selhala.\n" @@ -589,7 +589,7 @@ #define MSGTR_FormatNotRecognized "======= Bohužel, formát tohoto souboru nebyl rozpoznán/není podporován =======\n"\ "==== Pokud je soubor AVI, ASF nebo MPEG proud, kontaktujte prosím autora! ====\n" #define MSGTR_SettingProcessPriority "Nastavuji prioritu procesu: %s\n" -#define MSGTR_FilefmtFourccSizeFpsFtime "[V] fmtsouboru:%d fourcc:0x%X velikost:%dx%d fps:%5.2f fčas:=%6.4f\n" +#define MSGTR_FilefmtFourccSizeFpsFtime "[V] fmtsouboru:%d fourcc:0x%X velikost:%dx%d fps:%5.3f fčas:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "Nelze inicializovat muxer." #define MSGTR_MissingVideoStream "Nebyl nalezen video proud.\n" #define MSGTR_MissingAudioStream "Nebyl nalezen audio proud -> bez zvuku.\n"

2 2

[PATCH] use an existing translatable macro
by Corey Hickey 23 Apr '08

23 Apr '08

Hello, mencoder.c already uses MSGTR_FilefmtFourccSizeFpsFtime; we might as well use the same translatable in mplayer.c. I will apply this in one day unless anybody objects. -Corey Index: mplayer.c =================================================================== --- mplayer.c (revision 26473) +++ mplayer.c (working copy) @@ -3377,7 +3377,7 @@ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoProperties); mpctx->sh_video=mpctx->d_video->sh=NULL; } else { - mp_msg(MSGT_CPLAYER,MSGL_V,"[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", + mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_FilefmtFourccSizeFpsFtime, mpctx->demuxer->file_format,mpctx->sh_video->format, mpctx->sh_video->disp_w,mpctx->sh_video->disp_h, mpctx->sh_video->fps,mpctx->sh_video->frametime );

2 2

new entry in codecs.conf (not really new) for coreavc
by Gianluigi Tiesi 23 Apr '08

23 Apr '08

There is a patch around to make coreavc codec work on linux, perhaps on mingw seems to be enough to add the entry in codecs.conf videocodec coreavc info "CoreAVC DShow H264 decoder for x86 - http://corecodec.org/" status working format 0x10000005 fourcc H264,h264 fourcc X264,x264 fourcc avc1 AVC1,AVC1 fourcc davc,DAVC fourcc VSSH driver dshow dll "CoreAVCDecoder.ax" guid 0x09571a4b, 0xf1fe, 0x4c60, 0x97, 0x60, 0xde, 0x6d, 0x31, 0x0c, 0x7c, 0x31 out YV12,IYUV,I420,YUY2 Can someone verify this entry since I've not a serial for this codec? Regards -- Gianluigi Tiesi <sherpya(a)netfarm.it> EDP Project Leader Netfarm S.r.l. - http://www.netfarm.it/ Free Software: http://oss.netfarm.it/

2 3

[PATCH] fix dvdnav's dvdread compilation when using custom paths
by Nico Sabbi 22 Apr '08

22 Apr '08

it was recently reported that when using dvdnav's dvdread installed in a custom path (such as ~/abc) dvdread's libraries and headers will not be found. Attached patch fixes this issue. If there are no objections I'll commit this patch tomorrow (or, if you prefer, I can add custom --flags to dvdnav-config to make explicit the include and library paths).

2 4

[PATCH] Mimic decoder
by Ramiro Polla 22 Apr '08

22 Apr '08

Hello, How are new libavcodec codecs added to MPlayer? Is attached patch enough? Or should it be moved somewhere else on the file? Ramiro Polla Index: etc/codecs.conf =================================================================== --- etc/codecs.conf (revision 26265) +++ etc/codecs.conf (working copy) @@ -9,6 +9,12 @@ ; VIDEO CODECS ;============================================================================= +videocodec mimic + fourcc ML20 + out I420 + driver ffmpeg + dll "mimic" + videocodec ffkmvc fourcc KMVC out BGR8

4 6