From 3f6b469fac96a6f1187b6022fac28aa26faee230 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 25 Apr 2011 07:37:40 +0000 Subject: ac3 support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2169 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 14 +++++++------- src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp | 8 ++++++-- src/plugins/Input/ffmpeg/settingsdialog.cpp | 3 +++ src/plugins/Input/ffmpeg/settingsdialog.ui | 11 +++++++++-- .../Input/ffmpeg/translations/ffmpeg_plugin_cs.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_de.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_es.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_it.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_ja.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_lt.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_nl.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_pl.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_ru.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_tr.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts | 17 +++++++++++------ .../Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts | 17 +++++++++++------ 17 files changed, 168 insertions(+), 89 deletions(-) (limited to 'src') diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index 3c735eba1..902f6c9d8 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -159,10 +159,10 @@ bool DecoderFFmpeg::initialize() } if (c->channels > 0) - c->channels = qMin(2, c->channels); + c->request_channels = qMin(2, c->channels); else - c->channels = 2; - + c->request_channels = 2; + #if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(101<<8)+0)) av_dump_format(ic,0,0,0); #else @@ -192,14 +192,14 @@ bool DecoderFFmpeg::initialize() #if (LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0)) if(c->sample_fmt == AV_SAMPLE_FMT_S32) - configure(c->sample_rate, c->channels, Qmmp::PCM_S32LE); + configure(c->sample_rate, c->request_channels, Qmmp::PCM_S32LE); else - configure(c->sample_rate, c->channels, Qmmp::PCM_S16LE); + configure(c->sample_rate, c->request_channels, Qmmp::PCM_S16LE); #else if(c->sample_fmt == SAMPLE_FMT_S32) - configure(c->sample_rate, c->channels, Qmmp::PCM_S32LE); + configure(c->sample_rate, c->request_channels, Qmmp::PCM_S32LE); else - configure(c->sample_rate, c->channels, Qmmp::PCM_S16LE); + configure(c->sample_rate, c->request_channels, Qmmp::PCM_S16LE); #endif m_bitrate = c->bit_rate; qDebug("DecoderFFmpeg: initialize succes"); diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp index 25e73b95e..d1b6c4c76 100644 --- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp +++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp @@ -69,6 +69,8 @@ bool DecoderFFmpegFactory::canDecode(QIODevice *i) const return true; if(filters.contains("*.aac") && !memcmp(fmt->name, "aac", 3)) return true; + if(filters.contains("*.ac3") && !memcmp(fmt->name, "ac3", 3)) + return true; return false; } @@ -95,13 +97,15 @@ const DecoderProperties DecoderFFmpegFactory::properties() const properties.contentTypes << "audio/mpeg"; if(filters.contains("*.aac")) properties.contentTypes << "audio/aac" << "audio/aacp"; - if(filters.contains("*.m4a")) - properties.contentTypes << "audio/x-ffmpeg-shorten"; if(filters.contains("*.shn")) + properties.contentTypes << "audio/x-ffmpeg-shorten"; + if(filters.contains("*.m4a")) { properties.contentTypes << "audio/3gpp" << "audio/3gpp2" << "audio/mp4"; properties.contentTypes << "audio/MP4A-LATM" << "audio/mpeg4-generic"; } + if(filters.contains("*.ac3")) + properties.contentTypes << "audio/ac3"; properties.shortName = "ffmpeg"; properties.hasAbout = true; properties.hasSettings = true; diff --git a/src/plugins/Input/ffmpeg/settingsdialog.cpp b/src/plugins/Input/ffmpeg/settingsdialog.cpp index be77ebc43..e714fba47 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.cpp +++ b/src/plugins/Input/ffmpeg/settingsdialog.cpp @@ -60,6 +60,7 @@ SettingsDialog::SettingsDialog(QWidget *parent) ui.raCheckBox->setEnabled(avcodec_find_decoder(CODEC_ID_RA_288)); ui.raCheckBox->setChecked(filters.contains("*.ra") && avcodec_find_decoder(CODEC_ID_RA_288)); ui.shCheckBox->setChecked(filters.contains("*.shn") && avcodec_find_decoder(CODEC_ID_SHORTEN)); + ui.ac3CheckBox->setChecked(filters.contains("*.ac3") && avcodec_find_decoder(CODEC_ID_AC3)); } SettingsDialog::~SettingsDialog() @@ -87,6 +88,8 @@ void SettingsDialog::accept() filters << "*.ra"; if (ui.shCheckBox->isChecked()) filters << "*.shn"; + if (ui.ac3CheckBox->isChecked()) + filters << "*.ac3"; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("FFMPEG/filters", filters); QDialog::accept(); diff --git a/src/plugins/Input/ffmpeg/settingsdialog.ui b/src/plugins/Input/ffmpeg/settingsdialog.ui index b521b641e..ff2b81e35 100644 --- a/src/plugins/Input/ffmpeg/settingsdialog.ui +++ b/src/plugins/Input/ffmpeg/settingsdialog.ui @@ -6,8 +6,8 @@ 0 0 - 302 - 311 + 308 + 373 @@ -118,6 +118,13 @@ + + + + AC-3 + + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts index 14497fece..ed402a9d0 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_cs.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin O modulu FFmpeg - + Qmmp FFmpeg Audio Plugin Vstupní modul Qmmp FFmpeg - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin Modul FFmpeg - + FFmpeg Formats Formáty FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Přeloženo s libavformat-%1.%2.%3 a libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts index c9490bd31..b7032ce63 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_de.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Über FFmpeg-Audio-Modul - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg-Audio-Modul - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg-Modul - + FFmpeg Formats FFmpeg-Formate - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Kompiliert gegen libavformat-%1.%2.%3 und libavcodec-%4.%5.%6 @@ -125,6 +125,11 @@ Name eines Dateiformats Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts index 649c865bd..3562c4715 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_es.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Acerca del módulo de audio FFmpeg - + Qmmp FFmpeg Audio Plugin Módulo de audio FFmpeg para Qmmp - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Escrito por: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin Módulo FFmpeg - + FFmpeg Formats Formatos FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Compilado con libavformat-%1.%2.%3 y libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts index 91ddf2474..715e9cfeb 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_it.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Info sul modulo audi FFmpeg - + Qmmp FFmpeg Audio Plugin Modulo audio FFmpeg per Qmmp - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Autore: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin Modulo FFmpeg - + FFmpeg Formats Formati FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Compilato con libavformat-%1.%2.%3 e libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts index 6d9a7e9ae..6e9df03e2 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ja.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg プラグイン - + FFmpeg Formats FFmpeg 用の形式 - + About FFmpeg Audio Plugin FFmpeg 音響プラグインについて - + Qmmp FFmpeg Audio Plugin QMMP FFmpeg 音響プラグイン - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 libavformat-%1.%2.%3 と libavcodec-%4.%5.%6 対応でコンパイル - + Written by: Ilya Kotov <forkotov02@hotmail.ru> 制作: Илья Котов (Ilya Kotov) <forkotov02@hotmail.ru> @@ -134,5 +134,10 @@ Shorten 短縮 + + + AC-3 + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts index 8493ce408..5daca4399 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_lt.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Apie FFmpeg įskiepį - + Qmmp FFmpeg Audio Plugin FFmpeg Qmmp audio įskiepis - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Sukūrė: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg įskiepis - + FFmpeg Formats FFmpeg bylų tipai - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Surinkta iš libavformat-%1.%2.%3 ir libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts index bde61eb2c..c7badc676 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_nl.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Over de FFmpeg Audio Module - + Qmmp FFmpeg Audio Plugin FFmpeg Audio Module voor Qmmp - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Auteur: Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg Module - + FFmpeg Formats FFmpeg Formaat - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Gebouwd tegen libavformat-%1.%2.%3 en libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts index 2bb291cec..64e274f15 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_pl.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin Wtyczka FFMPEG - + FFmpeg Formats Formaty FFmpeg - + About FFmpeg Audio Plugin O wtyczce FFmpeg Audio - + Qmmp FFmpeg Audio Plugin Wtyczka FFmpeg Audio dla Qmmp - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Skompilowane przy użyciu libavformat-%1.%2.%3 i libavcodec-%4.%5.%6 - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Autor: Ilja Kotov <forkotov02@hotmail.ru> @@ -134,5 +134,10 @@ Shorten Shorten (SHN) + + + AC-3 + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts index ca0ebb27e..4fe50163d 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_ru.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Об аудио-модуле FFmpeg - + Qmmp FFmpeg Audio Plugin Аудио-модуль FFmpeg для Qmmp - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Разработчик: Илья Котов <forkotov02@hotmail.ru> - + FFmpeg Plugin Модуль FFmpeg - + FFmpeg Formats Форматы FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Собрано с libavformat-%1.%2.%3 и libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts index 960a84b77..0a4c1d29d 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_tr.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + FFmpeg Plugin FFmpeg Eklentisi - + FFmpeg Formats FFmpeg Biçimleri - + About FFmpeg Audio Plugin FFmpeg Ses Eklentisi Hakkında - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg Ses Eklentisi - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 libavformat-%1.%2.%3 ve libavcodec-%4.%5.%6 ile derlenmiştir - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Yazan: Ilya Kotov <forkotov02@hotmail.ru> @@ -134,5 +134,10 @@ Shorten + + + AC-3 + + diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts index 36b916990..cbaf424fb 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_uk_UA.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin Про аудіо-модуль FFmpeg - + Qmmp FFmpeg Audio Plugin Аудіо-модуль FFmpeg для Qmmp - + Written by: Ilya Kotov <forkotov02@hotmail.ru> Розробник: Ілля Котов <forkotov02@hotmail.ru> - + FFmpeg Plugin Модуль FFmpeg - + FFmpeg Formats Формати FFmpeg - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 Зібрано з libavformat-%1.%2.%3 та libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts index 40cb18e79..31fbe591f 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_CN.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin 关于 FFmpeg 音频插件 - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg 音频插件 - + Written by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg 插件 - + FFmpeg Formats FFmpeg 格式 - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 编译依赖 libavformat-%1.%2.%3 和 libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten + + + AC-3 + + FFmpeg Plugin Settings diff --git a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts index 98ba3550e..068d351d2 100644 --- a/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts +++ b/src/plugins/Input/ffmpeg/translations/ffmpeg_plugin_zh_TW.ts @@ -4,32 +4,32 @@ DecoderFFmpegFactory - + About FFmpeg Audio Plugin 關於 FFmpeg 聲訊插件 - + Qmmp FFmpeg Audio Plugin Qmmp FFmpeg 聲訊插件 - + Written by: Ilya Kotov <forkotov02@hotmail.ru> 作者：Ilya Kotov <forkotov02@hotmail.ru> - + FFmpeg Plugin FFmpeg 插件 - + FFmpeg Formats FFmpeg 格式 - + Compiled against libavformat-%1.%2.%3 and libavcodec-%4.%5.%6 編譯依賴 libavformat-%1.%2.%3 與 libavcodec-%4.%5.%6 @@ -124,6 +124,11 @@ Shorten + + + AC-3 + + FFmpeg Plugin Settings -- cgit v1.2.3-13-gbd6f