From 83f13318176c8f19020c1117523fcc4b903a8fad Mon Sep 17 00:00:00 2001 From: corey Date: Wed, 23 Apr 2008 20:14:14 +0000 Subject: [PATCH 01/30] use existing MSGTR_FilefmtFourccSizeFpsFtime translatable string macro git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26511 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mplayer.c b/mplayer.c index d5ee16ebdc..3a5cb9238a 100644 --- a/mplayer.c +++ b/mplayer.c @@ -3377,7 +3377,7 @@ if(mpctx->sh_video){ 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 ); From 0decac38d3e4623de68eac3f4eb8e8feda191dd4 Mon Sep 17 00:00:00 2001 From: corey Date: Wed, 23 Apr 2008 20:20:25 +0000 Subject: [PATCH 02/30] consistently print fps with three digits of precision git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26512 b3059339-0415-0410-9bf9-f77b7e298cf2 --- help/help_mp-bg.h | 2 +- help/help_mp-cs.h | 4 ++-- help/help_mp-de.h | 4 ++-- help/help_mp-en.h | 4 ++-- help/help_mp-es.h | 4 ++-- help/help_mp-fr.h | 2 +- help/help_mp-hu.h | 4 ++-- help/help_mp-it.h | 2 +- help/help_mp-nl.h | 2 +- help/help_mp-pl.h | 2 +- help/help_mp-ru.h | 4 ++-- help/help_mp-sk.h | 2 +- help/help_mp-sv.h | 2 +- help/help_mp-tr.h | 2 +- help/help_mp-zh_CN.h | 4 ++-- help/help_mp-zh_TW.h | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h index ff009a24fe..4d391b57f0 100644 --- a/help/help_mp-bg.h +++ b/help/help_mp-bg.h @@ -331,7 +331,7 @@ static char help_text[]= #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 "не може да задели памет" diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h index 89450a75b9..6bb906d625 100644 --- a/help/help_mp-cs.h +++ b/help/help_mp-cs.h @@ -396,7 +396,7 @@ static char help_text[]= #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 @@ static char help_text[]= #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" diff --git a/help/help_mp-de.h b/help/help_mp-de.h index 2897b9b7bd..723662bd47 100644 --- a/help/help_mp-de.h +++ b/help/help_mp-de.h @@ -412,7 +412,7 @@ static char help_text[]= #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 @@ static char help_text[]= "============== 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" diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 58e1e8310a..650757da9e 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -411,7 +411,7 @@ static char help_text[]= #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 @@ static char help_text[]= #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" diff --git a/help/help_mp-es.h b/help/help_mp-es.h index 53acf7b314..ee3ffce8ec 100644 --- a/help/help_mp-es.h +++ b/help/help_mp-es.h @@ -412,7 +412,7 @@ static char help_text[]= #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 @@ static char help_text[]= #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" diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h index 674dddaf70..fece8a23cb 100644 --- a/help/help_mp-fr.h +++ b/help/help_mp-fr.h @@ -393,7 +393,7 @@ static char help_text[]= #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" diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h index 57407951b1..15ca70481b 100644 --- a/help/help_mp-hu.h +++ b/help/help_mp-hu.h @@ -410,7 +410,7 @@ static char help_text[]= #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 @@ static char help_text[]= #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" diff --git a/help/help_mp-it.h b/help/help_mp-it.h index 7e4deb7616..ead625a172 100644 --- a/help/help_mp-it.h +++ b/help/help_mp-it.h @@ -407,7 +407,7 @@ static char help_text[]= #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" diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h index 22c6bc8423..e6b68fc048 100644 --- a/help/help_mp-nl.h +++ b/help/help_mp-nl.h @@ -318,7 +318,7 @@ static char help_text[]= #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" diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h index 6ffc4210c8..1c615241d7 100644 --- a/help/help_mp-pl.h +++ b/help/help_mp-pl.h @@ -388,7 +388,7 @@ static char help_text[]= #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" diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h index ce713e5262..09d13d20b5 100644 --- a/help/help_mp-ru.h +++ b/help/help_mp-ru.h @@ -406,7 +406,7 @@ static char help_text[]= #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 @@ static char help_text[]= #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" diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h index b1aecce626..da5a980034 100644 --- a/help/help_mp-sk.h +++ b/help/help_mp-sk.h @@ -382,7 +382,7 @@ static char help_text[]= #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" diff --git a/help/help_mp-sv.h b/help/help_mp-sv.h index afbe951475..ef0f2d7fbe 100644 --- a/help/help_mp-sv.h +++ b/help/help_mp-sv.h @@ -327,7 +327,7 @@ static char help_text[]= #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" diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h index 7dadde0482..1e9bbb60fe 100644 --- a/help/help_mp-tr.h +++ b/help/help_mp-tr.h @@ -407,7 +407,7 @@ static char help_text[]= #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" diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h index 924c8c95c0..d471c893da 100644 --- a/help/help_mp-zh_CN.h +++ b/help/help_mp-zh_CN.h @@ -405,7 +405,7 @@ static char help_text[]= #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 @@ static char help_text[]= #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" diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h index bd6601acf4..4ef549898e 100644 --- a/help/help_mp-zh_TW.h +++ b/help/help_mp-zh_TW.h @@ -389,7 +389,7 @@ static char help_text[]= #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 @@ static char help_text[]= #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" From a2073799acf2e98111df1775f618859b240b5a8a Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 10:12:02 +0000 Subject: [PATCH 03/30] cosmetics: alphabetical order git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26513 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stream/Makefile b/stream/Makefile index f69b5d350c..36eea14afc 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -16,6 +16,7 @@ SRCS_COMMON-$(DVBIN) += dvb_tune.c stream_dvb.c SRCS_COMMON-$(DVDNAV) += stream_dvdnav.c SRCS_COMMON-$(DVDREAD) += stream_dvd.c stream_dvd_common.c SRCS_COMMON-$(FTP) += stream_ftp.c +SRCS_COMMON-$(LIBNEMESI) += stream_nemesi.c SRCS_COMMON-$(LIBSMBCLIENT) += stream_smb.c SRCS_COMMON-$(MPLAYER_NETWORK) += stream_netstream.c \ asf_mmst_streaming.c \ @@ -43,8 +44,6 @@ SRCS_COMMON-$(NATIVE_RTSP) += stream_rtsp.c \ librtsp/rtsp_rtp.c \ librtsp/rtsp_session.c \ -SRCS_COMMON-$(LIBNEMESI) += stream_nemesi.c - SRCS_COMMON-$(PVR) += stream_pvr.c SRCS_COMMON-$(RADIO) += stream_radio.c SRCS_COMMON-$(RADIO_CAPTURE) += audio_in.c From 20ef914470e48f0f5db356dcb30d449f6370dbcd Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 13:04:50 +0000 Subject: [PATCH 04/30] Merge libmpcodecs/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 171 ++++++++++++++++++++++++++++++++++++++++--- libmpcodecs/Makefile | 153 -------------------------------------- 2 files changed, 161 insertions(+), 163 deletions(-) delete mode 100644 libmpcodecs/Makefile diff --git a/Makefile b/Makefile index 10ca79bedd..7a8ce893b7 100644 --- a/Makefile +++ b/Makefile @@ -59,6 +59,97 @@ SRCS_COMMON = asxparser.c \ libaf/format.c \ libaf/reorder_ch.c \ libaf/window.c \ + libmpcodecs/ad.c \ + libmpcodecs/ad_alaw.c \ + libmpcodecs/ad_dk3adpcm.c \ + libmpcodecs/ad_dvdpcm.c \ + libmpcodecs/ad_hwac3.c \ + libmpcodecs/ad_hwmpa.c \ + libmpcodecs/ad_imaadpcm.c \ + libmpcodecs/ad_msadpcm.c \ + libmpcodecs/ad_msgsm.c \ + libmpcodecs/ad_pcm.c \ + libmpcodecs/dec_audio.c \ + libmpcodecs/dec_video.c \ + libmpcodecs/img_format.c \ + libmpcodecs/mp_image.c \ + libmpcodecs/native/nuppelvideo.c \ + libmpcodecs/native/rtjpegn.c \ + libmpcodecs/native/xa_gsm.c \ + libmpcodecs/pullup.c \ + libmpcodecs/vd.c \ + libmpcodecs/vd_hmblck.c \ + libmpcodecs/vd_lzo.c \ + libmpcodecs/vd_mpegpes.c \ + libmpcodecs/vd_mtga.c \ + libmpcodecs/vd_null.c \ + libmpcodecs/vd_nuv.c \ + libmpcodecs/vd_raw.c \ + libmpcodecs/vd_sgi.c \ + libmpcodecs/vf.c \ + libmpcodecs/vf_1bpp.c \ + libmpcodecs/vf_2xsai.c \ + libmpcodecs/vf_blackframe.c \ + libmpcodecs/vf_boxblur.c \ + libmpcodecs/vf_crop.c \ + libmpcodecs/vf_cropdetect.c \ + libmpcodecs/vf_decimate.c \ + libmpcodecs/vf_delogo.c \ + libmpcodecs/vf_denoise3d.c \ + libmpcodecs/vf_detc.c \ + libmpcodecs/vf_dint.c \ + libmpcodecs/vf_divtc.c \ + libmpcodecs/vf_down3dright.c \ + libmpcodecs/vf_dsize.c \ + libmpcodecs/vf_dvbscale.c \ + libmpcodecs/vf_eq.c \ + libmpcodecs/vf_eq2.c \ + libmpcodecs/vf_expand.c \ + libmpcodecs/vf_field.c \ + libmpcodecs/vf_fil.c \ + libmpcodecs/vf_filmdint.c \ + libmpcodecs/vf_flip.c \ + libmpcodecs/vf_format.c \ + libmpcodecs/vf_framestep.c \ + libmpcodecs/vf_halfpack.c \ + libmpcodecs/vf_harddup.c \ + libmpcodecs/vf_hqdn3d.c \ + libmpcodecs/vf_hue.c \ + libmpcodecs/vf_il.c \ + libmpcodecs/vf_ilpack.c \ + libmpcodecs/vf_ivtc.c \ + libmpcodecs/vf_kerndeint.c \ + libmpcodecs/vf_mirror.c \ + libmpcodecs/vf_noformat.c \ + libmpcodecs/vf_noise.c \ + libmpcodecs/vf_ow.c \ + libmpcodecs/vf_palette.c \ + libmpcodecs/vf_perspective.c \ + libmpcodecs/vf_phase.c \ + libmpcodecs/vf_pp7.c \ + libmpcodecs/vf_pullup.c \ + libmpcodecs/vf_rectangle.c \ + libmpcodecs/vf_remove_logo.c \ + libmpcodecs/vf_rgb2bgr.c \ + libmpcodecs/vf_rgbtest.c \ + libmpcodecs/vf_rotate.c \ + libmpcodecs/vf_sab.c \ + libmpcodecs/vf_scale.c \ + libmpcodecs/vf_smartblur.c \ + libmpcodecs/vf_softpulldown.c \ + libmpcodecs/vf_softskip.c \ + libmpcodecs/vf_swapuv.c \ + libmpcodecs/vf_telecine.c \ + libmpcodecs/vf_test.c \ + libmpcodecs/vf_tfields.c \ + libmpcodecs/vf_tile.c \ + libmpcodecs/vf_tinterlace.c \ + libmpcodecs/vf_unsharp.c \ + libmpcodecs/vf_vo.c \ + libmpcodecs/vf_yadif.c \ + libmpcodecs/vf_yuvcsp.c \ + libmpcodecs/vf_yuy2.c \ + libmpcodecs/vf_yvu9.c \ libvo/aclib.c \ libvo/osd.c \ libvo/sub.c \ @@ -66,10 +157,14 @@ SRCS_COMMON = asxparser.c \ osdep/$(TIMER) \ SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c +SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c +SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c +SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c +SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c SRCS_COMMON-$(LIBASS) += libass/ass.c \ libass/ass_bitmap.c \ libass/ass_cache.c \ @@ -79,10 +174,35 @@ SRCS_COMMON-$(LIBASS) += libass/ass.c \ libass/ass_mp.c \ libass/ass_render.c \ libass/ass_utils.c \ + libmpcodecs/vf_ass.c \ -SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c -SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c +SRCS_COMMON-$(LIBAVCODEC) += libaf/af_lavcresample.c \ + libmpcodecs/ad_ffmpeg.c \ + libmpcodecs/vd_ffmpeg.c \ + libmpcodecs/vf_lavc.c \ + libmpcodecs/vf_lavcdeint.c \ + libmpcodecs/vf_screenshot.c \ + +# These filters use private headers and do not work with shared libavcodec. +SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \ + libmpcodecs/vf_fspp.c \ + libmpcodecs/vf_geq.c \ + libmpcodecs/vf_mcdeint.c \ + libmpcodecs/vf_qp.c \ + libmpcodecs/vf_spp.c \ + libmpcodecs/vf_uspp.c \ + +SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c +SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ + libmpcodecs/vd_libdv.c +SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c +SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c +SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c +SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c +SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c +SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c +SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c SRCS_COMMON-$(NEED_MMAP) += osdep/mmap-os2.c @@ -91,6 +211,12 @@ SRCS_COMMON-$(NEED_SHMEM) += osdep/shmem.c SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c +SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c +SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \ + libmpcodecs/vd_qtvideo.c +SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ + libmpcodecs/vd_realvid.c +SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/block.c \ tremor/codebook.c \ @@ -107,6 +233,19 @@ SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/window.c \ SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c +SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ + libmpcodecs/ad_dmo.c \ + libmpcodecs/ad_dshow.c \ + libmpcodecs/ad_twin.c \ + libmpcodecs/vd_dmo.c \ + libmpcodecs/vd_dshow.c \ + libmpcodecs/vd_vfw.c \ + libmpcodecs/vd_vfwex.c \ + +SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c +SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c +SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ + libmpcodecs/vf_zrmjpeg.c SRCS_MPLAYER = mplayer.c \ m_property.c \ @@ -191,9 +330,24 @@ SRCS_MENCODER = mencoder.c \ mp_msg-mencoder.c \ parser-mecmd.c \ xvid_vbr.c \ + libmpcodecs/ae.c \ + libmpcodecs/ae_pcm.c \ + libmpcodecs/ve.c \ + libmpcodecs/ve_raw.c \ -COMMON_LIBS = libmpcodecs/libmpcodecs.a \ - libmpdemux/libmpdemux.a \ +SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c +SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c +SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c +SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c +SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c +SRCS_MENCODER-$(QTX_CODECS) += libmpcodecs/ve_qtvideo.c +SRCS_MENCODER-$(TOOLAME) += libmpcodecs/ae_toolame.c +SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c +SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c +SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c +SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c + +COMMON_LIBS = libmpdemux/libmpdemux.a \ stream/stream.a \ libswscale/libswscale.a \ @@ -211,8 +365,7 @@ COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a -LIBS_MENCODER = libmpcodecs/libmpencoders.a \ - libmpdemux/libmpmux.a \ +LIBS_MENCODER = libmpdemux/libmpmux.a \ ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -237,7 +390,6 @@ PARTS = dvdread \ libavutil \ libdvdcss \ libfaad2 \ - libmpcodecs \ libmpdemux \ libmpeg2 \ libpostproc \ @@ -261,6 +413,8 @@ DIRS = gui \ libao2 \ libass \ libmenu \ + libmpcodecs \ + libmpcodecs/native \ libvo \ osdep \ tremor \ @@ -287,9 +441,6 @@ endef $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) -libmpcodecs/libmpencoders.a: - $(MAKE) -C libmpcodecs libmpencoders.a - libmpdemux/libmpmux.a: $(MAKE) -C libmpdemux libmpmux.a diff --git a/libmpcodecs/Makefile b/libmpcodecs/Makefile deleted file mode 100644 index 922088a185..0000000000 --- a/libmpcodecs/Makefile +++ /dev/null @@ -1,153 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libmpcodecs.a -LIBNAME_MENCODER = libmpencoders.a - -SRCS_COMMON = native/nuppelvideo.c \ - native/rtjpegn.c \ - native/xa_gsm.c \ - img_format.c \ - mp_image.c \ - dec_audio.c \ - ad.c \ - ad_alaw.c \ - ad_dk3adpcm.c \ - ad_dvdpcm.c \ - ad_hwac3.c \ - ad_hwmpa.c \ - ad_imaadpcm.c \ - ad_msadpcm.c \ - ad_msgsm.c \ - ad_pcm.c \ - dec_video.c \ - vd.c \ - vd_hmblck.c \ - vd_lzo.c \ - vd_mpegpes.c \ - vd_mtga.c \ - vd_null.c \ - vd_nuv.c \ - vd_raw.c \ - vd_sgi.c \ - vf.c \ - pullup.c \ - vf_1bpp.c \ - vf_2xsai.c \ - vf_blackframe.c \ - vf_boxblur.c \ - vf_crop.c \ - vf_cropdetect.c \ - vf_decimate.c \ - vf_delogo.c \ - vf_denoise3d.c \ - vf_detc.c \ - vf_dint.c \ - vf_divtc.c \ - vf_down3dright.c \ - vf_dsize.c \ - vf_dvbscale.c \ - vf_eq2.c \ - vf_eq.c \ - vf_expand.c \ - vf_field.c \ - vf_fil.c \ - vf_filmdint.c \ - vf_flip.c \ - vf_format.c \ - vf_framestep.c \ - vf_halfpack.c \ - vf_harddup.c \ - vf_hqdn3d.c \ - vf_hue.c \ - vf_il.c \ - vf_ilpack.c \ - vf_ivtc.c \ - vf_kerndeint.c \ - vf_mirror.c \ - vf_noformat.c \ - vf_noise.c \ - vf_palette.c \ - vf_perspective.c \ - vf_phase.c \ - vf_pp7.c \ - vf_pullup.c \ - vf_rectangle.c \ - vf_remove_logo.c \ - vf_rgb2bgr.c \ - vf_rgbtest.c \ - vf_rotate.c \ - vf_sab.c \ - vf_scale.c \ - vf_smartblur.c \ - vf_softpulldown.c \ - vf_softskip.c \ - vf_swapuv.c \ - vf_telecine.c \ - vf_test.c \ - vf_tfields.c \ - vf_tile.c \ - vf_tinterlace.c \ - vf_unsharp.c \ - vf_vo.c \ - vf_yadif.c \ - vf_yuvcsp.c \ - vf_yuy2.c \ - vf_yvu9.c \ - vf_ow.c \ - -# These filters use private headers and do not work with shared libavcodec. -SRCS_COMMON-$(LIBAVCODEC_A) += vf_fspp.c \ - vf_geq.c \ - vf_mcdeint.c \ - vf_qp.c \ - vf_spp.c \ - vf_uspp.c \ - -SRCS_COMMON-$(LIBASS) += vf_ass.c -SRCS_COMMON-$(FAAD) += ad_faad.c -SRCS_COMMON-$(HAVE_POSIX_SELECT) += vf_bmovl.c -SRCS_COMMON-$(JPEG) += vd_ijpg.c -SRCS_COMMON-$(LIBA52) += ad_liba52.c -SRCS_COMMON-$(LIBAVCODEC) += ad_ffmpeg.c vd_ffmpeg.c vf_lavc.c vf_lavcdeint.c vf_screenshot.c -SRCS_COMMON-$(LIBDCA) += ad_libdca.c -SRCS_COMMON-$(LIBDV) += ad_libdv.c vd_libdv.c -SRCS_COMMON-$(LIBMAD) += ad_libmad.c -SRCS_COMMON-$(LIBMPEG2) += vd_libmpeg2.c -SRCS_COMMON-$(LIBPOSTPROC) += vf_pp.c -SRCS_COMMON-$(LIBTHEORA) += vd_theora.c -SRCS_COMMON-$(LIBVORBIS) += ad_libvorbis.c -SRCS_COMMON-$(MP3LIB) += ad_mp3lib.c -SRCS_COMMON-$(MUSEPACK) += ad_mpc.c -SRCS_COMMON-$(PNG) += vd_mpng.c -SRCS_COMMON-$(QTX_CODECS) += ad_qtaudio.c vd_qtvideo.c -SRCS_COMMON-$(REAL_CODECS) += ad_realaud.c vd_realvid.c -SRCS_COMMON-$(SPEEX) += ad_speex.c -SRCS_COMMON-$(WIN32DLL) += ad_acm.c ad_dmo.c ad_dshow.c ad_twin.c \ - vd_dmo.c vd_dshow.c vd_vfw.c vd_vfwex.c -SRCS_COMMON-$(XANIM_CODECS) += vd_xanim.c -SRCS_COMMON-$(XVID4) += vd_xvid4.c -SRCS_COMMON-$(ZORAN) += vd_zrmjpeg.c vf_zrmjpeg.c - - -SRCS_MENCODER = ae.c \ - ae_pcm.c \ - ve.c \ - ve_raw.c \ - -SRCS_MENCODER-$(LIBAVCODEC) += ae_lavc.c ve_lavc.c -SRCS_MENCODER-$(LIBDV) += ve_libdv.c -SRCS_MENCODER-$(LIBLZO) += ve_nuv.c -SRCS_MENCODER-$(QTX_CODECS) += ve_qtvideo.c -SRCS_MENCODER-$(WIN32DLL) += ve_vfw.c -SRCS_MENCODER-$(X264) += ve_x264.c -SRCS_MENCODER-$(XVID4) += ve_xvid4.c -SRCS_MENCODER-$(FAAC) += ae_faac.c -SRCS_MENCODER-$(TOOLAME) += ae_toolame.c -SRCS_MENCODER-$(TWOLAME) += ae_twolame.c -SRCS_MENCODER-$(MP3LAME) += ae_lame.c - - -include ../mpcommon.mak - -clean:: - rm -f native/*.o native/*.a native/*~ From ab5d23b62069e6dfcb5d0e717730d5957c0f9490 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 13:38:12 +0000 Subject: [PATCH 05/30] Merge stream/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26515 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 71 +++++++++++++++++++++++++++++++++++++++++++++--- stream/Makefile | 72 ------------------------------------------------- 2 files changed, 68 insertions(+), 75 deletions(-) delete mode 100644 stream/Makefile diff --git a/Makefile b/Makefile index 7a8ce893b7..bed6440d2f 100644 --- a/Makefile +++ b/Makefile @@ -155,10 +155,26 @@ SRCS_COMMON = asxparser.c \ libvo/sub.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ + stream/open.c \ + stream/stream.c \ + stream/stream_cue.c \ + stream/stream_file.c \ + stream/stream_mf.c \ + stream/stream_null.c \ + stream/url.c \ SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c +SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \ + stream/cdinfo.c +SRCS_COMMON-$(CDDB) += stream/stream_cddb.c +SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \ + stream/stream_dvb.c +SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c +SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ + stream/stream_dvd_common.c SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c +SRCS_COMMON-$(FTP) += stream/stream_ftp.c SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c @@ -197,12 +213,40 @@ SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c +SRCS_COMMON-$(LIBNEMESI) += stream/stream_nemesi.c SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c +SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c +SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ + stream/asf_mmst_streaming.c \ + stream/asf_streaming.c \ + stream/cookies.c \ + stream/http.c \ + stream/network.c \ + stream/pnm.c \ + stream/rtp.c \ + stream/udp.c \ + stream/tcp.c \ + stream/stream_rtp.c \ + stream/stream_udp.c \ + stream/realrtsp/asmrp.c \ + stream/realrtsp/real.c \ + stream/realrtsp/rmff.c \ + stream/realrtsp/sdpplin.c \ + stream/realrtsp/xbuffer.c \ + SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c +SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ + stream/freesdp/common.c \ + stream/freesdp/errorlist.c \ + stream/freesdp/parser.c \ + stream/librtsp/rtsp.c \ + stream/librtsp/rtsp_rtp.c \ + stream/librtsp/rtsp_session.c \ + SRCS_COMMON-$(NEED_GETTIMEOFDAY) += osdep/gettimeofday.c SRCS_COMMON-$(NEED_GLOB) += osdep/glob-win.c SRCS_COMMON-$(NEED_MMAP) += osdep/mmap-os2.c @@ -212,11 +256,16 @@ SRCS_COMMON-$(NEED_STRSEP) += osdep/strsep.c SRCS_COMMON-$(NEED_SWAB) += osdep/swab.c SRCS_COMMON-$(NEED_VSSCANF) += osdep/vsscanf.c SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c +SRCS_COMMON-$(PVR) += stream/stream_pvr.c SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \ libmpcodecs/vd_qtvideo.c +SRCS_COMMON-$(RADIO) += stream/stream_radio.c +SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ libmpcodecs/vd_realvid.c SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c +SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c +SRCS_COMMON-$(STREAMING_LIVE555) += stream/stream_livedotcom.c SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/block.c \ tremor/codebook.c \ @@ -232,7 +281,16 @@ SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/synthesis.c \ tremor/window.c \ +SRCS_COMMON-$(TV) += stream/stream_tv.c stream/tv.c \ + stream/frequencies.c stream/tvi_dummy.c +SRCS_COMMON-$(TV_BSDBT848) += stream/tvi_bsdbt848.c +SRCS_COMMON-$(TV_DSHOW) += stream/tvi_dshow.c +SRCS_COMMON-$(TV_TELETEXT) += stream/tvi_vbi.c +SRCS_COMMON-$(TV_V4L1) += stream/tvi_v4l.c stream/audio_in.c +SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c +SRCS_COMMON-$(VCD) += stream/stream_vcd.c +SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/ad_dmo.c \ libmpcodecs/ad_dshow.c \ @@ -246,6 +304,12 @@ SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ libmpcodecs/vf_zrmjpeg.c +ifeq ($(AUDIO_INPUT),yes) +SRCS_COMMON-$(ALSA1X) += stream/ai_alsa1x.c +SRCS_COMMON-$(ALSA9) += stream/ai_alsa.c +SRCS_COMMON-$(OSS) += stream/ai_oss.c +endif + SRCS_MPLAYER = mplayer.c \ m_property.c \ @@ -348,7 +412,6 @@ SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c COMMON_LIBS = libmpdemux/libmpdemux.a \ - stream/stream.a \ libswscale/libswscale.a \ COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a @@ -395,7 +458,6 @@ PARTS = dvdread \ libpostproc \ libswscale \ mp3lib \ - stream \ vidix \ ifdef ARCH_X86 @@ -417,6 +479,10 @@ DIRS = gui \ libmpcodecs/native \ libvo \ osdep \ + stream \ + stream/freesdp \ + stream/librtsp \ + stream/realrtsp \ tremor \ TOOLS \ @@ -630,7 +696,6 @@ fastmemcpybench realcodecs: CFLAGS += -g # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. NETSTREAM_DEPS = libmpdemux/libmpdemux.a \ - stream/stream.a \ dvdread/libdvdread.a \ libdvdcss/libdvdcss.a \ libavutil/libavutil.a \ diff --git a/stream/Makefile b/stream/Makefile deleted file mode 100644 index 36eea14afc..0000000000 --- a/stream/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = stream.a - -SRCS_COMMON = open.c \ - stream.c \ - stream_cue.c \ - stream_file.c \ - stream_mf.c \ - stream_null.c \ - url.c \ - -SRCS_COMMON-$(CDDA) += stream_cdda.c cdinfo.c -SRCS_COMMON-$(CDDB) += stream_cddb.c -SRCS_COMMON-$(DVBIN) += dvb_tune.c stream_dvb.c -SRCS_COMMON-$(DVDNAV) += stream_dvdnav.c -SRCS_COMMON-$(DVDREAD) += stream_dvd.c stream_dvd_common.c -SRCS_COMMON-$(FTP) += stream_ftp.c -SRCS_COMMON-$(LIBNEMESI) += stream_nemesi.c -SRCS_COMMON-$(LIBSMBCLIENT) += stream_smb.c -SRCS_COMMON-$(MPLAYER_NETWORK) += stream_netstream.c \ - asf_mmst_streaming.c \ - asf_streaming.c \ - cookies.c \ - http.c \ - network.c \ - pnm.c \ - rtp.c \ - udp.c \ - tcp.c \ - stream_rtp.c \ - stream_udp.c \ - realrtsp/asmrp.c \ - realrtsp/real.c \ - realrtsp/rmff.c \ - realrtsp/sdpplin.c \ - realrtsp/xbuffer.c \ - -SRCS_COMMON-$(NATIVE_RTSP) += stream_rtsp.c \ - freesdp/common.c \ - freesdp/errorlist.c \ - freesdp/parser.c \ - librtsp/rtsp.c \ - librtsp/rtsp_rtp.c \ - librtsp/rtsp_session.c \ - -SRCS_COMMON-$(PVR) += stream_pvr.c -SRCS_COMMON-$(RADIO) += stream_radio.c -SRCS_COMMON-$(RADIO_CAPTURE) += audio_in.c -SRCS_COMMON-$(STREAM_CACHE) += cache2.c -SRCS_COMMON-$(STREAMING_LIVE555) += stream_livedotcom.c -SRCS_COMMON-$(TV) += stream_tv.c tv.c frequencies.c tvi_dummy.c -SRCS_COMMON-$(TV_BSDBT848) += tvi_bsdbt848.c -SRCS_COMMON-$(TV_DSHOW) += tvi_dshow.c -SRCS_COMMON-$(TV_TELETEXT) += tvi_vbi.c -SRCS_COMMON-$(TV_V4L1) += tvi_v4l.c audio_in.c -SRCS_COMMON-$(TV_V4L2) += tvi_v4l2.c audio_in.c -SRCS_COMMON-$(VCD) += stream_vcd.c -SRCS_COMMON-$(VSTREAM) += stream_vstream.c - -ifeq ($(AUDIO_INPUT),yes) -SRCS_COMMON-$(ALSA1X) += ai_alsa1x.c -SRCS_COMMON-$(ALSA9) += ai_alsa.c -SRCS_COMMON-$(OSS) += ai_oss.c -endif - -include ../mpcommon.mak - -clean:: - rm -f realrtsp/*.o realrtsp/*.a realrtsp/*~ \ - librtsp/*.o librtsp/*.a librtsp/*~ \ - freesdp/*.o freesdp/*.a freesdp/*~ From 9551fc7e63bb5e7d484bf0cb74d061c4318da01c Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 15:32:44 +0000 Subject: [PATCH 06/30] Expand conditional addition of elements to variables with a form that permits using two conditions. This allows getting rid of some ifeqs in Makefiles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26516 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 +++----- mp3lib/Makefile | 8 +++----- mpcommon.mak | 1 + 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index bed6440d2f..5ccb1f5778 100644 --- a/Makefile +++ b/Makefile @@ -163,6 +163,9 @@ SRCS_COMMON = asxparser.c \ stream/stream_null.c \ stream/url.c \ +SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA1X) += stream/ai_alsa1x.c +SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA9) += stream/ai_alsa.c +SRCS_COMMON-$(AUDIO_INPUT)-$(OSS) += stream/ai_oss.c SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \ stream/cdinfo.c @@ -304,11 +307,6 @@ SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ libmpcodecs/vf_zrmjpeg.c -ifeq ($(AUDIO_INPUT),yes) -SRCS_COMMON-$(ALSA1X) += stream/ai_alsa1x.c -SRCS_COMMON-$(ALSA9) += stream/ai_alsa.c -SRCS_COMMON-$(OSS) += stream/ai_oss.c -endif SRCS_MPLAYER = mplayer.c \ diff --git a/mp3lib/Makefile b/mp3lib/Makefile index 307feefe56..84d4998d9a 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -5,12 +5,10 @@ LIBNAME_COMMON = mp3lib.a SRCS_COMMON = sr1.c SRCS_COMMON-$(HAVE_MMX) += decode_mmx.c SRCS_COMMON-$(HAVE_SSE) += dct64_sse.c -ifeq ($(ARCH_X86_32),yes) SRCS_COMMON += decode_i586.c -SRCS_COMMON-$(HAVE_MMX) += dct64_mmx.c -SRCS_COMMON-$(HAVE_3DNOW) += dct36_3dnow.c dct64_3dnow.c -SRCS_COMMON-$(HAVE_3DNOWEX) += dct36_k7.c dct64_k7.c -endif +SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_MMX) += dct64_mmx.c +SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOW) += dct36_3dnow.c dct64_3dnow.c +SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOWEX) += dct36_k7.c dct64_k7.c SRCS_COMMON-$(HAVE_ALTIVEC) += dct64_altivec.c include ../mpcommon.mak diff --git a/mpcommon.mak b/mpcommon.mak index d200560bf8..9c68b9acdd 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -1,4 +1,5 @@ SRCS_COMMON += $(SRCS_COMMON-yes) +SRCS_COMMON += $(SRCS_COMMON-yes-yes) SRCS_MPLAYER += $(SRCS_MPLAYER-yes) SRCS_MENCODER += $(SRCS_MENCODER-yes) From a2d82df9ccfc0ca12129637aeb9869489ef57a4a Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 16:41:44 +0000 Subject: [PATCH 07/30] Move libfaad2 fixed-point CFLAGS setting to configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26517 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 8 ++++++-- libfaad2/Makefile | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index a004903894..296f1b2be5 100755 --- a/configure +++ b/configure @@ -6180,7 +6180,12 @@ if test "$_faad_internal" = yes ; then _def_faad_internal="#define USE_FAAD_INTERNAL 1" _faad=yes _res_comment="internal floating-point" - test "$_faad_fixed" = yes && _res_comment="internal fixed-point" + if test "$_faad_fixed" = yes ; then + # The FIXED_POINT implementation of FAAD2 improves performance + # on some platforms, especially for SBR files. + CFLAGS="$CFLAGS -DFIXED_POINT" + _res_comment="internal fixed-point" + fi elif test "$_faad_external" = yes ; then _faad=yes _ld_extra="$_ld_extra -lfaad" @@ -7805,7 +7810,6 @@ LIBMAD = $_mad LIBVORBIS = $_vorbis LIBTHEORA = $_theora FAAD_INTERNAL = $_faad_internal -FAAD_FIXED = $_faad_fixed LIBSMBCLIENT = $_smbsupport XMMS_PLUGINS = $_xmms MACOSX_FINDER_SUPPORT = $_macosx_finder_support diff --git a/libfaad2/Makefile b/libfaad2/Makefile index 59b06515a0..81dd521295 100644 --- a/libfaad2/Makefile +++ b/libfaad2/Makefile @@ -43,8 +43,4 @@ SRCS_COMMON = bits.c \ CFLAGS = -D_GNU_SOURCE -# The FIXED_POINT implementation of FAAD2 improves performance -# on some platforms, especially for SBR files. -CFLAGS-$(FAAD_FIXED) += -DFIXED_POINT - include ../mpcommon.mak From 6a23615946718c027213c46701274af6a01b6528 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 16:49:31 +0000 Subject: [PATCH 08/30] #include base64.h with full path. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26518 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_rtp_codec.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 7f9174d6a0..33b2dc41eb 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -6,7 +6,7 @@ extern "C" { #include #include #include "stheader.h" -#include "base64.h" +#include "libavutil/base64.h" } #ifdef USE_LIBAVCODEC From 1b7adb682202d310cff714b355164a2b29c877c6 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 17:26:57 +0000 Subject: [PATCH 09/30] Make sure necessary header files are created before recursing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26519 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5ccb1f5778..1df6c6cfd2 100644 --- a/Makefile +++ b/Makefile @@ -490,7 +490,7 @@ recurse: for part in $(PARTS); do $(MAKE) -C $$part; done DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d) -$(DEPS): help_mp.h version.h codecs.conf.h +$(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done From b5653b5698b468d2f5528979e331ec21eb868562 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 17:41:19 +0000 Subject: [PATCH 10/30] Include mpcommon.mak before declaring dependencies, which require mpcommon.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26520 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1df6c6cfd2..cc9450470f 100644 --- a/Makefile +++ b/Makefile @@ -489,13 +489,16 @@ all: recurse $(ALL_PRG) recurse: for part in $(PARTS); do $(MAKE) -C $$part; done +# Hack to keep .depend from being generated at the top level unnecessarily. +DEPS = foo + +include mpcommon.mak + DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done -include mpcommon.mak - CFLAGS := $(subst -I..,-I.,$(CFLAGS)) define RECURSIVE_RULE From e7f6edf300f9d465c92a6112c8f782ccb53c26eb Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 21:46:50 +0000 Subject: [PATCH 11/30] dependency generation infrastructure for C++ files git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26521 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- configure | 1 + mpcommon.mak | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cc9450470f..0face2127f 100644 --- a/Makefile +++ b/Makefile @@ -494,7 +494,7 @@ DEPS = foo include mpcommon.mak -DEPS = $(SRCS_COMMON:.c=.d) $(SRCS_MPLAYER:.c=.d) $(SRCS_MENCODER:.c=.d) +DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER))) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done diff --git a/configure b/configure index 296f1b2be5..92be2f7c91 100755 --- a/configure +++ b/configure @@ -7903,6 +7903,7 @@ HAVE_XVMC = $_xvmc DEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,\$^) | sed "s,[0-9a-z._-]*: \(\$(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&," MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," +MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," EOF diff --git a/mpcommon.mak b/mpcommon.mak index 9c68b9acdd..2cdcf7f266 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -34,6 +34,9 @@ distclean:: clean %.d: %.c $(MPDEPEND_CMD) > $@ +%.d: %.cpp + $(MPDEPEND_CMD_CXX) > $@ + %.ho: %.h $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< From 83f7e53ecaca8b4961bbc84dfbd0bf9307d8c8ef Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 21:58:45 +0000 Subject: [PATCH 12/30] Explicitly include dependency information in top-level Makefile. The inclusion is skipped in mpcommon.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26522 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 0face2127f..046bf54d40 100644 --- a/Makefile +++ b/Makefile @@ -711,4 +711,6 @@ toolsclean: rm -f $(TOOLS) TOOLS/fastmem*-* TOOLS/netstream$(EXESUF) rm -f TOOLS/bmovl-test$(EXESUF) TOOLS/vfw2menc$(EXESUF) $(REAL_TARGETS) +-include $(DEPS) + .PHONY: all doxygen *install* recurse strip tools From aaf2c51e8abb42a3fda320ca626d4258a54d05ad Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 22:05:43 +0000 Subject: [PATCH 13/30] Merge libmpdemux/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26523 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 89 +++++++++++++++++++++++++++++++++++++-------- libmpdemux/Makefile | 73 ------------------------------------- 2 files changed, 73 insertions(+), 89 deletions(-) delete mode 100644 libmpdemux/Makefile diff --git a/Makefile b/Makefile index 046bf54d40..642941c9f2 100644 --- a/Makefile +++ b/Makefile @@ -150,6 +150,50 @@ SRCS_COMMON = asxparser.c \ libmpcodecs/vf_yuvcsp.c \ libmpcodecs/vf_yuy2.c \ libmpcodecs/vf_yvu9.c \ + libmpdemux/aac_hdr.c \ + libmpdemux/asfheader.c \ + libmpdemux/aviheader.c \ + libmpdemux/aviprint.c \ + libmpdemux/demuxer.c \ + libmpdemux/demux_aac.c \ + libmpdemux/demux_asf.c \ + libmpdemux/demux_audio.c \ + libmpdemux/demux_avi.c \ + libmpdemux/demux_demuxers.c \ + libmpdemux/demux_film.c \ + libmpdemux/demux_fli.c \ + libmpdemux/demux_lmlm4.c \ + libmpdemux/demux_mf.c \ + libmpdemux/demux_mkv.c \ + libmpdemux/demux_mov.c \ + libmpdemux/demux_mpg.c \ + libmpdemux/demux_nsv.c \ + libmpdemux/demux_nuv.c \ + libmpdemux/demux_pva.c \ + libmpdemux/demux_rawaudio.c \ + libmpdemux/demux_rawvideo.c \ + libmpdemux/demux_realaud.c \ + libmpdemux/demux_real.c \ + libmpdemux/demux_roq.c \ + libmpdemux/demux_smjpeg.c \ + libmpdemux/demux_ts.c \ + libmpdemux/demux_ty.c \ + libmpdemux/demux_ty_osd.c \ + libmpdemux/demux_viv.c \ + libmpdemux/demux_vqf.c \ + libmpdemux/demux_y4m.c \ + libmpdemux/ebml.c \ + libmpdemux/extension.c \ + libmpdemux/mf.c \ + libmpdemux/mp3_hdr.c \ + libmpdemux/mp_taglists.c \ + libmpdemux/mpeg_hdr.c \ + libmpdemux/mpeg_packetizer.c \ + libmpdemux/parse_es.c \ + libmpdemux/parse_mp4.c \ + libmpdemux/video.c \ + libmpdemux/yuv4mpeg.c \ + libmpdemux/yuv4mpeg_ratio.c \ libvo/aclib.c \ libvo/osd.c \ libvo/sub.c \ @@ -178,6 +222,7 @@ SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c SRCS_COMMON-$(FTP) += stream/stream_ftp.c +SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c @@ -211,16 +256,21 @@ SRCS_COMMON-$(LIBAVCODEC_A) += libaf/af_lavcac3enc.c \ libmpcodecs/vf_spp.c \ libmpcodecs/vf_uspp.c \ +SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ - libmpcodecs/vd_libdv.c + libmpcodecs/vd_libdv.c \ + libmpdemux/demux_rawdv.c SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c -SRCS_COMMON-$(LIBNEMESI) += stream/stream_nemesi.c +SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ + stream/stream_nemesi.c +SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c -SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c +SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \ + libmpdemux/demux_ogg.c SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ @@ -241,7 +291,8 @@ SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ stream/realrtsp/sdpplin.c \ stream/realrtsp/xbuffer.c \ -SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c +SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ + libmpdemux/demux_mpc.c SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ stream/freesdp/common.c \ stream/freesdp/errorlist.c \ @@ -268,7 +319,10 @@ SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ libmpcodecs/vd_realvid.c SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c -SRCS_COMMON-$(STREAMING_LIVE555) += stream/stream_livedotcom.c +SRCS_COMMON-$(STREAMING_LIVE555) += libmpdemux/demux_rtp.cpp \ + libmpdemux/demux_rtp_codec.cpp \ + stream/stream_livedotcom.c \ + SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ tremor/block.c \ tremor/codebook.c \ @@ -302,8 +356,10 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/vd_dshow.c \ libmpcodecs/vd_vfw.c \ libmpcodecs/vd_vfwex.c \ + libmpdemux/demux_avs.c \ SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c +SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ libmpcodecs/vf_zrmjpeg.c @@ -396,9 +452,15 @@ SRCS_MENCODER = mencoder.c \ libmpcodecs/ae_pcm.c \ libmpcodecs/ve.c \ libmpcodecs/ve_raw.c \ + libmpdemux/muxer.c \ + libmpdemux/muxer_avi.c \ + libmpdemux/muxer_mpeg.c \ + libmpdemux/muxer_rawaudio.c \ + libmpdemux/muxer_rawvideo.c \ SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c +SRCS_MENCODER-$(LIBAVFORMAT) += libmpdemux/muxer_lavf.c SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c @@ -409,8 +471,7 @@ SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c -COMMON_LIBS = libmpdemux/libmpdemux.a \ - libswscale/libswscale.a \ +COMMON_LIBS = libswscale/libswscale.a \ COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a @@ -426,8 +487,6 @@ COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a -LIBS_MENCODER = libmpdemux/libmpmux.a \ - ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -451,7 +510,6 @@ PARTS = dvdread \ libavutil \ libdvdcss \ libfaad2 \ - libmpdemux \ libmpeg2 \ libpostproc \ libswscale \ @@ -475,6 +533,7 @@ DIRS = gui \ libmenu \ libmpcodecs \ libmpcodecs/native \ + libmpdemux \ libvo \ osdep \ stream \ @@ -508,9 +567,6 @@ endef $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) -libmpdemux/libmpmux.a: - $(MAKE) -C libmpdemux libmpmux.a - mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) @@ -534,6 +590,8 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< +libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec + install: install-dirs $(INSTALL_TARGETS) install-dirs: @@ -672,7 +730,7 @@ TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 #FIXME: Linking is broken, help welcome. -TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c libmpdemux/libmpdemux.a $(TOOLS_COMMON_LIBS) +TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TOOLS_COMMON_LIBS) fastmemcpybench: TOOLS/fastmemcpybench.c $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX @@ -696,8 +754,7 @@ fastmemcpybench realcodecs: CFLAGS += -g # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. -NETSTREAM_DEPS = libmpdemux/libmpdemux.a \ - dvdread/libdvdread.a \ +NETSTREAM_DEPS = dvdread/libdvdread.a \ libdvdcss/libdvdcss.a \ libavutil/libavutil.a \ m_option.o \ diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile deleted file mode 100644 index 5bd6338ca7..0000000000 --- a/libmpdemux/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libmpdemux.a -LIBNAME_MENCODER = libmpmux.a - -SRCS_COMMON = aac_hdr.c \ - asfheader.c \ - aviheader.c \ - aviprint.c \ - demuxer.c \ - demux_aac.c \ - demux_asf.c \ - demux_audio.c \ - demux_avi.c \ - demux_demuxers.c \ - demux_film.c \ - demux_fli.c \ - demux_lmlm4.c \ - demux_mf.c \ - demux_mkv.c ebml.c \ - demux_mov.c \ - demux_mpg.c \ - demux_nsv.c \ - demux_nuv.c \ - demux_pva.c \ - demux_rawaudio.c \ - demux_rawvideo.c \ - demux_realaud.c \ - demux_real.c \ - demux_roq.c \ - demux_smjpeg.c \ - demux_ts.c \ - demux_ty.c \ - demux_ty_osd.c \ - demux_viv.c \ - demux_vqf.c \ - demux_y4m.c \ - extension.c \ - mf.c \ - mp3_hdr.c \ - mp_taglists.c \ - mpeg_hdr.c \ - mpeg_packetizer.c \ - parse_es.c \ - parse_mp4.c \ - video.c \ - yuv4mpeg.c \ - yuv4mpeg_ratio.c \ - -SRCS_COMMON-$(GIF) += demux_gif.c -SRCS_COMMON-$(LIBAVFORMAT) += demux_lavf.c -SRCS_COMMON-$(LIBDV) += demux_rawdv.c -SRCS_COMMON-$(LIBNEMESI) += demux_nemesi.c -SRCS_COMMON-$(LIBNUT) += demux_nut.c -SRCS_COMMON-$(LIBVORBIS) += demux_ogg.c -SRCS_COMMON-$(MUSEPACK) += demux_mpc.c -SRCS_COMMON-$(STREAMING_LIVE555) += demux_rtp.cpp demux_rtp_codec.cpp -SRCS_COMMON-$(WIN32DLL) += demux_avs.c -SRCS_COMMON-$(XMMS_PLUGINS) += demux_xmms.c - -SRCS_MENCODER = muxer.c \ - muxer_avi.c \ - muxer_mpeg.c \ - muxer_rawaudio.c \ - muxer_rawvideo.c \ - -SRCS_MENCODER-$(LIBAVFORMAT) += muxer_lavf.c - -include ../mpcommon.mak - -demux_lavf.o mp_taglists.o .depend: CFLAGS += -I../libavcodec - -.depend: CFLAGS += $(EXTRAXX_INC) From 4267826b6bde2f18beed0637181cba5b5f814fde Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 22:27:01 +0000 Subject: [PATCH 14/30] Merge libdvdcss/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26524 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 13 ++++++++++--- libdvdcss/Makefile | 14 -------------- 2 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 libdvdcss/Makefile diff --git a/Makefile b/Makefile index 642941c9f2..1d8fe332e8 100644 --- a/Makefile +++ b/Makefile @@ -261,6 +261,13 @@ SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c +SRCS_COMMON-$(DVDCSS_INTERNAL) += libdvdcss/css.c \ + libdvdcss/device.c \ + libdvdcss/error.c \ + libdvdcss/ioctl.c \ + libdvdcss/libdvdcss.c \ + #libdvdcss/bsdi_ioctl \ + SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ @@ -483,7 +490,6 @@ COMMON_LIBS-$(LIBA52) += liba52/liba52.a COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a COMMON_LIBS-$(FAAD_INTERNAL) += libfaad2/libfaad2.a COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a -COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a @@ -508,7 +514,6 @@ PARTS = dvdread \ libavcodec \ libavformat \ libavutil \ - libdvdcss \ libfaad2 \ libmpeg2 \ libpostproc \ @@ -530,6 +535,7 @@ DIRS = gui \ libaf \ libao2 \ libass \ + libdvdcss \ libmenu \ libmpcodecs \ libmpcodecs/native \ @@ -590,6 +596,8 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< +libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" + libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec install: install-dirs $(INSTALL_TARGETS) @@ -755,7 +763,6 @@ fastmemcpybench realcodecs: CFLAGS += -g # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. NETSTREAM_DEPS = dvdread/libdvdread.a \ - libdvdcss/libdvdcss.a \ libavutil/libavutil.a \ m_option.o \ m_struct.o \ diff --git a/libdvdcss/Makefile b/libdvdcss/Makefile deleted file mode 100644 index 38b3e814cc..0000000000 --- a/libdvdcss/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libdvdcss.a - -SRCS_COMMON = css.c \ - device.c \ - error.c \ - ioctl.c \ - libdvdcss.c \ - #bsdi_ioctl \ - -CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" - -include ../mpcommon.mak From cc339fac3a7ce0ac732d0f2af368eea9c2630f7c Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 22:30:50 +0000 Subject: [PATCH 15/30] Rename make variable DVDCSS_INTERNAL --> LIBDVDCSS_INTERNAL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26525 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1d8fe332e8..0c810bd35b 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,7 @@ SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c -SRCS_COMMON-$(DVDCSS_INTERNAL) += libdvdcss/css.c \ +SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ libdvdcss/device.c \ libdvdcss/error.c \ libdvdcss/ioctl.c \ diff --git a/configure b/configure index 92be2f7c91..e456c83f3e 100755 --- a/configure +++ b/configure @@ -7784,7 +7784,7 @@ PVR = $_pvr VCD = $_vcd DVDREAD = $_dvdread DVDREAD_INTERNAL = $_dvdread_internal -DVDCSS_INTERNAL = $_libdvdcss_internal +LIBDVDCSS_INTERNAL = $_libdvdcss_internal DVDNAV = $_dvdnav WIN32DLL = $_win32dll WIN32_EMULATION = $_win32_emulation From 49aea49605c3f919eb066d1e6bdc03d74bad1973 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 24 Apr 2008 23:11:16 +0000 Subject: [PATCH 16/30] Merge libfaad2/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26526 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 43 +++++++++++++++++++++++++++++++++++++++++-- libfaad2/Makefile | 46 ---------------------------------------------- 2 files changed, 41 insertions(+), 48 deletions(-) delete mode 100644 libfaad2/Makefile diff --git a/Makefile b/Makefile index 0c810bd35b..83d42f3363 100644 --- a/Makefile +++ b/Makefile @@ -268,6 +268,45 @@ SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ libdvdcss/libdvdcss.c \ #libdvdcss/bsdi_ioctl \ +SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \ + libfaad2/cfft.c \ + libfaad2/common.c \ + libfaad2/decoder.c \ + libfaad2/drc.c \ + libfaad2/drm_dec.c \ + libfaad2/error.c \ + libfaad2/filtbank.c \ + libfaad2/hcr.c \ + libfaad2/huffman.c \ + libfaad2/ic_predict.c \ + libfaad2/is.c \ + libfaad2/lt_predict.c \ + libfaad2/mdct.c \ + libfaad2/mp4.c \ + libfaad2/ms.c \ + libfaad2/output.c \ + libfaad2/pns.c \ + libfaad2/ps_dec.c \ + libfaad2/ps_syntax.c \ + libfaad2/pulse.c \ + libfaad2/rvlc.c \ + libfaad2/sbr_dct.c \ + libfaad2/sbr_dec.c \ + libfaad2/sbr_e_nf.c \ + libfaad2/sbr_fbt.c \ + libfaad2/sbr_hfadj.c \ + libfaad2/sbr_hfgen.c \ + libfaad2/sbr_huff.c \ + libfaad2/sbr_qmf.c \ + libfaad2/sbr_syntax.c \ + libfaad2/sbr_tf_grid.c \ + libfaad2/specrec.c \ + libfaad2/ssr.c \ + libfaad2/ssr_fb.c \ + libfaad2/ssr_ipqf.c \ + libfaad2/syntax.c \ + libfaad2/tns.c \ + SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \ @@ -488,7 +527,6 @@ COMMON_LIBS-$(WIN32DLL) += loader/loader.a COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a COMMON_LIBS-$(LIBA52) += liba52/liba52.a COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a -COMMON_LIBS-$(FAAD_INTERNAL) += libfaad2/libfaad2.a COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a @@ -514,7 +552,6 @@ PARTS = dvdread \ libavcodec \ libavformat \ libavutil \ - libfaad2 \ libmpeg2 \ libpostproc \ libswscale \ @@ -536,6 +573,7 @@ DIRS = gui \ libao2 \ libass \ libdvdcss \ + libfaad2 \ libmenu \ libmpcodecs \ libmpcodecs/native \ @@ -597,6 +635,7 @@ osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" +libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec diff --git a/libfaad2/Makefile b/libfaad2/Makefile deleted file mode 100644 index 81dd521295..0000000000 --- a/libfaad2/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libfaad2.a - -SRCS_COMMON = bits.c \ - cfft.c \ - common.c \ - decoder.c \ - drc.c \ - drm_dec.c \ - error.c \ - filtbank.c \ - hcr.c \ - huffman.c \ - ic_predict.c \ - is.c \ - lt_predict.c \ - mdct.c \ - mp4.c \ - ms.c \ - output.c \ - pns.c \ - ps_dec.c \ - ps_syntax.c \ - pulse.c \ - rvlc.c \ - sbr_dct.c \ - sbr_dec.c \ - sbr_e_nf.c \ - sbr_fbt.c \ - sbr_hfadj.c \ - sbr_hfgen.c \ - sbr_huff.c \ - sbr_qmf.c \ - sbr_syntax.c \ - sbr_tf_grid.c \ - specrec.c \ - ssr.c \ - ssr_fb.c \ - ssr_ipqf.c \ - syntax.c \ - tns.c \ - -CFLAGS = -D_GNU_SOURCE - -include ../mpcommon.mak From 45ca5e0930571830b2fe8b56b7f4e3184f99bdbd Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 00:01:56 +0000 Subject: [PATCH 17/30] DVDCSS_INTERNAL has been renamed to LIBDVDCSS_INTERNAL. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26527 b3059339-0415-0410-9bf9-f77b7e298cf2 --- dvdread/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dvdread/Makefile b/dvdread/Makefile index c6fa743104..d0fc3732c2 100644 --- a/dvdread/Makefile +++ b/dvdread/Makefile @@ -14,6 +14,6 @@ SRCS_COMMON = cmd_print.c \ CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -CFLAGS-$(DVDCSS_INTERNAL) += -I../libdvdcss -DHAVE_DVDCSS_DVDCSS_H +CFLAGS-$(LIBDVDCSS_INTERNAL) += -I../libdvdcss -DHAVE_DVDCSS_DVDCSS_H include ../mpcommon.mak From 61d97d630e807ce958c0496e1a138d4fe16b34b3 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:25:17 +0000 Subject: [PATCH 18/30] Merge dvdread/Makefile into top-level Makefile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26528 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 24 ++++++++++++++++++------ dvdread/Makefile | 19 ------------------- 2 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 dvdread/Makefile diff --git a/Makefile b/Makefile index 83d42f3363..51e338774d 100644 --- a/Makefile +++ b/Makefile @@ -219,6 +219,16 @@ SRCS_COMMON-$(DVBIN) += stream/dvb_tune.c \ SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ stream/stream_dvd_common.c +SRCS_COMMON-$(DVDREAD_INTERNAL) += dvdread/cmd_print.c \ + dvdread/dvd_input.c \ + dvdread/dvd_reader.c \ + dvdread/dvd_udf.c \ + dvdread/ifo_print.c \ + dvdread/ifo_read.c \ + dvdread/md5.c \ + dvdread/nav_print.c \ + dvdread/nav_read.c \ + SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c SRCS_COMMON-$(FTP) += stream/stream_ftp.c @@ -527,7 +537,6 @@ COMMON_LIBS-$(WIN32DLL) += loader/loader.a COMMON_LIBS-$(MP3LIB) += mp3lib/mp3lib.a COMMON_LIBS-$(LIBA52) += liba52/liba52.a COMMON_LIBS-$(LIBMPEG2) += libmpeg2/libmpeg2.a -COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a @@ -547,8 +556,7 @@ INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui INSTALL_TARGETS += $(INSTALL_TARGETS-yes) -PARTS = dvdread \ - liba52 \ +PARTS = liba52 \ libavcodec \ libavformat \ libavutil \ @@ -562,7 +570,8 @@ ifdef ARCH_X86 PARTS += loader endif -DIRS = gui \ +DIRS = dvdread \ + gui \ gui/mplayer \ gui/mplayer/gtk \ gui/skin \ @@ -634,6 +643,10 @@ codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o osdep/mplayer-rc.o: osdep/mplayer.rc version.h $(WINDRES) -o $@ $< +dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE +ifeq ($(LIBDVDCSS_INTERNAL),yes) +dvdread/%.o dvdread/%.d: CFLAGS += -Ilibdvdcss -DHAVE_DVDCSS_DVDCSS_H +endif libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE @@ -801,8 +814,7 @@ fastmemcpybench realcodecs: CFLAGS += -g # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. -NETSTREAM_DEPS = dvdread/libdvdread.a \ - libavutil/libavutil.a \ +NETSTREAM_DEPS = libavutil/libavutil.a \ m_option.o \ m_struct.o \ $(TOOLS_COMMON_LIBS) diff --git a/dvdread/Makefile b/dvdread/Makefile deleted file mode 100644 index d0fc3732c2..0000000000 --- a/dvdread/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = dvdread.a - -SRCS_COMMON = cmd_print.c \ - dvd_input.c \ - dvd_reader.c \ - dvd_udf.c \ - ifo_print.c \ - ifo_read.c \ - md5.c \ - nav_print.c \ - nav_read.c \ - -CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE - -CFLAGS-$(LIBDVDCSS_INTERNAL) += -I../libdvdcss -DHAVE_DVDCSS_DVDCSS_H - -include ../mpcommon.mak From 3b68802ccc4a7696e6769abe4cc98914b913ca4f Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:28:33 +0000 Subject: [PATCH 19/30] Take name of getch file to link against from config.mak. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26529 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mp3lib/Makefile b/mp3lib/Makefile index 84d4998d9a..39ead3bea6 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -15,5 +15,5 @@ include ../mpcommon.mak decode_i586.o: CFLAGS += -fomit-frame-pointer -%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../osdep/getch2.o +%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../osdep/$(GETCH:.c=.o) $(CC) $(CFLAGS) -o $@ $^ -ltermcap -lm From b8d8895381310554ccd3ddb8348ce21494327a07 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:30:12 +0000 Subject: [PATCH 20/30] Add missing #include, fixes the warning: test2.c:65: warning: implicit declaration of function 'memcpy' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26530 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/test2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mp3lib/test2.c b/mp3lib/test2.c index 6a20960663..9f66393f0f 100644 --- a/mp3lib/test2.c +++ b/mp3lib/test2.c @@ -3,6 +3,7 @@ #include #include +#include #include #include From d0e5a5224b81e252539c990b2d375586c9defb41 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:30:43 +0000 Subject: [PATCH 21/30] Remove unused variable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26531 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/test2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mp3lib/test2.c b/mp3lib/test2.c index 9f66393f0f..70acdfe949 100644 --- a/mp3lib/test2.c +++ b/mp3lib/test2.c @@ -27,7 +27,6 @@ static unsigned char buffer[BUFFLEN]; int main(int argc,char* argv[]){ int len; int total=0; - float length; int r; int audio_fd; From c41f3b9244df1f245f69dc6380329f79571b1e21 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:32:26 +0000 Subject: [PATCH 22/30] Add return statement, fixes the warning: test2.c:72: warning: control reaches end of non-void function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26532 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/test2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mp3lib/test2.c b/mp3lib/test2.c index 70acdfe949..e35ad9aa32 100644 --- a/mp3lib/test2.c +++ b/mp3lib/test2.c @@ -68,5 +68,5 @@ int main(int argc,char* argv[]){ } fclose(mp3file); - + return 0; } From 8aa012384d03b0202b05c3326c3c806069385182 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:33:43 +0000 Subject: [PATCH 23/30] Remove redundant declaration, fixes the warning: test.c:15: warning: redundant redeclaration of 'gCpuCaps' ../cpudetect.h:53: warning: previous declaration of 'gCpuCaps' was here git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26533 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/mp3lib/test.c b/mp3lib/test.c index f256224a7d..5ad92b2d94 100644 --- a/mp3lib/test.c +++ b/mp3lib/test.c @@ -12,7 +12,6 @@ #include "config.h" #include "mp3lib/mp3.h" #include "cpudetect.h" -extern CpuCaps gCpuCaps; static inline unsigned int GetTimer(){ struct timeval tv; From ef59dbd34705eca4bf0580b501d9dbdd8e7d4d33 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:34:26 +0000 Subject: [PATCH 24/30] Add return statement, fixes the warning: test.c:75: warning: control reaches end of non-void function git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26534 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mp3lib/test.c b/mp3lib/test.c index 5ad92b2d94..1ae32aedde 100644 --- a/mp3lib/test.c +++ b/mp3lib/test.c @@ -70,5 +70,5 @@ int main(int argc,char* argv[]){ printf("CPU usage at normal playback: %5.2f %%\n",time1*0.0001f/length); fclose(mp3file); - + return 0; } From ba6cc3387ed4a5dbbf80fe3962ff17941f0f4504 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:37:47 +0000 Subject: [PATCH 25/30] Fix test program linking. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26535 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mp3lib/Makefile b/mp3lib/Makefile index 39ead3bea6..09ba6a368c 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -15,5 +15,5 @@ include ../mpcommon.mak decode_i586.o: CFLAGS += -fomit-frame-pointer -%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../osdep/$(GETCH:.c=.o) +%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) $(CC) $(CFLAGS) -o $@ $^ -ltermcap -lm From e58ca8c5da29e4170afb249356d0a8f2e73146ea Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 08:39:03 +0000 Subject: [PATCH 26/30] Remove useless comments with compilation commands. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26536 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/test.c | 2 -- mp3lib/test2.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/mp3lib/test.c b/mp3lib/test.c index 1ae32aedde..8ce1143ff2 100644 --- a/mp3lib/test.c +++ b/mp3lib/test.c @@ -1,8 +1,6 @@ #define DUMP_PCM -// gcc test.c -I.. -L. -lMP3 -lm -o test1 -O4 - #include #include diff --git a/mp3lib/test2.c b/mp3lib/test2.c index e35ad9aa32..3c78596d81 100644 --- a/mp3lib/test2.c +++ b/mp3lib/test2.c @@ -1,6 +1,3 @@ - -//gcc test2.c -O2 -I.. -L. ../libvo/aclib.c -lMP3 -lm -o test2 - #include #include #include From fb145ef6bc4a91087c4794481d832e0efc590d8c Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 16:51:58 +0000 Subject: [PATCH 27/30] Only compile decode_i586.c on x86_32. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26537 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mp3lib/Makefile b/mp3lib/Makefile index 09ba6a368c..f8eb6aa1be 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -5,7 +5,7 @@ LIBNAME_COMMON = mp3lib.a SRCS_COMMON = sr1.c SRCS_COMMON-$(HAVE_MMX) += decode_mmx.c SRCS_COMMON-$(HAVE_SSE) += dct64_sse.c -SRCS_COMMON += decode_i586.c +SRCS_COMMON-$(ARCH_X86_32) += decode_i586.c SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_MMX) += dct64_mmx.c SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOW) += dct36_3dnow.c dct64_3dnow.c SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOWEX) += dct36_k7.c dct64_k7.c From 1a35efe7f7373bfdf966722afe5bc7562e94adf7 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 16:54:24 +0000 Subject: [PATCH 28/30] Ignore test program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26538 b3059339-0415-0410-9bf9-f77b7e298cf2 From ffed0ab3d265bf13e67fc77e1b5abf153e652508 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 16:58:31 +0000 Subject: [PATCH 29/30] Only add loader to parts if WIN32DLL is enabled. Plus, some unrelated changes to mp3lib/Makefile committed by accident. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26539 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 2 +- mp3lib/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 51e338774d..3d2fd7d367 100644 --- a/Makefile +++ b/Makefile @@ -566,7 +566,7 @@ PARTS = liba52 \ mp3lib \ vidix \ -ifdef ARCH_X86 +ifeq ($(WIN32DLL),yes) PARTS += loader endif diff --git a/mp3lib/Makefile b/mp3lib/Makefile index f8eb6aa1be..7d4ef33ff1 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -15,5 +15,5 @@ include ../mpcommon.mak decode_i586.o: CFLAGS += -fomit-frame-pointer -%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) +%: %.c $(SRCS_COMMON:.c=.o) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) $(CC) $(CFLAGS) -o $@ $^ -ltermcap -lm From 59f2911c3ec64fcb9db8ac8e1216cf01506cac29 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Apr 2008 17:07:22 +0000 Subject: [PATCH 30/30] Revert accidentally committed changes. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26540 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mp3lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mp3lib/Makefile b/mp3lib/Makefile index 7d4ef33ff1..f8eb6aa1be 100644 --- a/mp3lib/Makefile +++ b/mp3lib/Makefile @@ -15,5 +15,5 @@ include ../mpcommon.mak decode_i586.o: CFLAGS += -fomit-frame-pointer -%: %.c $(SRCS_COMMON:.c=.o) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) +%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH) $(CC) $(CFLAGS) -o $@ $^ -ltermcap -lm