diff -Nru ps3mediaserver-1.71.0+mencoder35005/CHANGELOG.txt ps3mediaserver-1.81.0+mencoder35005/CHANGELOG.txt --- ps3mediaserver-1.71.0+mencoder35005/CHANGELOG.txt 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/CHANGELOG.txt 2013-04-22 19:41:39.000000000 +0000 @@ -1,22 +1,100 @@ Changelog: ========== +1.81.0 - 2013-04-21 + + Engines: + FFmpeg: + - Add/fix audio channel options + - Build script: add HTTPS support + + WEB.conf: + - Add support for the file:// protocol + - Match protocols (e.g. mms://...) before extensions (e.g. http://example.com/foo.mms) + + Misc: + - Media Parser v1: fix audio channel parsing + - Fix for "Can't assign requested address" bug after update to Java 1.6.0_45 on Mac OSX + +1.80.0 - 2013-04-06 + + Regressions: + - Re-allow all transcode engines to be disabled + + PMS.conf: + - FFmpeg has been renamed ffmpeg_video_custom_options and now defaults to null + + Renderers: + - Document TranscodeVideo and TranscodeAudio profiles + - Panasonic TVs: Add "exclusive" option to SeekByTime to work around a transcoding issue + - PS3: Restore seek-by-time support for streaming + - Android: allowing chunked transfer + - AirPlayer & iPad/iPhone: transcoding to WMV format gives better results + - Improved support for Sony Bravia HX (thanks, mazey!) + - Improved streaming support for some renderers (thanks, ExSport!) + + Engines: + FFmpeg Video and FFmpeg Web Video: + - Support all three TranscodeVideo profiles: WMV, MPEGTSAC3 and MPEGPSAC3 + - Preserve source video quality + FFmpeg Video: + - Custom FFmpeg options are now read before each transcode rather than only at startup + (parity with custom MEncoder options) + - Rescale videos larger than the renderer's max height/width + - Updated to use "wmav2" codec (#1583) + FFmpeg Audio: support all TranscodeAudio profiles + VLC: + - Added support for VLC as engine (thanks, LordQuackstar!) + + Language updates: + - Updated Brazilian translation (thanks, Bruno Arueira!) + - Updated Catalan translation (thanks, oscaroe!) + - Updated simplified Chinese translation (thanks, lovenemesis!) + - Updated Italian translation (thanks, nocciola82!) + + Misc: + - Fixed bug that prevents PMS running multiple profiles concurrently + - Fixed NPE when responding to DLNA subtitle requests + - Fixed NPE for empty soapactions + - Image thumbnailer: + - Added thumbnail support for TIFF and other formats + - Trapped exception when handling unsupported formats + - Fixed response to M-SEARCH "ssdp:all" message (thanks, ler0y!) + - Fixed fontconfig configuration for Mac OSX, improving subtitle quality + - Moved several transcoding settings from MEncoder to Common transcoding settings + - Layout improvements to remove scroll bars where possible + - Help is now context sensitive + +1.72.0 - 2012-11-18 + + Regressions: + - Fixed bug that occurred when using ShowDVDTitleDuration + - Fixed bug that caused embedded subtitles to be displayed when subtitles are disabled + - Fixed bug in handling of filenames with embedded $ characters + + Engines: + - Removed option to automatically switch to tsMuxeR (available manually via the #--TRANSCODE--# folder) + 1.71.0 - 2012-11-06 Windows: - Updated MEncoder and MPlayer to SB41 - Updated ffmpeg to 1.0 (Zeranoe Build 2012-10-10) - Fixed file permissions bug + Mac OS X subtitles: - Changed audio/subtitle defaults to accept anything - Removed fontconfig from MEncoder for improved subs compatibility + Renderers: - Improved Android.conf video support - Added support for Samsung SMT-G7400 (UPC Horizon) - Fixed bug that prevented Galaxy Nexus pictures displaying + Language updates: - Updated Chinese Traditional translation (thanks, mcc!) - Added Turkish icon + Misc: - Updated MediaInfo to 0.7.60 (GC1508) - Updated h2 database to 1.3.168 (thanks, valib!) diff -Nru ps3mediaserver-1.71.0+mencoder35005/INSTALL.txt ps3mediaserver-1.81.0+mencoder35005/INSTALL.txt --- ps3mediaserver-1.71.0+mencoder35005/INSTALL.txt 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/INSTALL.txt 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,31 @@ +Installers for Windows and Mac OS X and tarballs for Linux &c. can be found here: + + https://code.google.com/p/ps3mediaserver/downloads/list + +To install PMS from the tarball on Linux &c. (these instructions have been tested on Ubuntu 12.04, +but something similar should work on most Unix distributions), open a terminal and enter the +following commands (replace with the version you're downloading/using e.g. 1.80.0): + +1) Install the dependencies (this only needs to be done once): + + sudo apt-get install ffmpeg mediainfo mencoder openjdk-7-jre + # you can also optionally install vlc: sudo apt-get install vlc + +2) Download the tarball e.g.: + + # if wget isn't installed, run: sudo apt-get install wget + wget https://ps3mediaserver.googlecode.com/files/pms-generic-linux-unix-.tgz + +3) Extract the tarball into a pms- directory: + + tar xzvf pms-generic-linux-unix-.tgz + +4) Run (note: PMS should NOT be run as root): + + cd pms- + ./PMS.sh + +PMS will look for some files in the pms- directory (the working directory). +Other files will be looked for in locations specified here: + + http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=3507&p=32731#p32731 diff -Nru ps3mediaserver-1.71.0+mencoder35005/contrib/build-pms-binaries.sh ps3mediaserver-1.81.0+mencoder35005/contrib/build-pms-binaries.sh --- ps3mediaserver-1.71.0+mencoder35005/contrib/build-pms-binaries.sh 2012-11-10 22:50:08.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/contrib/build-pms-binaries.sh 2013-04-22 21:12:20.000000000 +0000 @@ -1708,7 +1708,7 @@ initialize # Build static libraries to link against -#build_yasm # for systems where YASM version is below 1.0.0 +build_yasm build_zlib build_bzip2 build_expat diff -Nru ps3mediaserver-1.71.0+mencoder35005/contrib/ffmpeg/CMakeLists.txt ps3mediaserver-1.81.0+mencoder35005/contrib/ffmpeg/CMakeLists.txt --- ps3mediaserver-1.71.0+mencoder35005/contrib/ffmpeg/CMakeLists.txt 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/contrib/ffmpeg/CMakeLists.txt 2013-04-22 19:41:39.000000000 +0000 @@ -7,10 +7,14 @@ # if this build's options or dependencies are changed, the version number should be # incremented in the following places prior to each PMS release: # -# * PMS_FFMPEG_VERSION in contrib/ffmpeg/vendor/ffmpeg-banner.patch -# * the corresponding version at the bottom of contrib/ffmpeg/README.md +# * PMS_FFMPEG_VERSION in vendor/ffmpeg-banner.patch +# * the corresponding version at the *bottom* of README.md # -# Note: the version should be incremented no more than *once* per PMS release. +# Note: +# +# * the version should be incremented no more than *once* per PMS release. +# * due to bugs in CMake, the build/ffmpeg-prefix directory may need to be removed each +# time the version is incremented in order to ensure the patch is reapplied # # links: # @@ -32,15 +36,14 @@ INCLUDE(ExternalProject) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_BINARY_DIR}/include) LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lib) - FIND_PACKAGE(PkgConfig REQUIRED) EXTERNALPROJECT_ADD( bzip2 URL http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz CONFIGURE_COMMAND "" - BUILD_COMMAND make PREFIX=${CMAKE_BINARY_DIR} SHARED= XCFLAGS=-I${CMAKE_BINARY_DIR}/include XLDFLAGS=-L${CMAKE_BINARY_DIR}/lib XLIBS=-ldl - INSTALL_COMMAND make install PREFIX=${CMAKE_BINARY_DIR} SHARED= + BUILD_COMMAND make PREFIX=${CMAKE_BINARY_DIR} + INSTALL_COMMAND make install PREFIX=${CMAKE_BINARY_DIR} BUILD_IN_SOURCE 1 ) @@ -89,21 +92,58 @@ ) EXTERNALPROJECT_ADD( + gmp + URL ftp://ftp.gmplib.org/pub/gmp/gmp-5.1.1.tar.bz2 + # XXX can be built for 32-bit or 64-bit by appending ABI=32 or ABI=64 to the configure command + CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared --enable-static + BUILD_IN_SOURCE 1 +) + +# XXX this silently fails to build libhogweed.a if gmp is not available/visible +# https://lists.gnu.org/archive/html/help-gnutls/2012-01/msg00019.html +EXTERNALPROJECT_ADD( + nettle + DEPENDS gmp + URL http://www.lysator.liu.se/~nisse/archive/nettle-2.6.tar.gz + # XXX dumb configure fails to check the prefix dir for lib and include, so specify them + CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared --with-include-path=${CMAKE_BINARY_DIR}/include --with-lib-path=${CMAKE_BINARY_DIR}/lib + BUILD_IN_SOURCE 1 +) + +EXTERNALPROJECT_ADD( + gnutls + DEPENDS gmp nettle + # this is the latest version that has an extension that CMake can unpack + # (the 2.12.x series is still being maintained/updated: http://www.gnutls.org/security.html) + # http://public.kitware.com/Bug/view.php?id=13515 + URL ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/gnutls-2.12.23.tar.bz2 + # XXX linking against nettle/hogweed breaks unless -lgmp is added + # XXX and it can't find the lib dir from --prefix, so that needs to be added as well + CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared --enable-static --without-p11-kit --disable-cxx LDFLAGS=-L${CMAKE_BINARY_DIR}/lib LIBS=-lgmp + BUILD_IN_SOURCE 1 +) + +EXTERNALPROJECT_ADD( gsm URL http://www.quut.com/gsm/gsm-1.0.13.tar.gz - # stop the gsm Makefile chmodding its install files to read-only (we want to be able to rebuild/overwrite without interaction) PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/gsm-permissions.patch - CONFIGURE_COMMAND "" INSTALL_COMMAND make install INSTALL_ROOT=${CMAKE_BINARY_DIR} GSM_INSTALL_INC=${CMAKE_BINARY_DIR}/include BUILD_IN_SOURCE 1 ) EXTERNALPROJECT_ADD( + iconv + URL http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.13.1.tar.gz + CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared + BUILD_IN_SOURCE 1 +) + +EXTERNALPROJECT_ADD( libass - DEPENDS fontconfig freetype fribidi - URL https://libass.googlecode.com/files/libass-0.10.0.tar.gz + DEPENDS fontconfig freetype fribidi iconv + URL http://libass.googlecode.com/files/libass-0.10.1.tar.gz CONFIGURE_COMMAND PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/lib/pkgconfig ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared --enable-static BUILD_IN_SOURCE 1 ) @@ -120,8 +160,8 @@ GIT_REPOSITORY git://git.ffmpeg.org/nut/ GIT_TAG 5e471c2 # 2011-03-26 CONFIGURE_COMMAND "" - BUILD_COMMAND cd src/trunk && make PREFIX=${CMAKE_BINARY_DIR} SHARED= XCFLAGS=-I${CMAKE_BINARY_DIR}/include XLDFLAGS=-L${CMAKE_BINARY_DIR}/lib XLIBS=-ldl - INSTALL_COMMAND cd src/trunk && make PREFIX=${CMAKE_BINARY_DIR} SHARED= install + BUILD_COMMAND cd src/trunk && make + INSTALL_COMMAND cd src/trunk && make install PREFIX=${CMAKE_BINARY_DIR} SHARED= BUILD_IN_SOURCE 1 ) @@ -142,16 +182,25 @@ EXTERNALPROJECT_ADD( openjpeg - URL https://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz + URL http://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz CONFIGURE_COMMAND ./bootstrap.sh && ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared --enable-static BUILD_IN_SOURCE 1 ) +IF (APPLE) + # Mac OSX build needs to force the correct architecture. + SET(CONFIGURE_COMMAND_OPENSSL ./configure darwin64-x86_64-cc no-shared no-idea no-mdc2 no-rc5 --prefix=${CMAKE_BINARY_DIR}) + SET(BUILD_COMMAND_OPENSSL make depend MAKEDEPPROG=${CMAKE_C_COMPILER} && make) +ELSE() + SET(CONFIGURE_COMMAND_OPENSSL ./config no-shared no-idea no-mdc2 no-rc5 --prefix=${CMAKE_BINARY_DIR}) + SET(BUILD_COMMAND_OPENSSL make depend && make) +ENDIF() + EXTERNALPROJECT_ADD( openssl URL http://www.openssl.org/source/openssl-1.0.1c.tar.gz - CONFIGURE_COMMAND ./config no-shared no-idea no-mdc2 no-rc5 --prefix=${CMAKE_BINARY_DIR} - BUILD_COMMAND make depend && make + CONFIGURE_COMMAND ${CONFIGURE_COMMAND_OPENSSL} + BUILD_COMMAND ${BUILD_COMMAND_OPENSSL} BUILD_IN_SOURCE 1 ) @@ -177,8 +226,10 @@ GIT_TAG e0056c5 # 2012-07-24 PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/rtmpdump-prefix.patch CONFIGURE_COMMAND "" - BUILD_COMMAND make PREFIX=${CMAKE_BINARY_DIR} SHARED= XCFLAGS=-I${CMAKE_BINARY_DIR}/include XLDFLAGS=-L${CMAKE_BINARY_DIR}/lib XLIBS=-ldl - INSTALL_COMMAND make PREFIX=${CMAKE_BINARY_DIR} SHARED= install + # TODO replace OpenSSL with GnuTLS: + # BUILD_COMMAND make PREFIX=${CMAKE_BINARY_DIR} CRYPTO=GNUTLS SHARED=no XCFLAGS=-I${CMAKE_BINARY_DIR}/include XLDFLAGS=-L${CMAKE_BINARY_DIR}/lib XLIBS=-ldl + BUILD_COMMAND make PREFIX=${CMAKE_BINARY_DIR} SHARED=no XCFLAGS=-I${CMAKE_BINARY_DIR}/include XLDFLAGS=-L${CMAKE_BINARY_DIR}/lib XLIBS=-ldl + INSTALL_COMMAND make install PREFIX=${CMAKE_BINARY_DIR} SHARED= BUILD_IN_SOURCE 1 ) @@ -186,16 +237,12 @@ schroedinger DEPENDS orc URL http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz - # http://www.slackware.com/~alien/slackbuilds/ffmpeg/build/schroedinger_notests.patch PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/schroedinger-no-tests.patch - # http://www.slackware.com/~alien/slackbuilds/ffmpeg/build/ffmpeg.SlackBuild # "Because of the patch, run autoreconf" CONFIGURE_COMMAND PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/lib/pkgconfig autoreconf -vif && PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/lib/pkgconfig ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared --enable-static - BUILD_COMMAND PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/lib/pkgconfig make - BUILD_IN_SOURCE 1 ) @@ -220,7 +267,6 @@ utvideo URL http://umezawa.dyndns.info/archive/utvideo/utvideo-11.1.1-src.zip CONFIGURE_COMMAND "" - BUILD_COMMAND make INSTALL_COMMAND make install prefix=${CMAKE_BINARY_DIR} BUILD_IN_SOURCE 1 ) @@ -249,16 +295,29 @@ EXTERNALPROJECT_ADD( vpx - URL http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2 + GIT_REPOSITORY http://git.chromium.org/webm/libvpx.git + GIT_TAG 83e8f2f97 # 2012-11-09 CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared BUILD_IN_SOURCE 1 ) +IF (APPLE) + # Mac OS X build needs to force the correct architecture. + # xavs is using old versions of config.guess and config.sub that do not recognize + # the same x86_64 architecture on Mac OS X that all other projects use. Forcing the + # architecture causes asm errors, so we disable asm as well. + SET(CONFIGURE_COMMAND_XAVS ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared --host=x86_64-apple-darwin --disable-asm) +ELSE() + SET(CONFIGURE_COMMAND_XAVS ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared) +ENDIF() + EXTERNALPROJECT_ADD( xavs SVN_REPOSITORY https://xavs.svn.sourceforge.net/svnroot/xavs/trunk/ SVN_REVISION -r55 # 2011-08-21 - CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR} --disable-shared + # Avoid "Server certificate verification failed: issuer is not trusted" error + SVN_TRUST_CERT 1 + CONFIGURE_COMMAND ${CONFIGURE_COMMAND_XAVS} BUILD_IN_SOURCE 1 ) @@ -273,11 +332,9 @@ EXTERNALPROJECT_ADD( xvidcore URL http://downloads.xvid.org/downloads/xvidcore-1.3.2.tar.gz - - # XXX xvidcore's configure script is alone in not providing a way (e.g. --disable-shared) + # XXX xvidcore's configure script doesn't provide a way (e.g. --disable-shared) # to prevent it bulding a shared library CONFIGURE_COMMAND cd build/generic && ./configure --prefix=${CMAKE_BINARY_DIR} --enable-static - BUILD_COMMAND cd build/generic && make INSTALL_COMMAND cd build/generic && make install BUILD_IN_SOURCE 1 @@ -286,6 +343,7 @@ SET(FFMPEG_DEPENDENCIES celt frei0r + gnutls gsm libass mp3lame @@ -293,7 +351,6 @@ ogg opencore openjpeg - openssl rtmp schroedinger speex @@ -321,6 +378,7 @@ # LDFLAGS for the following well-behaved libraries: # # libopenjpeg +# libgnutls ######################################################################## # @@ -338,6 +396,7 @@ --disable-ffserver --enable-bzlib --enable-frei0r + --enable-gnutls --enable-gpl --enable-libass --enable-libcelt @@ -366,27 +425,33 @@ --extra-cflags=-I${CMAKE_BINARY_DIR}/include/openjpeg-1.5 # see above --extra-cflags=-static --extra-ldflags=-L${CMAKE_BINARY_DIR}/lib - --extra-ldflags=-static --extra-libs=-ldl + --extra-libs=-lgmp # nettle breaks gnutls which breaks ffmpeg unless we add this (again) + --extra-libs=-liconv --prefix=${CMAKE_BINARY_DIR} ) +IF (NOT APPLE) + # Don't use this on OS X as it breaks compilation + LIST(APPEND FFMPEG_CONFIGURE_OPTIONS + --extra-ldflags=-static + ) +ENDIF() + SET(FFMPEG_CONFIGURE_COMMAND env "PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/lib/pkgconfig" - # http://lists.freedesktop.org/archives/fontconfig/2012-September/004318.html # http://lists.freedesktop.org/archives/fontconfig/2012-September/004348.html # http://ffmpeg-users.933282.n4.nabble.com/pkg-config-static-td4653220.html "pkg_config=${PKG_CONFIG_EXECUTABLE} --static" - ./configure ${FFMPEG_CONFIGURE_OPTIONS} ) EXTERNALPROJECT_ADD( ffmpeg DEPENDS ${FFMPEG_DEPENDENCIES} - URL http://ffmpeg.org/releases/ffmpeg-1.0.tar.gz + URL http://ffmpeg.org/releases/ffmpeg-1.1.2.tar.gz PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/ffmpeg-banner.patch CONFIGURE_COMMAND ${FFMPEG_CONFIGURE_COMMAND} BUILD_IN_SOURCE 1 diff -Nru ps3mediaserver-1.71.0+mencoder35005/contrib/ffmpeg/Makefile ps3mediaserver-1.81.0+mencoder35005/contrib/ffmpeg/Makefile --- ps3mediaserver-1.71.0+mencoder35005/contrib/ffmpeg/Makefile 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/contrib/ffmpeg/Makefile 2013-04-22 19:41:39.000000000 +0000 @@ -4,6 +4,11 @@ cmake -DCMAKE_BUILD_TYPE=Release .. && \ make +buildfiles: + @mkdir -p build && \ + cd build && \ + cmake -DCMAKE_BUILD_TYPE=Release .. + distclean: @rm -rf build @@ -14,4 +19,3 @@ debclean: @debuild clean - diff -Nru ps3mediaserver-1.71.0+mencoder35005/contrib/ffmpeg/README.md ps3mediaserver-1.81.0+mencoder35005/contrib/ffmpeg/README.md --- ps3mediaserver-1.71.0+mencoder35005/contrib/ffmpeg/README.md 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/contrib/ffmpeg/README.md 2013-04-22 19:41:39.000000000 +0000 @@ -55,7 +55,7 @@ ## Tips -To find cross-platform variables for build tools &c. look in contrib/ffmpeg/build/CMakeCache.txt. +To find cross-platform variables for build tools &c. look in build/CMakeCache.txt. To see build output suppressed by automake: @@ -67,10 +67,27 @@ See [here](https://lists.gnu.org/archive/html/bug-autoconf/2012-01/msg00009.html) for more details. +To make a specific target: + + cd build + make # eg make nettle + +`--enable-static` and `--disable-shared` work with most configure scripts. If `--enable-shared` is not supported, +it's usually ignored (and reported as a warning at the end of the config.log). + +Type `./configure --help` to see the configuration options. Removing unused features such as documentation and binaries +can speed up build time, work around bugs, and reduce dependency wrangling. + +### Troubleshooting: + +Check the package's config.log. + +Extract the command lines from build/CMakeFiles/<package>.dir/build.make and try running them manually. + ## Credits The helper and this documentation are based on [sffmpeg](https://github.com/pyke369/sffmpeg) by [pyke369](https://github.com/pyke369). ## Version -PMS1 +PMS4 diff -Nru ps3mediaserver-1.71.0+mencoder35005/contrib/ffmpeg/vendor/ffmpeg-banner.patch ps3mediaserver-1.81.0+mencoder35005/contrib/ffmpeg/vendor/ffmpeg-banner.patch --- ps3mediaserver-1.71.0+mencoder35005/contrib/ffmpeg/vendor/ffmpeg-banner.patch 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/contrib/ffmpeg/vendor/ffmpeg-banner.patch 2013-04-22 19:41:39.000000000 +0000 @@ -1,5 +1,5 @@ ---- ffmpeg/cmdutils.c 2012-10-08 09:14:33.928824569 +0100 -+++ ffmpeg/cmdutils.c 2012-10-08 09:16:57.292868973 +0100 +--- ffmpeg/cmdutils.c 2012-10-08 09:14:33.928824569 +0100 ++++ ffmpeg/cmdutils.c 2012-10-08 09:16:57.292868973 +0100 @@ -608,7 +608,7 @@ #define INDENT 1 @@ -9,12 +9,12 @@ #define SHOW_COPYRIGHT 8 #define PRINT_LIB_INFO(libname, LIBNAME, flags, level) \ -@@ -654,11 +654,12 @@ +@@ -654,11 +654,13 @@ #endif } +#define FFMPEG_CONFIGURATION "http://git.io/ZHdseg" -+#define PMS_FFMPEG_VERSION 1 ++#define PMS_FFMPEG_VERSION 4 static void print_program_info(int flags, int level) { const char *indent = flags & INDENT? " " : ""; @@ -24,7 +24,7 @@ if (flags & SHOW_COPYRIGHT) av_log(NULL, level, " Copyright (c) %d-%d the FFmpeg developers", program_birth_year, this_year); -@@ -676,6 +677,7 @@ +@@ -676,6 +678,7 @@ return; print_program_info (INDENT|SHOW_COPYRIGHT, AV_LOG_INFO); diff -Nru ps3mediaserver-1.71.0+mencoder35005/debian/changelog ps3mediaserver-1.81.0+mencoder35005/debian/changelog --- ps3mediaserver-1.71.0+mencoder35005/debian/changelog 2012-11-11 00:58:25.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/debian/changelog 2013-04-24 17:49:26.000000000 +0000 @@ -1,16 +1,34 @@ -ps3mediaserver (1.71.0+mencoder35005-2precise1) precise; urgency=low +ps3mediaserver (1.81.0+mencoder35005-3precise1) precise; urgency=low * Precise backport - -- I. Sokolov Sun, 11 Nov 2012 04:57:46 +0400 + -- I. Sokolov Wed, 24 Apr 2013 21:45:44 +0400 -ps3mediaserver (1.71.0+mencoder35005-2) precise; urgency=low +ps3mediaserver (1.81.0+mencoder35005-3) precise; urgency=low - * Upstream CHANGELOG renamed to CHANGELOG.txt + * Add VideoLAN dependency to support new vlc transcoding engine - -- I. Sokolov Sun, 11 Nov 2012 04:54:43 +0400 + -- I. Sokolov Wed, 24 Apr 2013 21:34:20 +0400 -ps3mediaserver (1.71.0+mencoder35005-1) precise; urgency=low +ps3mediaserver (1.81.0+mencoder35005-2) precise; urgency=low + + * Ant build fixed + + -- I. Sokolov Tue, 23 Apr 2013 02:07:02 +0400 + +ps3mediaserver (1.81.0+mencoder35005-1) precise; urgency=low + + * Build our own YSAM version 1.2.0 + + -- I. Sokolov Tue, 23 Apr 2013 01:07:57 +0400 + +ps3mediaserver (1.81.0+mencoder35004-1) precise; urgency=low + + * New upstream release 1.81.0 (https://github.com/ps3mediaserver/ps3mediaserver/blob/master/CHANGELOG.txt) + + -- I. Sokolov Mon, 22 Apr 2013 21:56:50 +0400 + +ps3mediaserver (1.71.0+mencoder35004-1) precise; urgency=low * New upstream release 1.71.0 (https://github.com/ps3mediaserver/ps3mediaserver/blob/master/CHANGELOG.txt) diff -Nru ps3mediaserver-1.71.0+mencoder35005/debian/control ps3mediaserver-1.81.0+mencoder35005/debian/control --- ps3mediaserver-1.71.0+mencoder35005/debian/control 2012-11-10 22:51:32.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/debian/control 2013-04-24 17:49:26.000000000 +0000 @@ -2,13 +2,13 @@ Section: net Priority: optional Maintainer: I. Sokolov -Build-Depends: debhelper (>= 8.0.0), ant, ant-contrib, default-jdk, libtool, yasm (>= 1.0.0), unzip, automake, autoconf, binutils, pkg-config +Build-Depends: debhelper (>= 8.0.0), ant, ant-contrib, default-jdk, libtool, unzip, automake, autoconf, binutils, pkg-config Standards-Version: 3.9.3 Homepage: https://code.google.com/p/ps3mediaserver/ Package: ps3mediaserver Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, flac, imagemagick, default-jre, ps3mediaserver-multiarch [amd64], libfreetype6 [i386], ttf-ubuntu-font-family +Depends: ${shlibs:Depends}, ${misc:Depends}, flac, vlc, imagemagick, default-jre, ps3mediaserver-multiarch [amd64], libfreetype6 [i386], ttf-ubuntu-font-family Description: DLNA Media Server PS3 Media Server is a DLNA compliant UPnP Media Server for the PS3 and other renderers, written in Java, with the purpose of streaming or transcoding any kind of media files, with minimum configuration. diff -Nru ps3mediaserver-1.71.0+mencoder35005/debian/patches/PMS.conf.patch ps3mediaserver-1.81.0+mencoder35005/debian/patches/PMS.conf.patch --- ps3mediaserver-1.71.0+mencoder35005/debian/patches/PMS.conf.patch 2012-11-10 22:51:32.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/debian/patches/PMS.conf.patch 2013-04-24 17:49:26.000000000 +0000 @@ -27,16 +27,16 @@ # Hide cache folder # ----------------- -@@ -388,7 +388,7 @@ - # GUI Option: Ordered list of engines (selector) - # System generates list of available engines, list depends on host. - # Default: "mencoder,avsmencoder,tsmuxer,ffmpegvideo,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,ffmpegdvrmsremux,rawthumbs" --engines = -+engines = tsmuxer,mencoder,ffmpegvideo,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,rawthumbs +@@ -390,7 +390,7 @@ + # disable all engines. + # Default: "mencoder,avsmencoder,tsmuxer,ffmpegvideo,vlctranscoder,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,ffmpegdvrmsremux,rawthumbs" + +-# engines = ++engines = tsmuxer,mencoder,ffmpegvideo,vlctranscoder,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,rawthumbs # ---------------------------------------------------------------------------- # Transcoding Settings: Common settings -@@ -457,7 +457,7 @@ +@@ -459,7 +459,7 @@ # ------------------ # GUI Option: Keep DTS track (no re-encode, compatible with AV receiver through optical or HDMI output) (toggle) # Default: false. @@ -45,7 +45,7 @@ # Use LPCM for audio # --------------------------- -@@ -491,7 +491,7 @@ +@@ -493,7 +493,7 @@ # Sets the quality for MPEG-2 conversion; MPEG-2 is the fallback format if the client # does not support a video format natively. # Default: "keyint=5:vqscale=1:vqmin=2" @@ -54,16 +54,7 @@ # ---< Misc options >--------------------------------------------------------- -@@ -569,7 +569,7 @@ - # ------------ - # GUI Option: Remux videos - # Default: true. --mencoder_mux_compatible = -+mencoder_mux_compatible = false - - # Codec specific parameters - # ------------------------- -@@ -663,7 +663,7 @@ +@@ -658,7 +658,7 @@ # GUI Option: Subtitle font (string) # GUI offers a navigator to a folder generating an absolute path. # Default: empty. @@ -72,7 +63,7 @@ # Subtitles folder blank # ---------------------- -@@ -698,7 +698,7 @@ +@@ -693,7 +693,7 @@ # from that will generate a number. Default is empty, causing PMS to pick # white. # Default: empty. @@ -81,7 +72,7 @@ # Style font scale # ---------------- -@@ -710,17 +710,17 @@ +@@ -705,17 +705,17 @@ # GUI Option: Styled font outline # The outline parameter used for ASS subtitling. # Default: 1. @@ -102,7 +93,7 @@ # Plain font scale # ---------------- -@@ -732,7 +732,7 @@ +@@ -727,7 +727,7 @@ # GUI Option: Plain font outline # The subfont outline parameter used for subtitling without ASS. # Default: 1. @@ -111,7 +102,7 @@ # GUI Option: Plain font blur # The subfont blur parameter used for subtitling without ASS. -@@ -742,7 +742,7 @@ +@@ -737,7 +737,7 @@ # GUI Option: Plain margin # The subpos parameter used for subtitling without ASS. # Default: 2. @@ -120,7 +111,7 @@ # Load subtitles # -------------- -@@ -756,7 +756,7 @@ +@@ -751,7 +751,7 @@ # ------------------------ # GUI Option: DVD/VOB subtitle quality # Default: 3. @@ -129,7 +120,7 @@ # Add borders # ----------- -@@ -830,23 +830,23 @@ +@@ -860,23 +860,23 @@ # ---< Binary tools paths >------------------------------------------ # Path to mencoder (absolute or relative from project.binaries.dir) # Default: Win: win32/mencoder.exe Mac: osx/mencoder Linux: mencoder + system PATH diff -Nru ps3mediaserver-1.71.0+mencoder35005/debian/patches/add-ant-build.patch ps3mediaserver-1.81.0+mencoder35005/debian/patches/add-ant-build.patch --- ps3mediaserver-1.71.0+mencoder35005/debian/patches/add-ant-build.patch 2012-11-10 22:51:32.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/debian/patches/add-ant-build.patch 2013-04-24 17:49:26.000000000 +0000 @@ -1,7 +1,7 @@ Description: add ant build support --- /dev/null +++ b/maven-build.xml -@@ -0,0 +1,1431 @@ +@@ -0,0 +1,1628 @@ + + + @@ -14,7 +14,7 @@ + + + -+ ++ + + + @@ -28,14 +28,13 @@ + + + -+ ++ + + + + + -+ -+ ++ + + + @@ -73,6 +72,7 @@ + + + ++ + + + @@ -115,6 +115,7 @@ + + + ++ + + + @@ -179,14 +180,9 @@ + + + -+ -+ -+ -+ -+ + + -+ ++ + + + @@ -376,6 +372,10 @@ + dest="${maven.repo.local}/org/beanshell/bsh-core/2.0b4/bsh-core-2.0b4.jar" + usetimestamp="false" + ignoreerrors="true"/> ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ ++ ++ ++ ++ ++ ++ ++ + + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + --- /dev/null +++ b/maven-build.properties -@@ -0,0 +1,36 @@ +@@ -0,0 +1,38 @@ +#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE! -+#Sat Nov 10 20:32:09 MSK 2012 ++#Mon Apr 22 23:07:04 MSK 2013 +maven.build.testDir.0=src/test/java +maven.settings.offline=false +maven.settings.interactiveMode=true @@ -1447,19 +1644,19 @@ +jgoodies-common-version=1.2.1 +project.build.sourceEncoding=UTF-8 +maven.build.testOutputDir=${maven.build.dir}/test-classes -+maven.build.finalName=pms-1.71.0 ++maven.build.finalName=pms-1.81.0 +maven.test.reports=${maven.build.dir}/test-reports +maven.repo.local=${user.home}/.m2/repository +junrar-version=0.7 +maven.build.dir=target +maven.build.outputDir=${maven.build.dir}/classes -+maven.build.resourceDir.3=src/main/external-resources/nsis -+maven.build.resourceDir.2=src/main/java ++maven.build.resourceDir.2=src/main/external-resources/nsis ++project.binaries=/home/locky2003/projects/ps3mediaserver/target/bin +project.build.directory=${maven.build.dir} +maven.build.resourceDir.1=src/main/resources +maven.build.resourceDir.0=src/main/resources -+git-commit-id-plugin-version=2.1.0 -+project.binaries-base=http\://ps3mediaserver.googlecode.com/svn/tags/1.71.0/ps3mediaserver ++git-commit-id-plugin-version=2.1.4 ++project.binaries-base=http\://ps3mediaserver.googlecode.com/svn/tags/1.81.0/ps3mediaserver +jgoodies-looks-version=2.4.2 +maven-javadoc-plugin-version=2.9 +mediautil-version=1.0 @@ -1468,10 +1665,12 @@ +cuelib-version=1.2.1-2008-06-13 +maven.build.testResourceDir.1=src/test/resources/net/pms/util +maven.build.testResourceDir.0=src/test/resources -+project.version.short=1.71.0 ++project.version.short=1.81.0 +jna-version=3.4.0 ++project.external-resources=/home/locky2003/projects/ps3mediaserver/src/main/external-resources +xmlwise-version=1.2 +project.build.outputDirectory=${maven.build.outputDir} ++maven.nsis.project.template=/home/locky2003/projects/ps3mediaserver/src/main/external-resources/nsis/project.jelly --- /dev/null +++ b/pms-build.properties @@ -0,0 +1 @@ @@ -1540,6 +1739,7 @@ + + + ++ + + + @@ -1596,11 +1796,6 @@ + + + -+ -+ -+ -+ -+ + + + @@ -1614,6 +1809,10 @@ + + + ++ ++ ++ ++ + + + diff -Nru ps3mediaserver-1.71.0+mencoder35005/debian/patches/path-to-mediainfo-lib.patch ps3mediaserver-1.81.0+mencoder35005/debian/patches/path-to-mediainfo-lib.patch --- ps3mediaserver-1.71.0+mencoder35005/debian/patches/path-to-mediainfo-lib.patch 2012-11-10 22:51:32.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/debian/patches/path-to-mediainfo-lib.patch 2013-04-24 17:49:26.000000000 +0000 @@ -1,19 +1,17 @@ --- a/src/main/java/net/pms/dlna/MediaInfo.java +++ b/src/main/java/net/pms/dlna/MediaInfo.java -@@ -44,17 +44,7 @@ - libraryName = "mediainfo64"; - } else { +@@ -46,15 +46,8 @@ libraryName = "mediainfo"; -- } -- + } + - // libmediainfo for Linux depends on libzen -- if (!Platform.isWindows() && !Platform.isMac()) { + if (!Platform.isWindows() && !Platform.isMac()) { - try { - // We need to load dependencies first, because we know where our native libs are (e.g. Java Web Start Cache). - // If we do not, the system will look for dependencies, but only in the library path. - NativeLibrary.getInstance("zen"); - } catch (LinkageError e) { -- logger.warn("Error loading libzen: " + e.getMessage()); +- LOGGER.warn("Error loading libzen: " + e.getMessage()); - } + NativeLibrary.addSearchPath(libraryName, "/usr/lib/ps3mediaserver/"); } diff -Nru ps3mediaserver-1.71.0+mencoder35005/debian/patches/project-properties.patch ps3mediaserver-1.81.0+mencoder35005/debian/patches/project-properties.patch --- ps3mediaserver-1.71.0+mencoder35005/debian/patches/project-properties.patch 2012-11-10 22:51:32.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/debian/patches/project-properties.patch 2013-04-24 17:49:26.000000000 +0000 @@ -11,7 +11,7 @@ -project.logback=logback.xml -project.logback.headless=logback.headless.xml +project.name=PS3 Media Server -+project.version=1.71.0+mencoder35004-1 (ppa:happy-neko) ++project.version=1.81.0+mencoder35004-1 (ppa:happy-neko) +project.renderers.dir=/etc/ps3mediaserver/renderers +project.binaries.dir=/usr/lib/ps3mediaserver/linux +project.documentation.dir=/usr/share/doc/ps3mediaserver/documentation @@ -22,5 +22,5 @@ # Git commit information from the git-commit-id-plugin -git.commit.id=${git.commit.id} -git.commit.time=${git.commit.time} -+git.commit.id=d4d1de9d04069697b900f2b98007694be2026f6e -+git.commit.time=Tue Nov 6 20:21:23 2012 +0100 ++git.commit.id=5b9f782ef1f2d362dcafa720e316eb78308ecead ++git.commit.time=Sun Apr 21 10:45:28 2013 +0200 diff -Nru ps3mediaserver-1.71.0+mencoder35005/debian/patches/remove-unstable-warning.patch ps3mediaserver-1.81.0+mencoder35005/debian/patches/remove-unstable-warning.patch --- ps3mediaserver-1.71.0+mencoder35005/debian/patches/remove-unstable-warning.patch 2012-11-10 22:51:32.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/debian/patches/remove-unstable-warning.patch 2013-04-24 17:49:26.000000000 +0000 @@ -1,7 +1,7 @@ Description: Remove unstable warning in window title --- a/src/main/java/net/pms/newgui/LooksFrame.java +++ b/src/main/java/net/pms/newgui/LooksFrame.java -@@ -252,11 +252,6 @@ +@@ -266,11 +266,6 @@ String projectVersion = PropertiesUtil.getProjectProperties().get("project.version"); String title = projectName + " " + projectVersion; diff -Nru ps3mediaserver-1.71.0+mencoder35005/pom.xml ps3mediaserver-1.81.0+mencoder35005/pom.xml --- ps3mediaserver-1.71.0+mencoder35005/pom.xml 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/pom.xml 2013-04-22 19:41:39.000000000 +0000 @@ -31,7 +31,7 @@ pms PS3 Media Server jar - 1.71.0 + 1.81.0 http://www.ps3mediaserver.org/ 2008 @@ -74,7 +74,7 @@ - 1.71.0 + 1.81.0 - - JUnRar mirror repository - JUnRar mirror repository - https://junrar-repository.googlecode.com/svn/deploy/ - + + + JUnRar mirror repository + JUnRar mirror repository + https://junrar-repository.googlecode.com/svn/deploy/ + + + + + + + false + + mygrid-repository + myGrid Repository + http://www.mygrid.org.uk/maven/repository + + @@ -261,7 +273,7 @@ slf4j-api ${slf4j-version} - + org.slf4j jcl-over-slf4j @@ -274,7 +286,7 @@ 2.2.2 - org.hamcrest @@ -307,6 +319,25 @@ 0.4.2 + + + net.java.dev.jai-imageio + jai-imageio-core-standalone + 1.2-pre-dr-b04-2011-07-04 + + org jaudiotagger @@ -386,6 +417,7 @@ 1.4 test + @@ -393,16 +425,16 @@ src/main/resources resources @@ -425,18 +457,6 @@ true - - - src/main/java - - **/*.properties - - - src/main/external-resources/nsis @@ -543,7 +563,7 @@ - + @@ -646,7 +666,7 @@ jgoodies-{artifactId}-{version}/jgoodies-{artifactId}-{version}.{packaging} f3955d59f2263fb889b02febec74377647a2eaba - + com.jgoodies forms @@ -659,7 +679,7 @@ jgoodies-{artifactId}-{version}/jgoodies-{artifactId}-{version}.{packaging} de8a67990cbeae62910cc2022f06c466476f2f2b - + com.jgoodies looks @@ -672,7 +692,7 @@ jgoodies-{artifactId}-{version}/jgoodies-{artifactId}-{version}.{packaging} 535745c08e342f7ea78556baad44a4a52ffb7863 - + jwbroek.cuelib cuelib @@ -746,10 +766,10 @@ 1.2 - + - + org.apache.maven.plugins maven-project-info-reports-plugin @@ -883,7 +903,7 @@ sl sv zhs - zht + zht @@ -927,7 +947,7 @@ when browsing folders with files in them on Windows. --> 3.2.5 - + @@ -941,14 +961,14 @@ - + maven-assembly-plugin - 2.3 + 2.4 make-jar-with-dependencies-win @@ -963,13 +983,24 @@ net.pms.PMS + + true - + @@ -1100,12 +1131,12 @@ - + org.codehaus.mojo @@ -1157,12 +1188,12 @@ unix - + maven-assembly-plugin - 2.2.1 + 2.4 @@ -1178,6 +1209,7 @@ net.pms.PMS + true @@ -1197,6 +1229,7 @@ net.pms.PMS + true @@ -1250,7 +1283,7 @@ - + @@ -1267,7 +1300,7 @@ - + @@ -1342,7 +1375,7 @@ maven-assembly-plugin - 2.2.1 + 2.4 @@ -1358,13 +1391,14 @@ net.pms.PMS + true @@ -1380,11 +1414,12 @@ net.pms.PMS + true - + @@ -1454,7 +1489,7 @@ - + diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/assembly/assembly-linux.xml ps3mediaserver-1.81.0+mencoder35005/src/main/assembly/assembly-linux.xml --- ps3mediaserver-1.71.0+mencoder35005/src/main/assembly/assembly-linux.xml 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/assembly/assembly-linux.xml 2013-04-22 19:41:39.000000000 +0000 @@ -50,6 +50,7 @@ README.md CHANGELOG.txt + INSTALL.txt LICENSE.txt diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/PMS.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/PMS.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/PMS.conf 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/PMS.conf 2013-04-22 19:41:39.000000000 +0000 @@ -379,16 +379,18 @@ # Default: empty. folders = - # ---------------------------------------------------------------------------- # Transcoder Settings # ---------------------------------------------------------------------------- # Transcoder engines # GUI Option: Ordered list of engines (selector) -# System generates list of available engines, list depends on host. -# Default: "mencoder,avsmencoder,tsmuxer,ffmpegvideo,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,ffmpegdvrmsremux,rawthumbs" -engines = +# The exact list of available engines depends on the server. +# Warning: the value can be empty, which overrides the default value and will +# disable all engines. +# Default: "mencoder,avsmencoder,tsmuxer,ffmpegvideo,vlctranscoder,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,ffmpegdvrmsremux,rawthumbs" + +# engines = # ---------------------------------------------------------------------------- # Transcoding Settings: Common settings @@ -508,7 +510,6 @@ # Default: empty. notranscode = - # Force transcode for extensions # ------------------------------ # GUI Option: Force transcode for extensions (list) @@ -565,12 +566,6 @@ # Default: false. mencoder_yadif = -# Remux videos -# ------------ -# GUI Option: Remux videos -# Default: true. -mencoder_mux_compatible = - # Codec specific parameters # ------------------------- # GUI Option : Use application default codec parms @@ -595,7 +590,7 @@ # GUI Option: Audio language priority (list) # A comma-separated list of language codes that defines the priority for # MEncoder when choosing audio languages, where "und" stands for "undefined". -# XXX Can be empty, which pre-empts the default value. +# XXX Can be empty, which overrides the default value. # Default: a localized list (e.g. "eng,fre,jpn,ger,und"). # mencoder_audiolangs = @@ -607,7 +602,7 @@ # GUI Option: Subtitle language priority (list) # A comma-separated list of language codes that defines the priority for # MEncoder when choosing subtitle languages, where "und" stands for "undefined". -# XXX Can be empty, which pre-empts the default value. +# XXX Can be empty, which overrides the default value. # Default: a localized list (e.g. "eng,fre,jpn,ger,und"). # mencoder_sublangs = @@ -615,7 +610,7 @@ # Force subtitle language # ----------------------- # GUI Option: Force subtitle language (string) -# XXX Can be empty, which pre-empts the default value. +# XXX Can be empty, which overrides the default value. # Default: the value of the language option, or "en". # forced_sub_lang = @@ -636,7 +631,7 @@ # subtitle language should be comma separated as a pair; individual pairs # should be semicolon separated. "*" can be used to match any language. # Subtitle language can be defined as "off" (e.g. "jpn,off;*,*"). -# XXX Can be empty, which pre-empts the default value. +# XXX Can be empty, which overrides the default value. # Default: a localized list (usually "*,*"). # mencoder_audiosublangs = @@ -790,6 +785,43 @@ # Default: true. audio_resample = +# ---------------------------------------------------------------------------- +# Transcoder Settings: FFmpeg +# ---------------------------------------------------------------------------- +# Custom ffmpeg options. Output options (i.e. options affecting the output file) +# should not be used. The following options are ignored: +# -f, -target, -acodec, -vcodec, -threads +# Default: null +ffmpeg_video_custom_options = + +# ---------------------------------------------------------------------------- +# Transcoder Settings: VLC +# ---------------------------------------------------------------------------- + +# GUI Option: Enable audio sync +# Default: false +#VLC_audio_sync_enabled = + +# No GUI option. Whether or not to display subtitles. +# Default: true +#VLC_subtitle_enabled = + +# GUI Option: override detection +# Default: false +#VLC_sample_rate_override = + +# GUI Option: Audio Sample Rate +# Default: 48000 +#VLC_sample_rate = + +# GUI Option: Video scale +# Default: 1.0 +#VLC_scale = + +# GUI Option: Enable experimental codecs +# Default: false +# VLC_use_experimental_codecs = + # ============================================================================ # Additional settings @@ -812,9 +844,6 @@ # Default: true. transcode_keep_first_connection = -# Default: "-threads 2 -g 1 -qscale 1 -qmin 2" -ffmpeg = - # The maximum size (in MB) that PMS should use for buffering audio. # Default: 100. maxaudiobuffer = @@ -826,6 +855,7 @@ # ---< Old deprecated options >----------------------------------------------- # turbomode = false # tsmuxer_preremix_ac3 = false +# mencoder_mux_compatible = false # ---< Binary tools paths >------------------------------------------ # Path to mencoder (absolute or relative from project.binaries.dir) diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/AirPlayer.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/AirPlayer.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/AirPlayer.conf 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/AirPlayer.conf 2013-04-22 19:41:39.000000000 +0000 @@ -50,7 +50,7 @@ # Transcode profiles for video and audio engines # currently supported: MPEGPSAC3, MPEGTSAC3 or WMV for video, LPCM, WAV or MP3 for audio -TranscodeVideo=MPEGPSAC3 +TranscodeVideo=WMV TranscodeAudio=WAV # Use default DVD buffer size: false = greater bitrate and faster encoding, diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/Android.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/Android.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/Android.conf 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/Android.conf 2013-04-22 19:41:39.000000000 +0000 @@ -20,3 +20,4 @@ MaxVideoHeight=0 TranscodeExtensions= StreamExtensions=mkv,hdmov,hdm,flac,fla,dts,ogg,asf,asx,m2v,mp4,mpg,mpeg,avi,mov,wmv +ChunkedTransfer=true diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/BraviaEX.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/BraviaEX.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/BraviaEX.conf 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/BraviaEX.conf 2013-04-22 19:41:39.000000000 +0000 @@ -9,7 +9,7 @@ #=========================================================== #UserAgentSearch= UserAgentAdditionalHeader=X-AV-Client-Info -UserAgentAdditionalHeaderSearch=(BRAVIA KDL.+EX[3457])|(BRAVIA KDL.+[CHN]X[578]) +UserAgentAdditionalHeaderSearch=(BRAVIA KDL.+EX[3457])|(BRAVIA KDL.+[CN]X[578]) Video=true Audio=true Image=true diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/BraviaHX.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/BraviaHX.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/BraviaHX.conf 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/BraviaHX.conf 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,64 @@ +# ps3mediaserver renderer profile for Sony Bravia HX series +# Refer to PS3.conf for help + +RendererName=Sony Bravia HX +RendererIcon=bravia-hx.png + +#=========================================================== +# Reported identifying headers: +# X-AV-Client-Info: av=5.0; cn="Sony Corporation"; mn="BRAVIA KDL-55HX750"; mv="1.7"; +#=========================================================== +#UserAgentSearch= +UserAgentAdditionalHeader=X-AV-Client-Info +UserAgentAdditionalHeaderSearch=BRAVIA KDL.+HX + +Video=true +Audio=true +Image=true +SeekByTime=true +TranscodeVideo=MPEGPSAC3 +TranscodeAudio=LPCM +DefaultVBVBufSize=true +MuxH264ToMpegTS=true +MuxDTSToMpeg=false +WrapDTSIntoPCM=false +MuxLPCMToMpeg=false +TranscodeFastStart=false +MaxVideoBitrateMbps=0 +MaxVideoWidth=0 +MaxVideoHeight=0 +H264Level41Limited=true +MimeTypesChanges=audio/wav=audio/L16|video/mp4=video/mpeg +DLNALocalizationRequired=true +#TranscodeExtensions=dvr-ms,dvr,mkv,dv,ty,mov,ogm,hdmov,hdm,rmv,rmvb,rm,asf,evo,asx,flv,m2v,mpe,mod,tivo,ty,tmf,ts,tp,m2p,mp4,m4v,avi,wmv,wm,divx,div,flac,mlp,fla,wma,m4a,aac,dts,mka,ape,ogg,shn,mpc,ra,mp2,wv,oma,aa3,gif,png,arw,cr2,crw,dng,raf,mrw,nef,pef,tif,tiff +#StreamExtensions= + +# For Bravia TVs and Sony Bluray players +ForceJPGThumbnails=true + +MediaInfo=true +CreateDLNATreeFaster = true + +# [Supported video formats]: +# Here we declare support (or lack) of DTS (here, none of the entries declare dts as a supported audio codec) +Supported = f:mpegps|mpegts v:mpeg1|mpeg2|mp4|h264 a:ac3|lpcm|aac|mpa m:video/mpeg +# No H264 for AVI files, plus specific mediainfo attributes, for better auto detection (qpel and gmc are not supported here) +Supported = f:avi|divx v:mp4|divx|mjpeg a:mp3|lpcm|mpa|ac3 m:video/x-divx qpel:no gmc:0 +Supported = f:mp4 v:mp4|h264 a:ac3|aac m:video/mp4 +# WMV files are supported, but not with 5.1 audio: (hence the n:2) +Supported = f:wmv v:wmv|vc1 a:wma n:2 m:video/x-ms-wmv + +# [Supported audio formats]: +Supported = f:wav a:dts|lpcm n:6 s:48000 m:audio/wav +Supported = f:wav n:2 s:48000 m:audio/wav +Supported = f:mp3 n:2 m:audio/mpeg +# Apple lossless not supported +Supported = f:aac n:2 a:(?!alac).+ m:audio/x-m4a +Supported = f:wma n:2 m:audio/x-ms-wma +Supported = f:atrac n:2 m:audio/x-oma + +# [Supported image formats] +Supported = f:jpg m:image/jpeg +Supported = f:png m:image/png +Supported = f:gif m:image/gif +Supported = f:tiff m:image/tiff diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/FreeboxHD.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/FreeboxHD.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/FreeboxHD.conf 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/FreeboxHD.conf 2013-04-22 19:41:39.000000000 +0000 @@ -8,7 +8,7 @@ Audio=true Image=true SeekByTime=false -#Freebox supports only Mpeg-TS : +# Freebox only supports MPEG-TS TranscodeVideo=MPEGTSAC3 MimeTypesChanges=video/mpeg=video/mp2t UseSameExtension=ts @@ -18,8 +18,7 @@ MuxDTSToMpeg=false WrapDTSIntoPCM=false MuxLPCMToMpeg=false -#fine tuned :p -MaxVideoBitrateMbps=30(2400) +MaxVideoBitrateMbps=30 MaxVideoWidth=0 MaxVideoHeight=0 TranscodeAudioTo441kHz=true diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/PS3.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/PS3.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/PS3.conf 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/PS3.conf 2013-04-22 19:41:39.000000000 +0000 @@ -27,7 +27,7 @@ # # When a renderer connects, it sends a "User-Agent" header. PMS tries to # match that header with all configuration profiles. If none of the profiles -# matches, the message "Unknown User-Agent:" will be displayed in the logs and +# match, the message "Unknown User-Agent:" will be displayed in the logs and # PMS will switch to a default profile. # # Because matching involves all renderer configuration profiles, it is @@ -127,9 +127,33 @@ # DLNA SETTINGS # -# SeekByTime: Set to true to use the DLNA feature seek by time instead of by -# range. -SeekByTime = true +# SeekByTime: Set to true to use the DLNA feature seek-by-time instead of +# the default seek-by-byte method. +# +# Valid values: +# +# true: +# +# The renderer supports seek-by-time. +# +# false: +# +# The renderer doesn't support seek-by-time, so it should +# only use the default seek-by-byte method. +# +# exclusive: +# +# While most renderers that support seek-by-time also support +# seek-by-byte, some (e.g. the PS3 [1] and Panasonic TVs [2]) +# behave unreliably if both are permitted when transcoding files. +# This option works around this by disabling seek-by-byte for +# transcoded files when permitting seek-by-time. +# +# The default is false. +# +# [1] Seeking via "Go To" with the PS3 (firmware 4.31) and MEncoder works with "exclusive", but hangs or crashes with "true". +# [2] http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=15841 +SeekByTime = exclusive # DLNALocalizationRequired: Serve different flavors of localization in the # DLNA parameters (PAL/NTSC, NA/EU/JP) to allow every world wide renderer to @@ -138,13 +162,13 @@ # CBRVideoBitrate is useful for renderers without SeekByTime support. It does time2byte conversion to support FF/RW. # Only possibility how to predict where we are when seeking is using CBR bitrate instead of VBR used by default -# Making CBR stream by MEnocder is 3 times slower than using VBR so count with it if you have poor computer! -# Speed can be hopefully optimized little bit in the future: +# Creating a CBR stream with MEncoder is 3 times slower than using VBR so bear this in mind if you have a slow computer! +# Speed can hopefully be optimized a little bit in the future: # http://www.ps3mediaserver.org/forum/viewtopic.php?f=14&t=8883&p=53706&hilit=ditlew#p53700 # http://www.ps3mediaserver.org/forum/viewtopic.php?f=11&t=11284&p=62765&hilit=1835#p62765 # CBRVideoBitrate=15000 -# ByteToTimeseekRewindSeconds is used for finetuning so default is 0 +# ByteToTimeseekRewindSeconds is used for fine tuning, so the default is 0 # ByteToTimeseekRewindSeconds=0 #----------------------------------------------------------------------------- @@ -171,36 +195,35 @@ # mux to. # -# TranscodeVideo: Profile to use for video transcoding. +# TranscodeVideo: Profile to use for transcoding video files. # One of the following: # -# MPEGPSAC3: MPEG-2 video, AC-3 audio, MPEG-PS container -# MPEGTSAC3: MPEG-2 video, AC-3 audio, MPEG-TS container -# WMV: WMV2 video, WMA2 audio, ASF container +# Profile Video Audio Container +# ------------------------------------------ +# MPEGPSAC3 MPEG-2 AC-3 MPEG-PS +# MPEGTSAC3 MPEG-2 AC-3 MPEG-TS +# WMV WMV 2 (WMV 8) WMA 2 ASF # # XXX MPEGPSAC3 was previously named MPEGAC3. The old name is deprecated. -# XXX Currently only the MEncoder engine supports all 3 profiles. -# Other engines transcode video to the MPEGPSAC3 profile, -# regardless of this setting. -# +# These profiles are supported by the MEncoder, FFmpeg and VLC engines. # The default value is MPEGPSAC3. TranscodeVideo = MPEGPSAC3 -# TranscodeAudio: Profile to use for audio transcoding. +# TranscodeAudio: Profile to use for transcoding audio files. # Currently supported: "LPCM", "MP3" or "WAV". # Default: LPCM TranscodeAudio = WAV # DefaultVBVBufSize: Whether or not to use the default DVD buffer size. Setting -# this to "false" means a greater bit rate and faster encoding, but it can +# this to "false" means a greater bitrate and faster encoding, but it can # generate incompatible videos dependent on the renderer. DefaultVBVBufSize = false -# MuxH264ToMpegTS: Set to "true" if the media renderer supports H264 and MPEG2 -# in a MPEGTS file. Ignored if MediaInfo = true. +# MuxH264ToMpegTS: Set to "true" if the media renderer supports H.264 and MPEG-2 +# in a MPEG-TS file. Ignored if MediaInfo = true. MuxH264ToMpegTS = true -# MuxDTSToMpeg: Set to "true" if the media renderer supports DTS in a MPEG +# MuxDTSToMpeg: Set to "true" if the media renderer supports DTS in an MPEG # file. Ignored if MediaInfo = true. MuxDTSToMpeg = false @@ -208,11 +231,11 @@ # into LPCM in a MPEG file. WrapDTSIntoPCM = true -# MuxLPCMToMpeg: Set to "true" if the media renderer supports LPCM in a MPEG +# MuxLPCMToMpeg: Set to "true" if the media renderer supports LPCM in an MPEG # file. Ignored if MediaInfo = true. MuxLPCMToMpeg = true -# MaxVideoBitrateMbps: The maximum bit rate supported by the media renderer. +# MaxVideoBitrateMbps: The maximum bitrate supported by the media renderer. # Setting to "0" means unlimited. # If computer is low on resources it is better to avoid using bandwidth limit which is much CPU demanding # It is better to lower quality settings by defining "CustomMencoderQualitySettings". @@ -265,10 +288,10 @@ # and define "Supported" formats instead. StreamExtensions = -# ForceJPGThumbnails: Some renderers require thumbnails to be represented as -# JPEGs (JPEG_TN) in the DLNA directory XML (e.g. Sony Bravia TVs and Blu-ray -# players). Set this to true to force PMS to use this representation. Note: -# this has no effect on thumbnail file formats or content-type headers. +# ForceJPGThumbnails: Some renderers (e.g. Sony Bravia TVs and Blu-ray +# players) require thumbnails to be represented as JPEGs (JPEG_TN) in the +# DLNA directory XML. Set this to true to force PMS to use this representation. +# Note: this has no effect on thumbnail file formats or content-type headers. ForceJPGThumbnails = false # ChunkedTransfer: Some renderers are particular about the "Content-Length" @@ -337,7 +360,8 @@ # This section defines which media formats are supported by this renderer. If # a file is supported and its mediainfo indicates that it falls within the # capabilities of this renderer, PMS will stream the file to the renderer. All -# other files will be transcoded before being sent to the renderer. +# other files will be transcoded to the format specified in "TranscodeVideo" +# or "TranscodeAudio" before being sent to the renderer. # # Each format that the renderer supports should result in a "Supported" line # that defines the capabilities of the renderer. When MediaInfo = true, media diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/SMP-N100.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/SMP-N100.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/SMP-N100.conf 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/SMP-N100.conf 2013-04-22 19:41:39.000000000 +0000 @@ -21,7 +21,7 @@ Video=true Audio=true Image=true -SeekByTime=false +SeekByTime=exclusive TranscodeVideo=MPEGTSAC3 TranscodeAudio=LPCM DefaultVBVBufSize=true diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/iPad-iPhone.conf ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/iPad-iPhone.conf --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/renderers/iPad-iPhone.conf 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/renderers/iPad-iPhone.conf 2013-04-22 19:41:39.000000000 +0000 @@ -82,7 +82,7 @@ # Transcode profiles for video and audio engines # currently supported: MPEGPSAC3, MPEGTSAC3 or WMV for video, LPCM, WAV or MP3 for audio -TranscodeVideo=MPEGPSAC3 +TranscodeVideo=WMV TranscodeAudio=WAV # Use default DVD buffer size: false = greater bitrate and faster encoding, diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/update/README.txt ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/update/README.txt --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/update/README.txt 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/update/README.txt 2013-04-22 19:41:39.000000000 +0000 @@ -1,15 +1,15 @@ -This directory contains update files. An update is only made available if it is compatible with the current release. A release is compatible if it doesn't break too many things. Given a MAJOR.MINOR.PATCH version (e.g. 1.30.1): +This directory contains update files. An update is only made available if it is compatible with the current release. A release is compatible if it doesn't break too many things. Given a MAJOR.MINOR.REVISION version (e.g. 1.30.1): Current versioning (flagging breaking changes by incrementing MINOR): changes in MAJOR are always incompatible changes in MINOR are compatible (e.g. 1.60.0 -> 1.61.0) unless the most-significant digit is incremented (e.g. 1.60.0 -> 1.70.0) - changes in PATCH are always compatible + changes in REVISION are always compatible Future versioning (semantic versioning): changes in MAJOR are always incompatible - changes in MINOR or PATCH are always compatible + changes in MINOR or REVISION are always compatible Prior to 1.71.0, many different files were used to manage versioning as the logic was effectively implemented in these files rather than in the code. The code is now smart enough to figure out for itself if an update is compatible, so the current file - latest_version.properties - should be the last one that needs to be created. diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/update/latest_version.properties ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/update/latest_version.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/external-resources/update/latest_version.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/external-resources/update/latest_version.properties 2013-04-22 19:41:39.000000000 +0000 @@ -1,2 +1,2 @@ -LatestVersion="1.70.1" -DownloadUrl.windows="http://ps3mediaserver.googlecode.com/files/pms-setup-windows-1.70.1.exe" +LatestVersion="1.80.0" +DownloadUrl.windows="http://ps3mediaserver.googlecode.com/files/pms-setup-windows-1.80.0.exe" diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/Messages.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/Messages.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/Messages.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/Messages.java 2013-04-22 19:41:39.000000000 +0000 @@ -1,24 +1,48 @@ +/* + * PS3 Media Server, for streaming any medias to your PS3. + * Copyright (C) 2008 A.Brochard + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; version 2 + * of the License only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package net.pms; import java.util.MissingResourceException; import java.util.ResourceBundle; -/**Class Messages provides a mechanism to localise the text messages found in PMS. It is based - * on {@link ResourceBundle}. +/** + * Class Messages provides a mechanism to localize the text messages found in + * PMS. It is based on {@link ResourceBundle}. */ public class Messages { - private static final String BUNDLE_NAME = "net.pms.messages"; + private static final String BUNDLE_NAME = "resources.i18n.messages"; private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); private Messages() { } - /**Returns the locale-specific string associated with the key. - * @param key Keys in PMS follow the format "group.x". group states where this key is likely to be - * used. For example, NetworkTab refers to the network configuration tab in the PMS GUI. x is just - * a number. - * @return Descriptive string if key is found or a copy of the key string if it is not. + /** + * Returns the locale-specific string associated with the key. + * + * @param key + * Keys in PMS follow the format "group.x". group states where + * this key is likely to be used. For example, NetworkTab refers + * to the network configuration tab in the PMS GUI. x is just a + * number. + * @return Descriptive string if key is found or a copy of the key string if + * it is not. */ public static String getString(String key) { try { diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/PMS.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/PMS.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/PMS.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/PMS.java 2013-04-22 19:41:39.000000000 +0000 @@ -37,7 +37,6 @@ import net.pms.io.*; import net.pms.logging.LoggingConfigFileLoader; import net.pms.network.HTTPServer; -import net.pms.network.NetworkConfiguration; import net.pms.network.ProxyServer; import net.pms.network.UPNPHelper; import net.pms.newgui.LooksFrame; @@ -48,6 +47,8 @@ import net.pms.util.PropertiesUtil; import net.pms.util.SystemErrWrapper; import net.pms.util.TaskRunner; +import net.pms.util.Version; + import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.event.ConfigurationEvent; import org.apache.commons.configuration.event.ConfigurationListener; @@ -61,9 +62,6 @@ import java.io.IOException; import java.io.PrintStream; import java.net.BindException; -import java.net.NetworkInterface; -import java.net.SocketException; -import java.net.UnknownHostException; import java.text.SimpleDateFormat; import java.util.*; import java.util.Map.Entry; @@ -90,6 +88,17 @@ // TODO(tcox): This shouldn't be static private static PmsConfiguration configuration; + /** + * Universally Unique Identifier used in the UPnP server. + */ + private String uuid; + + /** + * Relative location of a context sensitive help page in the documentation + * directory. + */ + private static String helpPage = "index.html"; + /**Returns a pointer to the main PMS GUI. * @return {@link net.pms.gui.IFrame} Main PMS window. */ @@ -193,7 +202,7 @@ } /**Executes a new Process and creates a fork that waits for its results. - * TODO:Extend explanation on where this is being used. + * TODO Extend explanation on where this is being used. * @param name Symbolic name for the process to be launched, only used in the trace log * @param error (boolean) Set to true if you want PMS to add error messages to the trace pane * @param workDir (File) optional working directory to run the process in @@ -325,7 +334,7 @@ proxy = -1; LOGGER.info("Starting " + PropertiesUtil.getProjectProperties().get("project.name") + " " + getVersion()); - LOGGER.info("by shagrath / 2008-2012"); + LOGGER.info("by shagrath / 2008-2013"); LOGGER.info("http://ps3mediaserver.org"); LOGGER.info("https://github.com/ps3mediaserver/ps3mediaserver"); LOGGER.info(""); @@ -402,8 +411,19 @@ } } - if (registry.getVlcv() != null && registry.getVlcp() != null) { - LOGGER.info("Found VideoLAN version " + registry.getVlcv() + " at: " + registry.getVlcp()); + // Check if VLC is found + String vlcVersion = registry.getVlcVersion(); + String vlcPath = registry.getVlcPath(); + + if (vlcVersion != null && vlcPath != null) { + LOGGER.info("Found VideoLAN version " + vlcVersion + " at: " + vlcPath); + + Version vlc = new Version(vlcVersion); + Version requiredVersion = new Version("2.0.2"); + + if (vlc.compareTo(requiredVersion) <= 0) { + LOGGER.error("Only VLC versions 2.0.2 and above are supported"); + } } //check if Kerio is installed @@ -521,8 +541,6 @@ } get().getServer().stop(); Thread.sleep(500); - } catch (IOException e) { - LOGGER.debug("Caught exception", e); } catch (InterruptedException e) { LOGGER.debug("Caught exception", e); } @@ -706,59 +724,22 @@ } /** - * Universally Unique Identifier used in the UPnP server. - */ - private String uuid; - - /** - * Creates a new {@link #uuid} for the UPnP server to use. Tries to follow the RFCs for creating the UUID based on the link MAC address. - * Defaults to a random one if that method is not available. + * Creates a new random {@link #uuid}. These are used to uniquely identify the server to renderers (i.e. + * renderers treat multiple servers with the same UUID as the same server). * @return {@link String} with an Universally Unique Identifier. */ + // XXX don't use the MAC address to seed the UUID as it breaks multiple profiles: + // http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&p=75542#p75542 public synchronized String usn() { if (uuid == null) { // retrieve UUID from configuration uuid = getConfiguration().getUuid(); if (uuid == null) { - // create a new UUID based on the MAC address of the used network adapter - NetworkInterface ni = null; + uuid = UUID.randomUUID().toString(); + LOGGER.info("Generated new random UUID: {}", uuid); - try { - // this retrieves the network interface via: - // - // 1) NetworkConfiguration.getAddressForNetworkInterfaceName(pmsConfInterfaceName) - // 2) NetworkConfiguration.getDefaultNetworkInterfaceAddress() - - ni = get().getServer().getNetworkInterface(); - - // failing that, default to: - // - // 3) NetworkConfiguration.getNetworkInterfaceByServerName() - if (ni == null) { - ni = NetworkConfiguration.getInstance().getNetworkInterfaceByServerName(); - } - - if (ni != null) { - byte[] addr = getRegistry().getHardwareAddress(ni); // return null when java.net.preferIPv4Stack=true - if (addr != null) { - uuid = UUID.nameUUIDFromBytes(addr).toString(); - LOGGER.info(String.format("Generated new UUID based on the MAC address of the network adapter '%s'", ni.getDisplayName())); - } - } - } catch (SocketException e) { - LOGGER.debug("Caught exception", e); - } catch (UnknownHostException e) { - LOGGER.debug("Caught exception", e); - } - - // create random UUID if the generation by MAC address failed - if (uuid == null) { - uuid = UUID.randomUUID().toString(); - LOGGER.info("Generated new random UUID"); - } - - // save the newly generated UUID + // save the newly-generated UUID getConfiguration().setUuid(uuid); try { @@ -768,7 +749,7 @@ } } - LOGGER.info("Using the following UUID configured in PMS.conf: " + uuid); + LOGGER.info("Using the following UUID configured in PMS.conf: {}", uuid); } return "uuid:" + uuid; @@ -1008,4 +989,24 @@ } } } + + /** + * Sets the relative URL of a context sensitive help page located in the + * documentation directory. + * + * @param page The help page. + */ + public static void setHelpPage(String page) { + helpPage = page; + } + + /** + * Returns the relative URL of a context sensitive help page in the + * documentation directory. + * + * @return The help page. + */ + public static String getHelpPage() { + return helpPage; + } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/ConfigurationUtil.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/ConfigurationUtil.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/ConfigurationUtil.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/ConfigurationUtil.java 2013-04-22 19:41:39.000000000 +0000 @@ -33,7 +33,7 @@ * The value is returned with leading and trailing whitespace removed in both cases. * @param configuration The configuration to look up the key in. * @param key The key to look up. - * @param def The default value to return when no valid key value can be found. + * @param def The default value to return when no value is set for the key. * @return The value configured for the key. */ @@ -57,7 +57,7 @@ * The value is returned with leading and trailing whitespace removed in both cases. * @param configuration The configuration to look up the key in. * @param key The key to look up. - * @param def The default value to return when no valid key value can be found. + * @param def The default value to return when no value is defined for the key. * @return The value configured for the key. */ diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/FormatConfiguration.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/FormatConfiguration.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/FormatConfiguration.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/FormatConfiguration.java 2013-04-22 19:41:39.000000000 +0000 @@ -5,6 +5,9 @@ import net.pms.dlna.InputFile; import net.pms.dlna.LibMediaInfoParser; import net.pms.formats.Format; + +import org.apache.commons.lang.StringUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,219 +16,221 @@ import java.util.regex.PatternSyntaxException; public class FormatConfiguration { - private static final Logger logger = LoggerFactory.getLogger(FormatConfiguration.class); - public static final String MPEGPS = "mpegps"; - public static final String MPEGTS = "mpegts"; - public static final String WMV = "wmv"; - public static final String AVI = "avi"; - public static final String MP4 = "mp4"; - public static final String MOV = "mov"; - public static final String FLV = "flv"; - public static final String WEBM = "WebM"; - public static final String RM = "rm"; - public static final String MATROSKA = "mkv"; - public static final String WAV = "wav"; - public static final String WAVPACK = "wavpack"; - public static final String LPCM = "lpcm"; + private static final Logger LOGGER = LoggerFactory.getLogger(FormatConfiguration.class); + private ArrayList supportSpecs; + // Use old parser for JPEG files (MediaInfo does not support EXIF) + private static final String[] PARSER_V1_EXTENSIONS = new String[] { ".jpg", ".jpe", ".jpeg" }; + public static final String AAC = "aac"; public static final String AC3 = "ac3"; - public static final String MP3 = "mp3"; - public static final String SHORTEN = "shn"; - public static final String MPA = "mpa"; - public static final String OGG = "ogg"; - public static final String WMA = "wma"; + public static final String AIFF = "aiff"; public static final String ALAC = "alac"; + public static final String APE = "ape"; + public static final String ATRAC = "atrac"; + public static final String AVI = "avi"; + public static final String BMP = "bmp"; + public static final String DIVX = "divx"; public static final String DTS = "dts"; public static final String DTSHD = "dtshd"; - public static final String TRUEHD = "truehd"; + public static final String DV = "dv"; public static final String EAC3 = "eac3"; - public static final String ATRAC = "atrac"; public static final String FLAC = "flac"; - public static final String APE = "ape"; - public static final String RA = "ra"; + public static final String FLV = "flv"; + public static final String GIF = "gif"; + public static final String H264 = "h264"; + public static final String JPG = "jpg"; + public static final String LPCM = "lpcm"; + public static final String MATROSKA = "mkv"; + public static final String MI_GMC = "gmc"; + public static final String MI_QPEL = "qpel"; + public static final String MJPEG = "mjpeg"; + public static final String MLP = "mlp"; + public static final String MOV = "mov"; + public static final String MP3 = "mp3"; + public static final String MP4 = "mp4"; + public static final String MPA = "mpa"; public static final String MPC = "mpc"; - public static final String AIFF = "aiff"; - public static final String DV = "dv"; public static final String MPEG1 = "mpeg1"; public static final String MPEG2 = "mpeg2"; - public static final String DIVX = "divx"; - public static final String H264 = "h264"; - public static final String MLP = "mlp"; - public static final String MJPEG = "mjpeg"; - public static final String VC1 = "vc1"; - public static final String JPG = "jpg"; + public static final String MPEGPS = "mpegps"; + public static final String MPEGTS = "mpegts"; + public static final String OGG = "ogg"; public static final String PNG = "png"; - public static final String GIF = "gif"; + public static final String RA = "ra"; + public static final String RM = "rm"; + public static final String SHORTEN = "shn"; public static final String TIFF = "tiff"; - public static final String BMP = "bmp"; - public static final String und = "und"; - public static final String MI_QPEL = "qpel"; - public static final String MI_GMC = "gmc"; - - // Use old parser for Jpeg files (MediaInfo does not support EXIF) - private static final String PARSER_V1_EXTENSIONS[] = new String[]{".jpg", ".jpe", ".jpeg"}; - - public void parse(DLNAMediaInfo media, InputFile file, Format ext, int type) { - boolean force_v1 = false; - if (file.getFile() != null) { - String fName = file.getFile().getName().toLowerCase(); - for (String e : PARSER_V1_EXTENSIONS) { - if (fName.endsWith(e)) { - force_v1 = true; - break; - } - } - if (force_v1) { - media.parse(file, ext, type, false); - } else { - LibMediaInfoParser.parse(media, file, type); - } - } else { - media.parse(file, ext, type, false); - } - } + public static final String TRUEHD = "truehd"; + public static final String VC1 = "vc1"; + public static final String WAVPACK = "wavpack"; + public static final String WAV = "wav"; + public static final String WEBM = "WebM"; + public static final String WMA = "wma"; + public static final String WMV = "wmv"; public static final String MIMETYPE_AUTO = "MIMETYPE_AUTO"; - private ArrayList list; + public static final String und = "und"; - private class Supports { - String format; - String videocodec; - String audiocodec; - String mimetype; - String maxnbchannels; - String maxfrequency; - String maxbitrate; - String maxvideowidth; - String maxvideoheight; - Map miExtras; - Pattern pformat; - Pattern pvideocodec; - Pattern paudiocodec; - int imaxnbchannels = Integer.MAX_VALUE; - int imaxfrequency = Integer.MAX_VALUE; - int imaxbitrate = Integer.MAX_VALUE; - int imaxvideowidth = Integer.MAX_VALUE; - int imaxvideoheight = Integer.MAX_VALUE; + private class SupportSpec { + private int iMaxBitrate = Integer.MAX_VALUE; + private int iMaxFrequency = Integer.MAX_VALUE; + private int iMaxNbChannels = Integer.MAX_VALUE; + private int iMaxVideoHeight = Integer.MAX_VALUE; + private int iMaxVideoWidth = Integer.MAX_VALUE; + private Map miExtras; + private Pattern pAudioCodec; + private Pattern pFormat; + private Pattern pVideoCodec; + private String audioCodec; + private String format; + private String line; + private String maxBitrate; + private String maxFrequency; + private String maxNbChannels; + private String maxVideoHeight; + private String maxVideoWidth; + private String mimeType; + private String videoCodec; - Supports() { - mimetype = MIMETYPE_AUTO; + SupportSpec() { + this.mimeType = MIMETYPE_AUTO; } boolean isValid() { - boolean v = format != null && format.length() > 0; - if (v) { + if (StringUtils.isBlank(format)) { // required + LOGGER.warn("No format supplied"); + return false; + } else { try { - pformat = Pattern.compile(format); - } catch (PatternSyntaxException pe) { - logger.info("Couldn't resolve this pattern: " + format + " / " + pe.getMessage()); - v = false; - } - if (videocodec != null) { - try { - pvideocodec = Pattern.compile(videocodec); - } catch (PatternSyntaxException pe) { - logger.info("Couldn't resolve this pattern: " + videocodec + " / " + pe.getMessage()); - v = false; - } + pFormat = Pattern.compile(format); + } catch (PatternSyntaxException pse) { + LOGGER.error("Error parsing format: " + format, pse); + return false; } - if (audiocodec != null) { - try { - paudiocodec = Pattern.compile(audiocodec); - } catch (PatternSyntaxException pe) { - logger.info("Couldn't resolve this pattern: " + audiocodec + " / " + pe.getMessage()); - v = false; - } + } + + if (videoCodec != null) { + try { + pVideoCodec = Pattern.compile(videoCodec); + } catch (PatternSyntaxException pse) { + LOGGER.error("Error parsing video codec: " + videoCodec, pse); + return false; } + } + + if (audioCodec != null) { try { - if (maxnbchannels != null) { - imaxnbchannels = Integer.parseInt(maxnbchannels); - } - } catch (Exception e) { - logger.info("Error in parsing number: " + maxnbchannels); - v = false; + pAudioCodec = Pattern.compile(audioCodec); + } catch (PatternSyntaxException pse) { + LOGGER.error("Error parsing audio codec: " + audioCodec, pse); + return false; } + } + + if (maxNbChannels != null) { try { - if (maxfrequency != null) { - imaxfrequency = Integer.parseInt(maxfrequency); - } - } catch (Exception e) { - logger.info("Error in parsing number: " + maxfrequency); - v = false; + iMaxNbChannels = Integer.parseInt(maxNbChannels); + } catch (NumberFormatException nfe) { + LOGGER.error("Error parsing number of channels: " + maxNbChannels, nfe); + return false; } + } + + if (maxFrequency != null) { try { - if (maxbitrate != null) { - imaxbitrate = Integer.parseInt(maxbitrate); - } - } catch (Exception e) { - logger.info("Error in parsing number: " + maxbitrate); - v = false; + iMaxFrequency = Integer.parseInt(maxFrequency); + } catch (NumberFormatException nfe) { + LOGGER.error("Error parsing maximum frequency: " + maxFrequency, nfe); + return false; } + } + + if (maxBitrate != null) { try { - if (maxvideowidth != null) { - imaxvideowidth = Integer.parseInt(maxvideowidth); - } - } catch (Exception e) { - logger.info("Error in parsing number: " + maxvideowidth); - v = false; + iMaxBitrate = Integer.parseInt(maxBitrate); + } catch (NumberFormatException nfe) { + LOGGER.error("Error parsing maximum bitrate: " + maxBitrate, nfe); + return false; } + } + + if (maxVideoWidth != null) { try { - if (maxvideoheight != null) { - imaxvideoheight = Integer.parseInt(maxvideoheight); - } - } catch (Exception e) { - logger.info("Error in parsing number: " + maxvideoheight); - v = false; + iMaxVideoWidth = Integer.parseInt(maxVideoWidth); + } catch (Exception nfe) { + LOGGER.error("Error parsing maximum video width: " + maxVideoWidth, nfe); + return false; } } - return v; - } - public boolean match(String container, String videocodec, String audiocodec) { - return match(container, videocodec, audiocodec, 0, 0, 0, 0, 0, null); + if (maxVideoHeight != null) { + try { + iMaxVideoHeight = Integer.parseInt(maxVideoHeight); + } catch (NumberFormatException nfe) { + LOGGER.error("Error parsing maximum video height: " + maxVideoHeight, nfe); + return false; + } + } + + return true; } - public boolean match(String format, String videocodec, String audiocodec, int nbAudioChannels, int frequency, int bitrate, int videowidth, int videoheight, Map extras) { + public boolean match(String container, String videoCodec, String audioCodec) { + return match(container, videoCodec, audioCodec, 0, 0, 0, 0, 0, null); + } + public boolean match( + String format, + String videoCodec, + String audioCodec, + int nbAudioChannels, + int frequency, + int bitrate, + int videoWidth, + int videoHeight, + Map extras + ) { boolean matched = false; - if (format != null && !(matched = pformat.matcher(format).matches())) { + if (format != null && !(matched = pFormat.matcher(format).matches())) { return false; } - if (matched && videocodec != null && pvideocodec != null && !(matched = pvideocodec.matcher(videocodec).matches())) { + if (matched && videoCodec != null && pVideoCodec != null && !(matched = pVideoCodec.matcher(videoCodec).matches())) { return false; } - if (matched && audiocodec != null && paudiocodec != null && !(matched = paudiocodec.matcher(audiocodec).matches())) { + if (matched && audioCodec != null && pAudioCodec != null && !(matched = pAudioCodec.matcher(audioCodec).matches())) { return false; } - if (matched && nbAudioChannels > 0 && imaxnbchannels > 0 && nbAudioChannels > imaxnbchannels) { + if (matched && nbAudioChannels > 0 && iMaxNbChannels > 0 && nbAudioChannels > iMaxNbChannels) { return false; } - if (matched && frequency > 0 && imaxfrequency > 0 && frequency > imaxfrequency) { + if (matched && frequency > 0 && iMaxFrequency > 0 && frequency > iMaxFrequency) { return false; } - if (matched && bitrate > 0 && imaxbitrate > 0 && bitrate > imaxbitrate) { + if (matched && bitrate > 0 && iMaxBitrate > 0 && bitrate > iMaxBitrate) { return false; } - if (matched && videowidth > 0 && imaxvideowidth > 0 && videowidth > imaxvideowidth) { + if (matched && videoWidth > 0 && iMaxVideoWidth > 0 && videoWidth > iMaxVideoWidth) { return false; } - if (matched && videoheight > 0 && imaxvideoheight > 0 && videoheight > imaxvideoheight) { + if (matched && videoHeight > 0 && iMaxVideoHeight > 0 && videoHeight > iMaxVideoHeight) { return false; } if (matched && extras != null && miExtras != null) { Iterator keyIt = extras.keySet().iterator(); + while (keyIt.hasNext()) { String key = keyIt.next(); String value = extras.get(key); + if (matched && key.equals(MI_QPEL) && miExtras.get(MI_QPEL) != null) { matched = miExtras.get(MI_QPEL).matcher(value).matches(); } else if (matched && key.equals(MI_GMC) && miExtras.get(MI_GMC) != null) { @@ -238,6 +243,49 @@ } } + public FormatConfiguration(List lines) { + supportSpecs = new ArrayList(); + + for (Object line : lines) { + if (line != null) { + SupportSpec supportSpec = parseSupportLine(line.toString()); + + if (supportSpec.isValid()) { + supportSpecs.add(supportSpec); + } else { + LOGGER.warn("Invalid configuration line: " + line); + } + } + } + } + + public void parse(DLNAMediaInfo media, InputFile file, Format ext, int type) { + boolean forceV1 = false; + + if (file.getFile() != null) { + String fName = file.getFile().getName().toLowerCase(); + + for (String e : PARSER_V1_EXTENSIONS) { + if (fName.endsWith(e)) { + forceV1 = true; + break; + } + } + + if (forceV1) { + // XXX this path generates thumbnails + media.parse(file, ext, type, false); + } else { + // XXX this path doesn't generate thumbnails + LibMediaInfoParser.parse(media, file, type); + } + } else { + media.parse(file, ext, type, false); + } + } + + // XXX Unused + @Deprecated public boolean isDVDVideoRemuxSupported() { return match(MPEGPS, MPEG2, null) != null; } @@ -258,87 +306,138 @@ return match(MPEGPS, MPEG2, null) != null || match(MPEGTS, MPEG2, null) != null; } + // XXX Unused + @Deprecated public boolean isHiFiMusicFileSupported() { return match(WAV, null, null, 0, 96000, 0, 0, 0, null) != null || match(MP3, null, null, 0, 96000, 0, 0, 0, null) != null; } public String getPrimaryVideoTranscoder() { - for (Supports conf : list) { - if (conf.match(MPEGPS, MPEG2, AC3)) { + for (SupportSpec supportSpec : supportSpecs) { + if (supportSpec.match(MPEGPS, MPEG2, AC3)) { return MPEGPS; } - if (conf.match(MPEGTS, MPEG2, AC3)) { + + if (supportSpec.match(MPEGTS, MPEG2, AC3)) { return MPEGTS; } - if (conf.match(WMV, WMV, WMA)) { + + if (supportSpec.match(WMV, WMV, WMA)) { return WMV; } } + return null; } + // XXX Unused + @Deprecated public String getPrimaryAudioTranscoder() { - for (Supports conf : list) { - if (conf.match(WAV, null, null)) { + for (SupportSpec supportSpec : supportSpecs) { + if (supportSpec.match(WAV, null, null)) { return WAV; } - if (conf.match(MP3, null, null)) { + + if (supportSpec.match(MP3, null, null)) { return MP3; } - } - return null; - } - public FormatConfiguration(List supported) { - list = new ArrayList(); - for (Object line : supported) { - if (line != null) { - Supports conf = parseSupportLine(line.toString()); - if (conf.isValid()) { - list.add(conf); - } else { - logger.info("Invalid configuration line: " + line); - } - } + // FIXME LPCM? } + + return null; } /** - * Match a media information to available audio codes for the renderer - * and return its mimetype if the match is successful. Returns null if + * Match media information to audio codecs supported by the renderer + * and return its MIME-type if the match is successful. Returns null if * the media is not natively supported by the renderer, which means it * has to be transcoded. - * @param media The media information - * @return The mimetype or null if no match was found. + * @param media The MediaInfo metadata + * @return The MIME type or null if no match was found. */ public String match(DLNAMediaInfo media) { if (media.getFirstAudioTrack() == null) { // no sound - return match(media.getContainer(), media.getCodecV(), null, 0, 0, media.getBitrate(), media.getWidth(), media.getHeight(), media.getExtras()); + return match( + media.getContainer(), + media.getCodecV(), + null, + 0, + 0, + media.getBitrate(), + media.getWidth(), + media.getHeight(), + media.getExtras() + ); } else { String finalMimeType = null; + for (DLNAMediaAudio audio : media.getAudioTracksList()) { - String mimeType = match(media.getContainer(), media.getCodecV(), audio.getCodecA(), audio.getAudioProperties().getNumberOfChannels(), audio.getSampleRate(), media.getBitrate(), media.getWidth(), media.getHeight(), media.getExtras()); + String mimeType = match( + media.getContainer(), + media.getCodecV(), + audio.getCodecA(), + audio.getAudioProperties().getNumberOfChannels(), + audio.getSampleRate(), + media.getBitrate(), + media.getWidth(), + media.getHeight(), + media.getExtras() + ); + finalMimeType = mimeType; - if (mimeType == null) // if at least one audio track is not compatible, the file must be transcoded. - { + + if (mimeType == null) { // if at least one audio track is not compatible, the file must be transcoded. return null; } } + return finalMimeType; } } - public String match(String container, String videocodec, String audiocodec) { - return match(container, videocodec, audiocodec, 0, 0, 0, 0, 0, null); - } - - public String match(String container, String videocodec, String audiocodec, int nbAudioChannels, int frequency, int bitrate, int videowidth, int videoheight, Map extras) { + public String match(String container, String videoCodec, String audioCodec) { + return match( + container, + videoCodec, + audioCodec, + 0, + 0, + 0, + 0, + 0, + null + ); + } + + public String match( + String container, + String videoCodec, + String audioCodec, + int nbAudioChannels, + int frequency, + int bitrate, + int videoWidth, + int videoHeight, + Map extras + ) { String matchedMimeType = null; - for (Supports conf : list) { - if (conf.match(container, videocodec, audiocodec, nbAudioChannels, frequency, bitrate, videowidth, videoheight, extras)) { - matchedMimeType = conf.mimetype; + for (SupportSpec supportSpec : supportSpecs) { + if (supportSpec.match( + container, + videoCodec, + audioCodec, + nbAudioChannels, + frequency, + bitrate, + videoWidth, + videoHeight, + extras + )) { + matchedMimeType = supportSpec.mimeType; break; } } @@ -346,39 +445,43 @@ return matchedMimeType; } - private Supports parseSupportLine(String line) { + private SupportSpec parseSupportLine(String line) { StringTokenizer st = new StringTokenizer(line, "\t "); - Supports conf = new Supports(); + SupportSpec supportSpec = new SupportSpec(); + while (st.hasMoreTokens()) { String token = st.nextToken(); + if (token.startsWith("f:")) { - conf.format = token.substring(2).trim(); + supportSpec.format = token.substring(2).trim(); } else if (token.startsWith("v:")) { - conf.videocodec = token.substring(2).trim(); + supportSpec.videoCodec = token.substring(2).trim(); } else if (token.startsWith("a:")) { - conf.audiocodec = token.substring(2).trim(); + supportSpec.audioCodec = token.substring(2).trim(); } else if (token.startsWith("n:")) { - conf.maxnbchannels = token.substring(2).trim(); + supportSpec.maxNbChannels = token.substring(2).trim(); } else if (token.startsWith("s:")) { - conf.maxfrequency = token.substring(2).trim(); + supportSpec.maxFrequency = token.substring(2).trim(); } else if (token.startsWith("w:")) { - conf.maxvideowidth = token.substring(2).trim(); + supportSpec.maxVideoWidth = token.substring(2).trim(); } else if (token.startsWith("h:")) { - conf.maxvideoheight = token.substring(2).trim(); + supportSpec.maxVideoHeight = token.substring(2).trim(); } else if (token.startsWith("m:")) { - conf.mimetype = token.substring(2).trim(); + supportSpec.mimeType = token.substring(2).trim(); } else if (token.startsWith("b:")) { - conf.maxbitrate = token.substring(2).trim(); + supportSpec.maxBitrate = token.substring(2).trim(); } else if (token.contains(":")) { - // extra mediainfo stuff - if (conf.miExtras == null) { - conf.miExtras = new HashMap(); + // extra MediaInfo stuff + if (supportSpec.miExtras == null) { + supportSpec.miExtras = new HashMap(); } + String key = token.substring(0, token.indexOf(":")); String value = token.substring(token.indexOf(":") + 1); - conf.miExtras.put(key, Pattern.compile(value)); + supportSpec.miExtras.put(key, Pattern.compile(value)); } } - return conf; + + return supportSpec; } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/PmsConfiguration.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/PmsConfiguration.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/PmsConfiguration.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/PmsConfiguration.java 2013-04-22 19:41:39.000000000 +0000 @@ -19,12 +19,10 @@ package net.pms.configuration; import com.sun.jna.Platform; - -import net.pms.io.SystemUtils; import net.pms.Messages; +import net.pms.io.SystemUtils; import net.pms.util.FileUtil; import net.pms.util.PropertiesUtil; - import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.ConversionException; @@ -32,7 +30,6 @@ import org.apache.commons.configuration.event.ConfigurationListener; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,43 +61,46 @@ private static final String KEY_ALTERNATE_SUBS_FOLDER = "alternate_subs_folder"; private static final String KEY_ALTERNATE_THUMB_FOLDER = "alternate_thumb_folder"; private static final String KEY_APERTURE_ENABLED = "aperture"; - private static final String KEY_AUDIO_BITRATE = "audiobitrate"; - private static final String KEY_AUDIO_CHANNEL_COUNT = "audiochannels"; + private static final String KEY_AUDIO_BITRATE = "audiobitrate"; // TODO (breaking change): should be renamed to e.g. audio_bitrate + private static final String KEY_AUDIO_CHANNEL_COUNT = "audiochannels"; // TODO (breaking change): should be renamed to e.g. audio_channels + private static final String KEY_AUDIO_LANGUAGES = "mencoder_audiolangs"; // TODO (breaking change): should be renamed to e.g. audio_languages private static final String KEY_AUDIO_RESAMPLE = "audio_resample"; private static final String KEY_AUDIO_THUMBNAILS_METHOD = "audio_thumbnails_method"; private static final String KEY_AUTOLOAD_SUBTITLES = "autoloadsrt"; // TODO (breaking change): rename to e.g. autoload_subtitles or autoload_external_subtitles private static final String KEY_AUTO_UPDATE = "auto_update"; - private static final String KEY_AVISYNTH_CONVERT_FPS = "avisynth_convertfps"; + private static final String KEY_AVISYNTH_CONVERT_FPS = "avisynth_convertfps"; // TODO (breaking change): rename to e.g. avisynth_convert_fps private static final String KEY_AVISYNTH_SCRIPT = "avisynth_script"; private static final String KEY_BUFFER_MAX = "buffer_max"; // FIXME what is this? if it should be kept, it needs to be a) documented and b) renamed (breaking change) - private static final String KEY_BUFFER_TYPE = "buffertype"; + private static final String KEY_BUFFER_TYPE = "buffertype"; // FIXME deprecated: unused private static final String KEY_CHAPTER_INTERVAL = "chapter_interval"; private static final String KEY_CHAPTER_SUPPORT = "chapter_support"; - private static final String KEY_CHARSET_ENCODING = "charsetencoding"; + private static final String KEY_CHARSET_ENCODING = "charsetencoding"; // TODO (breaking change): should be renamed to e.g. charset_encoding private static final String KEY_CODEC_SPEC_SCRIPT = "codec_spec_script"; private static final String KEY_DISABLE_FAKESIZE = "disable_fakesize"; private static final String KEY_DVDISO_THUMBNAILS = "dvd_isos_thumbnails"; private static final String KEY_EMBED_DTS_IN_PCM = "embed_dts_in_pcm"; private static final String KEY_ENGINES = "engines"; - private static final String KEY_FFMPEG_ALTERNATIVE_PATH = "alternativeffmpegpath"; - private static final String KEY_FFMPEG_SETTINGS = "ffmpeg"; + private static final String KEY_FFMPEG_ALTERNATIVE_PATH = "alternativeffmpegpath"; // deprecated: FFMpegDVRMSRemux will be removed and DVR-MS will be transcoded + private static final String KEY_FFMPEG_VIDEO_CUSTOM_OPTIONS = "ffmpeg_video_custom_options"; private static final String KEY_FIX_25FPS_AV_MISMATCH = "fix_25fps_av_mismatch"; + private static final String KEY_FORCED_SUBTITLE_LANGUAGE = "forced_sub_lang"; + private static final String KEY_FORCED_SUBTITLE_TAGS = "forced_sub_tags"; private static final String KEY_FORCETRANSCODE = "forcetranscode"; private static final String KEY_HIDE_EMPTY_FOLDERS = "hide_empty_folders"; private static final String KEY_HIDE_ENGINENAMES = "hide_enginenames"; private static final String KEY_HIDE_EXTENSIONS = "hide_extensions"; private static final String KEY_HIDE_MEDIA_LIBRARY_FOLDER = "hide_media_library_folder"; private static final String KEY_HIDE_TRANSCODE_FOLDER = "hide_transcode_folder"; - private static final String KEY_HIDE_VIDEO_SETTINGS = "hidevideosettings"; + private static final String KEY_HIDE_VIDEO_SETTINGS = "hidevideosettings"; // TODO (breaking change): should be renamed to e.g. hide_video_settings private static final String KEY_HTTP_ENGINE_V2 = "http_engine_v2"; private static final String KEY_IMAGE_THUMBNAILS_ENABLED = "image_thumbnails"; private static final String KEY_IPHOTO_ENABLED = "iphoto"; private static final String KEY_IP_FILTER = "ip_filter"; private static final String KEY_ITUNES_ENABLED = "itunes"; private static final String KEY_LANGUAGE = "language"; - private static final String KEY_MAX_AUDIO_BUFFER = "maxaudiobuffer"; - private static final String KEY_MAX_BITRATE = "maximumbitrate"; - private static final String KEY_MAX_MEMORY_BUFFER_SIZE = "maxvideobuffer"; + private static final String KEY_MAX_AUDIO_BUFFER = "maxaudiobuffer"; // TODO (breaking change): should be renamed to e.g. maximum_audio_buffer_size + private static final String KEY_MAX_BITRATE = "maximumbitrate"; // TODO (breaking change): should be renamed to e.g. maximum_bitrate + private static final String KEY_MAX_MEMORY_BUFFER_SIZE = "maxvideobuffer"; // TODO (breaking change): should be renamed to e.g. maximum_video_buffer_size private static final String KEY_MENCODER_AC3_FIXED = "mencoder_ac3_fixed"; private static final String KEY_MENCODER_ASS = "mencoder_ass"; private static final String KEY_MENCODER_ASS_DEFAULTSTYLE = "mencoder_ass_defaultstyle"; @@ -108,10 +108,9 @@ private static final String KEY_MENCODER_ASS_OUTLINE = "mencoder_ass_outline"; private static final String KEY_MENCODER_ASS_SCALE = "mencoder_ass_scale"; private static final String KEY_MENCODER_ASS_SHADOW = "mencoder_ass_shadow"; - private static final String KEY_MENCODER_AUDIO_LANGS = "mencoder_audiolangs"; private static final String KEY_MENCODER_AUDIO_SUB_LANGS = "mencoder_audiosublangs"; private static final String KEY_MENCODER_CUSTOM_OPTIONS = "mencoder_decode"; // TODO (breaking change): should be renamed to e.g. mencoder_custom_options - private static final String KEY_MENCODER_DISABLE_SUBS = "mencoder_disablesubs"; + public static final String KEY_DISABLE_SUBTITLES = "mencoder_disablesubs"; // TODO (breaking change): should be renamed to e.g. disable_subtitles private static final String KEY_MENCODER_FONT = "mencoder_font"; private static final String KEY_MENCODER_FONT_CONFIG = "mencoder_fontconfig"; private static final String KEY_MENCODER_FORCED_SUB_LANG = "forced_sub_lang"; @@ -121,7 +120,6 @@ private static final String KEY_MENCODER_MAIN_SETTINGS = "mencoder_encode"; private static final String KEY_MENCODER_MAX_THREADS = "mencoder_max_threads"; private static final String KEY_MENCODER_MT = "mencoder_mt"; - private static final String KEY_MENCODER_MUX_COMPATIBLE = "mencoder_mux_compatible"; private static final String KEY_MENCODER_NOASS_BLUR = "mencoder_noass_blur"; private static final String KEY_MENCODER_NOASS_OUTLINE = "mencoder_noass_outline"; private static final String KEY_MENCODER_NOASS_SCALE = "mencoder_noass_scale"; @@ -136,14 +134,13 @@ private static final String KEY_MENCODER_SCALEY = "mencoder_scaley"; private static final String KEY_MENCODER_SUB_CP = "mencoder_subcp"; private static final String KEY_MENCODER_SUB_FRIBIDI = "mencoder_subfribidi"; - private static final String KEY_MENCODER_SUB_LANGS = "mencoder_sublangs"; private static final String KEY_MENCODER_USE_PCM = "mencoder_usepcm"; private static final String KEY_MENCODER_USE_PCM_FOR_HQ_AUDIO_ONLY = "mencoder_usepcm_for_hq_audio_only"; private static final String KEY_MENCODER_VOBSUB_SUBTITLE_QUALITY = "mencoder_vobsub_subtitle_quality"; private static final String KEY_MENCODER_YADIF = "mencoder_yadif"; private static final String KEY_MINIMIZED = "minimized"; - private static final String KEY_MIN_MEMORY_BUFFER_SIZE = "minvideobuffer"; - private static final String KEY_MIN_STREAM_BUFFER = "minwebbuffer"; + private static final String KEY_MIN_MEMORY_BUFFER_SIZE = "minvideobuffer"; // TODO (breaking change): should be renamed to e.g. minimum_video_buffer_size + private static final String KEY_MIN_STREAM_BUFFER = "minwebbuffer"; // TODO (breaking change): should be renamed to e.g. minimum_web_buffer_size private static final String KEY_MUX_ALLAUDIOTRACKS = "tsmuxer_mux_all_audiotracks"; private static final String KEY_NETWORK_INTERFACE = "network_interface"; private static final String KEY_NOTRANSCODE = "notranscode"; @@ -159,25 +156,33 @@ private static final String KEY_SERVER_HOSTNAME = "hostname"; private static final String KEY_SERVER_PORT = "port"; private static final String KEY_SHARES = "shares"; - private static final String KEY_SKIP_LOOP_FILTER_ENABLED = "skiploopfilter"; + private static final String KEY_SKIP_LOOP_FILTER_ENABLED = "skiploopfilter"; // TODO (breaking change): should be renamed to e.g. skip_loop_filter private static final String KEY_SKIP_NETWORK_INTERFACES = "skip_network_interfaces"; private static final String KEY_SORT_METHOD = "key_sort_method"; private static final String KEY_SUBS_COLOR = "subs_color"; - private static final String KEY_TEMP_FOLDER_PATH = "temp"; + private static final String KEY_SUBTITLES_LANGUAGES = "mencoder_sublangs"; // TODO (breaking change): should be renamed to e.g. subtitles_languages + private static final String KEY_TEMP_FOLDER_PATH = "temp"; // TODO (breaking change): should be renamed to e.g. temp_directory private static final String KEY_THUMBNAIL_GENERATION_ENABLED = "thumbnails"; // TODO (breaking change): should be renamed to e.g. generate_thumbnails - private static final String KEY_THUMBNAIL_SEEK_POS = "thumbnail_seek_pos"; + private static final String KEY_THUMBNAIL_SEEK_POS = "thumbnail_seek_pos"; // TODO (breaking change): should be renamed to e.g. thumbnail_seek_position private static final String KEY_TRANSCODE_BLOCKS_MULTIPLE_CONNECTIONS = "transcode_block_multiple_connections"; private static final String KEY_TRANSCODE_FOLDER_NAME = "transcode_folder_name"; private static final String KEY_TRANSCODE_KEEP_FIRST_CONNECTION = "transcode_keep_first_connection"; private static final String KEY_TSMUXER_FORCEFPS = "tsmuxer_forcefps"; private static final String KEY_TSMUXER_PREREMIX_AC3 = "tsmuxer_preremix_ac3"; - private static final String KEY_TURBO_MODE_ENABLED = "turbomode"; + private static final String KEY_TURBO_MODE_ENABLED = "turbomode"; // FIXME unused private static final String KEY_UPNP_PORT = "upnp_port"; - private static final String KEY_USE_CACHE = "usecache"; + private static final String KEY_USE_CACHE = "usecache"; // TODO (breaking change): should be renamed to e.g. use_cache private static final String KEY_USE_MPLAYER_FOR_THUMBS = "use_mplayer_for_video_thumbs"; private static final String KEY_UUID = "uuid"; private static final String KEY_VIDEOTRANSCODE_START_DELAY = "key_videotranscode_start_delay"; private static final String KEY_VIRTUAL_FOLDERS = "vfolders"; + private static final String KEY_VLC_USE_EXPERIMENTAL_CODECS = "VLC_use_experimental_codecs"; // TODO (breaking change): should be lower case + private static final String KEY_VLC_AUDIO_SYNC_ENABLED = "VLC_audio_sync_enabled"; // TODO (breaking change): should be lower case + private static final String KEY_VLC_SUBTITLE_ENABLED = "VLC_subtitle_enabled"; // TODO (breaking change): should be lower case + private static final String KEY_VLC_SCALE = "VLC_scale"; // TODO (breaking change): should be lower case + private static final String KEY_VLC_SAMPLE_RATE_OVERRIDE = "VLC_sample_rate_override"; // TODO (breaking change): should be lower case + private static final String KEY_VLC_SAMPLE_RATE = "VLC_sample_rate"; // TODO (breaking change): should be lower case + private static final String KEY_VIDEO_HW_ACCELERATION = "video_hardware_acceleration"; // the name of the subdirectory under which PMS config files are stored for this build (default: PMS). // see Build for more details @@ -187,7 +192,7 @@ private static String HOSTNAME; private static String DEFAULT_AVI_SYNTH_SCRIPT; - private static final String BUFFER_TYPE_FILE = "file"; + private static final String BUFFER_TYPE_FILE = "file"; // deprecated: unused private static final int MAX_MAX_MEMORY_DEFAULT_SIZE = 600; private static final int BUFFER_MEMORY_FACTOR = 368; private static int MAX_MAX_MEMORY_BUFFER_SIZE = MAX_MAX_MEMORY_DEFAULT_SIZE; @@ -903,16 +908,40 @@ public boolean isMencoderAss() { return getBoolean(KEY_MENCODER_ASS, Platform.isWindows() || Platform.isMac()); } - + /** - * Returns whether or not subtitles should be disabled when using MEncoder - * as transcoding engine. Default is false, meaning subtitles should not - * be disabled. - * @return True if subtitles should be disabled, false otherwise. + * @deprecated Use {@link #isDisableSubtitles()} instead. */ - public boolean isMencoderDisableSubs() { - return getBoolean(KEY_MENCODER_DISABLE_SUBS, false); - } + public boolean isMencoderDisableSubs() { + return isDisableSubtitles(); + } + + + /** + * Returns whether or not subtitles should be disabled for all + * transcoding engines. Default is false, meaning subtitles should not + * be disabled. + * @return True if subtitles should be disabled, false otherwise. + */ + public boolean isDisableSubtitles() { + return getBoolean(KEY_DISABLE_SUBTITLES, false); + } + + /** + * @deprecated Use {@link #setDisableSubtitles(boolean)} instead. + */ + public void setMencoderDisableSubs(boolean value) { + setDisableSubtitles(value); + } + + /** + * Set whether or not subtitles should be disabled for + * all transcoding engines. + * @param value Set to true if subtitles should be disabled. + */ + public void setDisableSubtitles(boolean value) { + configuration.setProperty(KEY_DISABLE_SUBTITLES, value); + } /** * Returns whether or not the Pulse Code Modulation audio format should be @@ -942,7 +971,14 @@ } /** - * Returns the audio language priority for MEncoder as a comma-separated + * @deprecated Use {@link #getAudioLanguages()} instead. + */ + public String getMencoderAudioLanguages() { + return getAudioLanguages(); + } + + /** + * Returns the audio language priority as a comma separated * string. For example: "eng,fre,jpn,ger,und", where "und" * stands for "undefined". * Can be a blank string. @@ -950,54 +986,63 @@ * * @return The audio language priority string. */ - public String getMencoderAudioLanguages() { - return ConfigurationUtil.getPossiblyBlankConfigurationString( - configuration, - KEY_MENCODER_AUDIO_LANGS, - Messages.getString("MEncoderVideo.126") - ); + public String getAudioLanguages() { + return ConfigurationUtil.getPossiblyBlankConfigurationString(configuration, KEY_AUDIO_LANGUAGES, Messages.getString("MEncoderVideo.126")); + } + + /** + * @deprecated Use {@link #getSubtitlesLanguages()} instead. + */ + public String getMencoderSubLanguages() { + return getSubtitlesLanguages(); } /** - * Returns the subtitle language priority for MEncoder as a comma-separated - * string. For example: "eng,fre,jpn,ger,und", where "und" - * stands for "undefined". + * Returns the subtitle language priority as a comma separated + * string. For example: "loc,eng,fre,jpn,ger,und", where "loc" + * stands for the preferred local language and "und" stands for "undefined". * Can be a blank string. * Default value is locale-specific. * * @return The subtitle language priority string. */ - public String getMencoderSubLanguages() { - return ConfigurationUtil.getPossiblyBlankConfigurationString( - configuration, - KEY_MENCODER_SUB_LANGS, - Messages.getString("MEncoderVideo.127") - ); + public String getSubtitlesLanguages() { + return ConfigurationUtil.getPossiblyBlankConfigurationString(configuration, KEY_SUBTITLES_LANGUAGES, Messages.getString("MEncoderVideo.127")); + } + + /** + * @deprecated Use {@link #getForcedSubtitleLanguage()} instead. + */ + public String getMencoderForcedSubLanguage() { + return getForcedSubtitleLanguage(); } /** * Returns the ISO 639 language code for the subtitle language that should - * be forced upon MEncoder. + * be forced. * Can be a blank string. * @return The subtitle language code. */ - public String getMencoderForcedSubLanguage() { - return ConfigurationUtil.getPossiblyBlankConfigurationString( - configuration, - KEY_MENCODER_FORCED_SUB_LANG, - getLanguage() - ); + public String getForcedSubtitleLanguage() { + return ConfigurationUtil.getPossiblyBlankConfigurationString(configuration, KEY_FORCED_SUBTITLE_LANGUAGE, getLanguage()); } + + /** + * @deprecated Use {@link #getForcedSubtitleTags()} instead. + */ + public String getMencoderForcedSubTags() { + return getForcedSubtitleTags(); + } /** * Returns the tag string that identifies the subtitle language that - * should be forced upon MEncoder. + * should be forced. * @return The tag string. */ - public String getMencoderForcedSubTags() { - return getString(KEY_MENCODER_FORCED_SUB_TAGS, "forced"); + public String getForcedSubtitleTags() { + return getString(KEY_FORCED_SUBTITLE_TAGS, "forced"); } - + /** * Returns a string of audio language and subtitle language pairs * ordered by priority for MEncoder to try to match. Audio language @@ -1066,43 +1111,71 @@ } /** - * Sets the audio language priority for MEncoder as a comma-separated + * @deprecated Use {@link #setAudioLanguages(String)} instead. + */ + public void setMencoderAudioLanguages(String value) { + setAudioLanguages(value); + } + + /** + * Sets the audio language priority for MEncoder as a comma separated * string. For example: "eng,fre,jpn,ger,und", where "und" * stands for "undefined". * @param value The audio language priority string. */ - public void setMencoderAudioLanguages(String value) { - configuration.setProperty(KEY_MENCODER_AUDIO_LANGS, value); + public void setAudioLanguages(String value) { + configuration.setProperty(KEY_AUDIO_LANGUAGES, value); + } + + /** + * @deprecated Use {@link #setSubtitlesLanguages(String)} instead. + */ + public void setMencoderSubLanguages(String value) { + setSubtitlesLanguages(value); } /** - * Sets the subtitle language priority for MEncoder as a comma + * Sets the subtitle language priority as a comma * separated string. For example: "eng,fre,jpn,ger,und", * where "und" stands for "undefined". * @param value The subtitle language priority string. */ - public void setMencoderSubLanguages(String value) { - configuration.setProperty(KEY_MENCODER_SUB_LANGS, value); + public void setSubtitlesLanguages(String value) { + configuration.setProperty(KEY_SUBTITLES_LANGUAGES, value); + } + + /** + * @deprecated Use {@link #setForcedSubtitleLanguage(String)} instead. + */ + public void setMencoderForcedSubLanguage(String value) { + setForcedSubtitleLanguage(value); } /** * Sets the ISO 639 language code for the subtitle language that should - * be forced upon MEncoder. + * be forced. * @param value The subtitle language code. */ - public void setMencoderForcedSubLanguage(String value) { - configuration.setProperty(KEY_MENCODER_FORCED_SUB_LANG, value); + public void setForcedSubtitleLanguage(String value) { + configuration.setProperty(KEY_FORCED_SUBTITLE_LANGUAGE, value); + } + + /** + * @deprecated Use {@link #setForcedSubtitleTags(String)} instead. + */ + public void setMencoderForcedSubTags(String value) { + setForcedSubtitleTags(value); } /** * Sets the tag string that identifies the subtitle language that - * should be forced upon MEncoder. + * should be forced. * @param value The tag string. */ - public void setMencoderForcedSubTags(String value) { - configuration.setProperty(KEY_MENCODER_FORCED_SUB_TAGS, value); + public void setForcedSubtitleTags(String value) { + configuration.setProperty(KEY_FORCED_SUBTITLE_TAGS, value); } - + /** * Sets a string of audio language and subtitle language pairs * ordered by priority for MEncoder to try to match. Audio language @@ -1202,15 +1275,6 @@ } /** - * Set whether or not subtitles should be disabled when using MEncoder - * as transcoding engine. - * @param value Set to true if subtitles should be disabled. - */ - public void setMencoderDisableSubs(boolean value) { - configuration.setProperty(KEY_MENCODER_DISABLE_SUBS, value); - } - - /** * Sets whether or not the Pulse Code Modulation audio format should be * forced when using MEncoder as transcoding engine. * @param value Set to true if PCM should be forced. @@ -1270,7 +1334,8 @@ * upscale the video itself. * * @return True if MEncoder should be used, false otherwise. - * @see {@link #getMencoderScaleX(int)}, {@link #getMencoderScaleY(int)} + * @see #getMencoderScaleX() + * @see #getMencoderScaleY() */ public boolean isMencoderScaler() { return getBoolean(KEY_MENCODER_SCALER, false); @@ -1281,7 +1346,8 @@ * optimal resolution. Set to false to leave upscaling to the renderer. * * @param value Set to true if MEncoder should be used to upscale. - * @see {@link #setMencoderScaleX(int)}, {@link #setMencoderScaleY(int)} + * @see #setMencoderScaleX(int) + * @see #setMencoderScaleY(int) */ public void setMencoderScaler(boolean value) { configuration.setProperty(KEY_MENCODER_SCALER, value); @@ -1328,7 +1394,7 @@ } /** - * Returns the number of audio channels that MEncoder should use for + * Returns the number of audio channels that should be used for * transcoding. Default value is 6 (for 5.1 audio). * * @return The number of audio channels. @@ -1408,8 +1474,6 @@ * This only determines whether a thumbnailer (e.g. dcraw, MPlayer) * is used to generate thumbnails. It does not reflect whether * thumbnails should be displayed or not. - * - * @return boolean indicating whether thumbnail generation is enabled. */ @Deprecated public void setThumbnailsEnabled(boolean value) { @@ -1665,17 +1729,18 @@ return getInt(KEY_MIN_STREAM_BUFFER, 1); } + @Deprecated public boolean isFileBuffer() { - String bufferType = getString(KEY_BUFFER_TYPE, "").trim(); + String bufferType = getString(KEY_BUFFER_TYPE, ""); return bufferType.equals(BUFFER_TYPE_FILE); } public void setFfmpegSettings(String value) { - configuration.setProperty(KEY_FFMPEG_SETTINGS, value); + configuration.setProperty(KEY_FFMPEG_VIDEO_CUSTOM_OPTIONS, value); } public String getFfmpegSettings() { - return getString(KEY_FFMPEG_SETTINGS, "-threads 2 -g 1 -qscale 1 -qmin 2"); + return getString(KEY_FFMPEG_VIDEO_CUSTOM_OPTIONS, ""); } public boolean isMencoderNoOutOfSync() { @@ -1718,10 +1783,12 @@ configuration.setProperty(KEY_MENCODER_INTELLIGENT_SYNC, value); } + @Deprecated public String getFfmpegAlternativePath() { return getString(KEY_FFMPEG_ALTERNATIVE_PATH, null); } + @Deprecated public void setFfmpegAlternativePath(String value) { configuration.setProperty(KEY_FFMPEG_ALTERNATIVE_PATH, value); } @@ -1771,6 +1838,7 @@ if (value.trim().length() == 0) { value = "0"; } + configuration.setProperty(KEY_MENCODER_OVERSCAN_COMPENSATION_WIDTH, value); } @@ -1782,6 +1850,7 @@ if (value.trim().length() == 0) { value = "0"; } + configuration.setProperty(KEY_MENCODER_OVERSCAN_COMPENSATION_HEIGHT, value); } @@ -1790,7 +1859,16 @@ } public List getEnginesAsList(SystemUtils registry) { - List engines = stringToList(getString(KEY_ENGINES, "mencoder,avsmencoder,tsmuxer,ffmpegvideo,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,ffmpegdvrmsremux,rawthumbs")); + List engines = stringToList( + // an empty string means: disable all engines + // http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=15416 + ConfigurationUtil.getPossiblyBlankConfigurationString( + configuration, + KEY_ENGINES, + "mencoder,avsmencoder,tsmuxer,ffmpegvideo,vlctranscoder,ffmpegaudio,mplayeraudio,tsmuxeraudio,ffmpegwebvideo,vlcvideo,mencoderwebvideo,mplayervideodump,mplayerwebaudio,vlcaudio,ffmpegdvrmsremux,rawthumbs" + ) + ); + engines = hackAvs(registry, engines); return engines; } @@ -2000,12 +2078,20 @@ return getBoolean(KEY_EMBED_DTS_IN_PCM, false); } + /** + * @deprecated automatic switching to tsMuxeR from other transcoding engines is disabled. + */ + @Deprecated public void setMencoderMuxWhenCompatible(boolean value) { - configuration.setProperty(KEY_MENCODER_MUX_COMPATIBLE, value); + // noop } + /** + * @deprecated automatic switching to tsMuxeR from other transcoding engines is disabled. + */ + @Deprecated public boolean isMencoderMuxWhenCompatible() { - return getBoolean(KEY_MENCODER_MUX_COMPATIBLE, true); + return false; } public void setMuxAllAudioTracks(boolean value) { @@ -2307,4 +2393,67 @@ public void setTranscodeFolderName(String name) { configuration.setProperty(KEY_TRANSCODE_FOLDER_NAME, name); } + + public boolean isVlcExperimentalCodecs() { + return getBoolean(KEY_VLC_USE_EXPERIMENTAL_CODECS, false); + } + public void setVlcExperimentalCodecs(boolean b) { + configuration.setProperty(KEY_VLC_USE_EXPERIMENTAL_CODECS, b); + } + + public boolean isVlcAudioSyncEnabled() { + return getBoolean(KEY_VLC_AUDIO_SYNC_ENABLED, false); + } + + public void setVlcAudioSyncEnabled(boolean b) { + configuration.setProperty(KEY_VLC_AUDIO_SYNC_ENABLED, b); + } + + public boolean isVlcSubtitleEnabled() { + return getBoolean(KEY_VLC_SUBTITLE_ENABLED, true); + } + + public void setVlcSubtitleEnabled(boolean b) { + configuration.setProperty(KEY_VLC_SUBTITLE_ENABLED, b); + } + + public String getVlcScale() { + return getString(KEY_VLC_SCALE, "1.0"); + } + + public void setVlcScale(String value) { + configuration.setProperty(KEY_VLC_SCALE, value); + } + + public boolean getVlcSampleRateOverride() { + return getBoolean(KEY_VLC_SAMPLE_RATE_OVERRIDE, false); + } + + public void setVlcSampleRateOverride(boolean value) { + configuration.setProperty(KEY_VLC_SAMPLE_RATE_OVERRIDE, value); + } + + public String getVlcSampleRate() { + return getString(KEY_VLC_SAMPLE_RATE, "48000"); + } + + public void setVlcSampleRate(String value) { + configuration.setProperty(KEY_VLC_SAMPLE_RATE, value); + } + + /** + * State if the video hardware acceleration is allowed + * @return true if hardware acceleration is allowed, false otherwise + */ + public boolean isVideoHardwareAcceleration() { + return getBoolean(KEY_VIDEO_HW_ACCELERATION, false); + } + + /** + * Set the video hardware acceleration enable/disable + * @param value true if hardware acceleration is allowed, false otherwise + */ + public void setVideoHardwareAcceleration(boolean value) { + configuration.setProperty(KEY_VIDEO_HW_ACCELERATION, value); + } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/RendererConfiguration.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/RendererConfiguration.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/RendererConfiguration.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/RendererConfiguration.java 2013-04-22 19:41:39.000000000 +0000 @@ -29,82 +29,77 @@ import java.util.regex.Pattern; public class RendererConfiguration { - /* - * Static section - */ private static final Logger LOGGER = LoggerFactory.getLogger(RendererConfiguration.class); private static ArrayList rendererConfs; private static PmsConfiguration pmsConfiguration; private static RendererConfiguration defaultConf; private static Map addressAssociation = new HashMap(); + private RootFolder rootFolder; + private final PropertiesConfiguration configuration; + private FormatConfiguration formatConfiguration; + private int rank; + private final Map mimes; + private final Map DLNAPN; - private static final String RENDERER_NAME = "RendererName"; - private static final String RENDERER_ICON = "RendererIcon"; - private static final String USER_AGENT = "UserAgentSearch"; - private static final String USER_AGENT_ADDITIONAL_HEADER = "UserAgentAdditionalHeader"; - private static final String USER_AGENT_ADDITIONAL_SEARCH = "UserAgentAdditionalHeaderSearch"; - private static final String VIDEO = "Video"; - private static final String AUDIO = "Audio"; - private static final String IMAGE = "Image"; - private static final String SEEK_BY_TIME = "SeekByTime"; - + // property values private static final String DEPRECATED_MPEGPSAC3 = "MPEGAC3"; // XXX deprecated: old name with missing container + private static final String EXCLUSIVE = "exclusive"; + private static final String LPCM = "LPCM"; + private static final String MP3 = "MP3"; private static final String MPEGPSAC3 = "MPEGPSAC3"; private static final String MPEGTSAC3 = "MPEGTSAC3"; - private static final String WMV = "WMV"; - private static final String LPCM = "LPCM"; private static final String WAV = "WAV"; - private static final String MP3 = "MP3"; + private static final String WMV = "WMV"; - private static final String TRANSCODE_AUDIO = "TranscodeAudio"; - private static final String TRANSCODE_VIDEO = "TranscodeVideo"; + // property names + private static final String AUDIO = "Audio"; + private static final String AUTO_EXIF_ROTATE = "AutoExifRotate"; + private static final String BYTE_TO_TIMESEEK_REWIND_SECONDS = "ByteToTimeseekRewindSeconds"; // Ditlew + private static final String CBR_VIDEO_BITRATE = "CBRVideoBitrate"; // Ditlew + private static final String CHUNKED_TRANSFER = "ChunkedTransfer"; + private static final String CUSTOM_MENCODER_OPTIONS = "CustomMencoderOptions"; + private static final String CUSTOM_MENCODER_QUALITY_SETTINGS = "CustomMencoderQualitySettings"; private static final String DEFAULT_VBV_BUFSIZE = "DefaultVBVBufSize"; - private static final String MUX_H264_WITH_MPEGTS = "MuxH264ToMpegTS"; - private static final String MUX_DTS_TO_MPEG = "MuxDTSToMpeg"; - private static final String WRAP_DTS_INTO_PCM = "WrapDTSIntoPCM"; - private static final String MUX_LPCM_TO_MPEG = "MuxLPCMToMpeg"; + private static final String DLNA_LOCALIZATION_REQUIRED = "DLNALocalizationRequired"; + private static final String DLNA_ORGPN_USE = "DLNAOrgPN"; + private static final String DLNA_PN_CHANGES = "DLNAProfileChanges"; + private static final String DLNA_TREE_HACK = "CreateDLNATreeFaster"; + private static final String FORCE_JPG_THUMBNAILS = "ForceJPGThumbnails"; // Sony devices require JPG thumbnails + private static final String H264_L41_LIMITED = "H264Level41Limited"; + private static final String IMAGE = "Image"; + private static final String LONG_FILE_NAME_FORMAT = "LongFileNameFormat"; private static final String MAX_VIDEO_BITRATE = "MaxVideoBitrateMbps"; - private static final String MAX_VIDEO_WIDTH = "MaxVideoWidth"; private static final String MAX_VIDEO_HEIGHT = "MaxVideoHeight"; - private static final String USE_SAME_EXTENSION = "UseSameExtension"; - private static final String MIME_TYPES_CHANGES = "MimeTypesChanges"; - private static final String TRANSCODE_EXT = "TranscodeExtensions"; - private static final String STREAM_EXT = "StreamExtensions"; - private static final String H264_L41_LIMITED = "H264Level41Limited"; - private static final String TRANSCODE_AUDIO_441KHZ = "TranscodeAudioTo441kHz"; - private static final String TRANSCODED_SIZE = "TranscodedVideoFileSize"; - private static final String DLNA_PN_CHANGES = "DLNAProfileChanges"; - private static final String TRANSCODE_FAST_START = "TranscodeFastStart"; - private static final String AUTO_EXIF_ROTATE = "AutoExifRotate"; - private static final String DLNA_ORGPN_USE = "DLNAOrgPN"; - private static final String DLNA_LOCALIZATION_REQUIRED = "DLNALocalizationRequired"; + private static final String MAX_VIDEO_WIDTH = "MaxVideoWidth"; private static final String MEDIAPARSERV2 = "MediaInfo"; private static final String MEDIAPARSERV2_THUMB = "MediaParserV2_ThumbnailGeneration"; - private static final String SUPPORTED = "Supported"; - private static final String CUSTOM_MENCODER_QUALITY_SETTINGS = "CustomMencoderQualitySettings"; - private static final String CUSTOM_MENCODER_OPTIONS = "CustomMencoderOptions"; + private static final String MIME_TYPES_CHANGES = "MimeTypesChanges"; + private static final String MUX_DTS_TO_MPEG = "MuxDTSToMpeg"; + private static final String MUX_H264_WITH_MPEGTS = "MuxH264ToMpegTS"; + private static final String MUX_LPCM_TO_MPEG = "MuxLPCMToMpeg"; + private static final String RENDERER_ICON = "RendererIcon"; + private static final String RENDERER_NAME = "RendererName"; + private static final String SEEK_BY_TIME = "SeekByTime"; + private static final String SHORT_FILE_NAME_FORMAT = "ShortFileNameFormat"; private static final String SHOW_AUDIO_METADATA = "ShowAudioMetadata"; + private static final String SHOW_DVD_TITLE_DURATION = "ShowDVDTitleDuration"; // Ditlew private static final String SHOW_SUB_METADATA = "ShowSubMetadata"; - private static final String DLNA_TREE_HACK = "CreateDLNATreeFaster"; - private static final String CHUNKED_TRANSFER = "ChunkedTransfer"; + private static final String STREAM_EXT = "StreamExtensions"; private static final String SUBTITLE_HTTP_HEADER = "SubtitleHttpHeader"; - private static final String LONG_FILE_NAME_FORMAT = "LongFileNameFormat"; - private static final String SHORT_FILE_NAME_FORMAT = "ShortFileNameFormat"; - - // Sony devices require JPG thumbnails - private static final String FORCE_JPG_THUMBNAILS = "ForceJPGThumbnails"; - - // Ditlew - private static final String SHOW_DVD_TITLE_DURATION = "ShowDVDTitleDuration"; - private static final String CBR_VIDEO_BITRATE = "CBRVideoBitrate"; - private static final String BYTE_TO_TIMESEEK_REWIND_SECONDS = "ByteToTimeseekRewindSeconds"; - - private final PropertiesConfiguration configuration; - private FormatConfiguration formatConfiguration; - private int rank; - private final Map mimes; - private final Map DLNAPN; + private static final String SUPPORTED = "Supported"; + private static final String TRANSCODE_AUDIO_441KHZ = "TranscodeAudioTo441kHz"; + private static final String TRANSCODE_AUDIO = "TranscodeAudio"; + private static final String TRANSCODED_SIZE = "TranscodedVideoFileSize"; + private static final String TRANSCODE_EXT = "TranscodeExtensions"; + private static final String TRANSCODE_FAST_START = "TranscodeFastStart"; + private static final String TRANSCODE_VIDEO = "TranscodeVideo"; + private static final String USER_AGENT_ADDITIONAL_HEADER = "UserAgentAdditionalHeader"; + private static final String USER_AGENT_ADDITIONAL_SEARCH = "UserAgentAdditionalHeaderSearch"; + private static final String USER_AGENT = "UserAgentSearch"; + private static final String USE_SAME_EXTENSION = "UseSameExtension"; + private static final String VIDEO = "Video"; + private static final String WRAP_DTS_INTO_PCM = "WrapDTSIntoPCM"; public static RendererConfiguration getDefaultConf() { return defaultConf; @@ -192,7 +187,7 @@ } public static void resetAllRenderers() { - for(RendererConfiguration rc : rendererConfs) { + for (RendererConfiguration rc : rendererConfs) { rc.rootFolder = null; } } @@ -202,6 +197,7 @@ rootFolder = new RootFolder(); rootFolder.discoverChildren(); } + return rootFolder; } @@ -244,6 +240,7 @@ } } } + return null; } @@ -257,6 +254,7 @@ // to be the only way to get here. LOGGER.info("Another renderer like " + r.getRendererName() + " was found!"); } + return r; } @@ -287,6 +285,7 @@ } } } + return null; } @@ -438,6 +437,7 @@ default: break; } + return false; } @@ -513,6 +513,7 @@ } } else if (mimetype != null && mimetype.equals(HTTPResource.AUDIO_TRANSCODE)) { mimetype = getFormatConfiguration().match(FormatConfiguration.LPCM, null, null); + if (mimetype != null) { if (isTranscodeAudioTo441()) { mimetype += ";rate=44100;channels=2"; @@ -520,38 +521,66 @@ mimetype += ";rate=48000;channels=2"; } } + if (isTranscodeToWAV()) { mimetype = getFormatConfiguration().match(FormatConfiguration.WAV, null, null); } else if (isTranscodeToMP3()) { mimetype = getFormatConfiguration().match(FormatConfiguration.MP3, null, null); } } + return mimetype; } + if (mimetype != null && mimetype.equals(HTTPResource.VIDEO_TRANSCODE)) { mimetype = HTTPResource.MPEG_TYPEMIME; if (isTranscodeToWMV()) { - mimetype = HTTPResource.WMV_TYPEMIME; + mimetype = isMediaParserV2() + ? getFormatConfiguration().match(FormatConfiguration.WMV, FormatConfiguration.WMV, FormatConfiguration.WMA) + : HTTPResource.WMV_TYPEMIME; + } else if (isTranscodeToMPEGTSAC3()) { + mimetype = isMediaParserV2() + ? getFormatConfiguration().match(FormatConfiguration.MPEGTS, FormatConfiguration.MPEG2, FormatConfiguration.AC3) + : HTTPResource.MPEG_TYPEMIME; + } else { // default: MPEGPSAC3 + mimetype = isMediaParserV2() + ? getFormatConfiguration().match(FormatConfiguration.MPEGPS, FormatConfiguration.MPEG2, FormatConfiguration.AC3) + : HTTPResource.MPEG_TYPEMIME; } - } else if (mimetype != null && mimetype.equals(HTTPResource.AUDIO_TRANSCODE)) { - mimetype = HTTPResource.AUDIO_LPCM_TYPEMIME; - if (mimetype != null) { + } else if (mimetype.equals(HTTPResource.AUDIO_TRANSCODE)) { + if (isTranscodeToWAV()) { + mimetype = isMediaParserV2() + ? getFormatConfiguration().match(FormatConfiguration.WAV, null, null) + : HTTPResource.AUDIO_WAV_TYPEMIME; + } else if (isTranscodeToMP3()) { + mimetype = isMediaParserV2() + ? getFormatConfiguration().match(FormatConfiguration.MP3, null, null) + : HTTPResource.AUDIO_MP3_TYPEMIME; + } else { // default: LPCM + mimetype = isMediaParserV2() + ? getFormatConfiguration().match(FormatConfiguration.LPCM, null, null) + : HTTPResource.AUDIO_LPCM_TYPEMIME; + if (isTranscodeAudioTo441()) { mimetype += ";rate=44100;channels=2"; } else { mimetype += ";rate=48000;channels=2"; } } + if (isTranscodeToMP3()) { mimetype = HTTPResource.AUDIO_MP3_TYPEMIME; } + if (isTranscodeToWAV()) { mimetype = HTTPResource.AUDIO_WAV_TYPEMIME; } } + if (mimes.containsKey(mimetype)) { return mimes.get(mimetype); } + return mimetype; } @@ -676,16 +705,35 @@ public String getUseSameExtension(String file) { String s = getString(USE_SAME_EXTENSION, null); + if (s != null) { s = file + "." + s; } else { s = file; } + return s; } + /** + * Returns true if SeekByTime is set to "true" or "exclusive", false otherwise. + * Default value is false. + * + * @return true if the renderer supports seek-by-time, false otherwise. + */ public boolean isSeekByTime() { - return getBoolean(SEEK_BY_TIME, true); + return isSeekByTimeExclusive() || getBoolean(SEEK_BY_TIME, false); + } + + /** + * Returns true if SeekByTime is set to "exclusive", false otherwise. + * Default value is false. + * + * @return true if the renderer supports seek-by-time exclusively + * (i.e. not in conjunction with seek-by-byte), false otherwise. + */ + public boolean isSeekByTimeExclusive() { + return getString(SEEK_BY_TIME, "").equalsIgnoreCase("exclusive"); } public boolean isMuxH264MpegTS() { @@ -693,9 +741,11 @@ if (isMediaParserV2()) { muxCompatible = getFormatConfiguration().match(FormatConfiguration.MPEGTS, FormatConfiguration.H264, null) != null; } + if (Platform.isMac() && System.getProperty("os.version") != null && System.getProperty("os.version").contains("10.4.")) { muxCompatible = false; // no tsMuxeR for 10.4 (yet?) } + return muxCompatible; } @@ -707,6 +757,7 @@ if (isMediaParserV2()) { return getFormatConfiguration().isDTSSupported(); } + return getBoolean(MUX_DTS_TO_MPEG, false); } @@ -722,6 +773,7 @@ if (isMediaParserV2()) { return getFormatConfiguration().isLPCMSupported(); } + return getBoolean(MUX_LPCM_TO_MPEG, true); } @@ -764,11 +816,13 @@ } /** - * Returns the maximum bit rate supported by the media renderer as defined + * Returns the maximum bitrate (in megabits-per-second) supported by the media renderer as defined * in the renderer configuration. The default value is null. * - * @return The bit rate. + * @return The bitrate. */ + @Deprecated + // TODO this should return an integer and the units should be bits-per-second public String getMaxVideoBitrate() { return getString(MAX_VIDEO_BITRATE, null); } @@ -800,6 +854,8 @@ * @return The maximum video width. */ public int getMaxVideoWidth() { + // FIXME why is this 1920 if the default value is 0 (unlimited)? + // XXX we should also require width and height to both be 0 or both be > 0 return getInt(MAX_VIDEO_WIDTH, 1920); } @@ -810,9 +866,17 @@ * @return The maximum video height. */ public int getMaxVideoHeight() { + // FIXME why is this 1080 if the default value is 0 (unlimited)? + // XXX we should also require width and height to both be 0 or both be > 0 return getInt(MAX_VIDEO_HEIGHT, 1080); } + /** + * Returns true if the renderer has a maximum supported width + * or height, false otherwise. + * + * @return boolean indicating whether the renderer may need videos to be resized. + */ public boolean isVideoRescale() { return getMaxVideoWidth() > 0 && getMaxVideoHeight() > 0; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/WindowsRegistryProgramPaths.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/WindowsRegistryProgramPaths.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/configuration/WindowsRegistryProgramPaths.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/configuration/WindowsRegistryProgramPaths.java 2013-04-22 19:41:39.000000000 +0000 @@ -48,14 +48,17 @@ @Override public String getVlcPath() { SystemUtils registry = PMS.get().getRegistry(); - if (registry.getVlcp() != null) { - String vlc = registry.getVlcp(); - String version = registry.getVlcv(); + + if (registry.getVlcPath() != null) { + String vlc = registry.getVlcPath(); + String version = registry.getVlcVersion(); + if (new File(vlc).exists() && version != null) { logger.debug("Found VLC version " + version + " in Windows Registry: " + vlc); return vlc; } } + return defaults.getVlcPath(); } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaAudio.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaAudio.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaAudio.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaAudio.java 2013-04-22 19:41:39.000000000 +0000 @@ -285,7 +285,7 @@ * Returns the number of bits per sample for the audio. * * @return The number of bits per sample. - * @since 1.50 + * @since 1.50.0 */ public int getBitsperSample() { return bitsperSample; @@ -295,7 +295,7 @@ * Sets the number of bits per sample for the audio. * * @param bitsperSample The number of bits per sample to set. - * @since 1.50 + * @since 1.50.0 */ public void setBitsperSample(int bitsperSample) { this.bitsperSample = bitsperSample; @@ -305,7 +305,7 @@ * Returns audio bitrate. * * @return Audio bitrate. - * @since 1.54 + * @since 1.54.0 */ public int getBitRate() { return bitRate; @@ -315,7 +315,7 @@ * Sets audio bitrate. * * @param bitRate Audio bitrate to set. - * @since 1.54 + * @since 1.54.0 */ public void setBitRate(int bitRate) { this.bitRate = bitRate; @@ -325,7 +325,7 @@ * Returns the sample frequency for the audio. * * @return The sample frequency. - * @since 1.50 + * @since 1.50.0 */ public String getSampleFrequency() { return sampleFrequency; @@ -335,7 +335,7 @@ * Sets the sample frequency for the audio. * * @param sampleFrequency The sample frequency to set. - * @since 1.50 + * @since 1.50.0 */ public void setSampleFrequency(String sampleFrequency) { this.sampleFrequency = sampleFrequency; @@ -345,7 +345,7 @@ * Returns the number of channels for the audio. * * @return The number of channels - * @since 1.50 + * @since 1.50.0 * @deprecated Use getAudioProperties().getNumberOfChannels() instead */ @Deprecated @@ -357,7 +357,7 @@ * Sets the number of channels for the audio. * * @param numberOfChannels The number of channels to set. - * @since 1.50 + * @since 1.50.0 * @deprecated Use getAudioProperties().setNumberOfChannels(int numberOfChannels) instead */ @Deprecated @@ -370,7 +370,7 @@ * Returns the name of the audio codec that is being used. * * @return The name of the audio codec. - * @since 1.50 + * @since 1.50.0 */ public String getCodecA() { return codecA; @@ -380,7 +380,7 @@ * Sets the name of the audio codec that is being used. * * @param codecA The name of the audio codec to set. - * @since 1.50 + * @since 1.50.0 */ public void setCodecA(String codecA) { this.codecA = codecA; @@ -390,7 +390,7 @@ * Returns the name of the album to which an audio track belongs. * * @return The album name. - * @since 1.50 + * @since 1.50.0 */ public String getAlbum() { return album; @@ -400,7 +400,7 @@ * Sets the name of the album to which an audio track belongs. * * @param album The name of the album to set. - * @since 1.50 + * @since 1.50.0 */ public void setAlbum(String album) { this.album = album; @@ -410,7 +410,7 @@ * Returns the name of the artist performing the audio track. * * @return The artist name. - * @since 1.50 + * @since 1.50.0 */ public String getArtist() { return artist; @@ -420,7 +420,7 @@ * Sets the name of the artist performing the audio track. * * @param artist The artist name to set. - * @since 1.50 + * @since 1.50.0 */ public void setArtist(String artist) { this.artist = artist; @@ -430,7 +430,7 @@ * Returns the name of the song for the audio track. * * @return The song name. - * @since 1.50 + * @since 1.50.0 */ public String getSongname() { return songname; @@ -440,7 +440,7 @@ * Sets the name of the song for the audio track. * * @param songname The song name to set. - * @since 1.50 + * @since 1.50.0 */ public void setSongname(String songname) { this.songname = songname; @@ -450,7 +450,7 @@ * Returns the name of the genre for the audio track. * * @return The genre name. - * @since 1.50 + * @since 1.50.0 */ public String getGenre() { return genre; @@ -460,7 +460,7 @@ * Sets the name of the genre for the audio track. * * @param genre The name of the genre to set. - * @since 1.50 + * @since 1.50.0 */ public void setGenre(String genre) { this.genre = genre; @@ -470,7 +470,7 @@ * Returns the year of inception for the audio track. * * @return The year. - * @since 1.50 + * @since 1.50.0 */ public int getYear() { return year; @@ -480,7 +480,7 @@ * Sets the year of inception for the audio track. * * @param year The year to set. - * @since 1.50 + * @since 1.50.0 */ public void setYear(int year) { this.year = year; @@ -490,7 +490,7 @@ * Returns the track number within an album for the audio. * * @return The track number. - * @since 1.50 + * @since 1.50.0 */ public int getTrack() { return track; @@ -500,7 +500,7 @@ * Sets the track number within an album for the audio. * * @param track The track number to set. - * @since 1.50 + * @since 1.50.0 */ public void setTrack(int track) { this.track = track; @@ -510,7 +510,7 @@ * Returns the delay for the audio. * * @return The delay. - * @since 1.50 + * @since 1.50.0 * @deprecated Use getAudioProperties().getAudioDelay() instead */ @Deprecated @@ -522,7 +522,7 @@ * Sets the delay for the audio. * * @param audioDelay The delay to set. - * @since 1.50 + * @since 1.50.0 * @deprecated Use getAudioProperties().setAudioDelay(int audioDelay) instead */ @Deprecated @@ -535,7 +535,7 @@ * Returns the flavor for the audio. * * @return The flavor. - * @since 1.50 + * @since 1.50.0 */ public String getFlavor() { return flavor; @@ -545,7 +545,7 @@ * Sets the flavor for the audio. * * @param flavor The flavor to set. - * @since 1.50 + * @since 1.50.0 */ public void setFlavor(String flavor) { this.flavor = flavor; @@ -555,7 +555,7 @@ * Returns the audio codec to use for muxing. * * @return The audio codec to use. - * @since 1.50 + * @since 1.50.0 */ public String getMuxingModeAudio() { return muxingModeAudio; @@ -565,7 +565,7 @@ * Sets the audio codec to use for muxing. * * @param muxingModeAudio The audio codec to use. - * @since 1.50 + * @since 1.50.0 */ public void setMuxingModeAudio(String muxingModeAudio) { this.muxingModeAudio = muxingModeAudio; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaDatabase.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaDatabase.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaDatabase.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaDatabase.java 2013-04-22 19:41:39.000000000 +0000 @@ -144,7 +144,7 @@ if (!FileUtils.exists(dbDir)){ LOGGER.debug("The cache has been deleted because it was corrupt or had the wrong version"); } else { - if(!java.awt.GraphicsEnvironment.isHeadless()) { + if (!java.awt.GraphicsEnvironment.isHeadless()) { JOptionPane.showMessageDialog( (JFrame) (SwingUtilities.getWindowAncestor((Component) PMS.get().getFrame())), String.format(Messages.getString("DLNAMediaDatabase.5"), dbDir), diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaInfo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaInfo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaInfo.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaInfo.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,6 +18,8 @@ */ package net.pms.dlna; +import com.sun.jna.Platform; + import java.awt.Color; import java.awt.Font; import java.awt.Graphics; @@ -39,8 +41,10 @@ import javax.imageio.ImageIO; -import net.coobird.thumbnailator.Thumbnails; +import net.coobird.thumbnailator.tasks.UnsupportedFormatException; import net.coobird.thumbnailator.Thumbnails.Builder; +import net.coobird.thumbnailator.Thumbnails; + import net.pms.PMS; import net.pms.configuration.RendererConfiguration; import net.pms.formats.AudioAsVideo; @@ -62,20 +66,19 @@ import org.apache.sanselan.formats.jpeg.JpegImageMetadata; import org.apache.sanselan.formats.tiff.TiffField; import org.apache.sanselan.formats.tiff.constants.TiffConstants; + import org.jaudiotagger.audio.AudioFile; import org.jaudiotagger.audio.AudioFileIO; import org.jaudiotagger.audio.AudioHeader; import org.jaudiotagger.tag.FieldKey; import org.jaudiotagger.tag.Tag; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sun.jna.Platform; - - /** - * This class keeps track of scanned MediaInfo library information. - * + * This class keeps track of media file metadata scanned by the MediaInfo library. + * * TODO: Change all instance variables to private. For backwards compatibility * with external plugin code the variables have all been marked as deprecated * instead of changed to private, but this will surely change in the future. @@ -83,7 +86,9 @@ * removed. */ public class DLNAMediaInfo implements Cloneable { - private static final Logger logger = LoggerFactory.getLogger(DLNAMediaInfo.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DLNAMediaInfo.class); + private static final String THUMBNAIL_DIRECTORY_NAME = "thumbs"; + public static final long ENDFILE_POS = 99999475712L; public static final long TRANS_SIZE = 100000000000L; private boolean h264_parsed; @@ -91,6 +96,39 @@ // Stored in database private Double durationSec; + private static final Map AUDIO_CHANNEL_LAYOUT = new HashMap(); + + // map ffmpeg's audio layout field to the corresponding number of channels + // see: libavutil/channel_layout.c + static { + AUDIO_CHANNEL_LAYOUT.put("mono", 1); + AUDIO_CHANNEL_LAYOUT.put("downmix", 2); + AUDIO_CHANNEL_LAYOUT.put("stereo", 2); + AUDIO_CHANNEL_LAYOUT.put("2.1", 3); + AUDIO_CHANNEL_LAYOUT.put("3.0", 3); + AUDIO_CHANNEL_LAYOUT.put("3.0(back)", 3); + AUDIO_CHANNEL_LAYOUT.put("4.0", 4); + AUDIO_CHANNEL_LAYOUT.put("quad", 4); + AUDIO_CHANNEL_LAYOUT.put("quad(side)", 4); + AUDIO_CHANNEL_LAYOUT.put("3.1", 4); + AUDIO_CHANNEL_LAYOUT.put("5.0", 5); + AUDIO_CHANNEL_LAYOUT.put("5.0(side)", 5); + AUDIO_CHANNEL_LAYOUT.put("4.1", 5); + AUDIO_CHANNEL_LAYOUT.put("5:1", 6); + AUDIO_CHANNEL_LAYOUT.put("5.1", 6); + AUDIO_CHANNEL_LAYOUT.put("5.1(side)", 6); + AUDIO_CHANNEL_LAYOUT.put("6.0", 6); + AUDIO_CHANNEL_LAYOUT.put("6.0(front)", 6); + AUDIO_CHANNEL_LAYOUT.put("hexagonal", 6); + AUDIO_CHANNEL_LAYOUT.put("6.1", 7); + AUDIO_CHANNEL_LAYOUT.put("6.1(front)", 7); + AUDIO_CHANNEL_LAYOUT.put("7.0", 7); + AUDIO_CHANNEL_LAYOUT.put("7.0(front)", 7); + AUDIO_CHANNEL_LAYOUT.put("7.1", 8); + AUDIO_CHANNEL_LAYOUT.put("7.1(wide)", 8); + AUDIO_CHANNEL_LAYOUT.put("octagonal", 8); + } + /** * @deprecated Use standard getter and setter to access this variable. */ @@ -217,7 +255,7 @@ * @deprecated Use standard getter and setter to access this variable. */ @Deprecated - public boolean thumbready; + public boolean thumbready; /** * @deprecated Use standard getter and setter to access this variable. @@ -255,8 +293,8 @@ if (mediaRenderer.isBRAVIA() && getCodecV() != null && getCodecV().startsWith("mpeg2")) { muxable = true; } - if (mediaRenderer.isBRAVIA() && getHeight() < 288) // not supported for these small heights - { + + if (mediaRenderer.isBRAVIA() && getHeight() < 288) { // not supported for these small heights muxable = false; } @@ -271,6 +309,7 @@ if (extras == null) { extras = new HashMap(); } + extras.put(key, value); } @@ -278,13 +317,16 @@ if (extras == null) { return null; } + StringBuilder sb = new StringBuilder(); + for (Map.Entry entry : extras.entrySet()) { sb.append(entry.getKey()); sb.append("|"); sb.append(entry.getValue()); sb.append("|"); } + return sb.toString(); } @@ -295,7 +337,7 @@ try { putExtra(st.nextToken(), st.nextToken()); } catch (NoSuchElementException nsee) { - logger.debug("Caught exception", nsee); + LOGGER.debug("Caught exception", nsee); } } } @@ -316,17 +358,21 @@ String args[] = new String[14]; args[0] = getFfmpegPath(); boolean dvrms = media.getFile() != null && media.getFile().getAbsolutePath().toLowerCase().endsWith("dvr-ms"); + if (dvrms && StringUtils.isNotBlank(PMS.getConfiguration().getFfmpegAlternativePath())) { args[0] = PMS.getConfiguration().getFfmpegAlternativePath(); } + args[1] = "-ss"; args[2] = "" + PMS.getConfiguration().getThumbnailSeekPos(); args[3] = "-i"; + if (media.getFile() != null) { args[4] = ProcessUtil.getShortFileNameIfWideChars(media.getFile().getAbsolutePath()); } else { args[4] = "-"; } + args[5] = "-an"; args[6] = "-an"; args[7] = "-s"; @@ -336,6 +382,7 @@ args[11] = "-f"; args[12] = "image2"; args[13] = "pipe:"; + // FIXME MPlayer should not be used if thumbnail generation is disabled (and it should be disabled in the GUI) if (!PMS.getConfiguration().isThumbnailGenerationEnabled() || (PMS.getConfiguration().isUseMplayerForVideoThumbs() && !dvrms)) { args[2] = "0"; @@ -343,12 +390,15 @@ args[i] = "-an"; } } + OutputParams params = new OutputParams(PMS.getConfiguration()); params.maxBufferSize = 1; params.stdin = media.getPush(); params.noexitcheck = true; // not serious if anything happens during the thumbnailer + // true: consume stderr on behalf of the caller i.e. parse() final ProcessWrapperImpl pw = new ProcessWrapperImpl(args, params, false, true); + // FAILSAFE setParsing(true); Runnable r = new Runnable() { @@ -356,12 +406,12 @@ try { Thread.sleep(10000); ffmpeg_failure = true; - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } pw.stopProcess(); setParsing(false); } }; + Thread failsafe = new Thread(r, "FFMpeg Thumbnail Failsafe"); failsafe.start(); pw.runInSameThread(); @@ -376,11 +426,13 @@ boolean toolong = getDurationInSeconds() < PMS.getConfiguration().getThumbnailSeekPos(); args[2] = "" + (toolong ? (getDurationInSeconds() / 2) : PMS.getConfiguration().getThumbnailSeekPos()); args[3] = "-quiet"; + if (media.getFile() != null) { args[4] = ProcessUtil.getShortFileNameIfWideChars(media.getFile().getAbsolutePath()); } else { args[4] = "-"; } + args[5] = "-msglevel"; args[6] = "all=4"; args[7] = "-vf"; @@ -400,20 +452,20 @@ params.log = true; params.noexitcheck = true; // not serious if anything happens during the thumbnailer final ProcessWrapperImpl pw = new ProcessWrapperImpl(args, params); + // FAILSAFE setParsing(true); Runnable r = new Runnable() { - public void run() { try { Thread.sleep(3000); //mplayer_thumb_failure = true; - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } pw.stopProcess(); setParsing(false); } }; + Thread failsafe = new Thread(r, "MPlayer Thumbnail Failsafe"); failsafe.start(); pw.runInSameThread(); @@ -423,58 +475,67 @@ private String getFfmpegPath() { String value = PMS.getConfiguration().getFfmpegPath(); + if (value == null) { - logger.info("No ffmpeg - unable to thumbnail"); + LOGGER.info("No ffmpeg - unable to thumbnail"); throw new RuntimeException("No ffmpeg - unable to thumbnail"); } else { return value; } } - public void parse(InputFile f, Format ext, int type, boolean thumbOnly) { + public void parse(InputFile inputFile, Format ext, int type, boolean thumbOnly) { int i = 0; + while (isParsing()) { if (i == 5) { setMediaparsed(true); break; } + try { Thread.sleep(1000); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + i++; } + if (isMediaparsed()) { return; } - - if (f != null) { - - if (f.getFile() != null) { - setSize(f.getFile().length()); + if (inputFile != null) { + if (inputFile.getFile() != null) { + setSize(inputFile.getFile().length()); } else { - setSize(f.getSize()); + setSize(inputFile.getSize()); } + ProcessWrapperImpl pw = null; boolean ffmpeg_parsing = true; + if (type == Format.AUDIO || ext instanceof AudioAsVideo) { ffmpeg_parsing = false; DLNAMediaAudio audio = new DLNAMediaAudio(); - if (f.getFile() != null) { + + if (inputFile.getFile() != null) { try { - AudioFile af = AudioFileIO.read(f.getFile()); + AudioFile af = AudioFileIO.read(inputFile.getFile()); AudioHeader ah = af.getAudioHeader(); + if (ah != null && !thumbOnly) { int length = ah.getTrackLength(); int rate = ah.getSampleRateAsNumber(); + if (ah.getEncodingType().toLowerCase().contains("flac 24")) { audio.setBitsperSample(24); } + audio.setSampleFrequency("" + rate); setDuration((double) length); setBitrate((int) ah.getBitRateAsNumber()); audio.getAudioProperties().setNumberOfChannels(2); + if (ah.getChannels() != null && ah.getChannels().toLowerCase().contains("mono")) { audio.getAudioProperties().setNumberOfChannels(1); } else if (ah.getChannels() != null && ah.getChannels().toLowerCase().contains("stereo")) { @@ -482,25 +543,38 @@ } else if (ah.getChannels() != null) { audio.getAudioProperties().setNumberOfChannels(Integer.parseInt(ah.getChannels())); } + audio.setCodecA(ah.getEncodingType().toLowerCase()); + if (audio.getCodecA().contains("(windows media")) { audio.setCodecA(audio.getCodecA().substring(0, audio.getCodecA().indexOf("(windows media")).trim()); } } + Tag t = af.getTag(); + if (t != null) { if (t.getArtworkList().size() > 0) { setThumb(t.getArtworkList().get(0).getBinaryData()); } else { if (PMS.getConfiguration().getAudioThumbnailMethod() > 0) { - setThumb(CoverUtil.get().getThumbnailFromArtistAlbum(PMS.getConfiguration().getAudioThumbnailMethod() == 1 ? CoverUtil.AUDIO_AMAZON : CoverUtil.AUDIO_DISCOGS, audio.getArtist(), audio.getAlbum())); + setThumb( + CoverUtil.get().getThumbnailFromArtistAlbum( + PMS.getConfiguration().getAudioThumbnailMethod() == 1 ? + CoverUtil.AUDIO_AMAZON : + CoverUtil.AUDIO_DISCOGS, + audio.getArtist(), audio.getAlbum() + ) + ); } } + if (!thumbOnly) { audio.setAlbum(t.getFirst(FieldKey.ALBUM)); audio.setArtist(t.getFirst(FieldKey.ARTIST)); audio.setSongname(t.getFirst(FieldKey.TITLE)); String y = t.getFirst(FieldKey.YEAR); + try { if (y.length() > 4) { y = y.substring(0, 4); @@ -510,36 +584,42 @@ audio.setTrack(Integer.parseInt(((y != null && y.length() > 0) ? y : "1"))); audio.setGenre(t.getFirst(FieldKey.GENRE)); } catch (Throwable e) { - logger.debug("Error parsing unimportant metadata: " + e.getMessage()); + LOGGER.debug("Error parsing unimportant metadata: " + e.getMessage()); } } } } catch (Throwable e) { - logger.debug("Error parsing audio file: " + e.getMessage() + " - " + (e.getCause() != null ? e.getCause().getMessage() : "")); + LOGGER.debug("Error parsing audio file: {} - {}", e.getMessage(), e.getCause() != null ? e.getCause().getMessage() : ""); ffmpeg_parsing = false; } + if (audio.getSongname() == null || audio.getSongname().length() == 0) { - audio.setSongname(f.getFile().getName()); + audio.setSongname(inputFile.getFile().getName()); } + if (!ffmpeg_parsing) { getAudioTracksList().add(audio); } } } - if (type == Format.IMAGE && f.getFile() != null) { + + if (type == Format.IMAGE && inputFile.getFile() != null) { try { ffmpeg_parsing = false; - ImageInfo info = Sanselan.getImageInfo(f.getFile()); + ImageInfo info = Sanselan.getImageInfo(inputFile.getFile()); setWidth(info.getWidth()); setHeight(info.getHeight()); setBitsPerPixel(info.getBitsPerPixel()); String formatName = info.getFormatName(); + if (formatName.startsWith("JPEG")) { setCodecV("jpg"); - IImageMetadata meta = Sanselan.getMetadata(f.getFile()); + IImageMetadata meta = Sanselan.getMetadata(inputFile.getFile()); + if (meta != null && meta instanceof JpegImageMetadata) { JpegImageMetadata jpegmeta = (JpegImageMetadata) meta; TiffField tf = jpegmeta.findEXIFValue(TiffConstants.EXIF_TAG_MODEL); + if (tf != null) { setModel(tf.getStringValue().trim()); } @@ -568,74 +648,84 @@ } else if (formatName.startsWith("TIF")) { setCodecV("tiff"); } + setContainer(getCodecV()); } catch (Throwable e) { // ffmpeg_parsing = true; - logger.info("Error parsing image with Sanselan... switching to FFmpeg: " + e.getMessage()); + LOGGER.info("Error parsing image ({}) with Sanselan, switching to FFmpeg", inputFile.getFile().getAbsolutePath(), e); } + } + if (PMS.getConfiguration().getImageThumbnailsEnabled()) { try { - if (PMS.getConfiguration().getImageThumbnailsEnabled()) { - File thumbDir = new File(PMS.getConfiguration().getTempFolder() + "/thumbs/"); + File thumbDir = new File(PMS.getConfiguration().getTempFolder(), THUMBNAIL_DIRECTORY_NAME); - if (!thumbDir.exists() && !thumbDir.mkdirs()) { - logger.debug("Could not create directory \"" + thumbDir.getAbsolutePath() + "\""); - } else { - String thumbFilename = thumbDir + f.getFile().getName() + ".jpg"; + LOGGER.trace("Generating thumbnail for: {}", inputFile.getFile().getAbsolutePath()); - logger.trace("Creating thumbnail \"" + thumbFilename + "\""); + if (!thumbDir.exists() && !thumbDir.mkdirs()) { + LOGGER.warn("Could not create thumbnail directory: {}", thumbDir.getAbsolutePath()); + } else { + File thumbFile = new File(thumbDir, inputFile.getFile().getName() + ".jpg"); + String thumbFilename = thumbFile.getAbsolutePath(); - // Create the thumbnail image using the Thumbnailator library - final Builder thumbnail = Thumbnails.of(f.getFile()); - thumbnail.size(320, 180); - thumbnail.outputFormat("jpg"); - thumbnail.outputQuality(1.0f); - thumbnail.toFile(thumbFilename); - - File jpg = new File(thumbFilename); - - if (jpg.exists()) { - InputStream is = new FileInputStream(jpg); - int sz = is.available(); - - if (sz > 0) { - setThumb(new byte[sz]); - is.read(getThumb()); - } + LOGGER.trace("Creating (temporary) thumbnail: {}", thumbFilename); - is.close(); + // Create the thumbnail image using the Thumbnailator library + final Builder thumbnail = Thumbnails.of(inputFile.getFile()); + thumbnail.size(320, 180); + thumbnail.outputFormat("jpg"); + thumbnail.outputQuality(1.0f); + thumbnail.toFile(thumbFilename); - if (!jpg.delete()) { - jpg.deleteOnExit(); - } + File jpg = new File(thumbFilename); + + if (jpg.exists()) { + InputStream is = new FileInputStream(jpg); + int sz = is.available(); + + if (sz > 0) { + setThumb(new byte[sz]); + is.read(getThumb()); + } + + is.close(); + + if (!jpg.delete()) { + jpg.deleteOnExit(); } } } + } catch (UnsupportedFormatException ufe) { + LOGGER.warn("Can't create thumbnail for {}: {}", inputFile.getFile().getAbsolutePath(), ufe.getMessage()); } catch (Exception e) { - logger.info("Error generating thumbnail of image", e); + LOGGER.warn("Error generating thumbnail for: {}", inputFile.getFile().getAbsolutePath(), e); } } if (ffmpeg_parsing) { if (!thumbOnly || !PMS.getConfiguration().isUseMplayerForVideoThumbs()) { - pw = getFFMpegThumbnail(f); + pw = getFFMpegThumbnail(inputFile); } + String input = "-"; boolean dvrms = false; - if (f.getFile() != null) { - input = ProcessUtil.getShortFileNameIfWideChars(f.getFile().getAbsolutePath()); - dvrms = f.getFile().getAbsolutePath().toLowerCase().endsWith("dvr-ms"); + + if (inputFile.getFile() != null) { + input = ProcessUtil.getShortFileNameIfWideChars(inputFile.getFile().getAbsolutePath()); + dvrms = inputFile.getFile().getAbsolutePath().toLowerCase().endsWith("dvr-ms"); } - if (!ffmpeg_failure && !thumbOnly) { + if (!ffmpeg_failure && !thumbOnly) { if (input.equals("-")) { input = "pipe:"; } + boolean matchs = false; ArrayList lines = (ArrayList) pw.getResults(); int langId = 0; int subId = 0; ListIterator FFmpegMetaData = lines.listIterator(); + for (String line : lines) { FFmpegMetaData.next(); line = line.trim(); @@ -664,7 +754,7 @@ } else { setDuration(parseDurationString(durationStr)); } - + } else if (token.startsWith("bitrate: ")) { String bitr = token.substring(9); int spacepos = bitr.indexOf(" "); @@ -700,29 +790,23 @@ try { audio.setId(Integer.parseInt(idString, 16)); } catch (NumberFormatException nfe) { - logger.debug("Error parsing Stream ID: " + idString); + LOGGER.debug("Error parsing Stream ID: " + idString); } } while (st.hasMoreTokens()) { String token = st.nextToken().trim(); + Integer nChannels; + if (token.startsWith("Stream")) { audio.setCodecA(token.substring(token.indexOf("Audio: ") + 7)); - } else if (token.endsWith("Hz")) { audio.setSampleFrequency(token.substring(0, token.indexOf("Hz")).trim()); - } else if (token.equals("mono")) { - audio.getAudioProperties().setNumberOfChannels(1); - } else if (token.equals("stereo")) { - audio.getAudioProperties().setNumberOfChannels(2); - } else if (token.equals("5:1") || token.equals("5.1") || token.equals("6 channels")) { - audio.getAudioProperties().setNumberOfChannels(6); - } else if (token.equals("5 channels")) { - audio.getAudioProperties().setNumberOfChannels(5); - } else if (token.equals("4 channels")) { - audio.getAudioProperties().setNumberOfChannels(4); - } else if (token.equals("2 channels")) { - audio.getAudioProperties().setNumberOfChannels(2); + } else if ((nChannels = AUDIO_CHANNEL_LAYOUT.get(token)) != null) { + audio.getAudioProperties().setNumberOfChannels(nChannels); + } else if (token.matches("\\d+(?:\\s+channels?)")) { // implicitly anchored at both ends e.g. ^ ... $ + // setNumberOfChannels(String) parses the number out of the string + audio.getAudioProperties().setNumberOfChannels(token); } else if (token.equals("s32")) { audio.setBitsperSample(32); } else if (token.equals("s24")) { @@ -731,6 +815,7 @@ audio.setBitsperSample(16); } } + int FFmpegMetaDataNr = FFmpegMetaData.nextIndex(); if (FFmpegMetaDataNr > -1) line = lines.get(FFmpegMetaDataNr); if (line.indexOf("Metadata:") > -1) { @@ -768,7 +853,7 @@ } } catch (NumberFormatException nfe) { // Could happen if tbc is "1k" or something like that, no big deal - logger.debug("Could not parse frame rate \"" + frameRateDoubleString + "\""); + LOGGER.debug("Could not parse frame rate \"" + frameRateDoubleString + "\""); } } else if ((token.indexOf("tbr") > -1 || token.indexOf("tb(r)") > -1) && getFrameRate() == null) { @@ -783,12 +868,12 @@ try { setWidth(Integer.parseInt(resolution.substring(0, resolution.indexOf("x")))); } catch (NumberFormatException nfe) { - logger.debug("Could not parse width from \"" + resolution.substring(0, resolution.indexOf("x")) + "\""); + LOGGER.debug("Could not parse width from \"" + resolution.substring(0, resolution.indexOf("x")) + "\""); } try { setHeight(Integer.parseInt(resolution.substring(resolution.indexOf("x") + 1))); } catch (NumberFormatException nfe) { - logger.debug("Could not parse height from \"" + resolution.substring(resolution.indexOf("x") + 1) + "\""); + LOGGER.debug("Could not parse height from \"" + resolution.substring(resolution.indexOf("x") + 1) + "\""); } } } @@ -802,12 +887,18 @@ } else { lang.setLang(DLNAMediaLang.UND); } + lang.setId(subId++); int FFmpegMetaDataNr = FFmpegMetaData.nextIndex(); - if (FFmpegMetaDataNr > -1) line = lines.get(FFmpegMetaDataNr); + + if (FFmpegMetaDataNr > -1) { + line = lines.get(FFmpegMetaDataNr); + } + if (line.indexOf("Metadata:") > -1) { FFmpegMetaDataNr = FFmpegMetaDataNr + 1; line = lines.get(FFmpegMetaDataNr); + while (line.indexOf(" ") == 0) { if (line.toLowerCase().indexOf("title :") > -1) { int aa = line.indexOf(": "); @@ -828,44 +919,48 @@ } } - if (!thumbOnly && getContainer() != null && f.getFile() != null && getContainer().equals("mpegts") && isH264() && getDurationInSeconds() == 0) { + if (!thumbOnly && getContainer() != null && inputFile.getFile() != null && getContainer().equals("mpegts") && isH264() && getDurationInSeconds() == 0) { // let's do the parsing for getting the duration... try { - int length = MpegUtil.getDurationFromMpeg(f.getFile()); + int length = MpegUtil.getDurationFromMpeg(inputFile.getFile()); if (length > 0) { setDuration((double) length); } } catch (IOException e) { - logger.trace("Error retrieving length: " + e.getMessage()); + LOGGER.trace("Error retrieving length: " + e.getMessage()); } } if (PMS.getConfiguration().isUseMplayerForVideoThumbs() && type == Format.VIDEO && !dvrms) { try { - getMplayerThumbnail(f); - String frameName = "" + f.hashCode(); + getMplayerThumbnail(inputFile); + String frameName = "" + inputFile.hashCode(); frameName = PMS.getConfiguration().getTempFolder() + "/mplayer_thumbs/" + frameName + "00000001/00000001.jpg"; frameName = frameName.replace(',', '_'); File jpg = new File(frameName); + if (jpg.exists()) { InputStream is = new FileInputStream(jpg); int sz = is.available(); + if (sz > 0) { setThumb(new byte[sz]); is.read(getThumb()); } + is.close(); + if (!jpg.delete()) { jpg.deleteOnExit(); } // Try and retry if (!jpg.getParentFile().delete() && !jpg.getParentFile().delete()) { - logger.debug("Failed to delete \"" + jpg.getParentFile().getAbsolutePath() + "\""); + LOGGER.debug("Failed to delete \"" + jpg.getParentFile().getAbsolutePath() + "\""); } } } catch (IOException e) { - logger.debug("Caught exception", e); + LOGGER.debug("Caught exception", e); } } @@ -900,11 +995,12 @@ } } } catch (IOException e) { - logger.debug("Error while decoding thumbnail: " + e.getMessage()); + LOGGER.debug("Error while decoding thumbnail: " + e.getMessage()); } } } - finalize(type, f); + + finalize(type, inputFile); setMediaparsed(true); } } @@ -927,7 +1023,7 @@ } /** - * + * * @return 0 if nothing is specified, otherwise the duration */ public double getDurationInSeconds() { @@ -949,20 +1045,24 @@ if (duration == null) { return null; } + StringTokenizer st = new StringTokenizer(duration, ":"); + try { int h = Integer.parseInt(st.nextToken()); int m = Integer.parseInt(st.nextToken()); double s = Double.parseDouble(st.nextToken()); return h * 3600 + m * 60 + s; } catch (NumberFormatException nfe) { - logger.debug("Failed to parse duration \"" + duration + "\""); + LOGGER.debug("Failed to parse duration \"" + duration + "\""); } + return null; } public void finalize(int type, InputFile f) { String codecA = null; + if (getFirstAudioTrack() != null) { codecA = getFirstAudioTrack().getCodecA(); } @@ -1016,8 +1116,9 @@ if (getCodecV().equals("h264") && getContainer() != null && (getContainer().equals("matroska") || getContainer().equals("mkv") || getContainer().equals("mov") || getContainer().equals("mp4"))) { // containers without h264_annexB byte headers[][] = getAnnexBFrameHeader(f); if (ffmpeg_annexb_failure) { - logger.info("Fatal error when retrieving AVC informations !"); + LOGGER.info("Fatal error when retrieving AVC informations !"); } + if (headers != null) { setH264AnnexB(headers[1]); if (getH264AnnexB() != null) { @@ -1029,7 +1130,7 @@ System.arraycopy(getH264AnnexB(), skip, header, 0, header.length); AVCHeader avcHeader = new AVCHeader(header); avcHeader.parse(); - logger.trace("H264 file: " + f.getFilename() + ": Profile: " + avcHeader.getProfile() + " / level: " + avcHeader.getLevel() + " / ref frames: " + avcHeader.getRef_frames()); + LOGGER.trace("H264 file: " + f.getFilename() + ": Profile: " + avcHeader.getProfile() + " / level: " + avcHeader.getLevel() + " / ref frames: " + avcHeader.getRef_frames()); muxable = true; // Check if file is compliant with Level4.1 @@ -1040,7 +1141,7 @@ } } if (!muxable) { - logger.debug("H264 file: " + f.getFilename() + " is not ps3 compatible !"); + LOGGER.debug("H264 file: " + f.getFilename() + " is not ps3 compatible !"); } } else { muxable = false; @@ -1050,8 +1151,10 @@ } } } + h264_parsed = true; } + return muxable; } @@ -1065,15 +1168,18 @@ public String toString() { String s = "container: " + getContainer() + " / bitrate: " + getBitrate() + " / size: " + getSize() + " / codecV: " + getCodecV() + " / duration: " + getDurationString() + " / width: " + getWidth() + " / height: " + getHeight() + " / frameRate: " + getFrameRate() + " / thumb size : " + (getThumb() != null ? getThumb().length : 0) + " / muxingMode: " + getMuxingMode(); + for (DLNAMediaAudio audio : getAudioTracksList()) { s += "\n\taudio: id=" + audio.getId() + " / lang: " + audio.getLang() + " / flavor: " + audio.getFlavor() + " / codec: " + audio.getCodecA() + " / sf:" + audio.getSampleFrequency() + " / na: " + (audio.getAudioProperties() != null ? audio.getAudioProperties().getNumberOfChannels() : "-") + " / bs: " + audio.getBitsperSample(); if (audio.getArtist() != null) { s += " / " + audio.getArtist() + "|" + audio.getAlbum() + "|" + audio.getSongname() + "|" + audio.getYear() + "|" + audio.getTrack(); } } + for (DLNAMediaSubtitle sub : getSubtitleTracksList()) { s += "\n\tsub: id=" + sub.getId() + " / lang: " + sub.getLang() + " / flavor: " + sub.getFlavor() + " / type: " + (sub.getType() != null ? sub.getType().toString() : "null"); } + return s; } @@ -1083,9 +1189,11 @@ public String getValidFps(boolean ratios) { String validFrameRate = null; + if (getFrameRate() != null && getFrameRate().length() > 0) { try { double fr = Double.parseDouble(getFrameRate().replace(',', '.')); + if (fr >= 14.99 && fr < 15.1) { validFrameRate = "15"; } else if (fr > 23.9 && fr < 23.99) { @@ -1108,10 +1216,10 @@ validFrameRate = "60"; } } catch (NumberFormatException nfe) { - logger.error(null, nfe); + LOGGER.error(null, nfe); } - } + return validFrameRate; } @@ -1124,15 +1232,19 @@ public String getValidAspect(boolean ratios) { String a = null; + if (getAspect() != null) { double ar = Double.parseDouble(getAspect()); + if (ar > 1.7 && ar < 1.8) { a = ratios ? "16/9" : "1.777777777777777"; } + if (ar > 1.3 && ar < 1.4) { a = ratios ? "4/3" : "1.333333333333333"; } } + return a; } @@ -1140,6 +1252,7 @@ if (getWidth() > 0 && getHeight() > 0) { return getWidth() + "x" + getHeight(); } + return null; } @@ -1147,6 +1260,7 @@ if (getBitrate() > 0) { return (getBitrate() / 8); } + int realBitrate = 10000000; if (getDurationInSeconds() != 0) { @@ -1165,14 +1279,16 @@ } public byte[][] getAnnexBFrameHeader(InputFile f) { - String cmdArray[] = new String[14]; + String[] cmdArray = new String[14]; cmdArray[0] = PMS.getConfiguration().getFfmpegPath(); cmdArray[1] = "-i"; + if (f.getPush() == null && f.getFilename() != null) { cmdArray[2] = f.getFilename(); } else { cmdArray[2] = "-"; } + cmdArray[3] = "-vframes"; cmdArray[4] = "1"; cmdArray[5] = "-vcodec"; @@ -1185,8 +1301,7 @@ cmdArray[12] = "-y"; cmdArray[13] = "pipe:"; - byte returnData[][] = new byte[2][]; - + byte[][] returnData = new byte[2][]; OutputParams params = new OutputParams(PMS.getConfiguration()); params.maxBufferSize = 1; params.stdin = f.getPush(); @@ -1194,40 +1309,41 @@ final ProcessWrapperImpl pw = new ProcessWrapperImpl(cmdArray, params); Runnable r = new Runnable() { - public void run() { try { Thread.sleep(3000); ffmpeg_annexb_failure = true; - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } pw.stopProcess(); } }; + Thread failsafe = new Thread(r, "FFMpeg AnnexB Frame Header Failsafe"); failsafe.start(); pw.runInSameThread(); + if (ffmpeg_annexb_failure) { return null; } InputStream is = null; ByteArrayOutputStream baot = new ByteArrayOutputStream(); + try { is = pw.getInputStream(0); byte b[] = new byte[4096]; int n = -1; + while ((n = is.read(b)) > 0) { baot.write(b, 0, n); } + byte data[] = baot.toByteArray(); baot.close(); - returnData[0] = data; - is.close(); - int kf = 0; + for (int i = 3; i < data.length; i++) { if (data[i - 3] == 1 && (data[i - 2] & 37) == 37 && (data[i - 1] & -120) == -120) { kf = i - 2; @@ -1237,6 +1353,7 @@ int st = 0; boolean found = false; + if (kf > 0) { for (int i = kf; i >= 5; i--) { if (data[i - 5] == 0 && data[i - 4] == 0 && data[i - 3] == 0 && (data[i - 2] & 1) == 1 && (data[i - 1] & 39) == 39) { @@ -1253,21 +1370,26 @@ returnData[1] = header; } } catch (IOException e) { - logger.debug("Caught exception", e); + LOGGER.debug("Caught exception", e); } + return returnData; } @Override protected Object clone() throws CloneNotSupportedException { Object cloned = super.clone(); + if (cloned instanceof DLNAMediaInfo) { DLNAMediaInfo mediaCloned = ((DLNAMediaInfo) cloned); mediaCloned.setAudioTracksList(new ArrayList()); + for (DLNAMediaAudio audio : getAudioTracksList()) { mediaCloned.getAudioTracksList().add((DLNAMediaAudio) audio.clone()); } + mediaCloned.setSubtitleTracksList(new ArrayList()); + for (DLNAMediaSubtitle sub : getSubtitleTracksList()) { mediaCloned.getSubtitleTracksList().add((DLNAMediaSubtitle) sub.clone()); } @@ -1278,7 +1400,7 @@ /** * @return the bitrate - * @since 1.50 + * @since 1.50.0 */ public int getBitrate() { return bitrate; @@ -1286,7 +1408,7 @@ /** * @param bitrate the bitrate to set - * @since 1.50 + * @since 1.50.0 */ public void setBitrate(int bitrate) { this.bitrate = bitrate; @@ -1294,7 +1416,7 @@ /** * @return the width - * @since 1.50 + * @since 1.50.0 */ public int getWidth() { return width; @@ -1302,7 +1424,7 @@ /** * @param width the width to set - * @since 1.50 + * @since 1.50.0 */ public void setWidth(int width) { this.width = width; @@ -1310,7 +1432,7 @@ /** * @return the height - * @since 1.50 + * @since 1.50.0 */ public int getHeight() { return height; @@ -1318,7 +1440,7 @@ /** * @param height the height to set - * @since 1.50 + * @since 1.50.0 */ public void setHeight(int height) { this.height = height; @@ -1326,7 +1448,7 @@ /** * @return the size - * @since 1.50 + * @since 1.50.0 */ public long getSize() { return size; @@ -1334,7 +1456,7 @@ /** * @param size the size to set - * @since 1.50 + * @since 1.50.0 */ public void setSize(long size) { this.size = size; @@ -1342,7 +1464,7 @@ /** * @return the codecV - * @since 1.50 + * @since 1.50.0 */ public String getCodecV() { return codecV; @@ -1350,7 +1472,7 @@ /** * @param codecV the codecV to set - * @since 1.50 + * @since 1.50.0 */ public void setCodecV(String codecV) { this.codecV = codecV; @@ -1358,7 +1480,7 @@ /** * @return the frameRate - * @since 1.50 + * @since 1.50.0 */ public String getFrameRate() { return frameRate; @@ -1366,7 +1488,7 @@ /** * @param frameRate the frameRate to set - * @since 1.50 + * @since 1.50.0 */ public void setFrameRate(String frameRate) { this.frameRate = frameRate; @@ -1374,7 +1496,7 @@ /** * @return the frameRateMode - * @since 1.55 + * @since 1.55.0 */ public String getFrameRateMode() { return frameRateMode; @@ -1382,7 +1504,7 @@ /** * @param frameRateMode the frameRateMode to set - * @since 1.55 + * @since 1.55.0 */ public void setFrameRateMode(String frameRateMode) { this.frameRateMode = frameRateMode; @@ -1390,7 +1512,7 @@ /** * @return the aspect - * @since 1.50 + * @since 1.50.0 */ public String getAspect() { return aspect; @@ -1398,7 +1520,7 @@ /** * @param aspect the aspect to set - * @since 1.50 + * @since 1.50.0 */ public void setAspect(String aspect) { this.aspect = aspect; @@ -1406,7 +1528,7 @@ /** * @return the thumb - * @since 1.50 + * @since 1.50.0 */ public byte[] getThumb() { return thumb; @@ -1414,7 +1536,7 @@ /** * @param thumb the thumb to set - * @since 1.50 + * @since 1.50.0 */ public void setThumb(byte[] thumb) { this.thumb = thumb; @@ -1422,7 +1544,7 @@ /** * @return the mimeType - * @since 1.50 + * @since 1.50.0 */ public String getMimeType() { return mimeType; @@ -1430,7 +1552,7 @@ /** * @param mimeType the mimeType to set - * @since 1.50 + * @since 1.50.0 */ public void setMimeType(String mimeType) { this.mimeType = mimeType; @@ -1438,7 +1560,7 @@ /** * @return the bitsPerPixel - * @since 1.50 + * @since 1.50.0 */ public int getBitsPerPixel() { return bitsPerPixel; @@ -1446,7 +1568,7 @@ /** * @param bitsPerPixel the bitsPerPixel to set - * @since 1.50 + * @since 1.50.0 */ public void setBitsPerPixel(int bitsPerPixel) { this.bitsPerPixel = bitsPerPixel; @@ -1454,7 +1576,7 @@ /** * @return the audioTracks - * @since 1.60 + * @since 1.60.0 */ public List getAudioTracksList() { return audioTracks; @@ -1466,7 +1588,7 @@ */ @Deprecated public ArrayList getAudioCodes() { - if(audioTracks instanceof ArrayList) { + if (audioTracks instanceof ArrayList) { return (ArrayList) audioTracks; } else { return new ArrayList(); @@ -1475,7 +1597,7 @@ /** * @param audioTracks the audioTracks to set - * @since 1.60 + * @since 1.60.0 */ public void setAudioTracksList(List audioTracks) { this.audioTracks = audioTracks; @@ -1492,7 +1614,7 @@ /** * @return the subtitleTracks - * @since 1.60 + * @since 1.60.0 */ public List getSubtitleTracksList() { return subtitleTracks; @@ -1504,7 +1626,7 @@ */ @Deprecated public ArrayList getSubtitlesCodes() { - if(subtitleTracks instanceof ArrayList) { + if (subtitleTracks instanceof ArrayList) { return (ArrayList) subtitleTracks; } else { return new ArrayList(); @@ -1513,7 +1635,7 @@ /** * @param subtitleTracks the subtitleTracks to set - * @since 1.60 + * @since 1.60.0 */ public void setSubtitleTracksList(List subtitleTracks) { this.subtitleTracks = subtitleTracks; @@ -1530,7 +1652,7 @@ /** * @return the model - * @since 1.50 + * @since 1.50.0 */ public String getModel() { return model; @@ -1538,7 +1660,7 @@ /** * @param model the model to set - * @since 1.50 + * @since 1.50.0 */ public void setModel(String model) { this.model = model; @@ -1546,7 +1668,7 @@ /** * @return the exposure - * @since 1.50 + * @since 1.50.0 */ public int getExposure() { return exposure; @@ -1554,7 +1676,7 @@ /** * @param exposure the exposure to set - * @since 1.50 + * @since 1.50.0 */ public void setExposure(int exposure) { this.exposure = exposure; @@ -1562,7 +1684,7 @@ /** * @return the orientation - * @since 1.50 + * @since 1.50.0 */ public int getOrientation() { return orientation; @@ -1570,7 +1692,7 @@ /** * @param orientation the orientation to set - * @since 1.50 + * @since 1.50.0 */ public void setOrientation(int orientation) { this.orientation = orientation; @@ -1578,7 +1700,7 @@ /** * @return the iso - * @since 1.50 + * @since 1.50.0 */ public int getIso() { return iso; @@ -1586,7 +1708,7 @@ /** * @param iso the iso to set - * @since 1.50 + * @since 1.50.0 */ public void setIso(int iso) { this.iso = iso; @@ -1594,7 +1716,7 @@ /** * @return the muxingMode - * @since 1.50 + * @since 1.50.0 */ public String getMuxingMode() { return muxingMode; @@ -1602,7 +1724,7 @@ /** * @param muxingMode the muxingMode to set - * @since 1.50 + * @since 1.50.0 */ public void setMuxingMode(String muxingMode) { this.muxingMode = muxingMode; @@ -1610,7 +1732,7 @@ /** * @return the muxingModeAudio - * @since 1.50 + * @since 1.50.0 */ public String getMuxingModeAudio() { return muxingModeAudio; @@ -1618,7 +1740,7 @@ /** * @param muxingModeAudio the muxingModeAudio to set - * @since 1.50 + * @since 1.50.0 */ public void setMuxingModeAudio(String muxingModeAudio) { this.muxingModeAudio = muxingModeAudio; @@ -1626,7 +1748,7 @@ /** * @return the container - * @since 1.50 + * @since 1.50.0 */ public String getContainer() { return container; @@ -1634,7 +1756,7 @@ /** * @param container the container to set - * @since 1.50 + * @since 1.50.0 */ public void setContainer(String container) { this.container = container; @@ -1642,7 +1764,7 @@ /** * @return the h264_annexB - * @since 1.50 + * @since 1.50.0 */ public byte[] getH264AnnexB() { return h264_annexB; @@ -1650,7 +1772,7 @@ /** * @param h264AnnexB the h264_annexB to set - * @since 1.50 + * @since 1.50.0 */ public void setH264AnnexB(byte[] h264AnnexB) { this.h264_annexB = h264AnnexB; @@ -1658,7 +1780,7 @@ /** * @return the mediaparsed - * @since 1.50 + * @since 1.50.0 */ public boolean isMediaparsed() { return mediaparsed; @@ -1666,7 +1788,7 @@ /** * @param mediaparsed the mediaparsed to set - * @since 1.50 + * @since 1.50.0 */ public void setMediaparsed(boolean mediaparsed) { this.mediaparsed = mediaparsed; @@ -1674,7 +1796,7 @@ /** * @return the thumbready - * @since 1.50 + * @since 1.50.0 */ public boolean isThumbready() { return thumbready; @@ -1682,7 +1804,7 @@ /** * @param thumbready the thumbready to set - * @since 1.50 + * @since 1.50.0 */ public void setThumbready(boolean thumbready) { this.thumbready = thumbready; @@ -1690,7 +1812,7 @@ /** * @return the dvdtrack - * @since 1.50 + * @since 1.50.0 */ public int getDvdtrack() { return dvdtrack; @@ -1698,7 +1820,7 @@ /** * @param dvdtrack the dvdtrack to set - * @since 1.50 + * @since 1.50.0 */ public void setDvdtrack(int dvdtrack) { this.dvdtrack = dvdtrack; @@ -1706,7 +1828,7 @@ /** * @return the secondaryFormatValid - * @since 1.50 + * @since 1.50.0 */ public boolean isSecondaryFormatValid() { return secondaryFormatValid; @@ -1714,7 +1836,7 @@ /** * @param secondaryFormatValid the secondaryFormatValid to set - * @since 1.50 + * @since 1.50.0 */ public void setSecondaryFormatValid(boolean secondaryFormatValid) { this.secondaryFormatValid = secondaryFormatValid; @@ -1722,7 +1844,7 @@ /** * @return the parsing - * @since 1.50 + * @since 1.50.0 */ public boolean isParsing() { return parsing; @@ -1730,7 +1852,7 @@ /** * @param parsing the parsing to set - * @since 1.50 + * @since 1.50.0 */ public void setParsing(boolean parsing) { this.parsing = parsing; @@ -1738,7 +1860,7 @@ /** * @return the encrypted - * @since 1.50 + * @since 1.50.0 */ public boolean isEncrypted() { return encrypted; @@ -1746,7 +1868,7 @@ /** * @param encrypted the encrypted to set - * @since 1.50 + * @since 1.50.0 */ public void setEncrypted(boolean encrypted) { this.encrypted = encrypted; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaLang.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaLang.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaLang.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAMediaLang.java 2013-04-22 19:41:39.000000000 +0000 @@ -51,7 +51,7 @@ * "Undetermined" is returned. * * @return The language name - * @since 1.50 + * @since 1.50.0 */ public String getLangFullName() { if (StringUtils.isNotBlank(lang)) { @@ -68,7 +68,7 @@ * Returns the unique id for this language object * * @return The id. - * @since 1.50 + * @since 1.50.0 */ public int getId() { return id; @@ -78,7 +78,7 @@ * Sets a unique id for this language object. * * @param id The id to set. - * @since 1.50 + * @since 1.50.0 */ public void setId(int id) { this.id = id; @@ -91,7 +91,7 @@ * (indicates an audio track or subtitle should be disabled). * * @return The language code. - * @since 1.50 + * @since 1.50.0 */ public String getLang() { return lang; @@ -102,7 +102,7 @@ * subtitle should be disabled). * * @param lang The language code to set. - * @since 1.50 + * @since 1.50.0 */ public void setLang(String lang) { this.lang = lang; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAResource.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAResource.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/DLNAResource.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/DLNAResource.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,6 +18,7 @@ */ package net.pms.dlna; +import net.pms.Messages; import net.pms.PMS; import net.pms.configuration.FormatConfiguration; import net.pms.configuration.RendererConfiguration; @@ -33,7 +34,6 @@ import net.pms.io.OutputParams; import net.pms.io.ProcessWrapper; import net.pms.io.SizeLimitInputStream; -import net.pms.Messages; import net.pms.network.HTTPResource; import net.pms.util.FileUtil; import net.pms.util.ImagesUtil; @@ -50,6 +50,7 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.regex.Matcher; import static net.pms.util.StringUtil.*; @@ -217,7 +218,7 @@ protected boolean skipTranscode = false; private boolean allChildrenAreFolders = true; - private String flags; + private String dlnaOrgOpFlags; /** * @deprecated Use standard getter and setter to access this field. @@ -230,15 +231,16 @@ /** * @deprecated Use standard getter and setter to access this field. * - * the id which the last child got, so the next child can get unique id with incrementing this value. + * The numerical ID (1-based index) assigned to the last child of this folder. The next child is assigned this ID + 1. */ + // FIXME should be lastChildId @Deprecated - protected int lastChildrenId; + protected int lastChildrenId = 0; // XXX make private and rename lastChildrenId -> lastChildId /** * @deprecated Use standard getter and setter to access this field. * - * The last time when refresh is called. + * The last time refresh was called. */ @Deprecated protected long lastRefreshTime; @@ -270,20 +272,20 @@ * container. Its main purpose is to be unique in the parent container. * * @return The id string. - * @since 1.50 + * @since 1.50.0 */ protected String getId() { return id; } /** - * Set the id of this resource based on the index in its parent container. + * Set the ID of this resource based on the index in its parent container. * Its main purpose is to be unique in the parent container. The method is * automatically called by addChildInternal, so most of the time it is not * necessary to call it explicitly. * * @param id - * @since 1.50 + * @since 1.50.0 * @see #addChildInternal(DLNAResource) */ protected void setId(String id) { @@ -300,7 +302,7 @@ * http://www.mperfect.net/whsUpnp360/ . * * @return The resource id. - * @since 1.50 + * @since 1.50.0 */ public String getResourceId() { if (getId() == null) { @@ -357,7 +359,7 @@ public abstract boolean isFolder(); public String getDlnaContentFeatures() { - return (dlnaspec != null ? (dlnaspec + ";") : "") + getFlags() + ";DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01700000000000000000000000000000"; + return (dlnaspec != null ? (dlnaspec + ";") : "") + getDlnaOrgOpFlags() + ";DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01700000000000000000000000000000"; } public DLNAResource getPrimaryResource() { @@ -402,7 +404,7 @@ setSpecificType(specificType); } - /** Recursive function that searchs through all of the children until it finds + /** Recursive function that searches through all of the children until it finds * a {@link DLNAResource} that matches the name.

Only used by * {@link net.pms.dlna.RootFolder#addWebFolder(File webConf) * addWebFolder(File webConf)} while parsing the web.conf file. @@ -456,18 +458,20 @@ try { if (child.isValid()) { LOGGER.trace("Adding " + child.getName() + " / class: " + child.getClass().getName()); - VirtualFolder vf = null; if (allChildrenAreFolders && !child.isFolder()) { allChildrenAreFolders = false; } + addChildInternal(child); boolean forceTranscodeV2 = false; boolean parserV2 = child.getMedia() != null && getDefaultRenderer() != null && getDefaultRenderer().isMediaParserV2(); + if (parserV2) { // We already have useful info, just need to layout folders String mimeType = getDefaultRenderer().getFormatConfiguration().match(child.getMedia()); + if (mimeType != null) { // This is streamable child.getMedia().setMimeType(mimeType.equals(FormatConfiguration.MIMETYPE_AUTO) ? child.getMedia().getMimeType() : mimeType); @@ -532,7 +536,7 @@ boolean hasSubsToTranscode = false; - if (!PMS.getConfiguration().isMencoderDisableSubs()) { + if (!PMS.getConfiguration().isDisableSubtitles()) { hasSubsToTranscode = (PMS.getConfiguration().isAutoloadSubtitles() && child.isSrtFile()) || hasEmbeddedSubs; } @@ -542,11 +546,11 @@ isIncompatible = true; } - // Force transcoding if - // 1- MediaInfo support detected the file was not matched with supported codec configs and no SkipTranscode extension forced by user - // or 2- ForceTranscode extension forced by user - // or 3- FFmpeg support and the file is not ps3 compatible (need to remove this ?) and no SkipTranscode extension forced by user - // or 4- There's some sub files or embedded subs to deal with and no SkipTranscode extension forced by user + // Force transcoding if any of the following are true: + // 1) The file is not supported by the renderer and SkipTranscode is not enabled for this extension + // 2) ForceTranscode enabled for this extension + // 3) FFmpeg support and the file is not PS3 compatible (XXX need to remove this?) and SkipTranscode is not enabled for this extension + // 4) The file has embedded or external subs and SkipTranscode is not enabled for this extension if (forceTranscode || !isSkipTranscode() && (forceTranscodeV2 || isIncompatible || hasSubsToTranscode)) { child.setPlayer(player); LOGGER.trace("Switching " + child.getName() + " to player " + player.toString() + " for transcoding"); @@ -554,19 +558,19 @@ // Should the child be added to the transcode folder? if (child.getFormat().isVideo() && child.isTranscodeFolderAvailable()) { - vf = getTranscodeFolder(true); + // true: create (and append) the #--TRANSCODE--# folder to this folder if it doesn't already exist + VirtualFolder transcodeFolder = getTranscodeFolder(true); - if (vf != null) { - VirtualFolder fileFolder = new FileTranscodeVirtualFolder(child.getName(), null); + if (transcodeFolder != null) { + VirtualFolder fileTranscodeFolder = new FileTranscodeVirtualFolder(child.getName(), null); DLNAResource newChild = child.clone(); newChild.setPlayer(player); newChild.setMedia(child.getMedia()); - // newChild.original = child; - fileFolder.addChildInternal(newChild); + fileTranscodeFolder.addChildInternal(newChild); LOGGER.trace("Duplicate " + child.getName() + " with player: " + player.toString()); - vf.addChild(fileFolder); + transcodeFolder.addChild(fileTranscodeFolder); } } @@ -575,7 +579,7 @@ try { ((AdditionalResourceFolderListener) listener).addAdditionalFolder(this, child); } catch (Throwable t) { - LOGGER.error(String.format("Failed to add add additional folder for listener of type=%s", listener.getClass()), t); + LOGGER.error("Failed to add additional folder for listener of type: {}", listener.getClass(), t); } } } @@ -584,7 +588,12 @@ } } - if (child.getFormat() != null && child.getFormat().getSecondaryFormat() != null && child.getMedia() != null && getDefaultRenderer() != null && getDefaultRenderer().supportsFormat(child.getFormat().getSecondaryFormat())) { + if (child.getFormat() != null && + child.getFormat().getSecondaryFormat() != null && + child.getMedia() != null && + getDefaultRenderer() != null && + getDefaultRenderer().supportsFormat(child.getFormat().getSecondaryFormat()) + ) { DLNAResource newChild = child.clone(); newChild.setFormat(newChild.getFormat().getSecondaryFormat()); newChild.first = child; @@ -594,60 +603,79 @@ Player player = PlayerFactory.getPlayer(newChild); newChild.setPlayer(player); } + if (child.getMedia() != null && child.getMedia().isSecondaryFormatValid()) { addChild(newChild); } } } - }catch (Throwable t) { - LOGGER.error(String.format("Failed to add child '%s'", child.getName()), t); - + } catch (Throwable t) { + LOGGER.error("Error adding child: {}", child.getName(), t); child.setParent(null); getChildren().remove(child); } } /** - * Return the transcode virtual folder if it's supported and allowed. If create set to true, it tries to create if not yet created. + * Return the transcode folder for this resource. + * If PMS is configured to hide transcode folders, null is returned. + * If no folder exists and the create argument is false, null is returned. + * If no folder exists and the create argument is true, a new transcode folder is created. + * This method is called on the parent frolder each time a child is added to that parent + * (via {@link addChild(DLNAResource)}. * @param create - * @return + * @return the transcode virtual folder */ + // XXX package-private: used by MapFile; should be protected? TranscodeVirtualFolder getTranscodeFolder(boolean create) { if (!isTranscodeFolderAvailable()) { return null; } + if (PMS.getConfiguration().getHideTranscodeEnabled()) { return null; } + // search for transcode folder - for (DLNAResource r : getChildren()) { - if (r instanceof TranscodeVirtualFolder) { - return (TranscodeVirtualFolder) r; + for (DLNAResource child : getChildren()) { + if (child instanceof TranscodeVirtualFolder) { + return (TranscodeVirtualFolder) child; } } + if (create) { - TranscodeVirtualFolder vf = new TranscodeVirtualFolder(null); - addChildInternal(vf); - return vf; + TranscodeVirtualFolder transcodeFolder = new TranscodeVirtualFolder(null); + addChildInternal(transcodeFolder); + return transcodeFolder; } + return null; } /** - * Add to the internal list of child nodes, and sets the parent to the - * current node. + * Adds the supplied DNLA resource to the internal list of child nodes, + * and sets the parent to the current node. Avoids the side-effects + * associated with the {@link #addChild(DLNAResource)} method. * - * @param res + * @param child the DLNA resource to add to this node's list of children */ - protected synchronized void addChildInternal(DLNAResource res) { - if (res.getInternalId() != null) { - LOGGER.info("Node({}) already has an ID={}, which is overriden now. The previous parent node was:{}", new Object[] { res.getClass().getName(), res.getResourceId(), res.getParent()}); + protected synchronized void addChildInternal(DLNAResource child) { + if (child.getInternalId() != null) { + LOGGER.info( + "Node ({}) already has an ID ({}), which is overriden now. The previous parent node was: {}", + new Object[] { + child.getClass().getName(), + child.getResourceId(), + child.getParent() + } + ); } - getChildren().add(res); - res.setParent(this); - setLastChildrenId(getLastChildrenId() + 1); - res.setIndexId(getLastChildrenId()); + getChildren().add(child); + child.setParent(this); + + setLastChildId(getLastChildId() + 1); + child.setIndexId(getLastChildId()); } /** @@ -684,28 +712,38 @@ int parallel_thread_number = 3; if (resource instanceof DVDISOFile) { - parallel_thread_number = 1; // my dvd drive is dying wih 3 parallel threads + parallel_thread_number = 1; // my DVD drive is dying wih 3 parallel threads } - ThreadPoolExecutor tpe = new ThreadPoolExecutor(Math.min(count, parallel_thread_number), count, 20, TimeUnit.SECONDS, queue); + + ThreadPoolExecutor tpe = new ThreadPoolExecutor( + Math.min(count, parallel_thread_number), + count, + 20, + TimeUnit.SECONDS, + queue + ); for (int i = start; i < start + count; i++) { if (i < resource.getChildren().size()) { final DLNAResource child = resource.getChildren().get(i); + if (child != null) { tpe.execute(child); resources.add(child); } } } + try { tpe.shutdown(); tpe.awaitTermination(20, TimeUnit.SECONDS); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + LOGGER.trace("End of analysis"); } } } + return resources; } @@ -726,18 +764,21 @@ } final protected void discoverWithRenderer(RendererConfiguration renderer, int count, boolean forced) { - // Discovering if not already done. + // discover children if it hasn't been done already if (!isDiscovered()) { discoverChildren(); boolean ready = true; + if (renderer.isMediaParserV2() && renderer.isDLNATreeHack()) { ready = analyzeChildren(count); } else { ready = analyzeChildren(-1); } + if (!renderer.isMediaParserV2() || ready) { setDiscovered(true); } + notifyRefresh(); } else { // if forced, then call the old 'refreshChildren' method @@ -760,6 +801,7 @@ public void run() { if (first == null) { resolve(); + if (second != null) { second.resolve(); } @@ -777,11 +819,13 @@ public DLNAResource search(String searchId, int count, RendererConfiguration renderer) { if (getId() != null && searchId != null) { String[] indexPath = searchId.split("\\$", 2); + if (getId().equals(indexPath[0])) { if (indexPath.length == 1 || indexPath[1].length() == 0) { return this; } else { discoverWithRenderer(renderer, count, false); + for (DLNAResource file : getChildren()) { DLNAResource found = file.search(indexPath[1], count, renderer); if (found != null) { @@ -793,6 +837,7 @@ return null; } } + return null; } @@ -861,7 +906,7 @@ // Ditlew /** * Returns the DisplayName for the default renderer. - * + * * @return The display name. * @see #getDisplayName(RendererConfiguration) */ @@ -921,8 +966,8 @@ String dvdTrackDuration = ""; String engineFullName = ""; String engineShortName = ""; - String fileNameWithExtension = ""; - String fileNameWithoutExtension = ""; + String filenameWithExtension = ""; + String filenameWithoutExtension = ""; String subLangFullName = ""; String subLangShortName = ""; String subType = ""; @@ -953,12 +998,12 @@ format = smartRemove(format, "%F", true); format = smartRemove(format, "%f", true); } else { - fileNameWithExtension = getName(); - fileNameWithoutExtension = FileUtil.getFileNameWithoutExtension(fileNameWithExtension); + filenameWithExtension = getName(); + filenameWithoutExtension = FileUtil.getFileNameWithoutExtension(filenameWithExtension); // Check if file extensions are configured to be hidden if (this instanceof RealFile && PMS.getConfiguration().isHideExtensions() && !isFolder()) { - fileNameWithExtension = fileNameWithoutExtension; + filenameWithExtension = filenameWithoutExtension; } } @@ -982,7 +1027,8 @@ } // Handle DVD track duration - if (mediaRenderer != null && mediaRenderer.isShowDVDTitleDuration() && getMedia().getDvdtrack() > 0) { + if (mediaRenderer != null && mediaRenderer.isShowDVDTitleDuration() + && getMedia() != null && getMedia().getDvdtrack() > 0) { dvdTrackDuration = getMedia().getDurationString(); } else { format = smartRemove(format, "%d", false); @@ -1013,7 +1059,7 @@ format = smartRemove(format, "%A", true); format = smartRemove(format, "%a", true); } - + // Handle subtitle if (getMediaSubtitle() != null && getMediaSubtitle().getId() != -1) { subType = getMediaSubtitle().getType().getDescription(); @@ -1041,8 +1087,12 @@ result = result.replaceAll("%d", dvdTrackDuration); result = result.replaceAll("%E", engineFullName); result = result.replaceAll("%e", engineShortName); - result = result.replaceAll("%F", fileNameWithExtension); - result = result.replaceAll("%f", fileNameWithoutExtension); + // XXX escape $ characters in the filename e.g. "The $10,000 Pyramid" -> "The \$10,000 Pyramid" + // otherwise they confuse replaceAll: + // http://www.ps3mediaserver.org/forum/viewtopic.php?f=3&t=15734 + // http://cephas.net/blog/2006/02/09/javalangillegalargumentexception-illegal-group-reference-replaceall-and-dollar-signs/ + result = result.replaceAll("%F", Matcher.quoteReplacement(filenameWithExtension)); + result = result.replaceAll("%f", Matcher.quoteReplacement(filenameWithoutExtension)); result = result.replaceAll("%S", subLangFullName); result = result.replaceAll("%s", subLangShortName); result = result.replaceAll("%t", subType); @@ -1052,14 +1102,14 @@ return result; } - + /** * Removes the given token from the format string while trying to be smart * about it. This means that optional surrounding braces, curly braces, * brackets are removed as well, as are superfluous whitespace and * separators. For example, removing "%E" from "%F - %d [%E] {%x}" results * in "%F - %d {%x}". Removing "%d" from that will return "%F {%x}". - * + * * @param format * The format string to remove the token from. * @param token @@ -1111,30 +1161,36 @@ sb.append(PMS.get().getServer().getURL()); sb.append("/images/"); String id = null; + if (getMediaAudio() != null) { id = getMediaAudio().getLang(); } + if (getMediaSubtitle() != null && getMediaSubtitle().getId() != -1) { id = getMediaSubtitle().getLang(); } + if ((getMediaSubtitle() != null || getMediaAudio() != null) && StringUtils.isBlank(id)) { id = DLNAMediaLang.UND; } + if (id != null) { String code = Iso639.getISO639_2Code(id.toLowerCase()); sb.append("codes/").append(code).append(".png"); return sb.toString(); } + if (isAvisynth()) { sb.append("avisynth-logo-gears-mod.png"); return sb.toString(); } + return getURL("thumbnail0000"); } /** * @param prefix - * @return Returns an URL for a given media item. Not used for container types. + * @return Returns a URL for a given media item. Not used for container types. */ protected String getURL(String prefix) { StringBuilder sb = new StringBuilder(); @@ -1144,6 +1200,7 @@ sb.append("/"); sb.append(prefix); sb.append(encode(getName())); + return sb.toString(); } @@ -1168,12 +1225,13 @@ if (getChildren() == null) { return 0; } + return getChildren().size(); } + /* (non-Javadoc) * @see java.lang.Object#clone() */ - @Override protected DLNAResource clone() { DLNAResource o = null; @@ -1186,17 +1244,25 @@ return o; } + // this shouldn't be public + @Deprecated public String getFlags() { - return flags; + return getDlnaOrgOpFlags(); + } + + // permit the renderer to seek by time, bytes or both + private String getDlnaOrgOpFlags() { + return "DLNA.ORG_OP=" + dlnaOrgOpFlags; } - /**Returns a representation using DIDL response lines. It gives a complete representation of the item, with as many tags as available. + /**Returns an XML (DIDL) representation of the DLNA node. It gives a complete representation of the item, with as many tags as available. * Recommendations as per UPNP specification are followed where possible. * @param mediaRenderer Media Renderer for which to represent this information. Useful for some hacks. - * @return String representing the item. An example would start like this: {@code } + * @return String representing the item. An example would start like this: {@code } */ public final String toString(RendererConfiguration mediaRenderer) { StringBuilder sb = new StringBuilder(); + if (isFolder()) { openTag(sb, "container"); } else { @@ -1217,31 +1283,41 @@ addAttribute(sb, "childCount", childrenNumber()); } } + addAttribute(sb, "parentID", getParentId()); addAttribute(sb, "restricted", "true"); endTag(sb); final DLNAMediaAudio firstAudioTrack = getMedia() != null ? getMedia().getFirstAudioTrack() : null; if (firstAudioTrack != null && StringUtils.isNotBlank(firstAudioTrack.getSongname())) { - addXMLTagAndAttribute(sb, "dc:title", encodeXML(firstAudioTrack.getSongname() + (getPlayer() != null && !PMS.getConfiguration().isHideEngineNames() ? (" [" + getPlayer().name() + "]") : ""))); - } else // Ditlew - org - //addXMLTagAndAttribute(sb, "dc:title", encodeXML((isFolder()||player==null)?getDisplayName():mediaRenderer.getUseSameExtension(getDisplayName()))); - // Ditlew - { - addXMLTagAndAttribute(sb, "dc:title", encodeXML((isFolder() || getPlayer() == null) ? getDisplayName(mediaRenderer) : mediaRenderer.getUseSameExtension(getDisplayName(mediaRenderer)))); + addXMLTagAndAttribute( + sb, + "dc:title", + encodeXML(firstAudioTrack.getSongname() + (getPlayer() != null && !PMS.getConfiguration().isHideEngineNames() ? (" [" + getPlayer().name() + "]") : "")) + ); + } else { // Ditlew - org + // Ditlew + addXMLTagAndAttribute( + sb, + "dc:title", + encodeXML((isFolder() || getPlayer() == null) ? getDisplayName() : mediaRenderer.getUseSameExtension(getDisplayName(mediaRenderer))) + ); } if (firstAudioTrack != null) { if (StringUtils.isNotBlank(firstAudioTrack.getAlbum())) { addXMLTagAndAttribute(sb, "upnp:album", encodeXML(firstAudioTrack.getAlbum())); } + if (StringUtils.isNotBlank(firstAudioTrack.getArtist())) { addXMLTagAndAttribute(sb, "upnp:artist", encodeXML(firstAudioTrack.getArtist())); addXMLTagAndAttribute(sb, "dc:creator", encodeXML(firstAudioTrack.getArtist())); } + if (StringUtils.isNotBlank(firstAudioTrack.getGenre())) { addXMLTagAndAttribute(sb, "upnp:genre", encodeXML(firstAudioTrack.getGenre())); } + if (firstAudioTrack.getTrack() > 0) { addXMLTagAndAttribute(sb, "upnp:originalTrackNumber", "" + firstAudioTrack.getTrack()); } @@ -1249,34 +1325,68 @@ if (!isFolder()) { int indexCount = 1; + if (mediaRenderer.isDLNALocalizationRequired()) { indexCount = getDLNALocalesCount(); } + for (int c = 0; c < indexCount; c++) { openTag(sb, "res"); - // DLNA.ORG_OP : 1er 10 = exemple: TimeSeekRange.dlna.org :npt=187.000- - // 01 = Range par octets - // 00 = pas de range, meme pas de pause possible - flags = "DLNA.ORG_OP=01"; - if (getPlayer() != null) { - if (getPlayer().isTimeSeekable() && mediaRenderer.isSeekByTime()) { - if (mediaRenderer.isPS3()) { // ps3 doesn't like OP=11 - flags = "DLNA.ORG_OP=10"; - } else { - flags = "DLNA.ORG_OP=11"; + + // DLNA.ORG_OP flags + // + // Two booleans (binary digits) which determine what transport operations the renderer is allowed to + // perform (in the form of HTTP headers): the first digit allows the renderer to send + // TimeSeekRange.DLNA.ORG (seek-by-time) headers; the second allows it to send RANGE (seek-by-byte) + // headers. + // + // 00 - no seeking (or even pausing) allowed + // 01 - seek by byte + // 10 - seek by time + // 11 - seek by both + // + // See here for an example of how these options can be mapped to keys on the renderer's controller: + // http://www.ps3mediaserver.org/forum/viewtopic.php?f=2&t=2908&p=12550#p12550 + // + // Note that seek-by-time is the preferred option (seek-by-byte is a fallback) but it requires a) support + // by the renderer (via the SeekByTime renderer conf option) and either a) a file that's not being transcoded + // or if it is, b) support by its transcode engine for seek-by-time. + + dlnaOrgOpFlags = "01"; + + if (mediaRenderer.isSeekByTime()) { + if (getPlayer() != null) { // transcoded + if (getPlayer().isTimeSeekable()) { + // Some renderers - e.g. the PS3 and Panasonic TVs - behave erratically when + // transcoding if we keep the default seek-by-byte permission on when permitting + // seek-by-time: http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=15841 + // + // It's not clear if this is a bug in the DLNA libraries of these renderers or a bug + // in PMS, but setting an option in the renderer conf that disables seek-by-byte when + // we permit seek-by-time - e.g.: + // + // SeekByTime = exclusive + // + // - works around it. + if (mediaRenderer.isSeekByTimeExclusive()) { + dlnaOrgOpFlags = "10"; + } else { + dlnaOrgOpFlags = "11"; + } } - } - } else { - if (mediaRenderer.isSeekByTime() && !mediaRenderer.isPS3()) { - flags = "DLNA.ORG_OP=11"; + } else { // streamed + // See: http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=15841&start=10#p76201 + dlnaOrgOpFlags = "01"; } } + addAttribute(sb, "xmlns:dlna", "urn:schemas-dlna-org:metadata-1-0/"); String mime = getRendererMimeType(mimeType(), mediaRenderer); if (mime == null) { mime = "video/mpeg"; } + if (mediaRenderer.isPS3()) { // XXX TO REMOVE, OR AT LEAST MAKE THIS GENERIC // whole extensions/mime-types mess to rethink anyway if (mime.equals("video/x-divx")) { dlnaspec = "DLNA.ORG_PN=AVI"; @@ -1288,13 +1398,14 @@ if (getPlayer() != null) { // do we have some mpegts to offer ? boolean mpegTsMux = TSMuxerVideo.ID.equals(getPlayer().id()) || VideoLanVideoStreaming.ID.equals(getPlayer().id()); - if (!mpegTsMux) { // maybe, like the ps3, mencoder can launch tsmuxer if this a compatible H264 video - mpegTsMux = MEncoderVideo.ID.equals(getPlayer().id()) && ((getMediaSubtitle() == null && getMedia() != null && getMedia().getDvdtrack() == 0 && getMedia().isMuxable(mediaRenderer) - && PMS.getConfiguration().isMencoderMuxWhenCompatible() && mediaRenderer.isMuxH264MpegTS()) - || mediaRenderer.isTranscodeToMPEGTSAC3()); + if (!mpegTsMux) { + mpegTsMux = MEncoderVideo.ID.equals(getPlayer().id()) && mediaRenderer.isTranscodeToMPEGTSAC3(); } + if (mpegTsMux) { - dlnaspec = getMedia().isH264() && !VideoLanVideoStreaming.ID.equals(getPlayer().id()) && getMedia().isMuxable(mediaRenderer) ? "DLNA.ORG_PN=AVC_TS_HD_24_AC3_ISO" : "DLNA.ORG_PN=" + getMPEG_TS_SD_EU_ISOLocalizedValue(c); + dlnaspec = getMedia().isH264() && !VideoLanVideoStreaming.ID.equals(getPlayer().id()) && getMedia().isMuxable(mediaRenderer) ? + "DLNA.ORG_PN=AVC_TS_HD_24_AC3_ISO" : + "DLNA.ORG_PN=" + getMPEG_TS_SD_EU_ISOLocalizedValue(c); } else { dlnaspec = "DLNA.ORG_PN=" + getMPEG_PS_PALLocalizedValue(c); } @@ -1327,8 +1438,7 @@ dlnaspec = null; } - addAttribute(sb, "protocolInfo", "http-get:*:" + mime + ":" + (dlnaspec != null ? (dlnaspec + ";") : "") + flags); - + addAttribute(sb, "protocolInfo", "http-get:*:" + mime + ":" + (dlnaspec != null ? (dlnaspec + ";") : "") + getDlnaOrgOpFlags()); if (getFormat() != null && getFormat().isVideo() && getMedia() != null && getMedia().isMediaparsed()) { if (getPlayer() == null && getMedia() != null) { @@ -1346,14 +1456,18 @@ addAttribute(sb, "duration", getMedia().getDurationString()); } } + if (getMedia().getResolution() != null) { addAttribute(sb, "resolution", getMedia().getResolution()); } + addAttribute(sb, "bitrate", getMedia().getRealVideoBitrate()); + if (firstAudioTrack != null) { if (firstAudioTrack.getAudioProperties().getNumberOfChannels() > 0) { addAttribute(sb, "nrAudioChannels", firstAudioTrack.getAudioProperties().getNumberOfChannels()); } + if (firstAudioTrack.getSampleFrequency() != null) { addAttribute(sb, "sampleFrequency", firstAudioTrack.getSampleFrequency()); } @@ -1373,9 +1487,11 @@ if (getMedia().getDuration() != null) { addAttribute(sb, "duration", DLNAMediaInfo.getDurationString(getMedia().getDuration())); } + if (firstAudioTrack != null && firstAudioTrack.getSampleFrequency() != null) { addAttribute(sb, "sampleFrequency", firstAudioTrack.getSampleFrequency()); } + if (firstAudioTrack != null) { addAttribute(sb, "nrAudioChannels", firstAudioTrack.getAudioProperties().getNumberOfChannels()); } @@ -1383,7 +1499,7 @@ if (getPlayer() == null) { addAttribute(sb, "size", getMedia().getSize()); } else { - // calcul taille wav + // calculate WAV size if (firstAudioTrack != null) { int defaultFrequency = mediaRenderer.isTranscodeAudioTo441() ? 44100 : 48000; if (!PMS.getConfiguration().isAudioResample()) { @@ -1394,11 +1510,12 @@ LOGGER.debug("Caught exception", e); } } + int na = firstAudioTrack.getAudioProperties().getNumberOfChannels(); - if (na > 2) // no 5.1 dump in mplayer - { + if (na > 2) { // no 5.1 dump in mplayer na = 2; } + int finalsize = (int) (getMedia().getDurationInSeconds() * defaultFrequency * 2 * na); LOGGER.debug("Calculated size: " + finalsize); addAttribute(sb, "size", finalsize); @@ -1412,6 +1529,7 @@ addAttribute(sb, "duration", "09:59:59"); addAttribute(sb, "bitrate", "1000000"); } + endTag(sb); sb.append(getFileURL()); closeTag(sb, "res"); @@ -1428,6 +1546,7 @@ } else { addAttribute(sb, "dlna:profileID", "JPEG_TN"); } + endTag(sb); sb.append(thumbURL); closeTag(sb, "upnp:albumArtURI"); @@ -1441,6 +1560,7 @@ } else { addAttribute(sb, "protocolInfo", "http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN"); } + endTag(sb); sb.append(thumbURL); closeTag(sb, "res"); @@ -1476,6 +1596,7 @@ uclass = "object.item.videoItem"; } } + if (uclass != null) { addXMLTagAndAttribute(sb, "upnp:class", uclass); } @@ -1485,6 +1606,7 @@ } else { closeTag(sb, "item"); } + return sb.toString(); } @@ -1503,14 +1625,16 @@ if (temp == null) { temp = 0; } + final Integer refCount = temp; requestIdToRefcount.put(requestId, refCount + 1); + if (refCount == 0) { final DLNAResource self = this; Runnable r = new Runnable() { @Override public void run() { - LOGGER.info(String.format("renderer: %s, file: %s", rendererId, getSystemName())); + LOGGER.info("renderer: {}, file: {}", rendererId, getSystemName()); for (final ExternalListener listener : ExternalFactory.getExternalListeners()) { if (listener instanceof StartStopListener) { @@ -1521,7 +1645,7 @@ try { ((StartStopListener) listener).nowPlaying(getMedia(), self); } catch (Throwable t) { - LOGGER.error(String.format("Notification of startPlaying event failed for StartStopListener %s", listener.getClass()), t); + LOGGER.error("Notification of startPlaying event failed for StartStopListener {}", listener.getClass(), t); } } }; @@ -1563,7 +1687,7 @@ @Override public void run() { if (refCount == 1) { - LOGGER.info(String.format("renderer: %s, file: %s", rendererId, getSystemName())); + LOGGER.info("renderer: {}, file: {}", rendererId, getSystemName()); PMS.get().getFrame().setStatusLine(""); for (final ExternalListener listener : ExternalFactory.getExternalListeners()) { @@ -1575,10 +1699,11 @@ try { ((StartStopListener) listener).donePlaying(getMedia(), self); } catch (Throwable t) { - LOGGER.error(String.format("Notification of donePlaying event failed for StartStopListener %s", listener.getClass()), t); + LOGGER.error("Notification of donePlaying event failed for StartStopListener {}", listener.getClass(), t); } } }; + new Thread(fireStartStopEvent, "StopPlaying Event for " + listener.name()).start(); } } @@ -1620,7 +1745,7 @@ low = 0; // WDTV Live - if set to TS it asks multiple times and ends by - // asking for an invalid offset which kills mencoder + // asking for an invalid offset which kills MEncoder if (timeRange.getStartOrZero() > getMedia().getDurationInSeconds()) { return null; } @@ -1639,6 +1764,7 @@ PipedOutputStream out = new PipedOutputStream(); InputStream fis = new PipedInputStream(out); ((IPushOutput) this).push(out); + if (fis != null) { if (low > 0) { fis.skip(low); @@ -1673,6 +1799,7 @@ fis.skip(MpegUtil.getPositionForTimeInMpeg(((RealFile) this).getFile(), (int) timeRange.getStartOrZero() )); } } + return fis; } else { OutputParams params = new OutputParams(PMS.getConfiguration()); @@ -1690,49 +1817,63 @@ if (externalProcess == null || externalProcess.isDestroyed()) { LOGGER.info("Starting transcode/remux of " + getName()); + externalProcess = getPlayer().launchTranscode( getSystemName(), this, getMedia(), - params); + params + ); + if (params.waitbeforestart > 0) { - LOGGER.trace("Sleeping for " + params.waitbeforestart + " milliseconds"); + LOGGER.trace("Sleeping for {} milliseconds", params.waitbeforestart); + try { Thread.sleep(params.waitbeforestart); } catch (InterruptedException e) { LOGGER.error(null, e); } + LOGGER.trace("Finished sleeping for " + params.waitbeforestart + " milliseconds"); } } else if (params.timeseek > 0 && getMedia() != null && getMedia().isMediaparsed() && getMedia().getDurationInSeconds() > 0) { LOGGER.debug("Requesting time seek: " + params.timeseek + " seconds"); params.minBufferSize = 1; + Runnable r = new Runnable() { @Override public void run() { externalProcess.stopProcess(); } }; + new Thread(r, "External Process Stopper").start(); + ProcessWrapper newExternalProcess = getPlayer().launchTranscode( getSystemName(), this, getMedia(), - params); + params + ); + try { Thread.sleep(1000); } catch (InterruptedException e) { LOGGER.error(null, e); } + if (newExternalProcess == null) { LOGGER.trace("External process instance is null... sounds not good"); } + externalProcess = newExternalProcess; } + if (externalProcess == null) { return null; } + InputStream is = null; int timer = 0; while (is == null && timer < 10) { @@ -1742,8 +1883,7 @@ LOGGER.trace("External input stream instance is null... sounds not good, waiting 500ms"); try { Thread.sleep(500); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } } } @@ -1759,8 +1899,10 @@ externalProcess.stopProcess(); } }; + new Thread(r, "Hanging External Process Stopper").start(); } + return is; } } @@ -1808,15 +1950,20 @@ // need to override if some thumbnail work is to be done when mediaparserv2 enabled } - /**Checks if a thumbnail exists, and if possible, generates one. - * @param input InputFile to check or generate the thumbnail that is being asked for. + /** + * Checks if a thumbnail exists, and, if not, generates one (if possible). + * Called from Request/RequestV2 in response to thumbnail requests e.g. HEAD /get/0$1$0$42$3/thumbnail0000%5BExample.mkv + * Calls DLNAMediaInfo.generateThumbnail, which in turn calls DLNAMediaInfo.parse. + * + * @param inputFile File to check or generate the thumbnail for. */ - protected void checkThumbnail(InputFile input) { + protected void checkThumbnail(InputFile inputFile) { if (getMedia() != null && !getMedia().isThumbready() && PMS.getConfiguration().isThumbnailGenerationEnabled()) { getMedia().setThumbready(true); - getMedia().generateThumbnail(input, getFormat(), getType()); - if (getMedia().getThumb() != null && PMS.getConfiguration().getUseCache() && input.getFile() != null) { - PMS.get().getDatabase().updateThumbnail(input.getFile().getAbsolutePath(), input.getFile().lastModified(), getType(), getMedia()); + getMedia().generateThumbnail(inputFile, getFormat(), getType()); + + if (getMedia().getThumb() != null && PMS.getConfiguration().getUseCache() && inputFile.getFile() != null) { + PMS.get().getDatabase().updateThumbnail(inputFile.getFile().getAbsolutePath(), inputFile.getFile().lastModified(), getType(), getMedia()); } } } @@ -1934,7 +2081,7 @@ * this resource. * * @param media The object containing detailed information. - * @since 1.50 + * @since 1.50.0 */ protected void setMedia(DLNAMediaInfo media) { this.media = media; @@ -1946,7 +2093,7 @@ * returns the one that should be played. * * @return The audio object containing detailed information. - * @since 1.50 + * @since 1.50.0 */ public DLNAMediaAudio getMediaAudio() { return media_audio; @@ -1958,7 +2105,7 @@ * determines the one that should be played. * * @param mediaAudio The audio object containing detailed information. - * @since 1.50 + * @since 1.50.0 */ protected void setMediaAudio(DLNAMediaAudio mediaAudio) { this.media_audio = mediaAudio; @@ -1970,7 +2117,7 @@ * subtitles, this method returns the one that should be displayed. * * @return The subtitle object containing detailed information. - * @since 1.50 + * @since 1.50.0 */ public DLNAMediaSubtitle getMediaSubtitle() { return media_subtitle; @@ -1982,7 +2129,7 @@ * subtitles, this method determines the one that should be used. * * @param mediaSubtitle The subtitle object containing detailed information. - * @since 1.50 + * @since 1.50.0 */ protected void setMediaSubtitle(DLNAMediaSubtitle mediaSubtitle) { this.media_subtitle = mediaSubtitle; @@ -2011,12 +2158,12 @@ } /** - * @deprecated Use {@link #setLastModified()} instead. + * @deprecated Use {@link #setLastModified(long)} instead. * * Sets the timestamp at which this resource was last modified. * * @param lastModified The timestamp to set. - * @since 1.50 + * @since 1.50.0 */ @Deprecated protected void setLastmodified(long lastModified) { @@ -2048,7 +2195,7 @@ * resource for the renderer. The player object can be null. * * @param player The player object to set. - * @since 1.50 + * @since 1.50.0 */ protected void setPlayer(Player player) { this.player = player; @@ -2070,7 +2217,7 @@ * * @param discovered Set to true if this resource is discovered, * false otherwise. - * @since 1.50 + * @since 1.50.0 */ protected void setDiscovered(boolean discovered) { this.discovered = discovered; @@ -2080,7 +2227,7 @@ * Returns true if this resource has subtitles in a file. * * @return the srtFile - * @since 1.50 + * @since 1.50.0 */ protected boolean isSrtFile() { return srtFile; @@ -2090,7 +2237,7 @@ * Set to true if this resource has subtitles in a file. * * @param srtFile the srtFile to set - * @since 1.50 + * @since 1.50.0 */ protected void setSrtFile(boolean srtFile) { this.srtFile = srtFile; @@ -2112,7 +2259,7 @@ * to be refreshed, its counter should be updated. * * @param updateId The counter value to set. - * @since 1.50 + * @since 1.50.0 */ protected void setUpdateId(int updateId) { this.updateId = updateId; @@ -2123,7 +2270,7 @@ * to be refreshed, this counter is updated. * * @return The system update counter. - * @since 1.50 + * @since 1.50.0 */ public static int getSystemUpdateId() { return systemUpdateId; @@ -2134,7 +2281,7 @@ * to be refreshed, this counter should be updated. * * @param systemUpdateId The system update counter to set. - * @since 1.50 + * @since 1.50.0 */ public static void setSystemUpdateId(int systemUpdateId) { DLNAResource.systemUpdateId = systemUpdateId; @@ -2157,7 +2304,7 @@ * need to be shown. * * @param noName Set to true if the resource is nameless. - * @since 1.50 + * @since 1.50.0 */ protected void setNoName(boolean noName) { this.noName = noName; @@ -2176,7 +2323,7 @@ * Sets the from - to time range for this resource. * * @param splitRange The time range to set. - * @since 1.50 + * @since 1.50.0 */ protected void setSplitRange(Range.Time splitRange) { this.splitRange = splitRange; @@ -2186,7 +2333,7 @@ * Returns the number of the track to split from this resource. * * @return the splitTrack - * @since 1.50 + * @since 1.50.0 */ protected int getSplitTrack() { return splitTrack; @@ -2196,7 +2343,7 @@ * Sets the number of the track from this resource to split. * * @param splitTrack The track number. - * @since 1.50 + * @since 1.50.0 */ protected void setSplitTrack(int splitTrack) { this.splitTrack = splitTrack; @@ -2206,7 +2353,7 @@ * Returns the default renderer configuration for this resource. * * @return The default renderer configuration. - * @since 1.50 + * @since 1.50.0 */ protected RendererConfiguration getDefaultRenderer() { return defaultRenderer; @@ -2216,7 +2363,7 @@ * Sets the default renderer configuration for this resource. * * @param defaultRenderer The default renderer configuration to set. - * @since 1.50 + * @since 1.50.0 */ protected void setDefaultRenderer(RendererConfiguration defaultRenderer) { this.defaultRenderer = defaultRenderer; @@ -2226,7 +2373,7 @@ * Returns whether or not this resource is handled by Avisynth. * * @return True if handled by Avisynth, otherwise false. - * @since 1.50 + * @since 1.50.0 */ protected boolean isAvisynth() { return avisynth; @@ -2236,7 +2383,7 @@ * Sets whether or not this resource is handled by Avisynth. * * @param avisynth Set to true if handled by Avisyth, otherwise false. - * @since 1.50 + * @since 1.50.0 */ protected void setAvisynth(boolean avisynth) { this.avisynth = avisynth; @@ -2246,7 +2393,7 @@ * Returns true if transcoding should be skipped for this resource. * * @return True if transcoding should be skipped, false otherwise. - * @since 1.50 + * @since 1.50.0 */ protected boolean isSkipTranscode() { return skipTranscode; @@ -2257,7 +2404,7 @@ * * @param skipTranscode Set to true if trancoding should be skipped, false * otherwise. - * @since 1.50 + * @since 1.50.0 */ protected void setSkipTranscode(boolean skipTranscode) { this.skipTranscode = skipTranscode; @@ -2276,30 +2423,45 @@ * Sets the list of children for this resource. * * @param children The list of children to set. - * @since 1.50 + * @since 1.50.0 */ protected void setChildren(List children) { this.children = children; } /** - * Returns the id of the last child added. - * - * @return The id. - * @since 1.50 + * @deprecated use {@link #getLastChildId()} instead. */ + @Deprecated protected int getLastChildrenId() { + return getLastChildId(); + } + + /** + * Returns the numerical ID of the last child added. + * + * @return The ID. + * @since 1.80.0 + */ + protected int getLastChildId() { return lastChildrenId; } /** - * Sets the id of the last child added. + * @deprecated use {@link #setLastChildId(int)} instead. + */ + protected void setLastChildrenId(int lastChildId) { + setLastChildId(lastChildId); + } + + /** + * Sets the numerical ID of the last child added. * - * @param lastChildrenId The id to set. - * @since 1.50 + * @param lastChildId The ID to set. + * @since 1.80.0 */ - protected void setLastChildrenId(int lastChildrenId) { - this.lastChildrenId = lastChildrenId; + protected void setLastChildId(int lastChildId) { + this.lastChildrenId = lastChildId; } /** @@ -2315,10 +2477,9 @@ * Sets the timestamp when this resource was last refreshed. * * @param lastRefreshTime The timestamp to set. - * @since 1.50 + * @since 1.50.0 */ protected void setLastRefreshTime(long lastRefreshTime) { this.lastRefreshTime = lastRefreshTime; } } - diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/Feed.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/Feed.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/Feed.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/Feed.java 2013-04-22 19:41:39.000000000 +0000 @@ -223,7 +223,7 @@ /** * @return the url - * @since 1.50 + * @since 1.50.0 */ protected String getUrl() { return url; @@ -231,7 +231,7 @@ /** * @param url the url to set - * @since 1.50 + * @since 1.50.0 */ protected void setUrl(String url) { this.url = url; @@ -239,7 +239,7 @@ /** * @return the tempItemTitle - * @since 1.50 + * @since 1.50.0 */ protected String getTempItemTitle() { return tempItemTitle; @@ -247,7 +247,7 @@ /** * @param tempItemTitle the tempItemTitle to set - * @since 1.50 + * @since 1.50.0 */ protected void setTempItemTitle(String tempItemTitle) { this.tempItemTitle = tempItemTitle; @@ -255,7 +255,7 @@ /** * @return the tempItemLink - * @since 1.50 + * @since 1.50.0 */ protected String getTempItemLink() { return tempItemLink; @@ -263,7 +263,7 @@ /** * @param tempItemLink the tempItemLink to set - * @since 1.50 + * @since 1.50.0 */ protected void setTempItemLink(String tempItemLink) { this.tempItemLink = tempItemLink; @@ -271,7 +271,7 @@ /** * @return the tempFeedLink - * @since 1.50 + * @since 1.50.0 */ protected String getTempFeedLink() { return tempFeedLink; @@ -279,7 +279,7 @@ /** * @param tempFeedLink the tempFeedLink to set - * @since 1.50 + * @since 1.50.0 */ protected void setTempFeedLink(String tempFeedLink) { this.tempFeedLink = tempFeedLink; @@ -287,7 +287,7 @@ /** * @return the tempCategory - * @since 1.50 + * @since 1.50.0 */ protected String getTempCategory() { return tempCategory; @@ -295,7 +295,7 @@ /** * @param tempCategory the tempCategory to set - * @since 1.50 + * @since 1.50.0 */ protected void setTempCategory(String tempCategory) { this.tempCategory = tempCategory; @@ -303,7 +303,7 @@ /** * @return the tempItemThumbURL - * @since 1.50 + * @since 1.50.0 */ protected String getTempItemThumbURL() { return tempItemThumbURL; @@ -311,7 +311,7 @@ /** * @param tempItemThumbURL the tempItemThumbURL to set - * @since 1.50 + * @since 1.50.0 */ protected void setTempItemThumbURL(String tempItemThumbURL) { this.tempItemThumbURL = tempItemThumbURL; @@ -319,7 +319,7 @@ /** * @param name the name to set - * @since 1.50 + * @since 1.50.0 */ protected void setName(String name) { this.name = name; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/FileTranscodeVirtualFolder.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/FileTranscodeVirtualFolder.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/FileTranscodeVirtualFolder.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/FileTranscodeVirtualFolder.java 2013-04-22 19:41:39.000000000 +0000 @@ -32,14 +32,14 @@ import org.slf4j.LoggerFactory; /** - * This class populates the TRANSCODE folder with content. + * This class populates the file-specific transcode folder with content. */ public class FileTranscodeVirtualFolder extends VirtualFolder { private static final Logger LOGGER = LoggerFactory.getLogger(FileTranscodeVirtualFolder.class); private boolean resolved; /** - * Class to take care of sorting the resources properly. Resources + * Class to take care of sorting the resources correctly. Resources * are sorted by player, then by audio track, then by subtitle. */ private class ResourceSort implements Comparator { @@ -53,7 +53,7 @@ public int compare(DLNAResource resource1, DLNAResource resource2) { Integer playerIndex1 = players.indexOf(resource1.getPlayer()); Integer playerIndex2 = players.indexOf(resource2.getPlayer()); - + if (playerIndex1.equals(playerIndex2)) { String audioLang1 = resource1.getMediaAudio().getLang(); String audioLang2 = resource2.getMediaAudio().getLang(); @@ -82,20 +82,40 @@ return playerIndex1.compareTo(playerIndex2); } } - } + // FIXME unused + @Deprecated public FileTranscodeVirtualFolder(String name, String thumbnailIcon, boolean copy) { super(name, thumbnailIcon); } + public FileTranscodeVirtualFolder(String name, String thumbnailIcon) { // XXX thumbnailIcon is always null + super(name, thumbnailIcon); + } + + private void addChapterFile(DLNAResource source) { + if (PMS.getConfiguration().isChapterSupport() && PMS.getConfiguration().getChapterInterval() > 0) { + ChapterFileTranscodeVirtualFolder chapterFolder = new ChapterFileTranscodeVirtualFolder( + "Chapters:" + source.getDisplayName(), + null, + PMS.getConfiguration().getChapterInterval() + ); + DLNAResource newSeekChild = source.clone(); + newSeekChild.setNoName(true); + chapterFolder.addChildInternal(newSeekChild); + addChildInternal(chapterFolder); + } + } + /** - * This populates the TRANSCODE folder with all combinations of players, + * This populates the file-specific transcode folder with all combinations of players, * audio tracks and subtitles. */ @Override public void resolve() { super.resolve(); + if (!resolved && getChildren().size() == 1) { // OK DLNAResource child = getChildren().get(0); child.resolve(); @@ -143,7 +163,7 @@ // Create a temporary copy of the child with the audio and // subtitle modified in order to be able to match players to it. DLNAResource tempModifiedCopy = createModifiedResource(child, audio, subtitle); - + // Determine which players match this audio track and subtitle ArrayList players = PlayerFactory.getPlayers(tempModifiedCopy); @@ -183,9 +203,12 @@ * @param player The player to use. * @return The copy. */ - private DLNAResource createComboResource(DLNAResource original, - DLNAMediaAudio audio, DLNAMediaSubtitle subtitle, Player player) { - + private DLNAResource createComboResource( + DLNAResource original, + DLNAMediaAudio audio, + DLNAMediaSubtitle subtitle, + Player player + ) { // FIXME: Use new DLNAResource() instead of clone(). Clone is bad, mmmkay? DLNAResource copy = original.clone(); @@ -199,7 +222,7 @@ } /** - * Create a copy of the provided original resource and modifies it with + * Create a copy of the provided original resource and modify it with * the given audio track and subtitles. * * @param original The original {@link DLNAResource} to create a copy of. @@ -207,9 +230,11 @@ * @param subtitle The subtitle track to use. * @return The copy. */ - private DLNAResource createModifiedResource(DLNAResource original, - DLNAMediaAudio audio, DLNAMediaSubtitle subtitle) { - + private DLNAResource createModifiedResource( + DLNAResource original, + DLNAMediaAudio audio, + DLNAMediaSubtitle subtitle + ) { // FIXME: Use new DLNAResource() instead of clone(). Clone is bad, mmmkay? DLNAResource copy = original.clone(); @@ -219,19 +244,4 @@ copy.setMediaSubtitle(subtitle); return copy; } - - - private void addChapterFile(DLNAResource source) { - if (PMS.getConfiguration().getChapterInterval() > 0 && PMS.getConfiguration().isChapterSupport()) { - ChapterFileTranscodeVirtualFolder chapterFolder = new ChapterFileTranscodeVirtualFolder("Chapters:" + source.getDisplayName(), null, PMS.getConfiguration().getChapterInterval()); - DLNAResource newSeekChild = source.clone(); - newSeekChild.setNoName(true); - chapterFolder.addChildInternal(newSeekChild); - addChildInternal(chapterFolder); - } - } - - public FileTranscodeVirtualFolder(String name, String thumbnailIcon) { - super(name, thumbnailIcon); - } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/InputFile.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/InputFile.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/InputFile.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/InputFile.java 2013-04-22 19:41:39.000000000 +0000 @@ -2,14 +2,14 @@ import java.io.File; -/** - * TODO: Change all instance variables to private. For backwards compatibility - * with external plugin code the variables have all been marked as deprecated - * instead of changed to private, but this will surely change in the future. - * When everything has been changed to private, the deprecated note can be - * removed. - */ public class InputFile { + /** + * TODO: Change all instance variables to private. For backwards compatibility + * with external plugin code the variables have all been marked as deprecated + * rather than being changed to private, but this will change in the future. + * When everything has been changed to private, this note can be + * removed. + */ /** * @deprecated Use standard getter and setter to access this variable. @@ -52,7 +52,7 @@ /** * @return the file - * @since 1.50 + * @since 1.50.0 */ public File getFile() { return file; @@ -60,7 +60,7 @@ /** * @param file the file to set - * @since 1.50 + * @since 1.50.0 */ public void setFile(File file) { this.file = file; @@ -68,7 +68,7 @@ /** * @return the push - * @since 1.50 + * @since 1.50.0 */ public IPushOutput getPush() { return push; @@ -76,7 +76,7 @@ /** * @param push the push to set - * @since 1.50 + * @since 1.50.0 */ public void setPush(IPushOutput push) { this.push = push; @@ -84,7 +84,7 @@ /** * @return the filename - * @since 1.50 + * @since 1.50.0 */ public String getFilename() { return filename; @@ -92,7 +92,7 @@ /** * @param filename the filename to set - * @since 1.50 + * @since 1.50.0 */ public void setFilename(String filename) { this.filename = filename; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/LibMediaInfoParser.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/LibMediaInfoParser.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/LibMediaInfoParser.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/LibMediaInfoParser.java 2013-04-22 19:41:39.000000000 +0000 @@ -2,8 +2,10 @@ import net.pms.configuration.FormatConfiguration; import net.pms.formats.v2.SubtitleType; + import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,16 +13,18 @@ import java.util.StringTokenizer; public class LibMediaInfoParser { - private static final Logger logger = LoggerFactory.getLogger(LibMediaInfoParser.class); + private static final Logger LOGGER = LoggerFactory.getLogger(LibMediaInfoParser.class); private static MediaInfo MI; private static Base64 base64; static { MI = new MediaInfo(); + if (MI.isValid()) { MI.Option("Complete", "1"); MI.Option("Language", "raw"); } + base64 = new Base64(); } @@ -32,84 +36,90 @@ try { MI.finalize(); } catch (Throwable e) { - logger.debug("Caught exception", e); + LOGGER.debug("Caught exception", e); } } - public synchronized static void parse(DLNAMediaInfo media, InputFile file, int type) { - File filename = file.getFile(); - if (!media.isMediaparsed() && filename != null && MI.isValid() && MI.Open(filename.getAbsolutePath()) > 0) { + public synchronized static void parse(DLNAMediaInfo media, InputFile inputFile, int type) { + File file = inputFile.getFile(); + + if (!media.isMediaparsed() && file != null && MI.isValid() && MI.Open(file.getAbsolutePath()) > 0) { try { String info = MI.Inform(); - MediaInfo.StreamKind step = MediaInfo.StreamKind.General; + MediaInfo.StreamKind streamType = MediaInfo.StreamKind.General; DLNAMediaAudio currentAudioTrack = new DLNAMediaAudio(); boolean audioPrepped = false; DLNAMediaSubtitle currentSubTrack = new DLNAMediaSubtitle(); boolean subPrepped = false; + if (StringUtils.isNotBlank(info)) { - media.setSize(filename.length()); + media.setSize(file.length()); StringTokenizer st = new StringTokenizer(info, "\n\r"); + while (st.hasMoreTokens()) { String line = st.nextToken().trim(); if (line.equals("Video") || line.startsWith("Video #")) { - step = MediaInfo.StreamKind.Video; + streamType = MediaInfo.StreamKind.Video; } else if (line.equals("Audio") || line.startsWith("Audio #")) { if (audioPrepped) { addAudio(currentAudioTrack, media); currentAudioTrack = new DLNAMediaAudio(); } audioPrepped = true; - step = MediaInfo.StreamKind.Audio; + streamType = MediaInfo.StreamKind.Audio; } else if (line.equals("Text") || line.startsWith("Text #")) { if (subPrepped) { addSub(currentSubTrack, media); currentSubTrack = new DLNAMediaSubtitle(); } subPrepped = true; - step = MediaInfo.StreamKind.Text; + streamType = MediaInfo.StreamKind.Text; } else if (line.equals("Menu") || line.startsWith("Menu #")) { - step = MediaInfo.StreamKind.Menu; + streamType = MediaInfo.StreamKind.Menu; } else if (line.equals("Chapters")) { - step = MediaInfo.StreamKind.Chapters; + streamType = MediaInfo.StreamKind.Chapters; } + int point = line.indexOf(":"); + if (point > -1) { String key = line.substring(0, point).trim(); String ovalue = line.substring(point + 1).trim(); String value = ovalue.toLowerCase(); + if (key.equals("Format") || key.startsWith("Format_Version") || key.startsWith("Format_Profile")) { - if (step == MediaInfo.StreamKind.Text) { + if (streamType == MediaInfo.StreamKind.Text) { // first attempt to detect subtitle track format currentSubTrack.setType(SubtitleType.valueOfLibMediaInfoCodec(value)); } else { - getFormat(step, media, currentAudioTrack, value); + getFormat(streamType, media, currentAudioTrack, value, file); } - } else if (key.equals("Duration/String1") && step == MediaInfo.StreamKind.General) { + } else if (key.equals("Duration/String1") && streamType == MediaInfo.StreamKind.General) { media.setDuration(getDuration(value)); - } else if (key.equals("Codec_Settings_QPel") && step == MediaInfo.StreamKind.Video) { + } else if (key.equals("Codec_Settings_QPel") && streamType == MediaInfo.StreamKind.Video) { media.putExtra(FormatConfiguration.MI_QPEL, value); - } else if (key.equals("Codec_Settings_GMC") && step == MediaInfo.StreamKind.Video) { + } else if (key.equals("Codec_Settings_GMC") && streamType == MediaInfo.StreamKind.Video) { media.putExtra(FormatConfiguration.MI_GMC, value); - } else if (key.equals("MuxingMode") && step == MediaInfo.StreamKind.Video) { + } else if (key.equals("MuxingMode") && streamType == MediaInfo.StreamKind.Video) { media.setMuxingMode(ovalue); } else if (key.equals("CodecID")) { - if (step == MediaInfo.StreamKind.Text) { + if (streamType == MediaInfo.StreamKind.Text) { // second attempt to detect subtitle track format (CodecID usually is more accurate) currentSubTrack.setType(SubtitleType.valueOfLibMediaInfoCodec(value)); } else { - getFormat(step, media, currentAudioTrack, value); + getFormat(streamType, media, currentAudioTrack, value, file); } } else if (key.equals("Language/String")) { - if (step == MediaInfo.StreamKind.Audio) { + if (streamType == MediaInfo.StreamKind.Audio) { currentAudioTrack.setLang(getLang(value)); - } else if (step == MediaInfo.StreamKind.Text) { + } else if (streamType == MediaInfo.StreamKind.Text) { currentSubTrack.setLang(getLang(value)); } } else if (key.equals("Title")) { - if (step == MediaInfo.StreamKind.Audio) { + if (streamType == MediaInfo.StreamKind.Audio) { currentAudioTrack.setFlavor(getFlavor(value)); - } else if (step == MediaInfo.StreamKind.Text) { + } else if (streamType == MediaInfo.StreamKind.Text) { currentSubTrack.setFlavor(getFlavor(value)); } } else if (key.equals("Width")) { @@ -123,91 +133,96 @@ } else if (key.equals("FrameRateMode")) { media.setFrameRateMode(getFrameRateModeValue(value)); } else if (key.equals("OverallBitRate")) { - if (step == MediaInfo.StreamKind.General) { + if (streamType == MediaInfo.StreamKind.General) { media.setBitrate(getBitrate(value)); } } else if (key.equals("Channel(s)")) { - if (step == MediaInfo.StreamKind.Audio) { + if (streamType == MediaInfo.StreamKind.Audio) { currentAudioTrack.getAudioProperties().setNumberOfChannels(value); } } else if (key.equals("BitRate")) { - if (step == MediaInfo.StreamKind.Audio) { + if (streamType == MediaInfo.StreamKind.Audio) { currentAudioTrack.setBitRate(getBitrate(value)); } } else if (key.equals("SamplingRate")) { - if (step == MediaInfo.StreamKind.Audio) { + if (streamType == MediaInfo.StreamKind.Audio) { currentAudioTrack.setSampleFrequency(getSampleFrequency(value)); } } else if (key.equals("ID/String")) { // Special check for OGM: MediaInfo reports specific Audio/Subs IDs (0xn) while mencoder does not if (value.contains("(0x") && !FormatConfiguration.OGG.equals(media.getContainer())) { - if (step == MediaInfo.StreamKind.Audio) { + if (streamType == MediaInfo.StreamKind.Audio) { currentAudioTrack.setId(getSpecificID(value)); - } else if (step == MediaInfo.StreamKind.Text) { + } else if (streamType == MediaInfo.StreamKind.Text) { currentSubTrack.setId(getSpecificID(value)); } } else { - if (step == MediaInfo.StreamKind.Audio) { + if (streamType == MediaInfo.StreamKind.Audio) { currentAudioTrack.setId(media.getAudioTracksList().size()); - } else if (step == MediaInfo.StreamKind.Text) { + } else if (streamType == MediaInfo.StreamKind.Text) { currentSubTrack.setId(media.getSubtitleTracksList().size()); } } - } else if (key.equals("Cover_Data") && step == MediaInfo.StreamKind.General) { + } else if (key.equals("Cover_Data") && streamType == MediaInfo.StreamKind.General) { media.setThumb(getCover(ovalue)); - } else if (key.equals("Track") && step == MediaInfo.StreamKind.General) { + } else if (key.equals("Track") && streamType == MediaInfo.StreamKind.General) { currentAudioTrack.setSongname(ovalue); - } else if (key.equals("Album") && step == MediaInfo.StreamKind.General) { + } else if (key.equals("Album") && streamType == MediaInfo.StreamKind.General) { currentAudioTrack.setAlbum(ovalue); - } else if (key.equals("Performer") && step == MediaInfo.StreamKind.General) { + } else if (key.equals("Performer") && streamType == MediaInfo.StreamKind.General) { currentAudioTrack.setArtist(ovalue); - } else if (key.equals("Genre") && step == MediaInfo.StreamKind.General) { + } else if (key.equals("Genre") && streamType == MediaInfo.StreamKind.General) { currentAudioTrack.setGenre(ovalue); - } else if (key.equals("Recorded_Date") && step == MediaInfo.StreamKind.General) { + } else if (key.equals("Recorded_Date") && streamType == MediaInfo.StreamKind.General) { try { currentAudioTrack.setYear(Integer.parseInt(value)); } catch (NumberFormatException nfe) { - logger.debug("Could not parse year \"" + value + "\""); + LOGGER.debug("Could not parse year \"" + value + "\""); } - } else if (key.equals("Track/Position") && step == MediaInfo.StreamKind.General) { + } else if (key.equals("Track/Position") && streamType == MediaInfo.StreamKind.General) { try { currentAudioTrack.setTrack(Integer.parseInt(value)); } catch (NumberFormatException nfe) { - logger.debug("Could not parse track \"" + value + "\""); + LOGGER.debug("Could not parse track \"" + value + "\""); } - } else if (key.equals("Resolution") && step == MediaInfo.StreamKind.Audio) { + } else if (key.equals("Resolution") && streamType == MediaInfo.StreamKind.Audio) { try { currentAudioTrack.setBitsperSample(Integer.parseInt(value)); } catch (NumberFormatException nfe) { - logger.debug("Could not parse bits per sample \"" + value + "\""); + LOGGER.debug("Could not parse bits per sample \"" + value + "\""); } - } else if (key.equals("Video_Delay") && step == MediaInfo.StreamKind.Audio) { + } else if (key.equals("Video_Delay") && streamType == MediaInfo.StreamKind.Audio) { try { currentAudioTrack.getAudioProperties().setAudioDelay(value); } catch (NumberFormatException nfe) { - logger.debug("Could not parse delay \"" + value + "\""); + LOGGER.debug("Could not parse delay \"" + value + "\""); } } } } } + if (audioPrepped) { addAudio(currentAudioTrack, media); } + if (subPrepped) { addSub(currentSubTrack, media); } - media.finalize(type, file); + + media.finalize(type, inputFile); } catch (Exception e) { - logger.error("Error in MediaInfo parsing:", e); + LOGGER.error("Error in MediaInfo parsing:", e); } finally { MI.Close(); if (media.getContainer() == null) { media.setContainer(DLNAMediaLang.UND); } + if (media.getCodecV() == null) { media.setCodecV(DLNAMediaLang.UND); } + media.setMediaparsed(true); } } @@ -217,9 +232,11 @@ if (currentAudioTrack.getLang() == null) { currentAudioTrack.setLang(DLNAMediaLang.UND); } + if (currentAudioTrack.getCodecA() == null) { currentAudioTrack.setCodecA(DLNAMediaLang.UND); } + media.getAudioTracksList().add(currentAudioTrack); } @@ -227,14 +244,23 @@ if (currentSubTrack.getType() == SubtitleType.UNSUPPORTED) { return; } + if (currentSubTrack.getLang() == null) { currentSubTrack.setLang(DLNAMediaLang.UND); } + media.getSubtitleTracksList().add(currentSubTrack); } - public static void getFormat(MediaInfo.StreamKind current, DLNAMediaInfo media, DLNAMediaAudio audio, String value) { + @Deprecated + // FIXME this is obsolete (replaced by the private method below) and isn't called from anywhere outside this class + public static void getFormat(MediaInfo.StreamKind streamType, DLNAMediaInfo media, DLNAMediaAudio audio, String value) { + getFormat(streamType, media, audio, value, null); + } + + private static void getFormat(MediaInfo.StreamKind streamType, DLNAMediaInfo media, DLNAMediaAudio audio, String value, File file) { String format = null; + if (value.equals("matroska")) { format = FormatConfiguration.MATROSKA; } else if (value.equals("avi") || value.equals("opendml")) { @@ -348,11 +374,11 @@ } if (format != null) { - if (current == MediaInfo.StreamKind.General) { + if (streamType == MediaInfo.StreamKind.General) { media.setContainer(format); - } else if (current == MediaInfo.StreamKind.Video) { + } else if (streamType == MediaInfo.StreamKind.Video) { media.setCodecV(format); - } else if (current == MediaInfo.StreamKind.Audio) { + } else if (streamType == MediaInfo.StreamKind.Audio) { audio.setCodecA(format); } } @@ -362,6 +388,7 @@ if (value.indexOf("pixel") > -1) { value = value.substring(0, value.indexOf("pixel")); } + value = value.trim(); // Value can look like "512 / 512" at this point @@ -377,10 +404,11 @@ if (value.contains("/")) { value = value.substring(0, value.indexOf("/")).trim(); } + try { return Integer.parseInt(value); } catch (NumberFormatException ex) { - logger.info("Unknown bitrate detected. Returning 0."); + LOGGER.info("Unknown bitrate detected. Returning 0."); return 0; } } @@ -389,6 +417,7 @@ if (value.indexOf("(0x") > -1) { value = value.substring(0, value.indexOf("(0x")); } + value = value.trim(); int id = Integer.parseInt(value); return id; @@ -396,13 +425,15 @@ public static String getSampleFrequency(String value) { // some tracks show several values like "48000 / 48000 / 24000" for HE-AAC - // store only first value + // store only the first value if (value.indexOf("/") > -1) { value = value.substring(0, value.indexOf("/")); } + if (value.indexOf("khz") > -1) { value = value.substring(0, value.indexOf("khz")); } + value = value.trim(); return value; } @@ -411,6 +442,7 @@ if (value.indexOf("fps") > -1) { value = value.substring(0, value.indexOf("fps")); } + value = value.trim(); return value; } @@ -419,6 +451,7 @@ if (value.indexOf("/") > -1) { value = value.substring(0, value.indexOf("/")); } + value = value.trim(); return value; } @@ -427,9 +460,11 @@ if (value.indexOf("(") > -1) { value = value.substring(0, value.indexOf("(")); } + if (value.indexOf("/") > -1) { value = value.substring(0, value.indexOf("/")); } + value = value.trim(); return value; } @@ -442,25 +477,33 @@ private static double getDuration(String value) { int h = 0, m = 0, s = 0; StringTokenizer st = new StringTokenizer(value, " "); + while (st.hasMoreTokens()) { String token = st.nextToken(); int hl = token.indexOf("h"); + if (hl > -1) { h = Integer.parseInt(token.substring(0, hl).trim()); } + int mnl = token.indexOf("mn"); + if (mnl > -1) { m = Integer.parseInt(token.substring(0, mnl).trim()); } + int msl = token.indexOf("ms"); + if (msl == -1) { // Only check if ms was not found int sl = token.indexOf("s"); + if (sl > -1) { s = Integer.parseInt(token.substring(0, sl).trim()); } } } + return (h * 3600) + (m * 60) + s; } @@ -470,8 +513,9 @@ return base64.decode(based64Value.getBytes()); } } catch (Exception e) { - logger.error("Error in decoding thumbnail data", e); + LOGGER.error("Error in decoding thumbnail data", e); } + return null; } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/MapFile.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/MapFile.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/MapFile.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/MapFile.java 2013-04-22 19:41:39.000000000 +0000 @@ -179,7 +179,8 @@ public boolean analyzeChildren(int count) { int currentChildrenCount = getChildren().size(); int vfolder = 0; - while ((getChildren().size() - currentChildrenCount) < count || count == -1) { + + while (((getChildren().size() - currentChildrenCount) < count) || (count == -1)) { if (vfolder < getConf().getChildren().size()) { addChild(new MapFile(getConf().getChildren().get(vfolder))); ++vfolder; @@ -187,9 +188,11 @@ if (discoverable.isEmpty()) { break; } + manageFile(discoverable.remove(0)); } } + return discoverable.isEmpty(); } @@ -300,10 +303,12 @@ LOGGER.debug("File automatically added: " + f.getName()); } + // false: don't create the folder if it doesn't exist i.e. find the folder TranscodeVirtualFolder vf = getTranscodeFolder(false); for (DLNAResource f : removedFiles) { getChildren().remove(f); + if (vf != null) { for (int j = vf.getChildren().size() - 1; j >= 0; j--) { if (vf.getChildren().get(j).getName().equals(f.getName())) { @@ -406,7 +411,7 @@ /** * @return the conf - * @since 1.50 + * @since 1.50.0 */ protected MapFileConfiguration getConf() { return conf; @@ -414,7 +419,7 @@ /** * @param conf the conf to set - * @since 1.50 + * @since 1.50.0 */ protected void setConf(MapFileConfiguration conf) { this.conf = conf; @@ -422,7 +427,7 @@ /** * @return the potentialCover - * @since 1.50 + * @since 1.50.0 */ public File getPotentialCover() { return potentialCover; @@ -430,7 +435,7 @@ /** * @param potentialCover the potentialCover to set - * @since 1.50 + * @since 1.50.0 */ public void setPotentialCover(File potentialCover) { this.potentialCover = potentialCover; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/MediaInfo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/MediaInfo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/MediaInfo.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/MediaInfo.java 2013-04-22 19:41:39.000000000 +0000 @@ -36,7 +36,7 @@ import static java.util.Collections.singletonMap; public class MediaInfo { - private static final Logger logger = LoggerFactory.getLogger(MediaInfo.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MediaInfo.class); static String libraryName; static { @@ -53,7 +53,7 @@ // If we do not, the system will look for dependencies, but only in the library path. NativeLibrary.getInstance("zen"); } catch (LinkageError e) { - logger.warn("Error loading libzen: " + e.getMessage()); + LOGGER.warn("Error loading libzen: " + e.getMessage()); } } } @@ -96,6 +96,8 @@ } private Pointer Handle; + @Deprecated + // FIXME rename StreamType public enum StreamKind { General, Video, @@ -107,6 +109,8 @@ } // Enums + @Deprecated + // FIXME rename InfoType public enum InfoKind { /** * Unique name of parameter. @@ -147,17 +151,19 @@ // Constructor/Destructor public MediaInfo() { try { - logger.info("Loading MediaInfo library"); + LOGGER.info("Loading MediaInfo library"); Handle = MediaInfoDLL_Internal.INSTANCE.New(); - logger.info("Loaded " + Option_Static("Info_Version")); + LOGGER.info("Loaded " + Option_Static("Info_Version")); } catch (Throwable e) { if (e != null) { - logger.info("Error loading MediaInfo library: " + e.getMessage()); + LOGGER.info("Error loading MediaInfo library: " + e.getMessage()); } + if (!Platform.isWindows() && !Platform.isMac()) { - logger.info("Make sure you have libmediainfo and libzen installed"); + LOGGER.info("Make sure you have libmediainfo and libzen installed"); } - logger.info("The server will now use the less accurate ffmpeg parsing method"); + + LOGGER.info("The server will now use the less accurate ffmpeg parsing method"); } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/RealFile.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/RealFile.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/RealFile.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/RealFile.java 2013-04-22 19:41:39.000000000 +0000 @@ -31,7 +31,7 @@ import java.util.ArrayList; public class RealFile extends MapFile { - private static final Logger logger = LoggerFactory.getLogger(RealFile.class); + private static final Logger LOGGER = LoggerFactory.getLogger(RealFile.class); public RealFile(File file) { getConf().getFiles().add(file); @@ -49,33 +49,40 @@ public boolean isValid() { File file = this.getFile(); checktype(); + if (getType() == Format.VIDEO && file.exists() && PMS.getConfiguration().isAutoloadSubtitles() && file.getName().length() > 4) { setSrtFile(FileUtil.doesSubtitlesExists(file, null)); } + boolean valid = file.exists() && (getFormat() != null || file.isDirectory()); if (valid && getParent().getDefaultRenderer() != null && getParent().getDefaultRenderer().isMediaParserV2()) { - // we need to resolve the dlna resource now + // we need to resolve the DLNA resource now run(); - if (getMedia() != null && getMedia().getThumb() == null && getType() != Format.AUDIO) // MediaInfo retrieves cover art now - { + + if (getMedia() != null && getMedia().getThumb() == null && getType() != Format.AUDIO) { // MediaInfo retrieves cover art now getMedia().setThumbready(false); } + // Given that here getFormat() has already matched some (possibly plugin-defined) format: // Format.UNKNOWN + bad parse = inconclusive // known types + bad parse = bad/encrypted file if (getType() != Format.UNKNOWN && getMedia() != null && (getMedia().isEncrypted() || getMedia().getContainer() == null || getMedia().getContainer().equals(DLNAMediaLang.UND))) { valid = false; + if (getMedia().isEncrypted()) { - logger.info("The file " + file.getAbsolutePath() + " is encrypted. It will be hidden"); + LOGGER.info("The file {} is encrypted. It will be hidden", file.getAbsolutePath()); } else { - logger.info("The file " + file.getAbsolutePath() + " was badly parsed. It will be hidden"); + LOGGER.info("The file {} was badly parsed. It will be hidden", file.getAbsolutePath()); } } + + // XXX isMediaParserV2ThumbnailGeneration is only true for the "default renderer" if (getParent().getDefaultRenderer().isMediaParserV2ThumbnailGeneration()) { checkThumbnail(); } } + return valid; } @@ -84,8 +91,9 @@ try { return new FileInputStream(getFile()); } catch (FileNotFoundException e) { - logger.debug("File not found: \"" + getFile().getAbsolutePath() + "\""); + LOGGER.debug("File not found: {}", getFile().getAbsolutePath()); } + return null; } @@ -96,6 +104,7 @@ } else if (getMedia() != null && getMedia().isMediaparsed()) { return getMedia().getSize(); } + return getFile().length(); } @@ -112,10 +121,12 @@ if (this.getConf().getName() == null) { String name = null; File file = getFile(); + if (file.getName().trim().equals("")) { if (PMS.get().isWindows()) { name = PMS.get().getRegistry().getDiskLabel(file); } + if (name != null && name.length() > 0) { name = file.getAbsolutePath().substring(0, 1) + ":\\ [" + name + "]"; } else { @@ -124,6 +135,7 @@ } else { name = file.getName(); } + this.getConf().setName(name); } return this.getConf().getName(); @@ -146,6 +158,7 @@ @Override public void resolve() { File file = getFile(); + if (file.isFile() && (getMedia() == null || !getMedia().isMediaparsed())) { boolean found = false; InputFile input = new InputFile(); @@ -173,13 +186,15 @@ if (getMedia() == null) { setMedia(new DLNAMediaInfo()); } + found = !getMedia().isMediaparsed() && !getMedia().isParsing(); + if (getFormat() != null) { getFormat().parse(getMedia(), input, getType(), getParent().getDefaultRenderer()); - } else //don't think that will ever happen - { + } else { // don't think this will ever happen getMedia().parse(input, getFormat(), getType(), false); } + if (found && PMS.getConfiguration().getUseCache()) { DLNAMediaDatabase database = PMS.get().getDatabase(); @@ -189,6 +204,7 @@ } } } + super.resolve(); } @@ -269,13 +285,14 @@ @Override protected String getThumbnailURL() { - if (getType() == Format.IMAGE && !PMS.getConfiguration().getImageThumbnailsEnabled()) - { + if (getType() == Format.IMAGE && !PMS.getConfiguration().getImageThumbnailsEnabled()) { return null; } + StringBuilder sb = new StringBuilder(); sb.append(PMS.get().getServer().getURL()); sb.append("/"); + if (getMedia() != null && getMedia().getThumb() != null) { return super.getThumbnailURL(); } else if (getType() == Format.AUDIO) { @@ -284,6 +301,7 @@ } return null; } + return super.getThumbnailURL(); } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/RootFolder.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/RootFolder.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/RootFolder.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/RootFolder.java 2013-04-22 19:41:39.000000000 +0000 @@ -19,15 +19,8 @@ package net.pms.dlna; import com.sun.jna.Platform; - -import java.io.*; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.net.URISyntaxException; -import java.net.URLDecoder; -import java.util.*; - +import net.pms.Messages; +import net.pms.PMS; import net.pms.configuration.MapFileConfiguration; import net.pms.configuration.PmsConfiguration; import net.pms.configuration.RendererConfiguration; @@ -38,20 +31,22 @@ import net.pms.external.ExternalFactory; import net.pms.external.ExternalListener; import net.pms.gui.IFrame; -import net.pms.Messages; -import net.pms.PMS; - import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import xmlwise.Plist; import xmlwise.XmlParseException; +import java.io.*; +import java.net.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + public class RootFolder extends DLNAResource { private static final Logger LOGGER = LoggerFactory.getLogger(RootFolder.class); private final PmsConfiguration configuration = PMS.getConfiguration(); @@ -785,15 +780,6 @@ } }); - res.addChild(new VirtualVideoAction(Messages.getString("PMS.14"), configuration.isMencoderMuxWhenCompatible()) { - @Override - public boolean enable() { - configuration.setMencoderMuxWhenCompatible(!configuration.isMencoderMuxWhenCompatible()); - - return configuration.isMencoderMuxWhenCompatible(); - } - }); - res.addChild(new VirtualVideoAction(" !!-- Fix 23.976/25fps A/V Mismatch --!!", configuration.isFix25FPSAvMismatch()) { @Override public boolean enable() { @@ -812,12 +798,12 @@ } }); - vfSub.addChild(new VirtualVideoAction(Messages.getString("PMS.10"), configuration.isMencoderDisableSubs()) { + vfSub.addChild(new VirtualVideoAction(Messages.getString("PMS.10"), configuration.isDisableSubtitles()) { @Override public boolean enable() { - boolean oldValue = configuration.isMencoderDisableSubs(); + boolean oldValue = configuration.isDisableSubtitles(); boolean newValue = !oldValue; - configuration.setMencoderDisableSubs(newValue); + configuration.setDisableSubtitles(newValue); return newValue; } }); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/WebStream.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/WebStream.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/WebStream.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/WebStream.java 2013-04-22 19:41:39.000000000 +0000 @@ -117,7 +117,7 @@ /** * @return the url - * @since 1.50 + * @since 1.50.0 */ protected String getUrl() { return url; @@ -125,7 +125,7 @@ /** * @param url the url to set - * @since 1.50 + * @since 1.50.0 */ protected void setUrl(String url) { this.url = url; @@ -133,7 +133,7 @@ /** * @return the fluxName - * @since 1.50 + * @since 1.50.0 */ protected String getFluxName() { return fluxName; @@ -141,7 +141,7 @@ /** * @param fluxName the fluxName to set - * @since 1.50 + * @since 1.50.0 */ protected void setFluxName(String fluxName) { this.fluxName = fluxName; @@ -149,7 +149,7 @@ /** * @return the thumbURL - * @since 1.50 + * @since 1.50.0 */ protected String getThumbURL() { return thumbURL; @@ -157,7 +157,7 @@ /** * @param thumbURL the thumbURL to set - * @since 1.50 + * @since 1.50.0 */ protected void setThumbURL(String thumbURL) { this.thumbURL = thumbURL; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/virtual/TranscodeVirtualFolder.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/virtual/TranscodeVirtualFolder.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/dlna/virtual/TranscodeVirtualFolder.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/dlna/virtual/TranscodeVirtualFolder.java 2013-04-22 19:41:39.000000000 +0000 @@ -21,7 +21,7 @@ import net.pms.PMS; public class TranscodeVirtualFolder extends VirtualFolder { - public TranscodeVirtualFolder(String thumbnailIcon) { + public TranscodeVirtualFolder(String thumbnailIcon) { // XXX thumbnailIcon is always null super(PMS.getConfiguration().getTranscodeFolderName(), thumbnailIcon); } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/AviDemuxerInputStream.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/AviDemuxerInputStream.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/AviDemuxerInputStream.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/AviDemuxerInputStream.java 2013-04-22 19:41:39.000000000 +0000 @@ -162,7 +162,7 @@ } private void parseHeader() throws IOException { - LOGGER.trace("Parsing AVI Stream"); + LOGGER.trace("Parsing AVI stream"); String id = getString(stream, 4); getBytes(stream, 4); String type = getString(stream, 4); @@ -288,7 +288,7 @@ try { command = getString(stream, 4); } catch (Exception e) { - LOGGER.trace("Error attendue: " + e.getMessage()); + LOGGER.trace("Error reading stream: " + e.getMessage()); break; } @@ -386,7 +386,7 @@ if (read < number) { if (read < 0) { - throw new IOException("End of Stream"); + throw new IOException("End of stream"); } for (int i = read; i < number; i++) { diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegAudio.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegAudio.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegAudio.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegAudio.java 2013-04-22 19:41:39.000000000 +0000 @@ -22,43 +22,51 @@ import com.jgoodies.forms.factories.Borders; import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; -import net.pms.Messages; -import net.pms.PMS; + import net.pms.configuration.PmsConfiguration; import net.pms.dlna.DLNAMediaInfo; import net.pms.dlna.DLNAResource; import net.pms.formats.Format; import net.pms.io.OutputParams; import net.pms.io.ProcessWrapper; +import net.pms.io.ProcessWrapperImpl; +import net.pms.Messages; import net.pms.network.HTTPResource; +import net.pms.PMS; -import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import javax.swing.*; public class FFMpegAudio extends FFMpegVideo { public static final String ID = "ffmpegaudio"; private final PmsConfiguration configuration; + // should be private + @Deprecated + JCheckBox noresample; + public FFMpegAudio(PmsConfiguration configuration) { + super(configuration); this.configuration = configuration; } - JCheckBox noresample; @Override public JComponent config() { FormLayout layout = new FormLayout( "left:pref, 0:grow", - "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, 0:grow"); + "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, 0:grow" + ); PanelBuilder builder = new PanelBuilder(layout); builder.setBorder(Borders.EMPTY_BORDER); builder.setOpaque(false); CellConstraints cc = new CellConstraints(); - JComponent cmp = builder.addSeparator("Audio settings", cc.xyw(2, 1, 1)); cmp = (JComponent) cmp.getComponent(0); cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); @@ -71,6 +79,7 @@ configuration.setAudioResample(e.getStateChange() == ItemEvent.SELECTED); } }); + builder.add(noresample, cc.xy(2, 3)); return builder.getPanel(); @@ -86,6 +95,7 @@ return ID; } + // FIXME why is this false if launchTranscode supports it (-ss)? @Override public boolean isTimeSeekable() { return false; @@ -106,8 +116,10 @@ } @Override + @Deprecated public String[] args() { - return new String[]{"-f", "s16be", "-ar", "48000"}; + // unused: kept for backwards compatibility + return new String[] { "-f", "s16be", "-ar", "48000" }; } @Override @@ -117,31 +129,84 @@ @Override public ProcessWrapper launchTranscode( - String fileName, + String filename, DLNAResource dlna, DLNAMediaInfo media, - OutputParams params) throws IOException { - params.maxBufferSize = PMS.getConfiguration().getMaxAudioBuffer(); + OutputParams params + ) throws IOException { + params.maxBufferSize = configuration.getMaxAudioBuffer(); params.waitbeforestart = 2000; params.manageFastStart(); - String args[] = args(); - if (params.mediaRenderer.isTranscodeToMP3()) { - args = new String[]{"-f", "mp3", "-ar", "48000", "-ab", "320000"}; - } - if (params.mediaRenderer.isTranscodeToWAV()) { - args = new String[]{"-f", "wav", "-ar", "48000"}; - } - if (params.mediaRenderer.isTranscodeAudioTo441()) { - args[3] = "44100"; + + int nThreads = configuration.getNumberOfCpuCores(); + List cmdList = new ArrayList(); + + cmdList.add(executable()); + + cmdList.add("-loglevel"); + cmdList.add("warning"); // XXX this should probably be configurable, for debugging + + if (params.timeseek > 0) { + cmdList.add("-ss"); + cmdList.add("" + params.timeseek); } - if (!configuration.isAudioResample()) { - args[2] = "-vn"; - args[3] = "-vn"; + + // decoder threads + cmdList.add("-threads"); + cmdList.add("" + nThreads); + + cmdList.add("-i"); + cmdList.add(filename); + + // encoder threads + cmdList.add("-threads"); + cmdList.add("" + nThreads); + + if (params.timeend > 0) { + cmdList.add("-t"); + cmdList.add("" + params.timeend); } - if (params.mediaRenderer.isTranscodeAudioTo441()) { - args[3] = "44100"; + + if (params.mediaRenderer.isTranscodeToMP3()) { + cmdList.add("-f"); + cmdList.add("mp3"); + cmdList.add("-ab"); + cmdList.add("320000"); + } else if (params.mediaRenderer.isTranscodeToWAV()) { + cmdList.add("-f"); + cmdList.add("wav"); + } else { // default: LPCM + cmdList.add("-f"); + cmdList.add("s16be"); // same as -f wav, but without a WAV header + } + + if (configuration.isAudioResample()) { + if (params.mediaRenderer.isTranscodeAudioTo441()) { + cmdList.add("-ar"); + cmdList.add("44100"); + } else { + cmdList.add("-ar"); + cmdList.add("48000"); + } } - return getFFMpegTranscode(fileName, dlna, media, params, args); + + cmdList.add("pipe:"); + + String[] cmdArray = new String[ cmdList.size() ]; + cmdList.toArray(cmdArray); + + cmdArray = finalizeTranscoderArgs( + filename, + dlna, + media, + params, + cmdArray + ); + + ProcessWrapperImpl pw = new ProcessWrapperImpl(cmdArray, params); + pw.runInNewThread(); + + return pw; } /** diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegAviSynthVideo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegAviSynthVideo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegAviSynthVideo.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegAviSynthVideo.java 2013-04-22 19:41:39.000000000 +0000 @@ -44,6 +44,10 @@ private static final Logger logger = LoggerFactory.getLogger(FFMpegAviSynthVideo.class); public static final String ID = "avsffmpeg"; + public FFMpegAviSynthVideo() { + super(PMS.getConfiguration()); + } + @Override public String id() { return ID; @@ -64,12 +68,12 @@ return config("FFMpegVideo.0"); } - public static File getAVSScript(String fileName, DLNAMediaSubtitle subTrack) throws IOException { - return getAVSScript(fileName, subTrack, -1, -1); + public static File getAVSScript(String filename, DLNAMediaSubtitle subTrack) throws IOException { + return getAVSScript(filename, subTrack, -1, -1); } - public static File getAVSScript(String fileName, DLNAMediaSubtitle subTrack, int fromFrame, int toFrame) throws IOException { - String onlyFileName = fileName.substring(1 + fileName.lastIndexOf("\\")); + public static File getAVSScript(String filename, DLNAMediaSubtitle subTrack, int fromFrame, int toFrame) throws IOException { + String onlyFileName = filename.substring(1 + filename.lastIndexOf("\\")); File file = new File(PMS.getConfiguration().getTempFolder(), "pms-avs-" + onlyFileName + ".avs"); PrintWriter pw = new PrintWriter(new FileOutputStream(file)); @@ -77,13 +81,14 @@ if (PMS.getConfiguration().getAvisynthConvertFps()) { convertfps = ", convertfps=true"; } - File f = new File(fileName); + File f = new File(filename); if (f.exists()) { - fileName = ProcessUtil.getShortFileNameIfWideChars(fileName); + filename = ProcessUtil.getShortFileNameIfWideChars(filename); } - String movieLine = "clip=DirectShowSource(\"" + fileName + "\"" + convertfps + ")"; + String movieLine = "clip=DirectShowSource(\"" + filename + "\"" + convertfps + ")"; String subLine = null; - if (subTrack != null && PMS.getConfiguration().isAutoloadSubtitles() && !PMS.getConfiguration().isMencoderDisableSubs()) { + + if (subTrack != null && PMS.getConfiguration().isAutoloadSubtitles() && !PMS.getConfiguration().isDisableSubtitles()) { logger.trace("Avisynth script: Using sub track: " + subTrack); if (subTrack.getExternalFile() != null) { String function = "TextSub"; @@ -110,7 +115,7 @@ if (fullyManaged) { for (String s : lines) { - s = s.replace("", fileName); + s = s.replace("", filename); if (movieLine != null) { s = s.replace("", movieLine); } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegDVRMSRemux.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegDVRMSRemux.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegDVRMSRemux.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegDVRMSRemux.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,10 +18,16 @@ */ package net.pms.encoders; -import com.jgoodies.forms.builder.PanelBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.FormLayout; +import java.awt.Font; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import javax.swing.JComponent; +import javax.swing.JTextField; + import net.pms.Messages; import net.pms.PMS; import net.pms.configuration.PmsConfiguration; @@ -32,15 +38,13 @@ import net.pms.io.OutputParams; import net.pms.io.ProcessWrapper; import net.pms.io.ProcessWrapperImpl; + import org.apache.commons.lang.StringUtils; -import javax.swing.*; -import java.awt.*; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import com.jgoodies.forms.builder.PanelBuilder; +import com.jgoodies.forms.factories.Borders; +import com.jgoodies.forms.layout.CellConstraints; +import com.jgoodies.forms.layout.FormLayout; public class FFMpegDVRMSRemux extends Player { private JTextField altffpath; @@ -79,11 +83,22 @@ return Format.VIDEO; } + @Deprecated protected String[] getDefaultArgs() { - return new String[]{"-f", "vob", "-copyts", "-vcodec", "copy", "-acodec", "copy"}; + return new String[] { + "-vcodec", "copy", + "-acodec", "copy", + "-threads", "2", + "-g", "1", + "-qscale", "1", + "-qmin", "2", + "-f", "vob", + "-copyts" + }; } @Override + @Deprecated public String[] args() { return getDefaultArgs(); @@ -101,15 +116,18 @@ @Override public ProcessWrapper launchTranscode( - String fileName, + String filename, DLNAResource dlna, DLNAMediaInfo media, - OutputParams params) throws IOException { - return getFFMpegTranscode(fileName, dlna, media, params); + OutputParams params + ) throws IOException { + return getFFMpegTranscode(filename, dlna, media, params); } + // pointless redirection of launchTranscode + @Deprecated protected ProcessWrapperImpl getFFMpegTranscode( - String fileName, + String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params @@ -130,17 +148,20 @@ } cmdList.add("-i"); - cmdList.add(fileName); + cmdList.add(filename); for (String arg : args()) { cmdList.add(arg); } - String[] ffmpegSettings = StringUtils.split(configuration.getFfmpegSettings()); - - if (ffmpegSettings != null) { - for (String option : ffmpegSettings) { - cmdList.add(option); + String customSettingsString = configuration.getFfmpegSettings(); + if (StringUtils.isNotBlank(customSettingsString)) { + String[] customSettingsArray = StringUtils.split(customSettingsString); + + if (customSettingsArray != null) { + for (String option : customSettingsArray) { + cmdList.add(option); + } } } @@ -149,8 +170,7 @@ cmdList.toArray(cmdArray); cmdArray = finalizeTranscoderArgs( - this, - fileName, + filename, dlna, media, params, @@ -167,7 +187,8 @@ public JComponent config() { FormLayout layout = new FormLayout( "left:pref, 3dlu, p, 3dlu, 0:grow", - "p, 3dlu, p, 3dlu, 0:grow"); + "p, 3dlu, p, 3dlu, 0:grow" + ); PanelBuilder builder = new PanelBuilder(layout); builder.setBorder(Borders.EMPTY_BORDER); builder.setOpaque(false); @@ -180,15 +201,7 @@ builder.addLabel(Messages.getString("FFMpegDVRMSRemux.0"), cc.xy(1, 3)); altffpath = new JTextField(PMS.getConfiguration().getFfmpegAlternativePath()); - altffpath.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + altffpath.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { PMS.getConfiguration().setFfmpegAlternativePath(altffpath.getText()); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegVideo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegVideo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegVideo.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegVideo.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,28 +18,35 @@ */ package net.pms.encoders; + import java.awt.Font; +import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; import java.io.File; import java.io.IOException; -import java.util.StringTokenizer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import javax.swing.JComponent; import javax.swing.JTextField; import net.pms.Messages; import net.pms.PMS; +import net.pms.configuration.PmsConfiguration; +import net.pms.configuration.RendererConfiguration; import net.pms.dlna.DLNAMediaInfo; import net.pms.dlna.DLNAMediaSubtitle; import net.pms.dlna.DLNAResource; import net.pms.formats.Format; import net.pms.io.OutputParams; -import net.pms.io.PipeIPCProcess; import net.pms.io.ProcessWrapper; import net.pms.io.ProcessWrapperImpl; import net.pms.network.HTTPResource; +import net.pms.util.FileUtil; +import net.pms.util.ProcessUtil; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,11 +56,297 @@ import com.jgoodies.forms.layout.FormLayout; /** - * Pure FFmpeg video player. + * Pure FFmpeg video player. + * + * Design note: + * + * Helper methods that return lists of Strings representing options are public + * to facilitate composition e.g. a custom engine (plugin) that uses tsMuxeR for videos without + * subtitles and FFmpeg otherwise needs to compose and call methods on both players. + * + * To avoid API churn, and to provide wiggle room for future functionality, all of these methods + * take the same arguments as launchTranscode (and the same first four arguments as + * finalizeTranscoderArgs) even if one or more of the parameters are unused e.g.: + * + * public List getAudioBitrateOptions( + * String filename, + * DLNAResource dlna, + * DLNAMediaInfo media, + * OutputParams params + * ) */ public class FFMpegVideo extends Player { private static final Logger LOGGER = LoggerFactory.getLogger(FFMpegVideo.class); - public static final String ID = "ffmpegvideo"; + private JTextField ffmpeg; + private final PmsConfiguration configuration; + private static final String DEFAULT_QSCALE = "3"; + + // FIXME we have an id() accessor for this; no need for the field to be public + @Deprecated + public static final String ID = "ffmpegvideo"; + + /** + * This constructor is not used in the codebase. + */ + @Deprecated + public FFMpegVideo() { + this(PMS.getConfiguration()); + } + + /** + * Default constructor. + * + * @param configuration The PMS configuration options object + */ + public FFMpegVideo(PmsConfiguration configuration) { + this.configuration = configuration; + } + + /** + * Returns a list of strings representing the rescale options for this transcode i.e. the ffmpeg -vf + * options used to resize a video that's too wide and/or high for the specified renderer. + * If the renderer has no size limits, or there's no media metadata, or the video is within the renderer's + * size limits, an empty list is returned. + * + * @param filename The name of the file being transcoded. + * @param dlna The DLNA resource representing the file being transcoded. + * @param media the media metadata for the file being transcoded. May contain null fields (e.g. for web videos). + * @param params The {@link OutputParams} context object used to store miscellaneous parameters for this request. + * @return a {@link List} of Strings representing the rescale options for this video, + * or an empty list if the video doesn't need to be resized. + * @since 1.81.0 + */ + public List getVideoRescaleOptions(String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params) { + return getRescaleOptions(params.mediaRenderer, media); + } + + // TODO (breaking change) merge this into the method above + @Deprecated + public List getRescaleOptions(RendererConfiguration renderer, DLNAMediaInfo media) { + List rescaleOptions = new ArrayList(); + + boolean isResolutionTooHighForRenderer = renderer.isVideoRescale() // renderer defines a max width/height + && (media != null) + && ( + (media.getWidth() > renderer.getMaxVideoWidth()) + || + (media.getHeight() > renderer.getMaxVideoHeight()) + ); + + if (isResolutionTooHighForRenderer) { + String rescaleSpec = String.format( + // http://stackoverflow.com/a/8351875 + "scale=iw*min(%1$d/iw\\,%2$d/ih):ih*min(%1$d/iw\\,%2$d/ih),pad=%1$d:%2$d:(%1$d-iw)/2:(%2$d-ih)/2", + renderer.getMaxVideoWidth(), + renderer.getMaxVideoHeight() + ); + + rescaleOptions.add("-vf"); + rescaleOptions.add(rescaleSpec); + } + + return rescaleOptions; + } + + /** + * Returns a list of Strings representing ffmpeg output options + * (i.e. options that define the output file's video codec, audio codec and container) + * compatible with the renderer's TranscodeVideo profile. + * + * @param filename The name of the file being transcoded. + * @param dlna The DLNA resource representing the file being transcoded. + * @param media the media metadata for the file being transcoded. May contain null fields (e.g. for web videos). + * @param params The {@link OutputParams} context object used to store miscellaneous parameters for this request. + * @return a {@link List} of Strings representing the ffmpeg output parameters for the renderer according + * to its TranscodeVideo profile. + * @since 1.81.0 + */ + public List getVideoTranscodeOptions(String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params) { + return getTranscodeVideoOptions(params.mediaRenderer, media); + } + + // TODO (breaking change) merge this into the method above + @Deprecated + public List getTranscodeVideoOptions(RendererConfiguration renderer, DLNAMediaInfo media) { + List transcodeOptions = new ArrayList(); + + if (renderer.isTranscodeToWMV()) { // WMV + transcodeOptions.add("-c:v"); + transcodeOptions.add("wmv2"); + + transcodeOptions.add("-c:a"); + transcodeOptions.add("wmav2"); + + transcodeOptions.add("-f"); + transcodeOptions.add("asf"); + } else { // MPEGPSAC3 or MPEGTSAC3 + transcodeOptions.add("-c:v"); + transcodeOptions.add("mpeg2video"); + + transcodeOptions.add("-c:a"); + transcodeOptions.add("ac3"); + + if (renderer.isTranscodeToMPEGTSAC3()) { // MPEGTSAC3 + transcodeOptions.add("-f"); + transcodeOptions.add("mpegts"); + } else { // default: MPEGPSAC3 + transcodeOptions.add("-f"); + transcodeOptions.add("vob"); + } + } + + return transcodeOptions; + } + + /** + * Returns the video bitrate spec for the current transcode according to + * the limits/requirements of the renderer. + * + * @param filename The name of the file being transcoded. + * @param dlna The DLNA resource representing the file being transcoded. + * @param media the media metadata for the file being transcoded. May contain null fields (e.g. for web videos). + * @param params The {@link OutputParams} context object used to store miscellaneous parameters for this request. + * @return a {@link List} of Strings representing the video bitrate options for this transcode + * @since 1.81.0 + */ + public List getVideoBitrateOptions(String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params) { + return getVideoBitrateOptions(params.mediaRenderer, media); + } + + // TODO (breaking change) merge this into the method above + @Deprecated + public List getVideoBitrateOptions(RendererConfiguration renderer, DLNAMediaInfo media) { // media is currently unused + List videoBitrateOptions = new ArrayList(); + String sMaxVideoBitrate = renderer.getMaxVideoBitrate(); // currently Mbit/s + int iMaxVideoBitrate = 0; + + if (sMaxVideoBitrate != null) { + try { + iMaxVideoBitrate = Integer.parseInt(sMaxVideoBitrate); + } catch (NumberFormatException nfe) { + LOGGER.error("Can't parse max video bitrate", nfe); // XXX this should be handled in RendererConfiguration + } + } + + if (iMaxVideoBitrate == 0) { // unlimited: try to preserve the bitrate + videoBitrateOptions.add("-q:v"); // video qscale + videoBitrateOptions.add(DEFAULT_QSCALE); + } else { // limit the bitrate FIXME untested + // convert megabits-per-second (as per the current option name: MaxVideoBitrateMbps) to bps + // FIXME rather than dealing with megabit vs mebibit issues here, this should be left up to the client i.e. + // the renderer.conf unit should be bits-per-second (and the option should be renamed: MaxVideoBitrateMbps -> MaxVideoBitrate) + videoBitrateOptions.add("-b:v"); + videoBitrateOptions.add("" + iMaxVideoBitrate * 1000 * 1000); + } + + return videoBitrateOptions; + } + + /** + * Returns the audio bitrate spec for the current transcode according to + * the limits/requirements of the renderer. + * + * @param filename The name of the file being transcoded. + * @param dlna The DLNA resource representing the file being transcoded. + * @param media the media metadata for the file being transcoded. May contain null fields (e.g. for web videos). + * @param params The {@link OutputParams} context object used to store miscellaneous parameters for this request. + * @return a {@link List} of Strings representing the audio bitrate options for this transcode + * @since 1.81.0 + */ + public List getAudioBitrateOptions(String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params) { + return getAudioBitrateOptions(params.mediaRenderer, media); + } + + // TODO (breaking change) merge this into the method above + @Deprecated + public List getAudioBitrateOptions(RendererConfiguration renderer, DLNAMediaInfo media) { + List audioBitrateOptions = new ArrayList(); + + audioBitrateOptions.add("-q:a"); + audioBitrateOptions.add(DEFAULT_QSCALE); + + return audioBitrateOptions; + } + + /** + * Returns options for burning in subtitles, if enabled and available. + * + * @param filename The name of the file being transcoded. + * @param dlna The DLNA resource representing the file being transcoded. + * @param media the media metadata for the file being transcoded. May contain null fields (e.g. for web videos). + * @param params The {@link OutputParams} context object used to store miscellaneous parameters for this request. + * @return The list of subtitle options. + * @since 1.81.0 + */ + public List getVideoSubtitleOptions(String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params) { + RendererConfiguration renderer = params.mediaRenderer; + List subtitleOptions = new ArrayList(); + String externalSubtitlesFileName = null; + + if (params.sid != null) { + if (params.sid.isExternal()) { + // External subtitle file + if (params.sid.isExternalFileUtf16()) { + try { + // Convert UTF-16 -> UTF-8 + File convertedSubtitles = new File(configuration.getTempFolder(), "utf8_" + params.sid.getExternalFile().getName()); + FileUtil.convertFileFromUtf16ToUtf8(params.sid.getExternalFile(), convertedSubtitles); + externalSubtitlesFileName = ProcessUtil.getShortFileNameIfWideChars(convertedSubtitles.getAbsolutePath()); + } catch (IOException e) { + LOGGER.debug("Error converting file from UTF-16 to UTF-8", e); + externalSubtitlesFileName = ProcessUtil.getShortFileNameIfWideChars(params.sid.getExternalFile().getAbsolutePath()); + } + } else { + externalSubtitlesFileName = ProcessUtil.getShortFileNameIfWideChars(params.sid.getExternalFile().getAbsolutePath()); + } + + // Burn in subtitles with the subtitles filter (available since ffmpeg 1.1) + subtitleOptions.add("-vf"); + subtitleOptions.add("subtitles=" + externalSubtitlesFileName); + } + // TODO: Handle embedded subtitles + } + + return subtitleOptions; + } + + /** + * Returns the audio channel (-ac) options. + * + * @param filename The name of the file being transcoded. + * @param dlna The DLNA resource representing the file being transcoded. + * @param media the media metadata for the file being transcoded. May contain null fields (e.g. for web videos). + * @param params The {@link OutputParams} context object used to store miscellaneous parameters for this request. + * @return The list of audio channel options. + * @since 1.81.0 + */ + + public List getAudioChannelOptions(String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params) { + List audioChannelOptions = new ArrayList(); + int ac = -1; // -1: don't change the number of audio channels + int nChannels = params.aid == null ? -1 : params.aid.getAudioProperties().getNumberOfChannels(); + + if (nChannels == -1) { // unknown (e.g. web video) + ac = 2; // works fine if the video has < 2 channels + } else if (nChannels > 2) { + int maxOutputChannels = configuration.getAudioChannelCount(); + + if (maxOutputChannels <= 2) { + ac = maxOutputChannels; + } else if (params.mediaRenderer.isTranscodeToWMV()) { + // http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=16590 + // XXX WMA Pro (wmapro) supports > 2 channels, but ffmpeg doesn't have an encoder for it + ac = 2; + } + } + + if (ac != -1) { + audioChannelOptions.add("-ac"); + audioChannelOptions.add("" + ac); + } + + return audioChannelOptions; + } @Override public int purpose() { @@ -61,6 +354,7 @@ } @Override + // TODO make this static so it can replace ID, instead of having both public String id() { return ID; } @@ -71,24 +365,10 @@ } @Override + @Deprecated public boolean avisynth() { return false; } - private String overriddenArgs[]; - - public FFMpegVideo() { - if (PMS.getConfiguration().getFfmpegSettings() != null) { - StringTokenizer st = new StringTokenizer( - PMS.getConfiguration().getFfmpegSettings() + " -ab " + PMS.getConfiguration().getAudioBitrate() + "k -threads " + PMS.getConfiguration().getNumberOfCpuCores(), - " " - ); - overriddenArgs = new String[st.countTokens()]; - int i = 0; - while (st.hasMoreTokens()) { - overriddenArgs[i++] = st.nextToken(); - } - } - } @Override public String name() { @@ -100,48 +380,39 @@ return Format.VIDEO; } + // unused; return this array for backwards-compatibility + @Deprecated protected String[] getDefaultArgs() { - return new String[] { "-vcodec", "mpeg2video", "-f", "vob", "-acodec", "ac3" }; + return new String[] { + "-vcodec", + "mpeg2video", + "-f", + "vob", + "-acodec", + "ac3" + }; } @Override + @Deprecated public String[] args() { - String args[] = null; - String defaultArgs[] = getDefaultArgs(); - - if (overriddenArgs != null) { - args = new String[defaultArgs.length + overriddenArgs.length]; - - for (int i = 0; i < defaultArgs.length; i++) { - args[i] = defaultArgs[i]; - } - - boolean loggedDisallowedFfmpegOptions = false; - - for (int i = 0; i < overriddenArgs.length; i++) { - if (overriddenArgs[i].equals("-f") || overriddenArgs[i].equals("-acodec") || overriddenArgs[i].equals("-vcodec")) { - // no need to log this for each disallowed option - if (!loggedDisallowedFfmpegOptions) { - LOGGER.warn("The following ffmpeg options cannot be changed and will be ignored: -f, -acodec, -vcodec"); - loggedDisallowedFfmpegOptions = true; - } - - overriddenArgs[i] = "-y"; + return getDefaultArgs(); // unused; return this array for for backwards compatibility + } - if (i + 1 < overriddenArgs.length) { - overriddenArgs[i + 1] = "-y"; - } - } + private List getCustomArgs() { + List customOptions = new ArrayList(); + String customOptionsString = PMS.getConfiguration().getFfmpegSettings(); - args[i + defaultArgs.length] = overriddenArgs[i]; - } - } else { - args = defaultArgs; + if (StringUtils.isNotBlank(customOptionsString)) { + LOGGER.debug("Custom ffmpeg output options: {}", customOptionsString); } - return args; + Collections.addAll(customOptions, StringUtils.split(customOptionsString)); + return customOptions; } + // XXX hardwired to false and not referenced anywhere else in the codebase + @Deprecated public boolean mplayer() { return false; } @@ -158,111 +429,71 @@ @Override public ProcessWrapper launchTranscode( - String fileName, + String filename, DLNAResource dlna, DLNAMediaInfo media, - OutputParams params) throws IOException { - return getFFMpegTranscode(fileName, dlna, media, params, args()); - } - - protected ProcessWrapperImpl getFFMpegTranscode( - String fileName, - DLNAResource dlna, - DLNAMediaInfo media, - OutputParams params, - String args[] + OutputParams params ) throws IOException { - setAudioAndSubs(fileName, media, params, PMS.getConfiguration()); + int nThreads = PMS.getConfiguration().getNumberOfCpuCores(); + List cmdList = new ArrayList(); - PipeIPCProcess videoP = null; - PipeIPCProcess audioP = null; + // Populate params with audio track and subtitles metadata + setAudioAndSubs(filename, media, params, configuration); - if (mplayer()) { - videoP = new PipeIPCProcess("mplayer_vid1" + System.currentTimeMillis(), "mplayer_vid2" + System.currentTimeMillis(), false, false); - audioP = new PipeIPCProcess("mplayer_aud1" + System.currentTimeMillis(), "mplayer_aud2" + System.currentTimeMillis(), false, false); - } - - String cmdArray[] = new String[14 + args.length]; - cmdArray[0] = executable(); - cmdArray[1] = "-sn"; - cmdArray[2] = "-sn"; - - if (params.timeseek > 0 && !mplayer()) { - cmdArray[1] = "-ss"; - cmdArray[2] = "" + params.timeseek; - } - - cmdArray[3] = "-sn"; - cmdArray[4] = "-sn"; - cmdArray[5] = "-sn"; - cmdArray[6] = "-sn"; - - if (type() == Format.VIDEO) { - cmdArray[5] = "-i"; - cmdArray[6] = fileName; - if (mplayer()) { - cmdArray[3] = "-f"; - cmdArray[4] = "yuv4mpegpipe"; - // cmdArray[6] = pipeprefix + videoPipe + (PMS.get().isWindows()?".2":""); - cmdArray[6] = videoP.getOutputPipe(); - } - } + cmdList.add(executable()); - cmdArray[7] = "-sn"; - cmdArray[8] = "-sn"; - cmdArray[9] = "-sn"; - cmdArray[10] = "-sn"; - - if (type() == Format.VIDEO || type() == Format.AUDIO) { - if (type() == Format.VIDEO && (mplayer())) { - cmdArray[7] = "-f"; - cmdArray[8] = "wav"; - cmdArray[9] = "-i"; - // cmdArray[10] = pipeprefix + audioPipe + (PMS.get().isWindows()?".2":""); - cmdArray[10] = audioP.getOutputPipe(); - } else if (type() == Format.AUDIO) { - cmdArray[7] = "-i"; - cmdArray[8] = fileName; - } + cmdList.add("-loglevel"); + cmdList.add("warning"); // XXX this should probably be configurable, for debugging + + if (params.timeseek > 0) { + cmdList.add("-ss"); + cmdList.add("" + params.timeseek); } + // decoder threads + cmdList.add("-threads"); + cmdList.add("" + nThreads); + + cmdList.add("-i"); + cmdList.add(filename); + + // encoder threads + cmdList.add("-threads"); + cmdList.add("" + nThreads); + if (params.timeend > 0) { - cmdArray[9] = "-t"; - cmdArray[10] = "" + params.timeend; + cmdList.add("-t"); + cmdList.add("" + params.timeend); } - for (int i = 0; i < args.length; i++) { - cmdArray[11 + i] = args[i]; - } + // add video bitrate options (-b:a) + cmdList.addAll(getVideoBitrateOptions(filename, dlna, media, params)); - cmdArray[cmdArray.length - 3] = "-muxpreload"; - cmdArray[cmdArray.length - 2] = "0"; + // add audio bitrate options (-b:v) + cmdList.addAll(getAudioBitrateOptions(filename, dlna, media, params)); - if (PMS.getConfiguration().isFileBuffer()) { - File m = new File(PMS.getConfiguration().getTempFolder(), "pms-transcode.tmp"); - if (m.exists() && !m.delete()) { - LOGGER.info("Temp file currently used.. Waiting 3 seconds"); + // if the source is too large for the renderer, resize it (-vf scale=...) + cmdList.addAll(getVideoRescaleOptions(filename, dlna, media, params)); - try { - Thread.sleep(3000); - } catch (InterruptedException e) { } + // add subtitles (-vf subtitles=...) + cmdList.addAll(getVideoSubtitleOptions(filename, dlna, media, params)); - if (m.exists() && !m.delete()) { - LOGGER.info("Temp file cannot be deleted... Serious ERROR"); - } - } + // add audio channels (-ac) + cmdList.addAll(getAudioChannelOptions(filename, dlna, media, params)); + + // add custom args + cmdList.addAll(getCustomArgs()); - params.outputFile = m; - params.minFileSize = params.minBufferSize; - m.deleteOnExit(); - cmdArray[cmdArray.length - 1] = m.getAbsolutePath(); - } else { - cmdArray[cmdArray.length - 1] = "pipe:"; - } + // add the output options (-f, -acodec, -vcodec) + cmdList.addAll(getVideoTranscodeOptions(filename, dlna, media, params)); + + cmdList.add("pipe:"); + + String[] cmdArray = new String[ cmdList.size() ]; + cmdList.toArray(cmdArray); cmdArray = finalizeTranscoderArgs( - this, - fileName, + filename, dlna, media, params, @@ -270,85 +501,23 @@ ); ProcessWrapperImpl pw = new ProcessWrapperImpl(cmdArray, params); - - if (type() != Format.AUDIO && (mplayer())) { - ProcessWrapper mkfifo_vid_process = videoP.getPipeProcess(); - ProcessWrapper mkfifo_aud_process = audioP.getPipeProcess(); - - String seek_param = "-quiet"; - String seek_value = "-quiet"; - - if (params.timeseek > 0) { - seek_param = "-ss"; - seek_value = "" + params.timeseek; - } - - String overiddenMPlayerArgs[] = null; - - overiddenMPlayerArgs = new String[0]; - - String[] mPlayerdefaultVideoArgs = new String[] { - fileName, - seek_param, - seek_value, - "-vo", - "yuv4mpeg:file=" + videoP.getInputPipe(), - "-ao", - "pcm:waveheader:file=" + audioP.getInputPipe(), - "-benchmark", - "-noframedrop", - "-speed", - "100"/*, "-quiet"*/ - }; - - OutputParams mplayer_vid_params = new OutputParams(PMS.getConfiguration()); - mplayer_vid_params.maxBufferSize = 1; - - String videoArgs[] = new String[1 + overiddenMPlayerArgs.length + mPlayerdefaultVideoArgs.length]; - videoArgs[0] = PMS.getConfiguration().getMplayerPath(); - System.arraycopy(overiddenMPlayerArgs, 0, videoArgs, 1, overiddenMPlayerArgs.length); - System.arraycopy(mPlayerdefaultVideoArgs, 0, videoArgs, 1 + overiddenMPlayerArgs.length, mPlayerdefaultVideoArgs.length); - ProcessWrapperImpl mplayer_vid_process = new ProcessWrapperImpl(videoArgs, mplayer_vid_params); - - if (type() == Format.VIDEO) { - pw.attachProcess(mkfifo_vid_process); - } - - if (type() == Format.VIDEO || type() == Format.AUDIO) { - pw.attachProcess(mkfifo_aud_process); - } - - if (type() == Format.VIDEO) { - pw.attachProcess(mplayer_vid_process); - } - - if (type() == Format.VIDEO) { - mkfifo_vid_process.runInNewThread(); - } - - if (type() == Format.VIDEO || type() == Format.AUDIO) { - mkfifo_aud_process.runInNewThread(); - } - - try { - Thread.sleep(250); - } catch (InterruptedException e) { } - - if (type() == Format.VIDEO) { - videoP.deleteLater(); - mplayer_vid_process.runInNewThread(); - } - - try { - Thread.sleep(250); - } catch (InterruptedException e) { } - } - pw.runInNewThread(); + return pw; } - private JTextField ffmpeg; + // XXX pointless redirection of launchTranscode + // TODO remove this method and move its body into launchTranscode + @Deprecated + protected ProcessWrapperImpl getFFMpegTranscode( + String filename, + DLNAResource dlna, + DLNAMediaInfo media, + OutputParams params, + String args[] + ) throws IOException { + return (ProcessWrapperImpl) launchTranscode(filename, dlna, media, params); + } @Override public JComponent config() { @@ -371,15 +540,7 @@ cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); ffmpeg = new JTextField(PMS.getConfiguration().getFfmpegSettings()); - ffmpeg.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + ffmpeg.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { PMS.getConfiguration().setFfmpegSettings(ffmpeg.getText()); @@ -405,14 +566,14 @@ // Check whether the subtitle actually has a language defined, // uninitialized DLNAMediaSubtitle objects have a null language. if (subtitle != null && subtitle.getLang() != null) { - // The resource needs a subtitle, but PMS does not support subtitles for FFmpeg. + // The resource needs a subtitle, but PMS support for FFmpeg subtitles has not yet been implemented. return false; } try { String audioTrackName = resource.getMediaAudio().toString(); String defaultAudioTrackName = resource.getMedia().getAudioTracksList().get(0).toString(); - + if (!audioTrackName.equals(defaultAudioTrackName)) { // PMS only supports playback of the default audio track for FFmpeg return false; @@ -430,8 +591,7 @@ if (format != null) { Format.Identifier id = format.getIdentifier(); - if (id.equals(Format.Identifier.MKV) - || id.equals(Format.Identifier.MPG)) { + if (id.equals(Format.Identifier.MKV) || id.equals(Format.Identifier.MPG)) { return true; } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegWebVideo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegWebVideo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegWebVideo.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/FFMpegWebVideo.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,9 +18,14 @@ */ package net.pms.encoders; +import java.util.ArrayList; +import java.util.List; + import net.pms.configuration.PmsConfiguration; +import net.pms.configuration.RendererConfiguration; import net.pms.dlna.DLNAMediaInfo; import net.pms.dlna.DLNAResource; +import net.pms.encoders.FFMpegVideo; import net.pms.formats.Format; import net.pms.io.OutputParams; import net.pms.io.PipeProcess; @@ -33,11 +38,14 @@ import javax.swing.*; import java.io.IOException; -public class FFMpegWebVideo extends Player { +public class FFMpegWebVideo extends FFMpegVideo { private static final Logger LOGGER = LoggerFactory.getLogger(FFMpegWebVideo.class); - public static final String ID = "ffmpegwebvideo"; private final PmsConfiguration configuration; + // FIXME we have an id() accessor for this; no need for the field to be public + @Deprecated + public static final String ID = "ffmpegwebvideo"; + @Override public JComponent config() { return null; @@ -58,55 +66,90 @@ return false; } - @Override - public String mimeType() { - return "video/mpeg"; - } - public FFMpegWebVideo(PmsConfiguration configuration) { + super(configuration); this.configuration = configuration; } @Override public ProcessWrapper launchTranscode( - String fileName, + String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params ) throws IOException { params.minBufferSize = params.minFileSize; params.secondread_minsize = 100000; + RendererConfiguration renderer = params.mediaRenderer; - // basename of the named pipe: ffmpeg -y -loglevel warning -threads nThreads -i URL -threads nThreads -target ntsc-dvd /path/to/fifoName - String fifoName = String.format("ffmpegwebvideo_%d_%d", Thread.currentThread().getId(), System.currentTimeMillis()); + // basename of the named pipe: + // ffmpeg -loglevel warning -threads nThreads -i URL -threads nThreads -audio-channel-options -transcode-video-options /path/to/fifoName + String fifoName = String.format( + "ffmpegwebvideo_%d_%d", + Thread.currentThread().getId(), + System.currentTimeMillis() + ); // This process wraps the command that creates the named pipe PipeProcess pipe = new PipeProcess(fifoName); + pipe.deleteLater(); // delete the named pipe later; harmless if it isn't created + ProcessWrapper mkfifo_process = pipe.getPipeProcess(); + // start the process as early as possible + mkfifo_process.runInNewThread(); params.input_pipes[0] = pipe; int nThreads = configuration.getNumberOfCpuCores(); - // work around an ffmpeg bug: http://ffmpeg.org/trac/ffmpeg/ticket/998 - if (fileName.startsWith("mms:")) { - fileName = "mmsh:" + fileName.substring(4); + // XXX work around an ffmpeg bug: http://ffmpeg.org/trac/ffmpeg/ticket/998 + if (filename.startsWith("mms:")) { + filename = "mmsh:" + filename.substring(4); } // build the command line - String[] cmdArray = new String[] { - executable(), - "-y", - "-loglevel", "warning", - "-threads", "" + nThreads, - "-i", fileName, - "-threads", "" + nThreads, - "-target", "ntsc-dvd", - pipe.getInputPipe() - }; + List cmdList = new ArrayList(); + + cmdList.add(executable()); + + // XXX squashed bug - without this, ffmpeg hangs waiting for a confirmation + // that it can write to a file that already exists i.e. the named pipe + cmdList.add("-y"); + + cmdList.add("-loglevel"); + cmdList.add("warning"); // XXX this should probably be configurable, for debugging + + // decoder threads + cmdList.add("-threads"); + cmdList.add("" + nThreads); + + cmdList.add("-i"); + cmdList.add(filename); + + // encoder threads + cmdList.add("-threads"); + cmdList.add("" + nThreads); + + // add video bitrate options (-b:a) + cmdList.addAll(getVideoBitrateOptions(filename, dlna, media, params)); + + // add audio bitrate options (-b:v) + cmdList.addAll(getAudioBitrateOptions(filename, dlna, media, params)); + + // add audio channels (-ac) + cmdList.addAll(getAudioChannelOptions(filename, dlna, media, params)); + + // add the output options (-f, -acodec, -vcodec) + cmdList.addAll(getVideoTranscodeOptions(filename, dlna, media, params)); + + // output file + cmdList.add(pipe.getInputPipe()); + + // convert the command list to an array + String[] cmdArray = new String[ cmdList.size() ]; + cmdList.toArray(cmdArray); // hook to allow plugins to customize this command line cmdArray = finalizeTranscoderArgs( - this, - fileName, + filename, dlna, media, params, @@ -115,27 +158,23 @@ // now launch ffmpeg ProcessWrapperImpl pw = new ProcessWrapperImpl(cmdArray, params); - ProcessWrapper mkfifo_process = pipe.getPipeProcess(); - pw.attachProcess(mkfifo_process); - - // create the named pipe and wait briefly to allow it to be created - mkfifo_process.runInNewThread(); + pw.attachProcess(mkfifo_process); // clean up the mkfifo process when the transcode ends + // give the mkfifo process a little time try { - Thread.sleep(200); + Thread.sleep(300); } catch (InterruptedException e) { - LOGGER.error("thread interrupted while waiting for named pipe to be created", e); + LOGGER.error("Thread interrupted while waiting for named pipe to be created", e); } - pipe.deleteLater(); - - // launch transcode command and wait briefly to allow it to start + // launch the transcode command... pw.runInNewThread(); + // ... and wait briefly to allow it to start try { Thread.sleep(200); } catch (InterruptedException e) { - LOGGER.error("thread interrupted while waiting for transcode to start", e); + LOGGER.error("Thread interrupted while waiting for transcode to start", e); } return pw; @@ -146,22 +185,13 @@ return "FFmpeg Web Video"; } - @Override // TODO remove this when it's removed from Player + @Deprecated + @Override public String[] args() { return null; } - @Override - public String executable() { - return configuration.getFfmpegPath(); - } - - @Override - public int type() { - return Format.VIDEO; - } - /** * {@inheritDoc} */ diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderAviSynth.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderAviSynth.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderAviSynth.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderAviSynth.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,23 +18,29 @@ */ package net.pms.encoders; -import com.jgoodies.forms.builder.PanelBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.FormLayout; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.util.StringTokenizer; + +import javax.swing.JCheckBox; +import javax.swing.JComponent; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; + import net.pms.Messages; import net.pms.PMS; import net.pms.configuration.PmsConfiguration; import net.pms.dlna.DLNAResource; import net.pms.formats.Format; -import javax.swing.*; -import java.awt.*; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.util.StringTokenizer; +import com.jgoodies.forms.builder.PanelBuilder; +import com.jgoodies.forms.factories.Borders; +import com.jgoodies.forms.layout.CellConstraints; +import com.jgoodies.forms.layout.FormLayout; public class MEncoderAviSynth extends MEncoderVideo { public MEncoderAviSynth(PmsConfiguration configuration) { @@ -87,15 +93,7 @@ i++; } textArea = new JTextArea(sb.toString()); - textArea.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + textArea.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { StringBuilder sb = new StringBuilder(); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderVideo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderVideo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderVideo.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderVideo.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,23 +18,67 @@ */ package net.pms.encoders; -import bsh.EvalError; -import bsh.Interpreter; -import com.jgoodies.forms.builder.PanelBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.FormLayout; -import com.sun.jna.Platform; +import static net.pms.formats.v2.AudioUtils.getLPCMChannelMappingForMencoder; +import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang.StringUtils.defaultString; +import static org.apache.commons.lang.StringUtils.isBlank; +import static org.apache.commons.lang.StringUtils.isNotBlank; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.ComponentOrientation; +import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Locale; +import java.util.Map; +import java.util.StringTokenizer; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JColorChooser; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; + import net.pms.Messages; import net.pms.PMS; import net.pms.configuration.FormatConfiguration; import net.pms.configuration.PmsConfiguration; import net.pms.configuration.RendererConfiguration; -import net.pms.dlna.*; +import net.pms.dlna.DLNAMediaAudio; +import net.pms.dlna.DLNAMediaInfo; +import net.pms.dlna.DLNAResource; +import net.pms.dlna.InputFile; import net.pms.formats.Format; import net.pms.formats.v2.SubtitleType; import net.pms.formats.v2.SubtitleUtils; -import net.pms.io.*; +import net.pms.io.OutputParams; +import net.pms.io.PipeIPCProcess; +import net.pms.io.PipeProcess; +import net.pms.io.ProcessWrapper; +import net.pms.io.ProcessWrapperImpl; +import net.pms.io.StreamModifier; import net.pms.network.HTTPResource; import net.pms.newgui.FontFileFilter; import net.pms.newgui.LooksFrame; @@ -44,21 +88,20 @@ import net.pms.util.FileUtil; import net.pms.util.FormLayoutUtil; import net.pms.util.ProcessUtil; + +import org.apache.commons.configuration.event.ConfigurationEvent; +import org.apache.commons.configuration.event.ConfigurationListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; -import java.awt.*; -import java.awt.event.*; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.*; -import java.util.List; +import bsh.EvalError; +import bsh.Interpreter; -import static net.pms.formats.v2.AudioUtils.getLPCMChannelMappingForMencoder; -import static org.apache.commons.lang.BooleanUtils.isTrue; -import static org.apache.commons.lang.StringUtils.*; +import com.jgoodies.forms.builder.PanelBuilder; +import com.jgoodies.forms.factories.Borders; +import com.jgoodies.forms.layout.CellConstraints; +import com.jgoodies.forms.layout.FormLayout; +import com.sun.jna.Platform; public class MEncoderVideo extends Player { private static final Logger LOGGER = LoggerFactory.getLogger(MEncoderVideo.class); @@ -75,10 +118,6 @@ private JTextField mencoder_noass_blur; private JTextField mencoder_noass_outline; private JTextField mencoder_custom_options; - private JTextField langs; - private JTextField defaultsubs; - private JTextField forcedsub; - private JTextField forcedtags; private JTextField defaultaudiosubs; private JTextField defaultfont; private JComboBox subcp; @@ -96,11 +135,9 @@ private JCheckBox videoremux; private JCheckBox noskip; private JCheckBox intelligentsync; - private JTextField alternateSubFolder; private JButton subColor; private JTextField ocw; private JTextField och; - private JCheckBox subs; private JCheckBox fribidi; private final PmsConfiguration configuration; @@ -168,10 +205,6 @@ return noskip; } - public JCheckBox getSubs() { - return subs; - } - public MEncoderVideo(PmsConfiguration configuration) { this.configuration = configuration; } @@ -318,7 +351,7 @@ } }); - builder.add(button, FormLayoutUtil.flip(cc.xyw(1, 11, 2), colSpec, orientation)); + builder.add(button, FormLayoutUtil.flip(cc.xyw(1, 11, 4), colSpec, orientation)); forcefps = new JCheckBox(Messages.getString("MEncoderVideo.4")); forcefps.setContentAreaFilled(false); @@ -364,15 +397,7 @@ builder.addLabel(Messages.getString("MEncoderVideo.28"), FormLayoutUtil.flip(cc.xyw(10, 5, 3, CellConstraints.RIGHT, CellConstraints.CENTER), colSpec, orientation)); scaleX = new JTextField("" + configuration.getMencoderScaleX()); - scaleX.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + scaleX.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { try { @@ -386,15 +411,7 @@ builder.add(scaleX, FormLayoutUtil.flip(cc.xyw(13, 5, 3), colSpec, orientation)); builder.addLabel(Messages.getString("MEncoderVideo.30"), FormLayoutUtil.flip(cc.xyw(10, 7, 3, CellConstraints.RIGHT, CellConstraints.CENTER), colSpec, orientation)); scaleY = new JTextField("" + configuration.getMencoderScaleY()); - scaleY.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + scaleY.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { try { @@ -414,36 +431,13 @@ scaleY.setEnabled(false); } - videoremux = new JCheckBox("" + Messages.getString("MEncoderVideo.38") + ""); - videoremux.setContentAreaFilled(false); - - if (configuration.isMencoderMuxWhenCompatible()) { - videoremux.setSelected(true); - } - - videoremux.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - configuration.setMencoderMuxWhenCompatible((e.getStateChange() == ItemEvent.SELECTED)); - } - }); - - builder.add(videoremux, FormLayoutUtil.flip(cc.xyw(1, 9, 13), colSpec, orientation)); - cmp = builder.addSeparator(Messages.getString("MEncoderVideo.5"), FormLayoutUtil.flip(cc.xyw(1, 19, 15), colSpec, orientation)); cmp = (JComponent) cmp.getComponent(0); cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); builder.addLabel(Messages.getString("MEncoderVideo.6"), FormLayoutUtil.flip(cc.xy(1, 21), colSpec, orientation)); mencoder_custom_options = new JTextField(configuration.getMencoderCustomOptions()); - mencoder_custom_options.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + mencoder_custom_options.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderCustomOptions(mencoder_custom_options.getText()); @@ -451,98 +445,15 @@ }); builder.add(mencoder_custom_options, FormLayoutUtil.flip(cc.xyw(3, 21, 13), colSpec, orientation)); - builder.addLabel(Messages.getString("MEncoderVideo.7"), FormLayoutUtil.flip(cc.xyw(1, 23, 15), colSpec, orientation)); - - langs = new JTextField(configuration.getMencoderAudioLanguages()); - langs.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - configuration.setMencoderAudioLanguages(langs.getText()); - } - }); - - builder.add(langs, FormLayoutUtil.flip(cc.xyw(3, 23, 8), colSpec, orientation)); cmp = builder.addSeparator(Messages.getString("MEncoderVideo.8"), FormLayoutUtil.flip(cc.xyw(1, 25, 15), colSpec, orientation)); cmp = (JComponent) cmp.getComponent(0); cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); - builder.addLabel(Messages.getString("MEncoderVideo.9"), FormLayoutUtil.flip(cc.xy(1, 27), colSpec, orientation)); - - defaultsubs = new JTextField(configuration.getMencoderSubLanguages()); - defaultsubs.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - configuration.setMencoderSubLanguages(defaultsubs.getText()); - } - }); - - builder.addLabel(Messages.getString("MEncoderVideo.94"), FormLayoutUtil.flip(cc.xy(5, 27), colSpec, orientation)); - - forcedsub = new JTextField(configuration.getMencoderForcedSubLanguage()); - forcedsub.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - configuration.setMencoderForcedSubLanguage(forcedsub.getText()); - } - }); - - builder.addLabel(Messages.getString("MEncoderVideo.95"), FormLayoutUtil.flip(cc.xy(9, 27), colSpec, orientation)); - forcedtags = new JTextField(configuration.getMencoderForcedSubTags()); - forcedtags.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - configuration.setMencoderForcedSubTags(forcedtags.getText()); - } - }); - - builder.add(defaultsubs, FormLayoutUtil.flip(cc.xyw(3, 27, 2), colSpec, orientation)); - builder.add(forcedsub, FormLayoutUtil.flip(cc.xy(7, 27), colSpec, orientation)); - builder.add(forcedtags, FormLayoutUtil.flip(cc.xyw(11, 27, 5), colSpec, orientation)); builder.addLabel(Messages.getString("MEncoderVideo.10"), FormLayoutUtil.flip(cc.xy(1, 29), colSpec, orientation)); defaultaudiosubs = new JTextField(configuration.getMencoderAudioSubLanguages()); - defaultaudiosubs.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + defaultaudiosubs.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderAudioSubLanguages(defaultaudiosubs.getText()); @@ -580,7 +491,7 @@ Messages.getString("MEncoderVideo.115"), Messages.getString("MEncoderVideo.116"), Messages.getString("MEncoderVideo.117"), - Messages.getString("MEncoderVideo.118"), + Messages.getString("MEncoderVideo.118"), Messages.getString("MEncoderVideo.119"), Messages.getString("MEncoderVideo.120"), Messages.getString("MEncoderVideo.121"), @@ -606,15 +517,7 @@ } } }); - subcp.getEditor().getEditorComponent().addKeyListener(new KeyListener() { - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyPressed(KeyEvent e) { - } - + subcp.getEditor().getEditorComponent().addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { subcp.getItemListeners()[0].itemStateChanged(new ItemEvent(subcp, 0, subcp.getEditor().getItem(), ItemEvent.SELECTED)); @@ -641,15 +544,7 @@ builder.addLabel(Messages.getString("MEncoderVideo.24"), FormLayoutUtil.flip(cc.xy(1, 33), colSpec, orientation)); defaultfont = new JTextField(configuration.getMencoderFont()); - defaultfont.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + defaultfont.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderFont(defaultfont.getText()); @@ -673,261 +568,158 @@ }); builder.add(fontselect, FormLayoutUtil.flip(cc.xyw(11, 33, 2), colSpec, orientation)); - builder.addLabel(Messages.getString("MEncoderVideo.37"), FormLayoutUtil.flip(cc.xyw(1, 35, 3), colSpec, orientation)); - alternateSubFolder = new JTextField(configuration.getAlternateSubsFolder()); - alternateSubFolder.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { + ass = new JCheckBox(Messages.getString("MEncoderVideo.20")); + ass.setContentAreaFilled(false); + ass.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + if (e != null) { + configuration.setMencoderAss(e.getStateChange() == ItemEvent.SELECTED); + } } + }); - @Override - public void keyTyped(KeyEvent e) { - } + builder.add(ass, FormLayoutUtil.flip(cc.xy(1, 37), colSpec, orientation)); + ass.setSelected(configuration.isMencoderAss()); + ass.getItemListeners()[0].itemStateChanged(null); - @Override - public void keyReleased(KeyEvent e) { - configuration.setAlternateSubsFolder(alternateSubFolder.getText()); + fc = new JCheckBox(Messages.getString("MEncoderVideo.21")); + fc.setContentAreaFilled(false); + fc.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + configuration.setMencoderFontConfig(e.getStateChange() == ItemEvent.SELECTED); } }); - builder.add(alternateSubFolder, FormLayoutUtil.flip(cc.xyw(3, 35, 8), colSpec, orientation)); + builder.add(fc, FormLayoutUtil.flip(cc.xyw(3, 37, 5), colSpec, orientation)); + fc.setSelected(configuration.isMencoderFontConfig()); - JButton select = new JButton("..."); - select.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - JFileChooser chooser = null; - try { - chooser = new JFileChooser(); - } catch (Exception ee) { - chooser = new JFileChooser(new RestrictedFileSystemView()); - } - chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - int returnVal = chooser.showDialog((Component) e.getSource(), Messages.getString("FoldTab.28")); - if (returnVal == JFileChooser.APPROVE_OPTION) { - alternateSubFolder.setText(chooser.getSelectedFile().getAbsolutePath()); - configuration.setAlternateSubsFolder(chooser.getSelectedFile().getAbsolutePath()); - } + assdefaultstyle = new JCheckBox(Messages.getString("MEncoderVideo.36")); + assdefaultstyle.setContentAreaFilled(false); + assdefaultstyle.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + configuration.setMencoderAssDefaultStyle(e.getStateChange() == ItemEvent.SELECTED); } }); - builder.add(select, FormLayoutUtil.flip(cc.xyw(11, 35, 2), colSpec, orientation)); - builder.addLabel(Messages.getString("MEncoderVideo.12"), FormLayoutUtil.flip(cc.xy(1, 39, CellConstraints.RIGHT, CellConstraints.CENTER), colSpec, orientation)); - - mencoder_ass_scale = new JTextField(configuration.getMencoderAssScale()); - mencoder_ass_scale.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } + builder.add(assdefaultstyle, FormLayoutUtil.flip(cc.xyw(8, 37, 4), colSpec, orientation)); + assdefaultstyle.setSelected(configuration.isMencoderAssDefaultStyle()); - @Override - public void keyTyped(KeyEvent e) { - } + builder.addLabel(Messages.getString("MEncoderVideo.15"), FormLayoutUtil.flip(cc.xy(1, 39, CellConstraints.RIGHT, CellConstraints.CENTER), colSpec, orientation)); + mencoder_ass_margin = new JTextField(configuration.getMencoderAssMargin()); + mencoder_ass_margin.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - configuration.setMencoderAssScale(mencoder_ass_scale.getText()); + configuration.setMencoderAssMargin(mencoder_ass_margin.getText()); } }); - builder.addLabel(Messages.getString("MEncoderVideo.13"), FormLayoutUtil.flip(cc.xy(5, 39), colSpec, orientation)); - - mencoder_ass_outline = new JTextField(configuration.getMencoderAssOutline()); - mencoder_ass_outline.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } + builder.add(mencoder_ass_margin, FormLayoutUtil.flip(cc.xy(3, 39), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.19"), FormLayoutUtil.flip(cc.xy(5, 39), colSpec, orientation)); + mencoder_noass_subpos = new JTextField(configuration.getMencoderNoAssSubPos()); + mencoder_noass_subpos.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - configuration.setMencoderAssOutline(mencoder_ass_outline.getText()); + configuration.setMencoderNoAssSubPos(mencoder_noass_subpos.getText()); } }); - builder.addLabel(Messages.getString("MEncoderVideo.14"), FormLayoutUtil.flip(cc.xy(9, 39), colSpec, orientation)); + builder.add(mencoder_noass_subpos, FormLayoutUtil.flip(cc.xy(7, 39), colSpec, orientation)); - mencoder_ass_shadow = new JTextField(configuration.getMencoderAssShadow()); - mencoder_ass_shadow.addKeyListener(new KeyListener() { + subColor = new JButton(); + subColor.setText(Messages.getString("MEncoderVideo.31")); + subColor.setBackground(new Color(configuration.getSubsColor())); + subColor.addActionListener(new ActionListener() { @Override - public void keyPressed(KeyEvent e) { - } + public void actionPerformed(ActionEvent e) { + Color newColor = JColorChooser.showDialog( + SwingUtilities.getWindowAncestor((Component) PMS.get().getFrame()), + Messages.getString("MEncoderVideo.125"), + subColor.getBackground() + ); - @Override - public void keyTyped(KeyEvent e) { + if (newColor != null) { + subColor.setBackground(newColor); + configuration.setSubsColor(newColor.getRGB()); + } } + }); + + builder.add(subColor, FormLayoutUtil.flip(cc.xyw(9, 39, 4), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.12"), FormLayoutUtil.flip(cc.xy(1, 41, CellConstraints.RIGHT, CellConstraints.CENTER), colSpec, orientation)); + + mencoder_ass_scale = new JTextField(configuration.getMencoderAssScale()); + mencoder_ass_scale.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - configuration.setMencoderAssShadow(mencoder_ass_shadow.getText()); + configuration.setMencoderAssScale(mencoder_ass_scale.getText()); } }); - builder.addLabel(Messages.getString("MEncoderVideo.15"), FormLayoutUtil.flip(cc.xy(13, 39), colSpec, orientation)); + builder.add(mencoder_ass_scale, FormLayoutUtil.flip(cc.xy(3, 41), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.13"), FormLayoutUtil.flip(cc.xy(5, 41), colSpec, orientation)); - mencoder_ass_margin = new JTextField(configuration.getMencoderAssMargin()); - mencoder_ass_margin.addKeyListener(new KeyListener() { + mencoder_ass_outline = new JTextField(configuration.getMencoderAssOutline()); + mencoder_ass_outline.addKeyListener(new KeyAdapter() { @Override - public void keyPressed(KeyEvent e) { + public void keyReleased(KeyEvent e) { + configuration.setMencoderAssOutline(mencoder_ass_outline.getText()); } + }); - @Override - public void keyTyped(KeyEvent e) { - } + builder.add(mencoder_ass_outline, FormLayoutUtil.flip(cc.xy(7, 41), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.14"), FormLayoutUtil.flip(cc.xy(9, 41), colSpec, orientation)); + mencoder_ass_shadow = new JTextField(configuration.getMencoderAssShadow()); + mencoder_ass_shadow.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - configuration.setMencoderAssMargin(mencoder_ass_margin.getText()); + configuration.setMencoderAssShadow(mencoder_ass_shadow.getText()); } }); - builder.add(mencoder_ass_scale, FormLayoutUtil.flip(cc.xy(3, 39), colSpec, orientation)); - builder.add(mencoder_ass_outline, FormLayoutUtil.flip(cc.xy(7, 39), colSpec, orientation)); - builder.add(mencoder_ass_shadow, FormLayoutUtil.flip(cc.xy(11, 39), colSpec, orientation)); - builder.add(mencoder_ass_margin, FormLayoutUtil.flip(cc.xy(15, 39), colSpec, orientation)); - builder.addLabel(Messages.getString("MEncoderVideo.16"), FormLayoutUtil.flip(cc.xy(1, 41, CellConstraints.RIGHT, CellConstraints.CENTER), colSpec, orientation)); + builder.add(mencoder_ass_shadow, FormLayoutUtil.flip(cc.xy(11, 41), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.16"), FormLayoutUtil.flip(cc.xy(1, 43, CellConstraints.RIGHT, CellConstraints.CENTER), colSpec, orientation)); mencoder_noass_scale = new JTextField(configuration.getMencoderNoAssScale()); - mencoder_noass_scale.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + mencoder_noass_scale.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderNoAssScale(mencoder_noass_scale.getText()); } }); - builder.addLabel(Messages.getString("MEncoderVideo.17"), FormLayoutUtil.flip(cc.xy(5, 41), colSpec, orientation)); + builder.add(mencoder_noass_scale, FormLayoutUtil.flip(cc.xy(3, 43), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.17"), FormLayoutUtil.flip(cc.xy(5, 43), colSpec, orientation)); mencoder_noass_outline = new JTextField(configuration.getMencoderNoAssOutline()); - mencoder_noass_outline.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + mencoder_noass_outline.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderNoAssOutline(mencoder_noass_outline.getText()); } }); - builder.addLabel(Messages.getString("MEncoderVideo.18"), FormLayoutUtil.flip(cc.xy(9, 41), colSpec, orientation)); + builder.add(mencoder_noass_outline, FormLayoutUtil.flip(cc.xy(7, 43), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.18"), FormLayoutUtil.flip(cc.xy(9, 43), colSpec, orientation)); mencoder_noass_blur = new JTextField(configuration.getMencoderNoAssBlur()); - mencoder_noass_blur.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + mencoder_noass_blur.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderNoAssBlur(mencoder_noass_blur.getText()); } }); - builder.addLabel(Messages.getString("MEncoderVideo.19"), FormLayoutUtil.flip(cc.xy(13, 41), colSpec, orientation)); - - mencoder_noass_subpos = new JTextField(configuration.getMencoderNoAssSubPos()); - mencoder_noass_subpos.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - configuration.setMencoderNoAssSubPos(mencoder_noass_subpos.getText()); - } - }); - - builder.add(mencoder_noass_scale, FormLayoutUtil.flip(cc.xy(3, 41), colSpec, orientation)); - builder.add(mencoder_noass_outline, FormLayoutUtil.flip(cc.xy(7, 41), colSpec, orientation)); - builder.add(mencoder_noass_blur, FormLayoutUtil.flip(cc.xy(11, 41), colSpec, orientation)); - builder.add(mencoder_noass_subpos, FormLayoutUtil.flip(cc.xy(15, 41), colSpec, orientation)); - - ass = new JCheckBox(Messages.getString("MEncoderVideo.20")); - ass.setContentAreaFilled(false); - ass.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - if (e != null) { - configuration.setMencoderAss(e.getStateChange() == ItemEvent.SELECTED); - } - } - }); - - builder.add(ass, FormLayoutUtil.flip(cc.xy(1, 37), colSpec, orientation)); - ass.setSelected(configuration.isMencoderAss()); - ass.getItemListeners()[0].itemStateChanged(null); - - fc = new JCheckBox(Messages.getString("MEncoderVideo.21")); - fc.setContentAreaFilled(false); - fc.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - configuration.setMencoderFontConfig(e.getStateChange() == ItemEvent.SELECTED); - } - }); - - builder.add(fc, FormLayoutUtil.flip(cc.xyw(3, 37, 5), colSpec, orientation)); - fc.setSelected(configuration.isMencoderFontConfig()); - - assdefaultstyle = new JCheckBox(Messages.getString("MEncoderVideo.36")); - assdefaultstyle.setContentAreaFilled(false); - assdefaultstyle.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - configuration.setMencoderAssDefaultStyle(e.getStateChange() == ItemEvent.SELECTED); - } - }); - - builder.add(assdefaultstyle, FormLayoutUtil.flip(cc.xyw(8, 37, 4), colSpec, orientation)); - assdefaultstyle.setSelected(configuration.isMencoderAssDefaultStyle()); - - subs = new JCheckBox(Messages.getString("MEncoderVideo.22")); - subs.setContentAreaFilled(false); - - if (configuration.isAutoloadSubtitles()) { - subs.setSelected(true); - } - - subs.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - configuration.setAutoloadSubtitles((e.getStateChange() == ItemEvent.SELECTED)); - } - }); + builder.add(mencoder_noass_blur, FormLayoutUtil.flip(cc.xy(11, 43), colSpec, orientation)); - builder.add(subs, FormLayoutUtil.flip(cc.xyw(1, 43, 15), colSpec, orientation)); builder.addLabel(Messages.getString("MEncoderVideo.92"), FormLayoutUtil.flip(cc.xy(1, 45), colSpec, orientation)); subq = new JTextField(configuration.getMencoderVobsubSubtitleQuality()); - subq.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + subq.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderVobsubSubtitleQuality(subq.getText()); @@ -939,15 +731,7 @@ builder.addLabel(Messages.getString("MEncoderVideo.28") + "% ", FormLayoutUtil.flip(cc.xy(1, 49, CellConstraints.RIGHT, CellConstraints.CENTER), colSpec, orientation)); ocw = new JTextField(configuration.getMencoderOverscanCompensationWidth()); - ocw.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + ocw.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderOverscanCompensationWidth(ocw.getText()); @@ -958,15 +742,7 @@ builder.addLabel(Messages.getString("MEncoderVideo.30") + "% ", FormLayoutUtil.flip(cc.xy(5, 49), colSpec, orientation)); och = new JTextField(configuration.getMencoderOverscanCompensationHeight()); - och.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + och.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setMencoderOverscanCompensationHeight(och.getText()); @@ -975,59 +751,34 @@ builder.add(och, FormLayoutUtil.flip(cc.xyw(7, 49, 1), colSpec, orientation)); - subColor = new JButton(); - subColor.setText(Messages.getString("MEncoderVideo.31")); - subColor.setBackground(new Color(configuration.getSubsColor())); - subColor.addActionListener(new ActionListener() { + configuration.addConfigurationListener(new ConfigurationListener() { @Override - public void actionPerformed(ActionEvent e) { - Color newColor = JColorChooser.showDialog( - SwingUtilities.getWindowAncestor((Component) PMS.get().getFrame()), - Messages.getString("MEncoderVideo.125"), - subColor.getBackground() - ); - - if (newColor != null) { - subColor.setBackground(newColor); - configuration.setSubsColor(newColor.getRGB()); - } - } - }); - - builder.add(subColor, FormLayoutUtil.flip(cc.xyw(12, 37, 4), colSpec, orientation)); + public void configurationChanged(ConfigurationEvent event) { + if ((!event.isBeforeUpdate()) && PmsConfiguration.KEY_DISABLE_SUBTITLES.equals(event.getPropertyName())) { + + boolean enabled = !configuration.isDisableSubtitles(); + subq.setEnabled(enabled); + subcp.setEnabled(enabled); + ass.setEnabled(enabled); + assdefaultstyle.setEnabled(enabled); + fribidi.setEnabled(enabled); + fc.setEnabled(enabled); + mencoder_ass_scale.setEnabled(enabled); + mencoder_ass_outline.setEnabled(enabled); + mencoder_ass_shadow.setEnabled(enabled); + mencoder_ass_margin.setEnabled(enabled); + mencoder_noass_scale.setEnabled(enabled); + mencoder_noass_outline.setEnabled(enabled); + mencoder_noass_blur.setEnabled(enabled); + mencoder_noass_subpos.setEnabled(enabled); - JCheckBox disableSubs = ((LooksFrame) PMS.get().getFrame()).getTr().getDisableSubs(); - disableSubs.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - configuration.setMencoderDisableSubs(e.getStateChange() == ItemEvent.SELECTED); - - subs.setEnabled(!configuration.isMencoderDisableSubs()); - subq.setEnabled(!configuration.isMencoderDisableSubs()); - defaultsubs.setEnabled(!configuration.isMencoderDisableSubs()); - subcp.setEnabled(!configuration.isMencoderDisableSubs()); - ass.setEnabled(!configuration.isMencoderDisableSubs()); - assdefaultstyle.setEnabled(!configuration.isMencoderDisableSubs()); - fribidi.setEnabled(!configuration.isMencoderDisableSubs()); - fc.setEnabled(!configuration.isMencoderDisableSubs()); - mencoder_ass_scale.setEnabled(!configuration.isMencoderDisableSubs()); - mencoder_ass_outline.setEnabled(!configuration.isMencoderDisableSubs()); - mencoder_ass_shadow.setEnabled(!configuration.isMencoderDisableSubs()); - mencoder_ass_margin.setEnabled(!configuration.isMencoderDisableSubs()); - mencoder_noass_scale.setEnabled(!configuration.isMencoderDisableSubs()); - mencoder_noass_outline.setEnabled(!configuration.isMencoderDisableSubs()); - mencoder_noass_blur.setEnabled(!configuration.isMencoderDisableSubs()); - mencoder_noass_subpos.setEnabled(!configuration.isMencoderDisableSubs()); - - if (!configuration.isMencoderDisableSubs()) { - ass.getItemListeners()[0].itemStateChanged(null); + if (enabled) { + ass.getItemListeners()[0].itemStateChanged(null); + } } } }); - if (configuration.isMencoderDisableSubs()) { - disableSubs.setSelected(true); - } - JPanel panel = builder.getPanel(); // Apply the orientation to the panel and all components in it @@ -1156,7 +907,11 @@ int bitrates[] = new int[2]; if (bitrate.contains("(") && bitrate.contains(")")) { - bitrates[1] = Integer.parseInt(bitrate.substring(bitrate.indexOf("(") + 1, bitrate.indexOf(")"))); + try { + bitrates[1] = Integer.parseInt(bitrate.substring(bitrate.indexOf("(") + 1, bitrate.indexOf(")"))); + } catch (NumberFormatException e) { + bitrates[1] = 0; + } } if (bitrate.contains("(")) { @@ -1167,7 +922,11 @@ bitrate = "0"; } - bitrates[0] = (int) Double.parseDouble(bitrate); + try { + bitrates[0] = (int) Double.parseDouble(bitrate); + } catch (NumberFormatException e) { + bitrates[0] = 0; + } return bitrates; } @@ -1192,7 +951,7 @@ // Convert value from Mb to Kb defaultMaxBitrates[0] = 1000 * defaultMaxBitrates[0]; - // Halve it since it seems to send up to 1 second of video in advance + // Half it since it seems to send up to 1 second of video in advance defaultMaxBitrates[0] = defaultMaxBitrates[0] / 2; int bufSize = 1835; @@ -1235,6 +994,18 @@ return encodeSettings; } + /* + * collapse the multiple internal ways of saying "subtitles are disabled" into a single method + * which returns true if any of the following are true: + * + * 1) configuration.isMencoderDisableSubs() + * 2) params.sid == null + * 3) avisynth() + */ + private boolean isDisableSubtitles(OutputParams params) { + return configuration.isMencoderDisableSubs() || (params.sid == null) || avisynth(); + } + @Override public ProcessWrapper launchTranscode( String fileName, @@ -1270,12 +1041,6 @@ dvd = true; } - // don't honour "Switch to tsMuxeR..." if the resource is being streamed via an MEncoder entry in - // the #--TRANSCODE--# folder - boolean forceMencoder = !configuration.getHideTranscodeEnabled() - && dlna.isNoName() // XXX remove this? http://www.ps3mediaserver.org/forum/viewtopic.php?f=11&t=12149 - && (dlna.getParent() instanceof FileTranscodeVirtualFolder); - ovccopy = false; pcm = false; ac3Remux = false; @@ -1297,55 +1062,7 @@ LOGGER.error("Cannot parse configured MEncoder overscan compensation height: \"{}\"", configuration.getMencoderOverscanCompensationHeight()); } - if ( - !forceMencoder && - params.sid == null && - !dvd && - !avisynth() && - media != null && ( - media.isVideoPS3Compatible(newInput) || - !params.mediaRenderer.isH264Level41Limited() - ) && - media.isMuxable(params.mediaRenderer) && - configuration.isMencoderMuxWhenCompatible() && - params.mediaRenderer.isMuxH264MpegTS() && ( - intOCW == 0 && - intOCH == 0 - ) - ) { - String expertOptions[] = getSpecificCodecOptions( - configuration.getCodecSpecificConfig(), - media, - params, - fileName, - externalSubtitlesFileName, - configuration.isMencoderIntelligentSync(), - false - ); - - boolean nomux = false; - - for (String s : expertOptions) { - if (s.equals("-nomux")) { - nomux = true; - } - } - - if (!nomux) { - TSMuxerVideo tv = new TSMuxerVideo(configuration); - params.forceFps = media.getValidFps(false); - - if (media.getCodecV().equals("h264")) { - params.forceType = "V_MPEG4/ISO/AVC"; - } else if (media.getCodecV().startsWith("mpeg2")) { - params.forceType = "V_MPEG-2"; - } else if (media.getCodecV().equals("vc1")) { - params.forceType = "V_MS/VFW/WVC1"; - } - - return tv.launchTranscode(fileName, dlna, media, params); - } - } else if (params.sid == null && dvd && configuration.isMencoderRemuxMPEG2() && params.mediaRenderer.isMpeg2Supported()) { + if (params.sid == null && dvd && configuration.isMencoderRemuxMPEG2() && params.mediaRenderer.isMpeg2Supported()) { String expertOptions[] = getSpecificCodecOptions( configuration.getCodecSpecificConfig(), media, @@ -1449,6 +1166,7 @@ } else { channels = configuration.getAudioChannelCount(); // 5.1 max for ac3 encoding } + LOGGER.trace("channels=" + channels); String add = ""; @@ -1532,7 +1250,9 @@ // Ditlew - WDTV Live (+ other byte asking clients), CBR. This probably ought to be placed in addMaximumBitrateConstraints(..) int cbr_bitrate = params.mediaRenderer.getCBRVideoBitrate(); - String cbr_settings = (cbr_bitrate > 0) ? ":vrc_buf_size=5000:vrc_minrate=" + cbr_bitrate + ":vrc_maxrate=" + cbr_bitrate + ":vbitrate=" + ((cbr_bitrate > 16000) ? cbr_bitrate * 1000 : cbr_bitrate) : ""; + String cbr_settings = (cbr_bitrate > 0) ? + ":vrc_buf_size=5000:vrc_minrate=" + cbr_bitrate + ":vrc_maxrate=" + cbr_bitrate + ":vbitrate=" + ((cbr_bitrate > 16000) ? cbr_bitrate * 1000 : cbr_bitrate) : + ""; String encodeSettings = "-lavcopts autoaspect=1:vcodec=" + vcodec + (wmv ? ":acodec=wmav2:abitrate=448" : (cbr_settings + ":acodec=" + (configuration.isMencoderAc3Fixed() ? "ac3_fixed" : "ac3") + ":abitrate=" + CodecUtil.getAC3Bitrate(configuration, params.aid))) + @@ -1582,7 +1302,7 @@ StringBuilder sb = new StringBuilder(); // Set subtitles options - if (!configuration.isMencoderDisableSubs() && !avisynth() && params.sid != null) { + if (!configuration.isDisableSubtitles() && !avisynth() && params.sid != null) { int subtitleMargin = 0; int userMargin = 0; @@ -1592,6 +1312,7 @@ configuration.isMencoderAss() && // GUI: enable subtitles formating !foundNoassParam && // GUI: codec specific options !dvd; + if (apply_ass_styling) { sb.append("-ass "); @@ -1621,7 +1342,7 @@ String font = CodecUtil.getDefaultFontPath(); if (isNotBlank(font)) { // Variable "font" contains a font path instead of a font name. - // Does "-ass-force-style" support font paths? In tests on OSX + // Does "-ass-force-style" support font paths? In tests on OS X // the font path is ignored (Outline, Shadow and MarginV are // used, though) and the "-font" definition is used instead. // See: https://github.com/ps3mediaserver/ps3mediaserver/pull/14 @@ -1654,7 +1375,7 @@ sb.append("-ass-force-style MarginV=").append(subtitleMargin).append(" "); } - // MEncoder is not compiled with fontconfig on Mac OSX, therefore + // MEncoder is not compiled with fontconfig on Mac OS X, therefore // use of the "-ass" option also requires the "-font" option. if (Platform.isMac() && sb.toString().indexOf(" -font ") < 0) { String font = CodecUtil.getDefaultFontPath(); @@ -1703,8 +1424,8 @@ // Common subtitle options - // MEncoder on Mac OSX is compiled without fontconfig support. - // Appending the flag will break execution, so skip it on Mac OSX. + // MEncoder on Mac OS X is compiled without fontconfig support. + // Appending the flag will break execution, so skip it on Mac OS X. if (!Platform.isMac()) { // Use fontconfig if enabled sb.append("-").append(configuration.isMencoderFontConfig() ? "" : "no").append("fontconfig "); @@ -1720,6 +1441,7 @@ if (params.sid.isExternal()) { if (!params.sid.isExternalFileUtf()) { String subcp = null; + // append -subcp option for non UTF external subtitles if (isNotBlank(configuration.getMencoderSubCp())) { // manual setting @@ -1728,6 +1450,7 @@ // autodetect charset (blank mencoder_subcp config option) subcp = SubtitleUtils.getSubCpOptionForMencoder(params.sid); } + if (isNotBlank(subcp)) { sb.append("-subcp ").append(subcp).append(" "); if (configuration.isMencoderSubFribidi()) { @@ -1806,18 +1529,41 @@ } /* - * TODO: Move the following block up with the rest of the - * subtitle stuff + * handle subtitles + * + * try to reconcile the fact that the handling of "Definitely disable subtitles" is spread out + * over net.pms.encoders.Player.setAudioAndSubs and here by setting both of MEncoder's "disable + * subs" options if any of the internal conditions for disabling subtitles are met. */ - if (isBlank(externalSubtitlesFileName) && params.sid != null) { - cmdList.add("-sid"); - cmdList.add("" + params.sid.getId()); - } else if (isNotBlank(externalSubtitlesFileName) && !avisynth()) { // Trick necessary for MEncoder to skip the internal embedded track ? - cmdList.add("-sid"); - cmdList.add("100"); - } else if (isBlank(externalSubtitlesFileName)) { // Trick necessary for MEncoder to not display the internal embedded track - cmdList.add("-subdelay"); - cmdList.add("20000"); + if (isDisableSubtitles(params)) { + // MKV: in some circumstances, MEncoder automatically selects an internal sub unless we explicitly disable (internal) subtitles + // http://www.ps3mediaserver.org/forum/viewtopic.php?f=14&t=15891 + cmdList.add("-nosub"); + // make sure external subs are not automatically loaded + cmdList.add("-noautosub"); + } else { + // note: isEmbedded() and isExternal() are mutually exclusive + if (params.sid.isEmbedded()) { // internal (embedded) subs + cmdList.add("-sid"); + cmdList.add("" + params.sid.getId()); + } else { // external subtitles + assert params.sid.isExternal(); // confirm the mutual exclusion + + if (params.sid.getType() == SubtitleType.VOBSUB) { + cmdList.add("-vobsub"); + cmdList.add(externalSubtitlesFileName.substring(0, externalSubtitlesFileName.length() - 4)); + cmdList.add("-slang"); + cmdList.add("" + params.sid.getLang()); + } else { + cmdList.add("-sub"); + cmdList.add(externalSubtitlesFileName.replace(",", "\\,")); // Commas in MEncoder separate multiple subtitle files + + if (params.sid.isExternalFileUtf()) { + // append -utf8 option for UTF-8 external subtitles + cmdList.add("-utf8"); + } + } + } } // -ofps @@ -1845,7 +1591,7 @@ * subtitle stuff */ // external subtitles file - if (!configuration.isMencoderDisableSubs() && !avisynth() && params.sid != null && params.sid.isExternal()) { + if (!configuration.isDisableSubtitles() && !avisynth() && params.sid != null && params.sid.isExternal()) { if (params.sid.getType() == SubtitleType.VOBSUB) { cmdList.add("-vobsub"); cmdList.add(externalSubtitlesFileName.substring(0, externalSubtitlesFileName.length() - 4)); @@ -1902,7 +1648,7 @@ /* * Implement overscan compensation settings - * + * * This feature takes into account aspect ratio, * making it less blunt than the Video Scaler option */ @@ -1972,7 +1718,7 @@ media.getWidth() > 0 && media.getHeight() > 0 && ( - media.getWidth() > params.mediaRenderer.getMaxVideoWidth() || + media.getWidth() > params.mediaRenderer.getMaxVideoWidth() || media.getHeight() > params.mediaRenderer.getMaxVideoHeight() ) ) { @@ -1982,7 +1728,7 @@ /* * First we deal with some exceptions, then if they are not matched we will * let the renderer limits work. - * + * * This is so, for example, we can still define a maximum resolution of * 1920x1080 in the renderer config file but still support 1920x1088 when * it's needed, otherwise we would either resize 1088 to 1080, meaning the @@ -2043,7 +1789,7 @@ * case we scale it down to the nearest 4. * This fixes the long-time bug of videos displaying in black and * white with diagonal strips of colour, weird one. - * + * * TODO: Integrate this with the other stuff so that "scale" only * ever appears once in the MEncoder CMD. */ @@ -2055,7 +1801,7 @@ newHeight = (media.getHeight() / 4) * 4; cmdList.add("-vf"); - cmdList.add("softskip,scale=" + newWidth + ":" + newHeight); + cmdList.add("softskip,expand=" + newWidth + ":" + newHeight); } if (configuration.getMencoderMT() && !avisynth && !dvd && !(media.getCodecV() != null && (media.getCodecV().equals("mpeg2video")))) { @@ -2317,7 +2063,7 @@ audioPipe.deleteLater(); } else { // remove the -oac switch, otherwise the "too many video packets" errors appear again - for (ListIterator it = cmdList.listIterator(); it.hasNext();) { + for (ListIterator it = cmdList.listIterator(); it.hasNext();) { String option = it.next(); if (option.equals("-oac")) { @@ -2389,7 +2135,7 @@ // it seems the -really-quiet prevents mencoder to stop the pipe output after some time... // -mc 0.1 make the DTS-HD extraction works better with latest mencoder builds, and makes no impact on the regular DTS one String ffmpegLPCMextract[] = new String[]{ - executable(), + executable(), "-ss", "0", fileName, "-really-quiet", @@ -2518,10 +2264,10 @@ cmdList.add(pipe.getInputPipe()); } - String[] cmdArray = new String[cmdList.size()]; + String[] cmdArray = new String[ cmdList.size() ]; cmdList.toArray(cmdArray); + cmdArray = finalizeTranscoderArgs( - this, fileName, dlna, media, @@ -2535,10 +2281,11 @@ ProcessWrapper mkfifo_process = pipe.getPipeProcess(); pw.attachProcess(mkfifo_process); mkfifo_process.runInNewThread(); + try { Thread.sleep(50); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + pipe.deleteLater(); } } @@ -2547,8 +2294,7 @@ try { Thread.sleep(100); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } return pw; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderWebVideo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderWebVideo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderWebVideo.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MEncoderWebVideo.java 2013-04-22 19:41:39.000000000 +0000 @@ -96,36 +96,40 @@ String cmdArray[] = new String[args().length + 4]; cmdArray[0] = executable(); cmdArray[1] = fileName; + for (int i = 0; i < args().length; i++) { cmdArray[i + 2] = args()[i]; } + cmdArray[cmdArray.length - 2] = "-o"; cmdArray[cmdArray.length - 1] = pipe.getInputPipe(); ProcessWrapper mkfifo_process = pipe.getPipeProcess(); cmdArray = finalizeTranscoderArgs( - this, fileName, dlna, media, params, - cmdArray); + cmdArray + ); ProcessWrapperImpl pw = new ProcessWrapperImpl(cmdArray, params); pw.attachProcess(mkfifo_process); mkfifo_process.runInNewThread(); + try { Thread.sleep(50); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + pipe.deleteLater(); pw.runInNewThread(); + try { Thread.sleep(50); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + return pw; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MPlayerAudio.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MPlayerAudio.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MPlayerAudio.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MPlayerAudio.java 2013-04-22 19:41:39.000000000 +0000 @@ -41,10 +41,17 @@ import java.io.IOException; import java.util.Arrays; +// this does nothing that isn't done by the ffmpeg audio engine +// and, indeed, it delegates to ffmpeg for MP3 transcodes +@Deprecated public class MPlayerAudio extends Player { public static final String ID = "mplayeraudio"; private final PmsConfiguration configuration; + // XXX should be private + @Deprecated + JCheckBox noresample; + public MPlayerAudio(PmsConfiguration configuration) { this.configuration = configuration; } @@ -74,7 +81,8 @@ String fileName, DLNAResource dlna, DLNAMediaInfo media, - OutputParams params) throws IOException { + OutputParams params + ) throws IOException { if (!(this instanceof MPlayerWebAudio) && !(this instanceof MPlayerWebVideoDump)) { params.waitbeforestart = 2000; } @@ -82,32 +90,53 @@ params.manageFastStart(); if (params.mediaRenderer.isTranscodeToMP3()) { - FFMpegAudio audio = new FFMpegAudio(configuration); - return audio.launchTranscode(fileName, dlna, media, params); + FFMpegAudio ffmpegAudio = new FFMpegAudio(configuration); + return ffmpegAudio.launchTranscode(fileName, dlna, media, params); } params.maxBufferSize = PMS.getConfiguration().getMaxAudioBuffer(); PipeProcess audioP = new PipeProcess("mplayer_aud" + System.currentTimeMillis()); - String mPlayerdefaultAudioArgs[] = new String[]{PMS.getConfiguration().getMplayerPath(), fileName, "-prefer-ipv4", "-nocache", "-af", "channels=2", "-srate", "48000", "-vo", "null", "-ao", "pcm:nowaveheader:fast:file=" + audioP.getInputPipe(), "-quiet", "-format", "s16be"}; + String mPlayerdefaultAudioArgs[] = new String[] { + PMS.getConfiguration().getMplayerPath(), + fileName, + "-prefer-ipv4", + "-nocache", + "-af", + "channels=2", + "-srate", + "48000", + "-vo", + "null", + "-ao", + "pcm:nowaveheader:fast:file=" + audioP.getInputPipe(), + "-quiet", + "-format", + "s16be" + }; + if (params.mediaRenderer.isTranscodeToWAV()) { mPlayerdefaultAudioArgs[11] = "pcm:waveheader:fast:file=" + audioP.getInputPipe(); mPlayerdefaultAudioArgs[13] = "-quiet"; mPlayerdefaultAudioArgs[14] = "-quiet"; } + if (params.mediaRenderer.isTranscodeAudioTo441()) { mPlayerdefaultAudioArgs[7] = "44100"; } + if (!configuration.isAudioResample()) { mPlayerdefaultAudioArgs[6] = "-quiet"; mPlayerdefaultAudioArgs[7] = "-quiet"; } + params.input_pipes[0] = audioP; if (params.timeseek > 0 || params.timeend > 0) { mPlayerdefaultAudioArgs = Arrays.copyOf(mPlayerdefaultAudioArgs, mPlayerdefaultAudioArgs.length + 4); mPlayerdefaultAudioArgs[mPlayerdefaultAudioArgs.length - 4] = "-ss"; mPlayerdefaultAudioArgs[mPlayerdefaultAudioArgs.length - 3] = "" + params.timeseek; + if (params.timeend > 0) { mPlayerdefaultAudioArgs[mPlayerdefaultAudioArgs.length - 2] = "-endpos"; mPlayerdefaultAudioArgs[mPlayerdefaultAudioArgs.length - 1] = "" + params.timeend; @@ -120,26 +149,28 @@ ProcessWrapper mkfifo_process = audioP.getPipeProcess(); mPlayerdefaultAudioArgs = finalizeTranscoderArgs( - this, fileName, dlna, media, params, - mPlayerdefaultAudioArgs); + mPlayerdefaultAudioArgs + ); + ProcessWrapperImpl pw = new ProcessWrapperImpl(mPlayerdefaultAudioArgs, params); pw.attachProcess(mkfifo_process); mkfifo_process.runInNewThread(); + try { Thread.sleep(100); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } audioP.deleteLater(); pw.runInNewThread(); + try { Thread.sleep(100); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + return pw; } @@ -157,13 +188,13 @@ public int type() { return Format.AUDIO; } - JCheckBox noresample; @Override public JComponent config() { FormLayout layout = new FormLayout( "left:pref, 0:grow", - "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, 0:grow"); + "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, 0:grow" + ); PanelBuilder builder = new PanelBuilder(layout); builder.setBorder(Borders.EMPTY_BORDER); builder.setOpaque(false); @@ -182,6 +213,7 @@ configuration.setAudioResample(e.getStateChange() == ItemEvent.SELECTED); } }); + builder.add(noresample, cc.xy(2, 3)); return builder.getPanel(); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MPlayerWebVideoDump.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MPlayerWebVideoDump.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/MPlayerWebVideoDump.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/MPlayerWebVideoDump.java 2013-04-22 19:41:39.000000000 +0000 @@ -68,7 +68,6 @@ ProcessWrapper mkfifo_process = audioP.getPipeProcess(); mPlayerdefaultAudioArgs = finalizeTranscoderArgs( - this, fileName, dlna, media, diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/Player.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/Player.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/Player.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/Player.java 2013-04-22 19:41:39.000000000 +0000 @@ -70,13 +70,13 @@ public abstract String mimeType(); public abstract String executable(); - private static List finalizeTranscodeArgsListeners = + private static List finalizeTranscoderArgsListeners = new ArrayList(); public static void initializeFinalizeTranscoderArgsListeners() { for (ExternalListener listener : ExternalFactory.getExternalListeners()) { if (listener instanceof FinalizeTranscoderArgsListener) { - finalizeTranscodeArgsListeners.add((FinalizeTranscoderArgsListener) listener); + finalizeTranscoderArgsListeners.add((FinalizeTranscoderArgsListener) listener); } } } @@ -104,6 +104,17 @@ public boolean isTimeSeekable() { return false; } + + /** + * Each engine capable of video hardware acceleration must + * override this method and set + *

+ * return true. + * @return false + */ + public boolean isVideoHardwareAccelerationReady() { + return false; + } public abstract ProcessWrapper launchTranscode( String filename, @@ -117,23 +128,42 @@ return name(); } + // no need to pass Player as a parameter: it's the invocant + @Deprecated protected String[] finalizeTranscoderArgs( Player player, String filename, DLNAResource dlna, DLNAMediaInfo media, OutputParams params, - String[] cmdArgs) { - if (finalizeTranscodeArgsListeners.isEmpty()) { + String[] cmdArgs + ) { + return finalizeTranscoderArgs( + filename, + dlna, + media, + params, + cmdArgs + ); + } + + protected String[] finalizeTranscoderArgs( + String filename, + DLNAResource dlna, + DLNAMediaInfo media, + OutputParams params, + String[] cmdArgs + ) { + if (finalizeTranscoderArgsListeners.isEmpty()) { return cmdArgs; } else { // make it mutable List cmdList = new ArrayList(Arrays.asList(cmdArgs)); - for (FinalizeTranscoderArgsListener listener : finalizeTranscodeArgsListeners) { + for (FinalizeTranscoderArgsListener listener : finalizeTranscoderArgsListeners) { try { cmdList = listener.finalizeTranscoderArgs( - player, + this, filename, dlna, media, @@ -152,26 +182,30 @@ } /** - * This method populates the output parameters with the correct audio track - * and subtitles, based on the given filename, media info and configuration. + * This method populates the supplied {@link OutputParams} object with the correct audio track (aid) + * and subtitles (sid), based on the given filename, its MediaInfo metadata and PMS configuration settings. * * @param fileName * The file name used to determine the availability of subtitles. * @param media - * The MediaInfo details on the file. + * The MediaInfo metadata for the file. * @param params * The parameters to populate. * @param configuration * The PMS configuration settings. */ + // FIXME this code is almost unreadable in its current form and should be broken down into separate methods + // that handle just one facet of its functionality. it also needs to be decoupled from MEncoder public void setAudioAndSubs(String fileName, DLNAMediaInfo media, OutputParams params, PmsConfiguration configuration) { if (params.aid == null && media != null) { // check for preferred audio - StringTokenizer st = new StringTokenizer(configuration.getMencoderAudioLanguages(), ","); + StringTokenizer st = new StringTokenizer(configuration.getAudioLanguages(), ","); + while (st != null && st.hasMoreTokens()) { String lang = st.nextToken(); lang = lang.trim(); logger.trace("Looking for an audio track with lang: " + lang); + for (DLNAMediaAudio audio : media.getAudioTracksList()) { if (audio.matchCode(lang)) { params.aid = audio; @@ -195,7 +229,7 @@ if (params.aid == null) { params.aid = media.getAudioTracksList().get(0); - logger.trace("Choosed a default audio track: " + params.aid); + logger.trace("Chose a default audio track: " + params.aid); } } @@ -221,7 +255,7 @@ String sub = pair.substring(pair.indexOf(",") + 1); audio = audio.trim(); sub = sub.trim(); - logger.trace("Search a match for: " + currentLang + " with " + audio + " and " + sub); + logger.trace("Searching for a match for: " + currentLang + " with " + audio + " and " + sub); if (Iso639.isCodesMatching(audio, currentLang) || (currentLang != null && audio.equals("*"))) { if (sub.equals("off")) { @@ -231,7 +265,7 @@ for (DLNAMediaSubtitle present_sub : media.getSubtitleTracksList()) { if (present_sub.matchCode(sub) || sub.equals("*")) { matchedSub = present_sub; - logger.trace(" Found a match: " + matchedSub); + logger.trace("Found a match: " + matchedSub); break; } } @@ -245,14 +279,14 @@ } if (matchedSub != null && params.sid == null) { - if (matchedSub.getLang() != null && matchedSub.getLang().equals("off")) { + if (configuration.isMencoderDisableSubs() || (matchedSub.getLang() != null && matchedSub.getLang().equals("off"))) { logger.trace(" Disabled the subtitles: " + matchedSub); } else { params.sid = matchedSub; } } - if (!configuration.isMencoderDisableSubs() && params.sid == null && media != null) { + if (!configuration.isDisableSubtitles() && params.sid == null && media != null) { // Check for subtitles again File video = new File(fileName); FileUtil.doesSubtitlesExists(video, media, false); @@ -262,14 +296,14 @@ // Priority to external subtitles for (DLNAMediaSubtitle sub : media.getSubtitleTracksList()) { if (matchedSub !=null && matchedSub.getLang() !=null && matchedSub.getLang().equals("off")) { - StringTokenizer st = new StringTokenizer(configuration.getMencoderForcedSubTags(), ","); + StringTokenizer st = new StringTokenizer(configuration.getForcedSubtitleTags(), ","); while (st != null && sub.getFlavor() != null && st.hasMoreTokens()) { String forcedTags = st.nextToken(); forcedTags = forcedTags.trim(); if (sub.getFlavor().toLowerCase().indexOf(forcedTags) > -1 - && Iso639.isCodesMatching(sub.getLang(), configuration.getMencoderForcedSubLanguage())) { + && Iso639.isCodesMatching(sub.getLang(), configuration.getForcedSubtitleLanguage())) { logger.trace("Forcing preferred subtitles : " + sub.getLang() + "/" + sub.getFlavor()); logger.trace("Forced subtitles track : " + sub); @@ -286,29 +320,33 @@ break; } } else { - logger.trace("Found subtitles track: " + sub); - if (sub.getExternalFile() != null) { - logger.trace("Found external file: " + sub.getExternalFile().getAbsolutePath()); - params.sid = sub; - break; - } + logger.trace("Found subtitles track: " + sub); + + if (sub.getExternalFile() != null) { + logger.trace("Found external file: " + sub.getExternalFile().getAbsolutePath()); + params.sid = sub; + break; + } } } } + if ( - matchedSub !=null && - matchedSub.getLang() !=null && + matchedSub != null && + matchedSub.getLang() != null && matchedSub.getLang().equals("off") ) { return; } if (params.sid == null) { - StringTokenizer st = new StringTokenizer(configuration.getMencoderSubLanguages(), ","); + StringTokenizer st = new StringTokenizer(configuration.getSubtitlesLanguages(), ","); + while (st != null && st.hasMoreTokens()) { String lang = st.nextToken(); lang = lang.trim(); logger.trace("Looking for a subtitle track with lang: " + lang); + for (DLNAMediaSubtitle sub : media.getSubtitleTracksList()) { if (sub.matchCode(lang)) { params.sid = sub; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/PlayerFactory.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/PlayerFactory.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/PlayerFactory.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/PlayerFactory.java 2013-04-22 19:41:39.000000000 +0000 @@ -119,7 +119,7 @@ * PMS configuration settings. */ private static void registerPlayers(final PmsConfiguration configuration) { - + // TODO make these constructors consistent: pass configuration to all or to none if (Platform.isWindows()) { registerPlayer(new FFMpegAviSynthVideo()); } @@ -131,7 +131,8 @@ registerPlayer(new MEncoderAviSynth(configuration)); } - registerPlayer(new FFMpegVideo()); + registerPlayer(new FFMpegVideo(configuration)); + registerPlayer(new VLCVideo(configuration)); registerPlayer(new MPlayerAudio(configuration)); registerPlayer(new FFMpegWebVideo(configuration)); registerPlayer(new MEncoderWebVideo(configuration)); @@ -257,7 +258,7 @@ * and the first that reports it is compatible will be returned. * * @param resource - * The {@link DLNAMediaResource} to match + * The {@link DLNAResource} to match * @return The player if a match could be found, null * otherwise. * @since 1.60.0 diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/TSMuxerVideo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/TSMuxerVideo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/TSMuxerVideo.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/TSMuxerVideo.java 2013-04-22 19:41:39.000000000 +0000 @@ -645,13 +645,17 @@ pw.println(type + ", \"" + ffAudioPipe[i].getOutputPipe() + "\", " + timeshift + "track=" + (2 + i)); } } + pw.close(); PipeProcess tsPipe = new PipeProcess(System.currentTimeMillis() + "tsmuxerout.ts"); - String[] cmdArray = new String[]{executable(), f.getAbsolutePath(), tsPipe.getInputPipe()}; + String[] cmdArray = new String[]{ + executable(), + f.getAbsolutePath(), + tsPipe.getInputPipe() + }; cmdArray = finalizeTranscoderArgs( - this, fileName, dlna, media, @@ -669,26 +673,27 @@ try { Thread.sleep(50); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + tsPipe.deleteLater(); if (ffVideoPipe != null) { ProcessWrapper ff_pipe_process = ffVideoPipe.getPipeProcess(); p.attachProcess(ff_pipe_process); ff_pipe_process.runInNewThread(); + try { Thread.sleep(50); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + ffVideoPipe.deleteLater(); p.attachProcess(ffVideo); ffVideo.runInNewThread(); + try { Thread.sleep(50); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } } if (ffAudioPipe != null && params.aid != null) { @@ -696,10 +701,11 @@ ProcessWrapper ff_pipe_process = ffAudioPipe[i].getPipeProcess(); p.attachProcess(ff_pipe_process); ff_pipe_process.runInNewThread(); + try { Thread.sleep(50); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + ffAudioPipe[i].deleteLater(); p.attachProcess(ffAudio[i]); ffAudio[i].runInNewThread(); @@ -708,10 +714,10 @@ try { Thread.sleep(100); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } p.runInNewThread(); + return p; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/VLCVideo.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/VLCVideo.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/VLCVideo.java 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/VLCVideo.java 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,446 @@ +/* + * PS3 Media Server, for streaming any medias to your PS3. + * Copyright (C) 2008 A.Brochard + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; version 2 + * of the License only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package net.pms.encoders; + +import java.awt.ComponentOrientation; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import javax.swing.JCheckBox; +import javax.swing.JComponent; +import javax.swing.JSlider; +import javax.swing.JTextField; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import net.pms.Messages; +import net.pms.configuration.PmsConfiguration; +import net.pms.configuration.RendererConfiguration; +import net.pms.dlna.DLNAMediaInfo; +import net.pms.dlna.DLNAResource; +import net.pms.formats.Format; +import net.pms.io.OutputParams; +import net.pms.io.PipeProcess; +import net.pms.io.ProcessWrapper; +import net.pms.io.ProcessWrapperImpl; +import net.pms.network.HTTPResource; +import net.pms.util.FormLayoutUtil; + +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.jgoodies.forms.builder.DefaultFormBuilder; +import com.jgoodies.forms.layout.FormLayout; +import com.sun.jna.Platform; + +/** + * Use VLC as a backend transcoder. Note that 0.x and 1.x versions are + * unsupported (and probably will crash). Only the latest version will be + * supported + * + * @author Leon Blakey + */ +public class VLCVideo extends Player { + private static final Logger LOGGER = LoggerFactory.getLogger(VLCVideo.class); + protected final PmsConfiguration pmsconfig; + public static final String ID = "vlctranscoder"; + protected JTextField scale; + protected JCheckBox experimentalCodecs; + protected JCheckBox audioSyncEnabled; + protected JTextField sampleRate; + protected JCheckBox sampleRateOverride; + protected JTextField extraParams; + + public VLCVideo(PmsConfiguration pmsconfig) { + this.pmsconfig = pmsconfig; + } + + @Override + public int purpose() { + return VIDEO_SIMPLEFILE_PLAYER; + } + + @Override + public String id() { + return ID; + } + + @Override + public boolean isTimeSeekable() { + return true; + } + + @Override + public boolean avisynth() { + return false; + } + + @Override + public String[] args() { + return new String[]{}; + } + + @Override + public String name() { + return "VLC"; + } + + @Override + public int type() { + return Format.VIDEO; + } + + @Override + public String mimeType() { + // I think? + return HTTPResource.VIDEO_TRANSCODE; + } + + @Override + public String executable() { + return pmsconfig.getVlcPath(); + } + + @Override + public boolean isCompatible(DLNAResource resource) { + // VLC is a general transcoder that should support every format + // Until problem occurs, assume compatible + return true; + } + + /** + * Pick codecs for VLC based on formats the renderer supports. + * + * @param renderer The {@link RendererConfiguration}. + * @return The codec configuration + */ + protected CodecConfig genConfig(RendererConfiguration renderer) { + CodecConfig config = new CodecConfig(); + if (renderer.isTranscodeToWMV()) { + // Assume WMV = XBox = all media renderers with this flag + LOGGER.debug("Using XBox WMV codecs"); + config.videoCodec = "wmv2"; + config.audioCodec = "wma"; + config.container = "asf"; + } else if (renderer.isTranscodeToMPEGTSAC3()) { + // Default codecs for DLNA standard + LOGGER.debug("Using DLNA standard codecs with ts container"); + config.videoCodec = "mp2v"; + config.audioCodec = "mp2a"; // NOTE: a52 sometimes causes audio to stop after ~5 mins + config.container = "ts"; + } else { + // Default codecs for DLNA standard + LOGGER.debug("Using DLNA standard codecs with ps (default) container"); + config.videoCodec = "mp2v"; + config.audioCodec = "mp2a"; // NOTE: a52 sometimes causes audio to stop after ~5 mins + config.container = "ps"; + } + LOGGER.trace("Using " + config.videoCodec + ", " + config.audioCodec + ", " + config.container); + + // Audio sample rate handling + if (sampleRateOverride.isSelected()) { + config.sampleRate = Integer.valueOf(sampleRate.getText()); + } + + // This has caused garbled audio, so only enable when told to + if (audioSyncEnabled.isSelected()) { + config.extraTrans.put("audio-sync", ""); + } + return config; + } + + protected static class CodecConfig { + String videoCodec; + String audioCodec; + String container; + String extraParams; + HashMap extraTrans = new HashMap(); + int sampleRate; + } + + protected Map getEncodingArgs(CodecConfig config) { + // See: http://www.videolan.org/doc/streaming-howto/en/ch03.html + // See: http://wiki.videolan.org/Codec + Map args = new HashMap(); + + // Codecs to use + args.put("vcodec", config.videoCodec); + args.put("acodec", config.audioCodec); + + // Bitrate in kbit/s (TODO: Use global option?) + args.put("vb", "4096"); + args.put("ab", "128"); + + // Video scaling + args.put("scale", scale.getText()); + + // Audio Channels + args.put("channels", 2); + + // Static sample rate + args.put("samplerate", config.sampleRate); + + // Recommended on VLC DVD encoding page + args.put("keyint", 16); + + // Recommended on VLC DVD encoding page + args.put("strict-rc", ""); + + // Stream subtitles to client + // args.add("scodec=dvbs"); + // args.add("senc=dvbsub"); + + // Hardcode subtitles into video + args.put("soverlay", ""); + + // Add extra args + args.putAll(config.extraTrans); + + return args; + } + + @Override + public ProcessWrapper launchTranscode(String fileName, DLNAResource dlna, DLNAMediaInfo media, OutputParams params) throws IOException { + boolean isWindows = Platform.isWindows(); + + // Make sure we can play this + CodecConfig config = genConfig(params.mediaRenderer); + + PipeProcess tsPipe = new PipeProcess("VLC" + System.currentTimeMillis() + "." + config.container); + ProcessWrapper pipe_process = tsPipe.getPipeProcess(); + + LOGGER.trace("filename: " + fileName); + LOGGER.trace("dlna: " + dlna); + LOGGER.trace("media: " + media); + LOGGER.trace("outputparams: " + params); + + // XXX it can take a long time for Windows to create a named pipe + // (and mkfifo can be slow if /tmp isn't memory-mapped), so start this as early as possible + pipe_process.runInNewThread(); + tsPipe.deleteLater(); + + params.input_pipes[0] = tsPipe; + params.minBufferSize = params.minFileSize; + params.secondread_minsize = 100000; + + List cmdList = new ArrayList(); + cmdList.add(executable()); + cmdList.add("-I"); + cmdList.add("dummy"); + + // Hardware acceleration seems to be more stable now, so its enabled + if (pmsconfig.isVideoHardwareAcceleration()) { + cmdList.add("--ffmpeg-hw"); + } + + // Useful for the more esoteric codecs people use + if (experimentalCodecs.isSelected()) { + cmdList.add("--sout-ffmpeg-strict=-2"); + } + + // Stop the DOS box from appearing on windows + if (isWindows) { + cmdList.add("--dummy-quiet"); + } + + // File needs to be given before sout, otherwise vlc complains + cmdList.add(fileName); + + // Huge fake track id that shouldn't conflict with any real subtitle or audio id. Hopefully. + String disableSuffix = "track=214748361"; + + // Handle audio language + if (params.aid != null) { // User specified language at the client, acknowledge it + if (params.aid.getLang() == null || params.aid.getLang().equals("und")) { // VLC doesn't understand und, but does understand a non existant track + cmdList.add("--audio-" + disableSuffix); + } else { // Load by ID (better) + cmdList.add("--audio-track=" + params.aid.getId()); + } + } else { // Not specified, use language from GUI + cmdList.add("--audio-language=" + pmsconfig.getAudioLanguages()); + } + + // Handle subtitle language + if (params.sid != null) { // User specified language at the client, acknowledge it + if (params.sid.getLang() == null || params.sid.getLang().equals("und")) { // VLC doesn't understand und, but does understand a non existant track + cmdList.add("--sub-" + disableSuffix); + } else { // Load by ID (better) + cmdList.add("--sub-track=" + params.sid.getId()); + } + } else if (!pmsconfig.isDisableSubtitles()){ // Not specified, use language from GUI if enabled + // FIXME: VLC does not understand "loc" or "und". + cmdList.add("--sub-language=" + pmsconfig.getSubtitlesLanguages()); + } else { + cmdList.add("--sub-" + disableSuffix); + } + + // Skip forward if nessesary + if (params.timeseek != 0) { + cmdList.add("--start-time"); + cmdList.add(String.valueOf(params.timeseek)); + } + + // Generate encoding args + StringBuilder encodingArgsBuilder = new StringBuilder(); + for (Map.Entry curEntry : getEncodingArgs(config).entrySet()) { + encodingArgsBuilder.append(curEntry.getKey()).append("=").append(curEntry.getValue()).append(","); + } + + // Add our transcode options + String transcodeSpec = String.format( + "#transcode{%s}:std{access=file,mux=%s,dst=\"%s%s\"}", + encodingArgsBuilder.toString(), + config.container, + (isWindows ? "\\\\" : ""), + tsPipe.getInputPipe()); + cmdList.add("--sout"); + cmdList.add(transcodeSpec); + + // Force VLC to die when finished + cmdList.add("vlc:// quit"); + + // Add any extra parameters + if (!extraParams.getText().trim().isEmpty()) { // Add each part as a new item + cmdList.addAll(Arrays.asList(StringUtils.split(extraParams.getText().trim(), " "))); + } + + // Pass to process wrapper + String[] cmdArray = new String[cmdList.size()]; + cmdList.toArray(cmdArray); + cmdArray = finalizeTranscoderArgs(fileName, dlna, media, params, cmdArray); + LOGGER.trace("Finalized args: " + StringUtils.join(cmdArray, " ")); + ProcessWrapperImpl pw = new ProcessWrapperImpl(cmdArray, params); + pw.attachProcess(pipe_process); + + // TODO: Why is this here? + try { + Thread.sleep(150); + } catch (InterruptedException e) { + } + + pw.runInNewThread(); + return pw; + } + + @Override + public JComponent config() { + // Apply the orientation for the locale + Locale locale = new Locale(pmsconfig.getLanguage()); + ComponentOrientation orientation = ComponentOrientation.getOrientation(locale); + String colSpec = FormLayoutUtil.getColSpec("right:pref, 3dlu, pref:grow, 7dlu, right:pref, 3dlu, pref:grow", orientation); + FormLayout layout = new FormLayout(colSpec, ""); + // Here goes my 3rd try to learn JGoodies Form + layout.setColumnGroups(new int[][]{{1, 5}, {3, 7}}); + DefaultFormBuilder mainPanel = new DefaultFormBuilder(layout); + + mainPanel.appendSeparator(Messages.getString("VlcTrans.1")); + mainPanel.append(experimentalCodecs = new JCheckBox(Messages.getString("VlcTrans.3"), pmsconfig.isVlcExperimentalCodecs()), 3); + experimentalCodecs.setContentAreaFilled(false); + experimentalCodecs.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + pmsconfig.setVlcExperimentalCodecs(e.getStateChange() == ItemEvent.SELECTED); + } + }); + mainPanel.append(audioSyncEnabled = new JCheckBox(Messages.getString("VlcTrans.4"), pmsconfig.isVlcAudioSyncEnabled()), 3); + audioSyncEnabled.setContentAreaFilled(false); + audioSyncEnabled.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + pmsconfig.setVlcAudioSyncEnabled(e.getStateChange() == ItemEvent.SELECTED); + } + }); + mainPanel.nextLine(); + + // Developer stuff. Theoretically is temporary + mainPanel.appendSeparator(Messages.getString("VlcTrans.10")); + + // Add scale as a subpanel because it has an awkward layout + mainPanel.append(Messages.getString("VlcTrans.11")); + FormLayout scaleLayout = new FormLayout("pref,3dlu,pref", ""); + DefaultFormBuilder scalePanel = new DefaultFormBuilder(scaleLayout); + double startingScale = Double.valueOf(pmsconfig.getVlcScale()); + scalePanel.append(scale = new JTextField(String.valueOf(startingScale))); + final JSlider scaleSlider = new JSlider(JSlider.HORIZONTAL, 0, 10, (int) (startingScale * 10)); + scalePanel.append(scaleSlider); + scaleSlider.addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent ce) { + String value = String.valueOf((double) scaleSlider.getValue() / 10); + scale.setText(value); + pmsconfig.setVlcScale(value); + } + }); + scale.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + String typed = scale.getText(); + if (!typed.matches("\\d\\.\\d")) { + return; + } + double value = Double.parseDouble(typed); + scaleSlider.setValue((int) (value * 10)); + pmsconfig.setVlcScale(String.valueOf(value)); + } + }); + mainPanel.append(scalePanel.getPanel(), 3); + + // Audio sample rate + FormLayout sampleRateLayout = new FormLayout("right:pref, 3dlu, right:pref, 3dlu, right:pref, 3dlu, left:pref", ""); + DefaultFormBuilder sampleRatePanel = new DefaultFormBuilder(sampleRateLayout); + sampleRateOverride = new JCheckBox(Messages.getString("VlcTrans.17"), pmsconfig.getVlcSampleRateOverride()); + sampleRatePanel.append(Messages.getString("VlcTrans.18"), sampleRateOverride); + sampleRate = new JTextField(pmsconfig.getVlcSampleRate(), 8); + sampleRate.setEnabled(pmsconfig.getVlcSampleRateOverride()); + sampleRate.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + pmsconfig.setVlcSampleRate(sampleRate.getText()); + } + }); + sampleRatePanel.append(Messages.getString("VlcTrans.19"), sampleRate); + sampleRateOverride.addItemListener(new ItemListener() { + @Override + public void itemStateChanged(ItemEvent e) { + boolean checked = e.getStateChange() == ItemEvent.SELECTED; + pmsconfig.setVlcSampleRateOverride(checked); + sampleRate.setEnabled(checked); + } + }); + + mainPanel.nextLine(); + mainPanel.append(sampleRatePanel.getPanel(), 7); + + // Extra options + mainPanel.nextLine(); + mainPanel.append(Messages.getString("VlcTrans.20"), extraParams = new JTextField(), 5); + + return mainPanel.getPanel(); + } +} diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/VideoLanVideoStreaming.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/VideoLanVideoStreaming.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/encoders/VideoLanVideoStreaming.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/encoders/VideoLanVideoStreaming.java 2013-04-22 19:41:39.000000000 +0000 @@ -141,7 +141,8 @@ getEncodingArgs(), getMux(), (isWindows ? "\\\\" : ""), - tsPipe.getInputPipe()); + tsPipe.getInputPipe() + ); // XXX there's precious little documentation on how (if at all) VLC // treats colons and hyphens (and :name= and --name=) differently @@ -151,6 +152,7 @@ if (isWindows) { cmdList.add("--dummy-quiet"); } + if (isWindows || Platform.isMac()) { cmdList.add("--sout=" + transcodeSpec); } else { @@ -163,6 +165,7 @@ if (Platform.isMac()) { cmdList.add(""); } + cmdList.add(fileName); cmdList.add("vlc://quit"); @@ -170,7 +173,6 @@ cmdList.toArray(cmdArray); cmdArray = finalizeTranscoderArgs( - this, fileName, dlna, media, @@ -182,8 +184,7 @@ try { Thread.sleep(150); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } pw.runInNewThread(); return pw; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/formats/Format.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/formats/Format.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/formats/Format.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/formats/Format.java 2013-04-22 19:41:39.000000000 +0000 @@ -33,7 +33,7 @@ * Abstract class to store known information about a given format. */ public abstract class Format implements Cloneable { - private static final Logger logger = LoggerFactory.getLogger(Format.class); + private static final Logger LOGGER = LoggerFactory.getLogger(Format.class); public enum Identifier { AUDIO_AS_VIDEO, @@ -168,7 +168,8 @@ filename = filename.toLowerCase(); for (String singleid : getId()) { String id = singleid.toLowerCase(); - match = filename.endsWith("." + id) || filename.startsWith(id + "://"); + // XXX match the protocol before the extension + match = filename.startsWith(id + "://") || filename.endsWith("." + id); if (match) { matchedId = singleid; return true; @@ -196,11 +197,13 @@ @Override protected Object clone() { Object o = null; + try { o = super.clone(); } catch (CloneNotSupportedException e) { - logger.error(null, e); + LOGGER.error(null, e); } + return o; } @@ -220,7 +223,8 @@ } else { media.parse(file, this, type, false); } - logger.trace("Parsing results: " + file + " / " + media); + + LOGGER.trace("Parsing results: " + file + " / " + media); } /** diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/formats/MPG.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/formats/MPG.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/formats/MPG.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/formats/MPG.java 2013-04-22 19:41:39.000000000 +0000 @@ -44,7 +44,9 @@ ArrayList> a = new ArrayList>(); PMS r3 = PMS.get(); for (String engine : PMS.getConfiguration().getEnginesAsList(r3.getRegistry())) { - if (engine.equals(MEncoderVideo.ID)) { + if (engine.equals(VLCVideo.ID)) { + a.add(VLCVideo.class); + } else if (engine.equals(MEncoderVideo.ID)) { a.add(MEncoderVideo.class); } else if (engine.equals(MEncoderAviSynth.ID) && PMS.get().getRegistry().isAvis()) { a.add(MEncoderAviSynth.class); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/formats/TIF.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/formats/TIF.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/formats/TIF.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/formats/TIF.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,7 +18,6 @@ */ package net.pms.formats; - public class TIF extends JPG { /** * {@inheritDoc} @@ -28,7 +27,6 @@ return Identifier.TIF; } - /** * {@inheritDoc} */ diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/formats/WEB.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/formats/WEB.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/formats/WEB.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/formats/WEB.java 2013-04-22 19:41:39.000000000 +0000 @@ -91,7 +91,7 @@ @Override // TODO remove screen - it's been tried numerous times (see forum) and it doesn't work public String[] getId() { - return new String[] { "http", "mms", "mmsh", "mmst", "rtsp", "rtp", "udp", "screen" }; + return new String[] { "file", "http", "mms", "mmsh", "mmst", "rtsp", "rtp", "udp", "screen" }; } @Override diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/BasicSystemUtils.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/BasicSystemUtils.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/BasicSystemUtils.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/BasicSystemUtils.java 2013-04-22 19:41:39.000000000 +0000 @@ -89,7 +89,7 @@ * @see net.pms.io.SystemUtils#getVlcp() */ @Override - public String getVlcp() { + public String getVlcPath() { return vlcp; } @@ -99,7 +99,7 @@ * @see net.pms.io.SystemUtils#getVlcv() */ @Override - public String getVlcv() { + public String getVlcVersion() { return vlcv; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/BlockerFileInputStream.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/BlockerFileInputStream.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/BlockerFileInputStream.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/BlockerFileInputStream.java 2013-04-22 19:41:39.000000000 +0000 @@ -25,6 +25,8 @@ import java.io.FileInputStream; import java.io.IOException; +@Deprecated +// no longer used public class BlockerFileInputStream extends UnusedInputStream { private static final Logger logger = LoggerFactory.getLogger(BlockerFileInputStream.class); private static final int CHECK_INTERVAL = 1000; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/MacSystemUtils.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/MacSystemUtils.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/MacSystemUtils.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/MacSystemUtils.java 2013-04-22 19:41:39.000000000 +0000 @@ -1,8 +1,11 @@ package net.pms.io; +import org.apache.commons.io.IOUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.InputStream; import java.io.IOException; import java.net.NetworkInterface; import java.net.SocketException; @@ -11,23 +14,21 @@ import java.util.regex.Pattern; public class MacSystemUtils extends BasicSystemUtils { - private final static Logger logger = LoggerFactory.getLogger(MacSystemUtils.class); + private final static Logger LOGGER = LoggerFactory.getLogger(MacSystemUtils.class); - public MacSystemUtils() { - } + public MacSystemUtils() { } @Override public void browseURI(String uri) { try { - // On OSX, open the given URI with the "open" command. + // On OS X, open the given URI with the "open" command. // This will open HTTP URLs in the default browser. Runtime.getRuntime().exec(new String[] { "open", uri }); - } catch (IOException e) { - logger.trace("Unable to open the given URI: " + uri + "."); + LOGGER.trace("Unable to open the given URI: {}", uri); } } - + @Override public boolean isNetworkInterfaceLoopback(NetworkInterface ni) throws SocketException { return false; @@ -35,29 +36,28 @@ /** * Fetch the hardware address for a network interface. - * - * @param ni Interface to fetch the mac address for - * @return the mac address as bytes, or null if it couldn't be fetched. + * + * @param ni Interface to fetch the MAC address for + * @return the MAC address as bytes, or null if it couldn't be fetched. * @throws SocketException - * This won't happen on Mac OS, since the NetworkInterface is + * This won't happen on OS X, since the NetworkInterface is * only used to get a name. */ @Override public byte[] getHardwareAddress(NetworkInterface ni) throws SocketException { - // On Mac OS, fetch the hardware address from the command line tool "ifconfig". + // On Mac OS X, fetch the hardware address from the command line tool "ifconfig". byte[] aHardwareAddress = null; + InputStream inputStream = null; try { - Process aProc = Runtime.getRuntime().exec(new String[] { "ifconfig", ni.getName(), "ether" }); - aProc.waitFor(); - OutputTextConsumer aConsumer = new OutputTextConsumer(aProc.getInputStream(), false); - aConsumer.run(); - List aLines = aConsumer.getResults(); + Process process = Runtime.getRuntime().exec(new String[] { "ifconfig", ni.getName(), "ether" }); + inputStream = process.getInputStream(); + List lines = IOUtils.readLines(inputStream); String aMacStr = null; Pattern aMacPattern = Pattern.compile("\\s*ether\\s*([a-d0-9]{2}:[a-d0-9]{2}:[a-d0-9]{2}:[a-d0-9]{2}:[a-d0-9]{2}:[a-d0-9]{2})"); - for (String aLine : aLines) { - Matcher aMacMatcher = aMacPattern.matcher(aLine); + for (String line : lines) { + Matcher aMacMatcher = aMacPattern.matcher(line); if (aMacMatcher.find()) { aMacStr = aMacMatcher.group(1); @@ -75,12 +75,11 @@ } } } catch (IOException e) { - logger.debug("Failed to execute ifconfig", e); - } catch (InterruptedException e) { - logger.debug("Interrupted while waiting for ifconfig", e); - Thread.interrupted(); // XXX work around a Java bug - see ProcessUtil.waitFor() + LOGGER.warn("Failed to execute ifconfig", e); + } finally { + IOUtils.closeQuietly(inputStream); } - return aHardwareAddress; - } + return aHardwareAddress; + } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputBufferConsumer.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputBufferConsumer.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputBufferConsumer.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputBufferConsumer.java 2013-04-22 19:41:39.000000000 +0000 @@ -26,7 +26,7 @@ import java.util.List; public class OutputBufferConsumer extends OutputConsumer { - private static final Logger logger = LoggerFactory.getLogger(OutputBufferConsumer.class); + private static final Logger LOGGER = LoggerFactory.getLogger(OutputBufferConsumer.class); private BufferedOutputFile outputBuffer; /** @@ -49,23 +49,23 @@ public void run() { try { - //logger.trace("Starting read from pipe"); + // LOGGER.trace("Starting read from pipe"); byte buf[] = new byte[PIPE_BUFFER_SIZE]; int n = 0; while ((n = inputStream.read(buf)) > 0) { - //logger.trace("Fetched " + n + " from pipe"); + // LOGGER.trace("Fetched " + n + " from pipe"); outputBuffer.write(buf, 0, n); } - //logger.debug("Finished to read"); + // LOGGER.debug("Finished to read"); } catch (IOException ioe) { - logger.debug("Error consuming stream of spawned process: " + ioe.getMessage()); + LOGGER.debug("Error consuming stream of spawned process: " + ioe.getMessage()); } finally { - //logger.trace("Closing read from pipe"); + // LOGGER.trace("Closing read from pipe"); if (inputStream != null) { try { inputStream.close(); } catch (IOException e) { - logger.debug("Caught exception", e); + LOGGER.debug("Caught exception", e); } } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputConsumer.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputConsumer.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputConsumer.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputConsumer.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,6 +18,8 @@ */ package net.pms.io; +import org.apache.commons.io.IOUtils; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,11 +37,7 @@ @Deprecated public void destroy() { - try { - inputStream.close(); - } catch (IOException e) { - LOGGER.debug("Failed to close stream", e); - } + IOUtils.closeQuietly(inputStream); } public abstract BufferedOutputFile getBuffer(); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputParams.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputParams.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputParams.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputParams.java 2013-04-22 19:41:39.000000000 +0000 @@ -29,7 +29,10 @@ import java.util.Map; public class OutputParams { - public File outputFile; + @Deprecated + public File outputFile; // XXX no longer used + + // TODO: Refactor all public variables to private with public getters and setters. public File workDir; public Map env; public double minFileSize; @@ -40,8 +43,8 @@ public int fromFrame; public int toFrame; public int waitbeforestart; - public PipeProcess input_pipes[] = new PipeProcess[2]; - public PipeProcess output_pipes[] = new PipeProcess[2]; + public PipeProcess[] input_pipes = new PipeProcess[2]; + public PipeProcess[] output_pipes = new PipeProcess[2]; public DLNAMediaAudio aid; public DLNAMediaSubtitle sid; public int secondread_minsize; @@ -65,19 +68,22 @@ } else { waitbeforestart = 6000; } + fromFrame = -1; toFrame = -1; secondread_minsize = 1000000; + if (configuration != null) { minFileSize = configuration.getMinStreamBuffer(); minBufferSize = configuration.getMinMemoryBufferSize(); maxBufferSize = configuration.getMaxMemoryBufferSize(); } + if (maxBufferSize < 100) { maxBufferSize = 100; } + timeseek = 0; - outputFile = null; env = null; } @@ -99,7 +105,7 @@ + losslessaudio + ", lossyaudio=" + lossyaudio + ", maxBufferSize=" + maxBufferSize + ", mediaRenderer=" + mediaRenderer + ", minBufferSize=" + minBufferSize + ", minFileSize=" + minFileSize + ", no_videoencode=" + no_videoencode + ", noexitcheck=" + noexitcheck - + ", outputFile=" + outputFile + ", output_pipes=" + Arrays.toString(output_pipes) + + ", output_pipes=" + Arrays.toString(output_pipes) + ", secondread_minsize=" + secondread_minsize + ", shift_scr=" + shift_scr + ", sid=" + sid + ", stdin=" + stdin + ", timeend=" + timeend + ", timeseek=" + timeseek + ", toFrame=" + toFrame + ", waitbeforestart=" + waitbeforestart + ", workDir=" + workDir + ", env=" + env + "]"; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputTextConsumer.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputTextConsumer.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputTextConsumer.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputTextConsumer.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,6 +18,9 @@ */ package net.pms.io; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.LineIterator; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,8 +31,11 @@ import java.util.ArrayList; import java.util.List; +/** + * An input stream consumer that stores the consumed lines in a list and optionally logs each line. + */ public class OutputTextConsumer extends OutputConsumer { - private static final Logger logger = LoggerFactory.getLogger(OutputTextConsumer.class); + private static final Logger LOGGER = LoggerFactory.getLogger(OutputTextConsumer.class); private List lines = new ArrayList(); private Object linesLock = new Object(); private boolean log; @@ -41,35 +47,28 @@ } public void run() { - BufferedReader br = null; + LineIterator it = null; + try { - br = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); - String line = null; - int authorized = 10; - while ((line = br.readLine()) != null) { - if (line.length() > 0 && line.startsWith("[") && authorized > 0) { - addLine(line); - if (log) { - logger.trace(line); - } - authorized--; - } else if (line.length() > 0 && !line.startsWith("[") && !line.startsWith("100") && !line.startsWith("size") && !line.startsWith("frame") && !line.startsWith("Pos") && !line.startsWith("ERROR:") && !line.startsWith("BUFFER") && !line.startsWith("INITV")) { + it = IOUtils.lineIterator(inputStream, "UTF-8"); + + while (it.hasNext()) { + String line = it.nextLine(); + + if (line.length() > 0) { addLine(line); - if (log) { - logger.trace(line); - } + } + + if (log) { + LOGGER.debug(line); } } } catch (IOException ioe) { - logger.debug("Error consuming stream of spawned process: " + ioe.getMessage()); + LOGGER.debug("Error consuming input stream: {}", ioe.getMessage()); + } catch (IllegalStateException ise) { + LOGGER.debug("Error reading from closed input stream: {}", ise.getMessage()); } finally { - if (br != null) { - try { - br.close(); - } catch (IOException e) { - logger.debug("Caught exception", e); - } - } + LineIterator.closeQuietly(it); // clean up all associated resources } } @@ -85,9 +84,11 @@ public List getResults() { List clonedResults = new ArrayList(); + synchronized (linesLock) { clonedResults.addAll(lines); } + return clonedResults; } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputTextLogger.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputTextLogger.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/OutputTextLogger.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/OutputTextLogger.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,6 +18,9 @@ */ package net.pms.io; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.LineIterator; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,32 +34,28 @@ * A version of OutputTextConsumer that a) logs all output to the debug.log and b) doesn't store the output */ public class OutputTextLogger extends OutputConsumer { - private static final Logger logger = LoggerFactory.getLogger(OutputTextLogger.class); + private static final Logger LOGGER = LoggerFactory.getLogger(OutputTextLogger.class); public OutputTextLogger(InputStream inputStream) { super(inputStream); } public void run() { - BufferedReader br = null; + LineIterator it = null; try { - br = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); - String line = null; + it = IOUtils.lineIterator(inputStream, "UTF-8"); - while ((line = br.readLine()) != null) { - logger.debug(line); + while (it.hasNext()) { + String line = it.nextLine(); + LOGGER.debug(line); } } catch (IOException ioe) { - logger.debug("Error consuming stream of spawned process: " + ioe.getMessage()); + LOGGER.debug("Error consuming input stream: {}", ioe.getMessage()); + } catch (IllegalStateException ise) { + LOGGER.debug("Error reading from closed input stream: {}", ise.getMessage()); } finally { - if (br != null) { - try { - br.close(); - } catch (IOException e) { - logger.debug("Caught exception", e); - } - } + LineIterator.closeQuietly(it); // clean up all associated resources } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/ProcessWrapperImpl.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/ProcessWrapperImpl.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/ProcessWrapperImpl.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/ProcessWrapperImpl.java 2013-04-22 19:41:39.000000000 +0000 @@ -24,6 +24,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.sun.jna.Platform; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -32,22 +34,14 @@ import java.util.Map; public class ProcessWrapperImpl extends Thread implements ProcessWrapper { - private static final Logger logger = LoggerFactory.getLogger(ProcessWrapperImpl.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ProcessWrapperImpl.class); - @Override - public String toString() { - return super.getName(); - } - - private boolean success; - - public boolean isSuccess() { - return success; - } + /** FONTCONFIG_PATH environment variable name */ + private static final String FONTCONFIG_PATH = "FONTCONFIG_PATH"; private String cmdLine; private Process process; - private OutputConsumer outConsumer; + private OutputConsumer stdoutConsumer; private OutputConsumer stderrConsumer; private OutputParams params; private boolean destroyed; @@ -58,6 +52,16 @@ private boolean keepStdout; private boolean keepStderr; private static int processCounter = 0; + private boolean success; + + @Override + public String toString() { + return super.getName(); + } + + public boolean isSuccess() { + return success; + } public ProcessWrapperImpl(String cmdArray[], OutputParams params) { this(cmdArray, params, false, false); @@ -122,100 +126,149 @@ public void run() { ProcessBuilder pb = new ProcessBuilder(cmdArray); + try { - logger.debug("Starting " + cmdLine); - if (params.outputFile != null && params.outputFile.getParentFile().isDirectory()) { - pb.directory(params.outputFile.getParentFile()); - } + LOGGER.debug("Starting " + cmdLine); + if (params.workDir != null && params.workDir.isDirectory()) { pb.directory(params.workDir); } + + // Retrieve all environment variables of the process + Map environment = pb.environment(); + + // The variable params.env is initialized to null in the OutputParams + // constructor and never set to another value in PMS code. Plugins + // might use it? if (params.env != null && !params.env.isEmpty()) { - Map environment = pb.environment(); // actual name of system path var is case-sensitive String sysPathKey = PMS.get().isWindows() ? "Path" : "PATH"; // as is Map String PATH = params.env.containsKey("PATH") ? params.env.get("PATH") : params.env.containsKey("path") ? params.env.get("path") : params.env.containsKey("Path") ? params.env.get("Path") : null; + if (PATH != null) { PATH += (File.pathSeparator + environment.get(sysPathKey)); } + environment.putAll(params.env); + if (PATH != null) { environment.put(sysPathKey, PATH); } } + + // Fontconfig on Mac OSX may have problems locating fonts. As a result + // subtitles may be rendered invisible. Force feed fontconfig the + // FONTCONFIG_PATH environment variable to the prepackaged fontconfig + // configuration directory that comes with PMS on Mac OSX to make + // sure it has sensible defaults. + if (Platform.isMac()) { + // Do not overwrite the variable if it already exists. + if (!environment.containsKey(FONTCONFIG_PATH)) { + String pmsWorkingDirectory = new File("").getAbsolutePath(); + String fontconfigFontsPath = pmsWorkingDirectory + "/fonts"; + LOGGER.trace("Setting FONTCONFIG_PATH to \"" + fontconfigFontsPath + "\""); + environment.put(FONTCONFIG_PATH, fontconfigFontsPath); + } + } + + // XXX A cleaner way to execute short-running commands (e.g. vlc -version) + // is being developed. When that's done, this class can be used solely + // for the long-running tasks i.e. transcodes. At that point, we won't need + // separate stdout and stderr and can merge them by uncommenting the + // following line: + // pb.redirectErrorStream(true); process = pb.start(); PMS.get().currentProcesses.add(process); + stderrConsumer = keepStderr ? new OutputTextConsumer(process.getErrorStream(), true) : new OutputTextLogger(process.getErrorStream()); stderrConsumer.start(); - outConsumer = null; - if (params.outputFile != null) { - logger.debug("Writing in " + params.outputFile.getAbsolutePath()); - outConsumer = keepStdout - ? new OutputTextConsumer(process.getInputStream(), false) - : new OutputTextLogger(process.getInputStream()); - } else if (params.input_pipes[0] != null) { - logger.debug("Reading pipe: " + params.input_pipes[0].getInputPipe()); + stdoutConsumer = null; + + if (params.input_pipes[0] != null) { + LOGGER.debug("Reading pipe: " + params.input_pipes[0].getInputPipe()); bo = params.input_pipes[0].getDirectBuffer(); + if (bo == null || params.losslessaudio || params.lossyaudio || params.no_videoencode) { InputStream is = params.input_pipes[0].getInputStream(); - outConsumer = new OutputBufferConsumer((params.avidemux) ? new AviDemuxerInputStream(is, params, attachedProcesses) : is, params); - bo = outConsumer.getBuffer(); + + if (params.avidemux) { + is = new AviDemuxerInputStream(is, params, attachedProcesses); + } + + stdoutConsumer = new OutputBufferConsumer(is, params); + bo = stdoutConsumer.getBuffer(); } + bo.attachThread(this); new OutputTextLogger(process.getInputStream()).start(); } else if (params.log) { - outConsumer = keepStdout + stdoutConsumer = keepStdout ? new OutputTextConsumer(process.getInputStream(), true) : new OutputTextLogger(process.getInputStream()); } else { - outConsumer = new OutputBufferConsumer(process.getInputStream(), params); - bo = outConsumer.getBuffer(); + stdoutConsumer = new OutputBufferConsumer(process.getInputStream(), params); + bo = stdoutConsumer.getBuffer(); bo.attachThread(this); } + + if (stdoutConsumer != null) { + stdoutConsumer.start(); + } + if (params.stdin != null) { params.stdin.push(process.getOutputStream()); } - if (outConsumer != null) { - outConsumer.start(); - } Integer pid = ProcessUtil.getProcessID(process); if (pid != null) { - logger.debug("Unix process ID (" + cmdArray[0] + "): " + pid); + LOGGER.debug("Unix process ID ({}): {}", cmdArray[0], pid); } ProcessUtil.waitFor(process); + // wait up to a second for the stderr consumer thread to finish try { - if (outConsumer != null) { - outConsumer.join(1000); + if (stderrConsumer != null) { + stderrConsumer.join(1000); } - } catch (InterruptedException e) { - } - if (bo != null) { - bo.close(); - } + } catch (InterruptedException e) { } + + // wait up to a second for the stdout consumer thread to finish + try { + if (stdoutConsumer != null) { + stdoutConsumer.join(1000); + } + } catch (InterruptedException e) { } } catch (Exception e) { - logger.error("Fatal error in process initialization: ", e); + LOGGER.error("Error initializing process: ", e); stopProcess(); } finally { + try { + if (bo != null) { + bo.close(); + } + } catch (IOException ioe) { + LOGGER.debug("Error closing buffered output file", ioe.getMessage()); + } + if (!destroyed && !params.noexitcheck) { try { success = true; if (process != null && process.exitValue() != 0) { - logger.info("Process " + cmdArray[0] + " has a return code of " + process.exitValue() + "! Maybe an error occurred... check the log file"); + LOGGER.info("Process {} has a return code of {}! Maybe an error occurred... check the log file", cmdArray[0], process.exitValue()); success = false; } } catch (IllegalThreadStateException itse) { - logger.error("An error occurred", itse); + LOGGER.error("Error reading process exit value", itse); } } + if (attachedProcesses != null) { for (ProcessWrapper pw : attachedProcesses) { if (pw != null) { @@ -223,6 +276,7 @@ } } } + PMS.get().currentProcesses.remove(process); } } @@ -248,32 +302,30 @@ public InputStream getInputStream(long seek) throws IOException { if (bo != null) { return bo.getInputStream(seek); - } else if (outConsumer != null && outConsumer.getBuffer() != null) { - return outConsumer.getBuffer().getInputStream(seek); - } else if (params.outputFile != null) { - BlockerFileInputStream fIn = new BlockerFileInputStream(this, params.outputFile, params.minFileSize); - fIn.skip(seek); - return fIn; + } else if (stdoutConsumer != null && stdoutConsumer.getBuffer() != null) { + return stdoutConsumer.getBuffer().getInputStream(seek); } + return null; } public List getOtherResults() { - if (outConsumer == null) { + if (stdoutConsumer == null) { return null; } + try { - outConsumer.join(1000); - } catch (InterruptedException e) { - } - return outConsumer.getResults(); + stdoutConsumer.join(1000); + } catch (InterruptedException e) { } + + return stdoutConsumer.getResults(); } public List getResults() { try { stderrConsumer.join(1000); - } catch (InterruptedException e) { - } + } catch (InterruptedException e) { } + return stderrConsumer.getResults(); } @@ -282,11 +334,13 @@ destroyed = true; if (process != null) { Integer pid = ProcessUtil.getProcessID(process); + if (pid != null) { - logger.debug("Stopping Unix process " + pid + ": " + this); + LOGGER.debug("Stopping Unix process " + pid + ": " + this); } else { - logger.debug("Stopping process: " + this); + LOGGER.debug("Stopping process: " + this); } + ProcessUtil.destroy(process); } @@ -297,8 +351,9 @@ } } } - if (outConsumer != null && outConsumer.getBuffer() != null) { - outConsumer.getBuffer().reset(); + + if (stdoutConsumer != null && stdoutConsumer.getBuffer() != null) { + stdoutConsumer.getBuffer().reset(); } } } @@ -313,8 +368,9 @@ public void setReadyToStop(boolean nullable) { if (nullable != this.nullable) { - logger.trace("Ready to Stop: " + nullable); + LOGGER.trace("Ready to Stop: " + nullable); } + this.nullable = nullable; } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/SystemUtils.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/SystemUtils.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/io/SystemUtils.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/io/SystemUtils.java 2013-04-22 19:41:39.000000000 +0000 @@ -22,9 +22,9 @@ public abstract boolean isKerioFirewall(); - public abstract String getVlcp(); + public abstract String getVlcPath(); - public abstract String getVlcv(); + public abstract String getVlcVersion(); public abstract boolean isAvis(); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,315 +0,0 @@ -Dialog.Confirm=Confirm -Dialog.Error=Error -Dialog.Information=Information -Dialog.Options=Options -Dialog.Question=Question -DLNAMediaDatabase.0=The cache database needs to be reinitialized.\nSorry for the inconvenience \! -DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z -DLNAMediaDatabase.2=Cleanup database... -DLNAMediaDatabase.3=Compacting database... -DLNAMediaDatabase.4=Scanning Folder: -DLNAMediaDatabase.5=Damaged cache has to be deleted but the program couldn't do it.\nStop the program and delete the folder %s manually. -DLNAResource.0=External Subtitles -DLNAResource.1=No Encoding -DLNAResource.2=No Enc. -DLNAResource.3=[%E] {Audio: %c/%A (%b)} {Sub: %t/%S (%u)} -DLNAResource.4=%F - %d [%E] {%x} {Sub: %t/%S (%u)} -FFMpegDVRMSRemux.0=Alternative FFmpeg Path: -FFMpegDVRMSRemux.1=Settings for DVR-MS remuxing -FFMpegVideo.0=Encoder settings for AviSynth/FFmpeg engine only (Prefer AviSynth/MEncoder) -FFMpegVideo.1=Encoder settings for FFmpeg engine -FoldTab.0= -FoldTab.1=Sharing options -FoldTab.2=Scan all shared folders -FoldTab.3=Scanning all the shared folders can take a lot of time \!\n -FoldTab.4=Are you sure to launch the scan?\n\n -FoldTab.5=Hide file extensions -FoldTab.6=Hide \#Video Settings\# Folder -FoldTab.7=Shared folders -FoldTab.8=Hide transcoding engine names -FoldTab.9=Add Directory -FoldTab.10=Do you want to stop the scan?\n\n -FoldTab.11=Enable transcoded video copy on PS3 (Careful, files have no fixed size !) -FoldTab.12=Sort the shared folders -FoldTab.13=Thumbnails -FoldTab.14=Use MPlayer for video thumbnails -FoldTab.15=Alphabetical (A-Z) -FoldTab.16=By date, newest first -FoldTab.17=By date, oldest first -FoldTab.18=File order: -FoldTab.19=DVD ISO thumbnails -FoldTab.20=ASCIIbetical -FoldTab.21=Image thumbnails -FoldTab.22=Alphanumeric -FoldTab.23=Download from amazon.com -FoldTab.24=Download from discogs.com -FoldTab.26=Audio thumbnails import: -FoldTab.27=Alternate video cover art folder -FoldTab.28=Choose a folder -FoldTab.29=Show iPhoto library -FoldTab.30=Show iTunes library -FoldTab.31=Hide empty/non-media folders (Careful: slower browsing) -FoldTab.32=Hide cache folder -FoldTab.33=Hide \#--TRANSCODE--\# Folder -FoldTab.34=Show aperture library -FoldTab.35=None -FontFileFilter.3=TrueType Fonts -LinksTab.5=Helpful links: -LinksTab.6=Build: -LooksFrame.5=Quit -LooksFrame.6=Main Panel -LooksFrame.9=Save -LooksFrame.12=Restart Server -LooksFrame.13=The server has to be restarted due to a configuration change -LooksFrame.18=Status -LooksFrame.19=Traces -LooksFrame.20=General Configuration -LooksFrame.21=Transcoding Settings -LooksFrame.22=Navigation/Share Settings -LooksFrame.24=Help -LooksFrame.25=About -LooksFrame.26=FOR TESTING ONLY, POSSIBLY UNSTABLE -MEncoderAviSynth.2=Video decoder settings for AviSynth engine only -MEncoderAviSynth.3=Enable AviSynth variable framerate change into a constant framerate (convertfps=true) -MEncoderAviSynth.4=# AviSynth script is now fully customisable\n -MEncoderAviSynth.5=# The following variables are available:\n -MEncoderAviSynth.6=# : The complete DirectShowSource instruction, e.g. DirectShowSource(filename, convertfps)\n -MEncoderAviSynth.7=# : The complete subtitle instruction if there's any detected (SRT/SUB/IDX/ASS/SSA)\n -MEncoderAviSynth.8=# : The video filename for if you want to do all this by yourself\n -MEncoderAviSynth.10=\n -MEncoderAviSynth.11=\n -MEncoderVideo.0=Skip loop filter deblocking for H.264. Can degrade quality. -MEncoderVideo.1=Video/Audio decoder settings for MEncoder engine only -MEncoderVideo.2=A/V sync alternative method -MEncoderVideo.3=Use application default codec parameters (Recommended!) -MEncoderVideo.4=Force framerate parsed from FFmpeg -MEncoderVideo.5=You can add here specific options, such as a denoise filter for example: -vf hqdn3d -MEncoderVideo.6=Custom options: -MEncoderVideo.7=Audio language priority: -MEncoderVideo.8=Subtitles settings -MEncoderVideo.9=Subtitles language priority: -MEncoderVideo.10=Audio/subtitles language priority (e.g.: en,off;jpn,eng) -MEncoderVideo.11=Codepage for non-Unicode subtitles: -MEncoderVideo.12=Override styled subtitles settings: Font scale -MEncoderVideo.13=Font outline -MEncoderVideo.14=Font shadow -MEncoderVideo.15=Sub margin (px) -MEncoderVideo.16=Plaintext subtitles settings: Font scale -MEncoderVideo.17=Font outline -MEncoderVideo.18=Font blur -MEncoderVideo.19=Sub margin (%) -MEncoderVideo.20=Use ASS/SSA subtitle styling -MEncoderVideo.21=Fontconfig/Embedded fonts -MEncoderVideo.22=Automatically load *.srt/*.sub subtitles with the same file name -MEncoderVideo.23=FriBiDi mode -MEncoderVideo.24=Specify TrueType font (for subtitles): -MEncoderVideo.25=Select a TrueType font -MEncoderVideo.26=Deinterlace filter -MEncoderVideo.27=Use Video Scaler -MEncoderVideo.28=Width -MEncoderVideo.29=Expert Settings : Codec-specific parameters -MEncoderVideo.30=Height -MEncoderVideo.31=Subs color -MEncoderVideo.32=Keep AC-3 track (no re-encode, may cause inaudible dialog and A/V sync issues) -MEncoderVideo.33=Custom parameters: -MEncoderVideo.34=Edit codecs specific parameters -MEncoderVideo.35=Use multiple CPU cores -MEncoderVideo.36=Use embedded style -MEncoderVideo.37=Alternate Subtitles Folder -MEncoderVideo.38=Remux videos with tsMuxeR when possible instead of transcoding -MEncoderVideo.39=Remux DVD ISO video track (no re-encode) -MEncoderVideo.68=\#Here you can put specific parameters for some codec combinations.\n -MEncoderVideo.69=\#It's mostly for A/V synchronization issues, but it can be used for anything else as well\n -MEncoderVideo.70=\#Consider it like expert settings as this shouldn't be used if you don't know exactly what you're doing\n -MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n -MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Careful, any malformed line will be wiped out\n -MEncoderVideo.75=\#Special options:\n -MEncoderVideo.76=\# -noass: definitely disable ASS/SSA subtitles as they can mess up A/V sync\n -MEncoderVideo.77=\# -nosync: definitely disable A/V sync alternative method for this condition (-mc will do the same)\n -MEncoderVideo.78=\# -quality: override video quality settings\n -MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n -MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n -MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n -MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=DVD/VOBsub subtitle quality (0-4) (higher is better): -MEncoderVideo.93=Add borders for overscan compensation: -MEncoderVideo.94=Forced sub: -MEncoderVideo.95=Forced tags: -MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ -MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ -MEncoderVideo.98=cp1252 /* Windows - Western Europe */ -MEncoderVideo.99=cp1253 /* Windows - Greek */ -MEncoderVideo.100=cp1254 /* Windows - Turkish */ -MEncoderVideo.101=cp1255 /* Windows - Hebrew */ -MEncoderVideo.102=cp1256 /* Windows - Arabic */ -MEncoderVideo.103=cp1257 /* Windows - Baltic */ -MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ -MEncoderVideo.105=ISO-8859-1 /* Western Europe */ -MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ -MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ -MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ -MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ -MEncoderVideo.110=ISO-8859-6 /* Arabic */ -MEncoderVideo.111=ISO-8859-7 /* Greek */ -MEncoderVideo.112=ISO-8859-8 /* Hebrew */ -MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ -MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ -MEncoderVideo.115=ISO-8859-11 /* Thai */ -MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ -MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ -MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ -MEncoderVideo.119=ISO-8859-16 /* Central European languages */ -MEncoderVideo.120=cp932 /* Japanese */ -MEncoderVideo.121=cp936 /* Chinese */ -MEncoderVideo.122=cp949 /* Korean */ -MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */ -MEncoderVideo.124=UTF-8 /* Unicode */ -MEncoderVideo.125=Choose Subtitles Color -MEncoderVideo.126=eng,fre,jpn,ger,und -MEncoderVideo.127=eng,fre,jpn,ger,und -MEncoderVideo.128=*,* -MEncoderVideo.129=/* Auto */ -MEncoderVideo.130=enca:ru:cp1251 /* Russian (auto) */ -MEncoderVideo.131=enca:pl:cp1250 /* Eastern Europe (auto) */ -MEncoderVideo.132=enca:zh:big5 /* Chinese (auto) */ -NetworkTab.0=Language [needs application restart]: -NetworkTab.1=Browse compressed archives (.rar/.zip/.cbr) -NetworkTab.2=Generate thumbnails -NetworkTab.3=Start minimized -NetworkTab.4=Install as a Windows Service -NetworkTab.5=General settings -NetworkTab.6=Transcode buffer maximum size, in megabytes (maximum: MAX_BUFFER_SIZE): -NetworkTab.7=Number of cores used for transcoding (it seems you have %d): -NetworkTab.8=Check for updates -NetworkTab.9=Check automatically -NetworkTab.11=You have installed the Windows service \! For using it, you must quit this application,\n -NetworkTab.12=then start (and configure) the service from the windows administration panel.\n\n -NetworkTab.13=The cache will be reinitialized \!\n -NetworkTab.14=Error in the installation of the Windows service!\n -NetworkTab.15=Navigation/Parsing settings -NetworkTab.16=Thumbnail seeking position (in seconds): -NetworkTab.17=Enable the cache -NetworkTab.18=Reset cache -NetworkTab.19=Are you sure? -NetworkTab.20=Force networking on interface: -NetworkTab.22=Network settings (advanced) -NetworkTab.23=Force IP of the server: -NetworkTab.24=Force port of the server (5001 by default): -NetworkTab.25=PS3 Settings -NetworkTab.26=Character encoding of your PS3 file names (see XMB->System settings->Charset): -NetworkTab.27=Unused settings you shouldn't use :p -NetworkTab.28=Turbo mode (enable tcp_nodelay) / be careful, not sure if that's ok to do this -NetworkTab.29=Block incoming request for the same file from PS3 when transcode has started -NetworkTab.30=Use an IP filter (whitelist): -NetworkTab.31=Advanced HTTP and system settings -NetworkTab.32=HTTP Engine V2 -NetworkTab.33=Prevent OS from sleeping while streaming -NetworkTab.34=Plugins -NetworkTab.35=Maximum bandwidth in Mb/s (0 means no limit): -NetworkTab.36=Default renderer when automatic detection fails: -NetworkTab.37=Unknown renderer -NetworkTab.38=Force default renderer (disable automatic detection) -PMS.0=No renderers were found -PMS.1=Audio -PMS.2=\#- Cache -\# -PMS.3=A/V sync alternative method -PMS.4=Deinterlace Filter -PMS.5=Connected to PS3 -PMS.6=Auto load .srt/.sub subtitles -PMS.7=SkipLoopFilter for H.264 Decoding (Could degrade quality) -PMS.8=Subtitles -PMS.9=All Audio Playlists -PMS.10=Definitely disable subtitles -PMS.11=All Audio Tracks -PMS.12=By Date -PMS.13=By Artist -PMS.14=Default H.264 Remux with MEncoder -PMS.16=By Album -PMS.17=Unknown renderer -PMS.18=Connected -PMS.19=By Genre -PMS.21=By camera model -PMS.22=By Artist/Album -PMS.25=By ISO settings -PMS.26=By Genre/Artist/Album -PMS.27=Save configuration -PMS.28=By Letter/Artist/Album -PMS.31=Photo -PMS.32=All Photos -PMS.34=Video -PMS.35=All Videos -PMS.36=HD Videos -PMS.37=\#- Video Settings -\# -PMS.39=SD Videos -PMS.40=DVD Images -PMS.41=(Re)installing Win32 service -PMS.42=Error initalizing PMS! -PMS.130=Searching for renderers... -ProfileChooser.1=PS3 Media Server Profile Chooser -ProfileChooser.2=Select -ProfileChooser.3=Profile file (.conf) or directory -StatusTab.2=Status -StatusTab.3=Waiting... -StatusTab.5=Empty -StatusTab.6=Transcoding buffer status: -StatusTab.7=I/O statistics: -StatusTab.8=Current bitrate: -StatusTab.9=Detected media renderers -StatusTab.10=Peak bitrate: -StatusTab.11=Mb/s -StatusTab.12=MB -TracesTab.3=Clear -TranscodeVirtualFolder.0=\#--TRANSCODE--\# -TreeNodeSettings.4=This engine is not loaded\! -TrTab2.0=Enable/disable a transcoding engine -TrTab2.1=No settings for now -TrTab2.2=Video encoder settings with following engines: MEncoder/AviSynth/FFmpeg -TrTab2.3=Audio settings, apply to following decoders: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Video quality settings -TrTab2.5=Common transcode settings -TrTab2.6=Sort the transcoding engines list. First one will appears in the original video folder -TrTab2.7=Misc options -TrTab2.8=Skip transcode for the following extensions (comma separated): -TrTab2.9=Force transcode for the following extensions (comma separated): -TrTab2.10=Allows you to stream DTS directly to your receiver.\nBe careful, it's possible to have a static sound. Notes:\n- You must have a DTS compatible receiver, connected on TOSLINK or HDMI\n- The volume icon on XMB must be on 'Normal'\n- The channels icon on XMB must be on 'Left+Right'\n -TrTab2.11=Engines -TrTab2.12=Common decoder settings -TrTab2.13=Common encoder settings -TrTab2.14=Video Files Engines -TrTab2.15=Audio Files Engines -TrTab2.16=Web Video Streaming Engines -TrTab2.17=Web Audio Streaming Engines -TrTab2.18=Misc Engines -TrTab2.19=Engines are in descending -TrTab2.20=order; the highest is first -TrTab2.21=(AviSynth not supported) -TrTab2.22=Automatic audio resampling to 44.1 or 48 kHz -TrTab2.27=Use LPCM for audio (no re-encode) -TrTab2.28=Keep DTS track (no re-encode, compatible with AV receiver through optical or HDMI output) -TrTab2.29=AC-3 re-encoding audio bitrate (in kibit/s) (e.g.: 576, 640): -TrTab2.32=MPEG-2 options: -TrTab2.39=The video is automatically transcoded and muxed to a MPEG-PS / AC-3 audio (highly compatible on PS3) -TrTab2.40=\nYou can play with the vqscale, vqmin and keyint parameters to achieve good, even almost lossless transcoding quality. -TrTab2.41=\nThe drawback to this is the VBR bitrate, which can sometimes peak above your max network capacity. -TrTab2.42=\nThat's why you can also set the bandwidth if you're on WiFi, CPL, etc. However, the transcoding quality -TrTab2.43=\nis a balance between network speed and CPU power: the more quality you put into a constrained bitrate, -TrTab2.44=\nthe more your CPU will suffer\! Also, don't expect to fit a 1080p action movie in the purest quality in 15Mbps :p -TrTab2.50=Maximum number of audio channels to output for AC-3 re-encoding: -TrTab2.51=Definitely disable subtitles -TrTab2.52=\#--TRANSCODE--\# folder chapter support (interval in minutes): -TrTab2.55=2 channels (Stereo) -TrTab2.56=6 channels (5.1) -TrTab2.60=Great quality -TrTab2.61=Lossless quality -TrTab2.62=Good quality -TrTab2.63=Good quality for HD Wifi transcoding -TrTab2.64=Medium quality for HD Wifi transcoding -TrTab2.65=Low quality, low-end CPU or HD Wifi transcoding -TSMuxerVideo.0=Demux with MEncoder and encode all audio tracks to AC-3 -TSMuxerVideo.1=Demux with MEncoder and encode DTS/FLAC audio tracks to LPCM [Careful, seeking don't work yet] -TSMuxerVideo.2=Force FPS parsed from FFmpeg in the meta file -TSMuxerVideo.3=Video decoder settings for tsMuxeR engine only -TSMuxerVideo.19=Mux all audio tracks diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ar.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ar.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ar.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ar.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,295 +0,0 @@ -# -# This file was automatically translated with Google Translate (http://translate.google.com/#en|ar) -# as a proof of concept for right-to-left oriented language support in PMS. -# -# A proper translation still needs to be done. -# -DLNAMediaDatabase.0=\u0642\u0627\u0639\u062F\u0629 \u0628\u064A\u0627\u0646\u0627\u062A \u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062A\u062E\u0632\u064A\u0646 \u0627\u0644\u0645\u0624\u0642\u062A \u064A\u062D\u062A\u0627\u062C \u0625\u0644\u0649 \u064A\u0643\u0648\u0646 reinitialized.\n \u0646 \u0646\u0623\u0633\u0641 \u0644\u0644\ \u0625\u0632\u0639\u0627\u062C! -DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z -DLNAMediaDatabase.2=\u062A\u0646\u0638\u064A\u0641 \u0642\u0627\u0639\u062F\u0629 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A ... -DLNAMediaDatabase.3=\u0636\u063A\u0637 \u0642\u0627\u0639\u062F\u0629 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A ... -DLNAMediaDatabase.4=\u0645\u0633\u062D \u0627\u0644\u0645\u062C\u0644\u062F: -FFMpegDVRMSRemux.0=\u0627\u0644\u0628\u062F\u064A\u0644 FFmpeg \u0645\u0633\u0627\u0631: -FFMpegDVRMSRemux.1=\u0636\u0628\u0637 DVR-MS remuxing -FFMpegVideo.0=\u0636\u0628\u0637 \u062A\u0631\u0645\u064A\u0632 \u0644\u0627\u0641\u064A\u0633\u064A\u0646\u062B / FFMPEG \u0645\u062D\u0631\u0643 \u0641\u0642\u0637 (\u064A\u0641\u0636\u0644 \u0627\u0641\u064A\u0633\u064A\u0646\u062B / \u0645\u064A\u0646\u0643\u0648\u062F\u0631) -FoldTab.0=<\u0643\u0644 \u0627\u0644\u0645\u0634\u063A\u0644\u0627\u062A> -FoldTab.1=\u062E\u064A\u0627\u0631\u0627\u062A \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0629 -FoldTab.2=\u062A\u0641\u062D\u0635 \u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0627\u0644\u0645\u0634\u062A\u0631\u0643\u0629 -FoldTab.3=\u0648\u064A\u0645\u0643\u0646 \u0645\u0633\u062D \u0643\u0644 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0627\u0644\u0645\u0634\u062A\u0631\u0643\u0629 \u062A\u0623\u062E\u0630 \u0627\u0644\u0643\u062B\u064A\u0631 \u0645\u0646 \u0627\u0644\u0648\u0642\u062A\!\n -FoldTab.4=\u0647\u0644 \u0623\u0646\u062A \u0645\u062A\u0623\u0643\u062F \u0644\u0625\u0637\u0644\u0627\u0642 \u0627\u0644\u0645\u0633\u062D\u061F\n\n -FoldTab.5=\u0625\u062E\u0641\u0627\u0621 \u0645\u0644\u062D\u0642\u0627\u062A \u0627\u0644\u0645\u0644\u0641\u0627\u062A -FoldTab.6=\u0627\u062E\u0641\u0627\u0621 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0645\u062C\u0644\u062F -FoldTab.7=\u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0627\u0644\u0645\u0634\u062A\u0631\u0643\u0629 -FoldTab.8=\u0625\u062E\u0641\u0627\u0621 \u0623\u0633\u0645\u0627\u0621 \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A \u0645\u062D\u0631\u0643 -FoldTab.9=\u0625\u0636\u0627\u0641\u0629 \u062F\u0644\u064A\u0644 -FoldTab.10=\u0647\u0644 \u062A\u0631\u063A\u0628 \u0641\u064A \u0627\u0644\u062A\u0648\u0642\u0641 \u0639\u0646 \u0627\u0644\u0641\u062D\u0635\u061F\n\n -FoldTab.11=\u062A\u0645\u0643\u064A\u0646 \u0627\u0644\u0645\u062D\u0648\u0644\u0629 \u0646\u0633\u062E\u0629 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0639\u0644\u0649 PS3 (\u0627\u0644\u062F\u0642\u064A\u0642\u060C \u0648\u0645\u0644\u0641\u0627\u062A \u0644\u064A\u0633 \u0644\u0647\u0627 \u062D\u062C\u0645 \u062B\u0627\u0628\u062A!) -FoldTab.12=\u0641\u0631\u0632 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0627\u0644\u0645\u0634\u062A\u0631\u0643\u0629 -FoldTab.13=\u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 -FoldTab.14=\u0627\u0633\u062A\u062E\u062F\u0645 \u0625\u0645\u0628\u0644\u0627\u064A\u0631 \u0644\u0644\u0645\u0635\u063A\u0631\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 -FoldTab.15=\u0627\u0644\u0623\u0628\u062C\u062F\u064A (A-Z) -FoldTab.16=\u062D\u0633\u0628 \u0627\u0644\u062A\u0627\u0631\u064A\u062E\u060C \u0627\u0644\u0623\u062D\u062F\u062B \u0623\u0648\u0644\u0627 -FoldTab.17=\u062D\u0633\u0628 \u0627\u0644\u062A\u0627\u0631\u064A\u062E\u060C \u0627\u0644\u0623\u0642\u062F\u0645 \u0623\u0648\u0644\u0627 -FoldTab.18=\u0645\u0644\u0641 \u0627\u0644\u0646\u0638\u0627\u0645: -FoldTab.19=\u062F\u064A \u0641\u064A \u062F\u064A \u0627\u064A\u0632\u0648 \u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 -FoldTab.20=ASCIIbetical -FoldTab.21=\u0635\u0648\u0631\u0629 \u0645\u0635\u063A\u0631\u0629 -FoldTab.22=\u0623\u0628\u062C\u062F\u064A\u0629 -FoldTab.23=\u062A\u062D\u0645\u064A\u0644 \u0645\u0646 amazon.com -FoldTab.24=\u062A\u062D\u0645\u064A\u0644 \u0645\u0646 discogs.com -FoldTab.26=\u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 \u0639\u0631\u0636 \u0627\u0644\u0635\u0648\u062A: -FoldTab.27=\u0627\u0644\u0628\u062F\u064A\u0644 \u062A\u063A\u0637\u064A\u0629 \u0627\u0644\u0641\u0646 \u0641\u064A\u062F\u064A\u0648 \u0627\u0644\u0645\u062C\u0644\u062F -FoldTab.28=\u0627\u062E\u062A\u064A\u0627\u0631 \u0645\u062C\u0644\u062F -FoldTab.29=\u0625\u0638\u0647\u0627\u0631 \u0645\u0643\u062A\u0628\u0629 iPhoto -FoldTab.30=\u0639\u0631\u0636 \u0627\u064A \u062A\u064A\u0648\u0646\u0632 \u0645\u0643\u062A\u0628\u0629 -FoldTab.31=\u0625\u062E\u0641\u0627\u0621 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0641\u0627\u0631\u063A\u0629 / \u063A\u064A\u0631 \u0633\u0627\u0626\u0644 \u0627\u0644\u0625\u0639\u0644\u0627\u0645 (\u062D\u0630\u0631\u0627: \u0627\u0644\u062A\u0635\u0641\u062D \u0628\u0637\u064A\u0621) -FoldTab.32=\u0625\u062E\u0641\u0627\u0621 \u0627\u0644\u0645\u062C\u0644\u062F \u0627\u0644\u0645\u0624\u0642\u062A -FoldTab.33=\u0625\u062E\u0641\u0627\u0621 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0641\u064A\u0631\u062A -FoldTab.34=\u062A\u0638\u0647\u0631 \u0641\u062A\u062D\u0629 \u0645\u0643\u062A\u0628\u0629 -FontFileFilter.3=\u062E\u0637\u0648\u0637 \u062A\u0631\u0648\u062A\u0627\u064A\u0628 -LinksTab.5=\u0631\u0648\u0627\u0628\u0637 \u0645\u0641\u064A\u062F\u0629: -LinksTab.6=\u0628\u0646\u0627\u0621: -LooksFrame.5=\u0627\u0633\u062A\u0642\u0627\u0644 -LooksFrame.6=\u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629 \u0644\u0648\u062D\u0629 -LooksFrame.9=\u062D\u0641\u0638 -LooksFrame.12=\u0625\u0639\u0627\u062F\u0629 \u062A\u0634\u063A\u064A\u0644 \u0627\u0644\u062E\u0627\u062F\u0645 -LooksFrame.13=\u0627\u0644\u062E\u0627\u062F\u0645 \u0644\u0627\u0628\u062F \u0645\u0646 \u0625\u0639\u0627\u062F\u0629 \u062A\u0634\u063A\u064A\u0644 \u0628\u0633\u0628\u0628 \u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u062A\u0643\u0648\u064A\u0646 -LooksFrame.18=\u062D\u0627\u0644\u0629 -LooksFrame.19=\u0622\u062B\u0627\u0631 -LooksFrame.20=\u062A\u0643\u0648\u064A\u0646 \u0639\u0627\u0645 -LooksFrame.21=\u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A \u0625\u0639\u062F\u0627\u062F\u0627\u062A -LooksFrame.22=\u0627\u0644\u0645\u0644\u0627\u062D\u0629 / \u062D\u0635\u0629 \u0625\u0639\u062F\u0627\u062F\u0627\u062A -LooksFrame.24=\u0645\u0633\u0627\u0639\u062F\u0629 -LooksFrame.25=\u062D\u0648\u0644 -LooksFrame.26=\u0627\u0644\u0627\u062E\u062A\u0628\u0627\u0631 \u0641\u0642\u0637\u060C \u0645\u0646 \u0627\u0644\u0645\u062D\u062A\u0645\u0644 \u063A\u064A\u0631 \u0645\u0633\u062A\u0642\u0631\u0629 -MEncoderAviSynth.2=\u0636\u0628\u0637 \u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0644\u0645\u062D\u0631\u0643 \u0627\u0641\u064A\u0633\u064A\u0646\u062B \u0641\u0642\u0637 -MEncoderAviSynth.3=\u062A\u0645\u0643\u064A\u0646 \u0627\u0641\u064A\u0633\u064A\u0646\u062B \u062A\u063A\u064A\u064A\u0631 \u0641\u0631\u0627\u0645\u064A\u0631\u0627\u062A\u064A \u0627\u0644\u0645\u062A\u063A\u064A\u0631 \u0641\u064A \u0641\u0631\u0627\u0645\u064A\u0631\u0627\u062A\u064A \u062B\u0627\u0628\u062A (convertfps = \u0635\u062D\u064A\u062D) -MEncoderAviSynth.4=#AviSynth script is now fully customisable !\n -MEncoderAviSynth.5=#You must use the following variables (\"clip\" being the avisynth variable of the movie):\n -MEncoderAviSynth.6=#: insert the complete DirectShowSource instruction [ clip=DirectShowSource(movie, convertfps) ]\n -MEncoderAviSynth.7=#: insert the complete TextSub/VobSub instruction if there's any detected srt/sub/idx/ass subtitle file\n -MEncoderAviSynth.8=#: variable of the movie filename, if you want to do all this by yourself\n -MEncoderAviSynth.9=#Be careful, the custom script MUST return the clip object\n -MEncoderAviSynth.10=<\u0641\u064A\u0644\u0645>\n -MEncoderAviSynth.11=<\u0639\u0646\u0648\u0627\u0646 \u0641\u0631\u0639\u064A>\n -MEncoderAviSynth.12=\u0639\u0648\u062F\u0629 \u0643\u0644\u064A\u0628 -MEncoderVideo.0=\u062A\u062E\u0637\u064A \u0641\u0644\u062A\u0631 \u0644\u0625\u0632\u0627\u0644\u0629 \u0643\u062A\u0644 \u062D\u0644\u0642\u0629 H.264. \u064A\u0645\u0643\u0646 \u0623\u0646 \u062A\u062A\u062D\u0644\u0644 \u062C\u0648\u062F\u0629. -MEncoderVideo.1=\u0627\u0644\u0641\u064A\u062F\u064A\u0648 / \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0635\u0648\u062A \u0644\u0641\u0643 \u0645\u062D\u0631\u0643 \u0645\u064A\u0646\u0643\u0648\u062F\u0631 \u0641\u0642\u0637 -MEncoderVideo.2=A / V \u0637\u0631\u064A\u0642\u0629 \u0628\u062F\u064A\u0644\u0629 \u0645\u062A\u0632\u0627\u0645\u0646\u0629 -MEncoderVideo.3=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A \u062A\u0637\u0628\u064A\u0642 \u0627\u0644\u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0627\u0641\u062A\u0631\u0627\u0636\u064A (\u0645\u0633\u062A\u062D\u0633\u0646!) -MEncoderVideo.4=\u0641\u0631\u0636 \u0641\u0631\u0627\u0645\u064A\u0631\u0627\u062A\u064A \u062A\u062D\u0644\u064A\u0644 \u0645\u0646 FFMPEG -MEncoderVideo.5=\u064A\u0645\u0643\u0646\u0643 \u0625\u0636\u0627\u0641\u0629 \u0647\u0646\u0627 \u062E\u064A\u0627\u0631\u0627\u062A \u0645\u062D\u062F\u062F\u0629\u060C \u0645\u062B\u0644 \u0645\u0631\u0634\u062D denoise \u0639\u0644\u0649 \u0633\u0628\u064A\u0644 \u0627\u0644\u0645\u062B\u0627\u0644: -vf hqdn3d -MEncoderVideo.6=\u0639\u0631\u0641 \u062E\u064A\u0627\u0631\u0627\u062A: -MEncoderVideo.7=\u0627\u0644\u0635\u0648\u062A \u0644\u063A\u0629 \u0630\u0627\u062A \u0627\u0644\u0623\u0648\u0644\u0648\u064A\u0629: -MEncoderVideo.8=\u062A\u0631\u062C\u0645\u0629 \u0625\u0639\u062F\u0627\u062F\u0627\u062A -MEncoderVideo.9=\u062A\u0631\u062C\u0645\u0629 \u0644\u063A\u0629 \u0630\u0627\u062A \u0627\u0644\u0623\u0648\u0644\u0648\u064A\u0629: -MEncoderVideo.10=\u0627\u0644\u0635\u0648\u062A \u0644\u063A\u0629 \u0627\u0644\u062A\u0631\u062C\u0645\u0629 / \u0627\u0644\u0623\u0648\u0644\u0648\u064A\u0629 (\u0639\u0644\u0649 \u0633\u0628\u064A\u0644 \u0627\u0644\u0645\u062B\u0627\u0644: \u0627\u0646\u060C \u062D\u0627\u0644\u0627\u060C \u0627\u0644\u064A\u0627\u0628\u0627\u0646\u060C \u0627\u0646\u0643\u0644\u062A\u0631\u0627) -MEncoderVideo.11=\u062A\u0631\u062C\u0645\u0629 \u0645\u062E\u0637\u0637 \u0627\u0644\u0634\u0641\u0631\u0629: -MEncoderVideo.12=\u062A\u062C\u0627\u0648\u0632 \u0639\u0644\u0649 \u063A\u0631\u0627\u0631 \u062A\u0631\u062C\u0645\u0629: \u0636\u0628\u0637 \u062D\u062C\u0645 \u0627\u0644\u062E\u0637 -MEncoderVideo.13=\u0627\u0644\u062E\u0637 \u0627\u0644\u0645\u062E\u0637\u0637 \u0627\u0644\u062A\u0641\u0635\u064A\u0644\u064A -MEncoderVideo.14=\u0627\u0644\u062E\u0637 \u0627\u0644\u0638\u0644 -MEncoderVideo.15=\u0634\u0628\u0647 \u0647\u0627\u0645\u0634 (\u0645\u0642\u0635\u0641) -MEncoderVideo.16=\u0645\u0634\u0641\u0631 \u062A\u0631\u062C\u0645\u0629: \u0636\u0628\u0637 \u062D\u062C\u0645 \u0627\u0644\u062E\u0637 -MEncoderVideo.17=\u0627\u0644\u062E\u0637 \u0627\u0644\u0645\u062E\u0637\u0637 \u0627\u0644\u062A\u0641\u0635\u064A\u0644\u064A -MEncoderVideo.18=\u0627\u0644\u062E\u0637 \u0637\u0645\u0633 -MEncoderVideo.19=\u0634\u0628\u0647 \u0647\u0627\u0645\u0634 (\u066A) -MEncoderVideo.20=\u0627\u0633\u062A\u062E\u062F\u0645 ASS / SSA \u0627\u0644\u062A\u0635\u0645\u064A\u0645 \u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0641\u0631\u0639\u064A -MEncoderVideo.21=Fontconfig / \u062C\u0632\u0621\u0627 \u0644\u0627 \u064A\u062A\u062C\u0632\u0623 \u0645\u0646 \u0627\u0644\u062E\u0637\u0648\u0637 -MEncoderVideo.22=* \u062A\u062D\u0645\u064A\u0644 \u062A\u0644\u0642\u0627\u0626\u064A\u0627. SRT / *. \u062A\u0631\u062C\u0645\u0629 \u0627\u0644\u0641\u0631\u0639\u064A\u0629 \u0645\u0639 \u0646\u0641\u0633 \u0627\u0633\u0645 \u0627\u0644\u0645\u0644\u0641 -MEncoderVideo.23=FriBiDi \u0648\u0636\u0639 -MEncoderVideo.24=\u062A\u062D\u062F\u064A\u062F \u062E\u0637 \u062A\u0631\u0648\u062A\u0627\u064A\u0628 (\u0644\u062A\u0631\u062C\u0645\u0629): -MEncoderVideo.25=\u062A\u062D\u062F\u064A\u062F \u062E\u0637 \u062A\u0631\u0648\u062A\u0627\u064A\u0628 -MEncoderVideo.26=\u062A\u0634\u0627\u0628\u0643 \u0641\u0644\u062A\u0631 -MEncoderVideo.27=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0627\u0644\u0645\u062A\u0633\u0644\u0642 -MEncoderVideo.28=\u0639\u0631\u0636 -MEncoderVideo.29=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u062E\u0628\u0631\u0627\u0621: \u062A\u0631\u0645\u064A\u0632 \u0645\u062D\u062F\u062F\u0629 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A -MEncoderVideo.30=\u0627\u0631\u062A\u0641\u0627\u0639 -MEncoderVideo.31=\u0627\u0644\u063A\u0648\u0627\u0635\u0627\u062A \u0627\u0644\u0644\u0648\u0646 -MEncoderVideo.32=Remux \u0639\u0646\u062F\u0645\u0627 \u0627\u0644\u0635\u0648\u062A \u0647\u0648 AC-3 (\u0623\u064A \u0625\u0639\u0627\u062F\u0629 \u062A\u0631\u0645\u064A\u0632) -MEncoderVideo.33=\u0639\u0631\u0641 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A: -MEncoderVideo.34=\u062A\u0639\u062F\u064A\u0644 \u0627\u0644\u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A \u0645\u062D\u062F\u062F\u0629 -MEncoderVideo.35=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062C\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064A\u0629 \u0645\u062A\u0639\u062F\u062F\u0629 \u0627\u0644\u0646\u0648\u0649 -MEncoderVideo.36=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0623\u0633\u0644\u0648\u0628 \u062C\u0632\u0621\u0627 \u0644\u0627 \u064A\u062A\u062C\u0632\u0623 \u0645\u0646 -MEncoderVideo.37=\u0627\u0644\u0628\u062F\u064A\u0644 \u062A\u0631\u062C\u0645\u0627\u062A \u0645\u062C\u0644\u062F -MEncoderVideo.38=Remux \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0645\u0639 tsMuxeR \u0639\u0646\u062F\u0645\u0627 \u064A\u0643\u0648\u0646 \u0630\u0644\u0643 \u0645\u0645\u0643\u0646\u0627\u060C \u0628\u062F\u0644\u0627 \u0645\u0646 \u062A\u062D\u0648\u064A\u0644 \u0627\u0644\u0634\u0641\u0631\u0629 -MEncoderVideo.39=Remux \u0641\u064A\u062F\u064A\u0648 \u062F\u064A \u0641\u064A \u062F\u064A \u0627\u064A\u0632\u0648 \u0627\u0644\u0645\u0633\u0627\u0631 (\u0623\u064A \u0625\u0639\u0627\u062F\u0629 \u062A\u0631\u0645\u064A\u0632) -MEncoderVideo.68=\#Here you can put specific parameters for some codec combinations.\n -MEncoderVideo.69=\#It's mostly for A/V synchronization issues, but it can be used for anything else as well\n -MEncoderVideo.70=\#Consider it like expert settings as this shouldn't be used if you don't know exactly what you're doing\n -MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n -MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Careful, any malformed line will be wiped out\n -MEncoderVideo.75=\#Special options:\n -MEncoderVideo.76=\# -noass: definitely disable ASS/SSA subtitles as they can mess up A/V sync\n -MEncoderVideo.77=\# -nosync: definitely disable A/V sync alternative method for this condition (-mc will do the same)\n -MEncoderVideo.78=\# -quality: override video quality settings\n -MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n -MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n -MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n -MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=\u062F\u064A \u0641\u064A \u062F\u064A / VOBsub \u062C\u0648\u062F\u0629 \u0627\u0644\u062A\u0631\u062C\u0645\u0629 (0-4) (\u0623\u0639\u0644\u0649 \u0647\u064A \u0623\u062D\u0633\u0646): -MEncoderVideo.93=\u0625\u0636\u0627\u0641\u0629 \u062D\u062F\u0648\u062F \u0644\u0644\u062D\u0635\u0648\u0644 \u0639\u0644\u0649 \u062A\u0639\u0648\u064A\u0636 overscan: -MEncoderVideo.94=\u0627\u0636\u0637\u0631 \u0641\u0631\u0639\u064A\u0629 \u0647\u064A: -MEncoderVideo.95=\u0623\u062C\u0628\u0631 \u0628\u0647: -MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ -MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ -MEncoderVideo.98=cp1252 /* Windows - Western Europe */ -MEncoderVideo.99=cp1253 /* Windows - Greek */ -MEncoderVideo.100=cp1254 /* Windows - Turkish */ -MEncoderVideo.101=cp1255 /* Windows - Hebrew */ -MEncoderVideo.102=cp1256 /* Windows - Arabic */ -MEncoderVideo.103=cp1257 /* Windows - Baltic */ -MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ -MEncoderVideo.105=ISO-8859-1 /* Western Europe */ -MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ -MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ -MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ -MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ -MEncoderVideo.110=ISO-8859-6 /* Arabic */ -MEncoderVideo.111=ISO-8859-7 /* Greek */ -MEncoderVideo.112=ISO-8859-8 /* Hebrew */ -MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ -MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ -MEncoderVideo.115=ISO-8859-11 /* Thai */ -MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ -MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ -MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ -MEncoderVideo.119=ISO-8859-16 /* Central European languages */ -MEncoderVideo.120=cp932 /* Japanese */ -MEncoderVideo.121=cp936 /* Chinese */ -MEncoderVideo.122=cp949 /* Korean */ -MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */ -MEncoderVideo.124=UTF-8 /* Unicode */ -MEncoderVideo.125=Choose Subtitles Color -NetworkTab.0=\u0644\u063A\u0629 [\u064A\u062C\u0628 \u062A\u0637\u0628\u064A\u0642 \u0625\u0639\u0627\u062F\u0629 \u062A\u0634\u063A\u064A\u0644]: -NetworkTab.1=\u062A\u0635\u0641\u062D \u0627\u0644\u0645\u062D\u0641\u0648\u0638\u0627\u062A \u0627\u0644\u0645\u0636\u063A\u0648\u0637\u0629 (.rar / .zip / .cbr) -NetworkTab.2=\u062A\u0648\u0644\u064A\u062F \u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 -NetworkTab.3=\u0628\u062F\u0621 \u0645\u0635\u063A\u0631 -NetworkTab.4=\u062A\u062B\u0628\u064A\u062A \u0628\u0627\u0639\u062A\u0628\u0627\u0631\u0647\u0627 \u062E\u062F\u0645\u0629 \u0648\u064A\u0646\u062F\u0648\u0632 -NetworkTab.5=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0639\u0627\u0645\u0629 -NetworkTab.6=\u0641\u064A\u0631\u062A \u062D\u062C\u0645 \u0627\u0644\u0645\u062E\u0632\u0646 \u0627\u0644\u0645\u0624\u0642\u062A \u0627\u0644\u0623\u0642\u0635\u0649\u060C \u0641\u064A \u0645\u064A\u063A\u0627 \u0628\u0627\u064A\u062A (\u0627\u0644\u062D\u062F \u0627\u0644\u0623\u0642\u0635\u0649: MAX_BUFFER_SIZE): -NetworkTab.7=\u0639\u062F\u062F \u0627\u0644\u0646\u0648\u0649 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645\u0629 \u0644\u0646\u0642\u0644 \u0627\u0644\u062A\u0631\u0645\u064A\u0632 (\u064A\u0628\u062F\u0648 \u0623\u0646 \u0644\u062F\u064A\u0643 %d): -NetworkTab.8=\u0627\u0644\u062A\u062D\u0642\u0642 \u0645\u0646 \u0627\u0644\u062A\u062D\u062F\u064A\u062B\u0627\u062A -NetworkTab.9=\u062A\u062D\u0642\u0642 \u062A\u0644\u0642\u0627\u0626\u064A\u0627 -NetworkTab.11=\u0643\u0646\u062A \u0642\u062F \u0642\u0645\u062A \u0628\u062A\u062B\u0628\u064A\u062A \u062E\u062F\u0645\u0629 Windows \! \u0644\u0627\u0633\u062A\u062E\u062F\u0627\u0645\u0647\u060C \u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0647\u0630\u0627 \u0627\u0644\u062A\u0637\u0628\u064A\u0642\u060C \u0627\u0633\u062A\u0642\u0627\u0644\u060C \ \u0646 -NetworkTab.12=\u062B\u0645 \u062A\u0628\u062F\u0623 (\u0648\u062A\u0643\u0648\u064A\u0646) \u0644\u062E\u062F\u0645\u0629 \u0648\u064A\u0646\u062F\u0648\u0632 \u0645\u0646 \u0644\u0648\u062D\u0629 \u0627\u0644\u0625\u062F\u0627\u0631\u0629. \ \u0646 \ \u0646 -NetworkTab.13=\u0648\u0633\u0648\u0641 \u064A\u0643\u0648\u0646 reinitialized \u0639\u0644\u0649 \u0645\u062E\u0628\u0623 \! \n -NetworkTab.14=\u062E\u0637\u0623 \u0641\u064A \u062A\u0631\u0643\u064A\u0628 \u062E\u062F\u0645\u0629 Windows \u0646 \! -NetworkTab.15=\u0627\u0644\u0645\u0644\u0627\u062D\u0629 / \u062A\u0648\u0632\u064A\u0639 \u0625\u0639\u062F\u0627\u062F\u0627\u062A -NetworkTab.16=\u0645\u0648\u0642\u0641 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 \u0627\u0644\u062A\u064A \u062A\u0633\u0639\u0649 (\u062B\u0627\u0646\u064A\u0629): -NetworkTab.17=\u062A\u0645\u0643\u064A\u0646 \u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062A\u062E\u0632\u064A\u0646 \u0627\u0644\u0645\u0624\u0642\u062A -NetworkTab.18=\u0625\u0639\u0627\u062F\u0629 \u0636\u0628\u0637 \u0645\u062E\u0628\u0623 -NetworkTab.19=\u0647\u0644 \u0623\u0646\u062A \u0645\u062A\u0623\u0643\u062F\u061F -NetworkTab.20=\u0634\u0628\u0643\u0629 \u0627\u0644\u0646\u0641\u0627\u0630 \u0641\u064A \u0627\u0644\u0648\u0627\u062C\u0647\u0629: -NetworkTab.22=\u0636\u0628\u0637 \u0634\u0628\u0643\u0629 (\u0645\u062A\u0642\u062F\u0645) -NetworkTab.23=\u0641\u0631\u0636 IP \u0644\u0645\u0644\u0642\u0645: -NetworkTab.24=\u0642\u0648\u0629 \u0627\u0644\u0645\u0646\u0641\u0630 \u0644\u0645\u0644\u0642\u0645 (5001 \u0627\u0641\u062A\u0631\u0627\u0636\u064A\u0627): -NetworkTab.25=PS3 \u0644\u0648\u062D\u0629 \u0627\u0644\u062A\u062D\u0643\u0645 -NetworkTab.26=\u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u062D\u0631\u0648\u0641 \u0645\u0646 \u0623\u0633\u0645\u0627\u0626\u0643\u0645 \u0645\u0644\u0641 PS3 (\u0627\u0646\u0638\u0631 XMB - \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0646\u0638\u0627\u0645> -> \u0645\u062D\u0627\u0631\u0641): -NetworkTab.27=\u063A\u064A\u0631 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645\u0629 \u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u062A\u064A \u064A\u062C\u0628 \u0639\u062F\u0645 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 :P -NetworkTab.28=\u0648\u0636\u0639 \u062A\u0648\u0631\u0628\u0648 (\u062A\u0645\u0643\u064A\u0646 tcp_nodelay) / \u062A\u0648\u062E\u064A \u0627\u0644\u062D\u0630\u0631\u060C \u0648\u0644\u0633\u062A \u0645\u062A\u0623\u0643\u062F\u0627 \u0625\u0630\u0627 \u0643\u0627\u0646 \u0647\u0630\u0627 \u0647\u0648 \u0645\u0648\u0627\u0641\u0642 \u0644\u0644\u0642\u064A\u0627\u0645 \u0628\u0630\u0644\u0643 -NetworkTab.29=\u0645\u0646\u0639 \u0637\u0644\u0628 \u0648\u0627\u0631\u062F \u0644\u0646\u0641\u0633 \u0627\u0644\u0645\u0644\u0641 \u0645\u0646 PS3 \u0639\u0646\u062F\u0645\u0627 \u0628\u062F\u0623\u062A \u0641\u064A\u0631\u062A -NetworkTab.30=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0641\u0644\u062A\u0631 IP: -NetworkTab.31=HTTP \u0627\u0644\u0645\u062A\u0642\u062F\u0645\u0629 \u0648\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0646\u0638\u0627\u0645 -NetworkTab.32=HTTP \u0627\u0644\u0645\u062D\u0631\u0643 V2 -NetworkTab.33=\u0645\u0646\u0639 \u0646\u0638\u0627\u0645 \u0627\u0644\u062A\u0634\u063A\u064A\u0644 \u0645\u0646 \u0627\u0644\u0646\u0648\u0645 \u0641\u064A \u062D\u064A\u0646 \u062A\u062F\u0641\u0642 -NetworkTab.34=\u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062A -NetworkTab.35=\u0623\u0642\u0635\u0649 \u0639\u0631\u0636 \u0627\u0644\u0646\u0637\u0627\u0642 \u0627\u0644\u062A\u0631\u062F\u062F\u064A \u0641\u064A \u0645\u064A\u062C\u0627 \u0628\u062A / \u062B\u0627\u0646\u064A\u0629 (0 \u064A\u0639\u0646\u064A \u0639\u062F\u0645 \u0648\u062C\u0648\u062F \u062D\u062F\u0648\u062F): -PMS.0=\u0644\u0645 \u064A\u062A\u0645 \u0627\u0644\u0639\u062B\u0648\u0631 \u0639\u0644\u0649 \u0639\u0627\u0631\u0636\u064A\u0646 -PMS.1=\u0627\u0644\u0635\u0648\u062A -PMS.2=\#- \u0645\u062E\u0628\u0623 -\# -PMS.3=A / V \u0637\u0631\u064A\u0642\u0629 \u0628\u062F\u064A\u0644\u0629 \u0645\u062A\u0632\u0627\u0645\u0646\u0629 -PMS.4=\u062A\u0634\u0627\u0628\u0643 \u062A\u0635\u0641\u064A\u0629 -PMS.5=\u0628\u062C\u0647\u0627\u0632 PS3 -PMS.6=\u0627\u0644\u0633\u064A\u0627\u0631\u0627\u062A \u062A\u062D\u0645\u064A\u0644 .srt / .sub \u062A\u0631\u062C\u0645\u0627\u062A -PMS.7=SkipLoopFilter \u0644\u0644\u062D\u0635\u0648\u0644 \u0639\u0644\u0649 \u0641\u0643 H.264 (\u062A\u062E\u0641\u0641 \u062C\u0648\u062F\u0629) -PMS.8=\u062A\u0631\u062C\u0645\u0629 -PMS.9=\u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0635\u0646\u0641\u0627\u062A \u0627\u0644\u0633\u0645\u0639\u064A\u0629 -PMS.10=\u062A\u0639\u0637\u064A\u0644 \u0628\u0627\u0644\u062A\u0623\u0643\u064A\u062F \u062A\u0631\u062C\u0645\u0627\u062A -PMS.11=\u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0633\u0627\u0631\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 -PMS.12=\u062D\u0633\u0628 \u0627\u0644\u062A\u0627\u0631\u064A\u062E -PMS.13=\u0628\u0648\u0627\u0633\u0637\u0629 \u0627\u0644\u0641\u0646\u0627\u0646 -PMS.14=Remux \u0627\u0644\u0627\u0641\u062A\u0631\u0627\u0636\u064A H.264 \u0645\u0639 \u0645\u064A\u0646\u0643\u0648\u062F\u0631 -PMS.16=\u0645\u0646 \u0627\u0644\u0623\u0644\u0628\u0648\u0645 -PMS.17=\u063A\u064A\u0631 \u0645\u0639\u0631\u0648\u0641 \u0627\u0644\u0639\u0627\u0631\u0636 -PMS.18=\u0645\u062A\u0635\u0644 -PMS.19=\u062D\u0633\u0628 \u0627\u0644\u0646\u0648\u0639 -PMS.21=\u0645\u0646 \u0637\u0631\u0627\u0632 \u0627\u0644\u0643\u0627\u0645\u064A\u0631\u0627 -PMS.22=\u0645\u0646 \u0642\u0628\u0644 \u0627\u0644\u0641\u0646\u0627\u0646 / \u0627\u0644\u0623\u0644\u0628\u0648\u0645 -PMS.25=\u0628\u0648\u0627\u0633\u0637\u0629 \u0625\u0639\u062F\u0627\u062F\u0627\u062A ISO -PMS.26=\u0628\u0648\u0627\u0633\u0637\u0629 \u0646\u0648\u0639 / \u0627\u0644\u0641\u0646\u0627\u0646 / \u0627\u0644\u0623\u0644\u0628\u0648\u0645 -PMS.27=\u062D\u0641\u0638 \u0627\u0644\u062A\u0643\u0648\u064A\u0646 -PMS.31=\u0635\u0648\u0631 -PMS.32=\u0643\u0644 \u0627\u0644\u0635\u0648\u0631 -PMS.34=\u0641\u064A\u062F\u064A\u0648 -PMS.35=\u0643\u0644 \u0644\u0642\u0637\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 -PMS.36=\u0623\u0641\u0644\u0627\u0645 HD -PMS.37=\#- \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 -\# -PMS.39=\u0623\u0641\u0644\u0627\u0645 SD -PMS.41=(\u0625\u0639\u0627\u062F\u0629) \u062A\u062B\u0628\u064A\u062A Win32 \u0648\u062E\u062F\u0645\u0629 -PMS.130=\u0627\u0644\u0628\u062D\u062B \u0639\u0646 \u0639\u0627\u0631\u0636\u064A\u0646 ... -ProfileChooser.1=PS3 \u0645\u064A\u062F\u064A\u0627 \u200B\u200B\u0633\u064A\u0631\u0641\u0631 \u0627\u0644\u0634\u062E\u0635\u064A \u0645\u0646\u062A\u0642\u064A -ProfileChooser.2=\u062D\u062F\u062F -ProfileChooser.3=\u0645\u0644\u0641 \u0627\u0644\u0645\u0644\u0641 (. \u0623\u0633\u064A\u0648\u0637) \u0623\u0648 \u062F\u0644\u064A\u0644 -StatusTab.2=\u062D\u0627\u0644\u0629 -StatusTab.3=\u0627\u0646\u062A\u0638\u0627\u0631 ... -StatusTab.5=\u0641\u0627\u0631\u063A -StatusTab.6=\u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A \u062D\u0627\u0644\u0629 \u0627\u0644\u0639\u0627\u0632\u0644\u0629: -StatusTab.7=I / O \u0625\u062D\u0635\u0627\u0626\u064A\u0627\u062A: -StatusTab.8=\u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A \u0627\u0644\u062D\u0627\u0644\u064A: -StatusTab.9=\u0627\u0644\u0643\u0634\u0641 \u0639\u0646 \u0648\u0633\u0627\u0626\u0644 \u0627\u0644\u0625\u0639\u0644\u0627\u0645 \u0639\u0627\u0631\u0636\u064A\u0646 -StatusTab.10=\u0630\u0631\u0648\u0629 \u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A: -StatusTab.11=\u0645\u064A\u063A\u0627\u0628\u062A \u0641\u064A \u0627\u0644\u062B\u0627\u0646\u064A\u0629 -TSMuxerVideo.0=Demux \u0645\u0639 \u0645\u064A\u0646\u0643\u0648\u062F\u0631 \u0648\u062A\u0631\u0645\u064A\u0632 \u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0633\u0627\u0631\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 \u0625\u0644\u0649 AC-3 -TSMuxerVideo.1=Demux \u0645\u0639 \u0645\u064A\u0646\u0643\u0648\u062F\u0631 \u0648\u062A\u0631\u0645\u064A\u0632 DTS / FLAC \u0627\u0644\u0645\u0633\u0627\u0631\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 \u0625\u0644\u0649 LPCM [\u0627\u0644\u062F\u0642\u064A\u0642\u060C \u0648\u0627\u0644\u0633\u0639\u064A \u0644\u0627 \u062A\u0639\u0645\u0644 \u062D\u062A\u0649 \u0627\u0644\u0622\u0646] -TSMuxerVideo.2=FPS \u0642\u0648\u0629 \u062A\u062D\u0644\u064A\u0644 \u0645\u0646 FFMPEG \u0641\u064A \u0645\u0644\u0641 \u0627\u0644\u062A\u0639\u0631\u064A\u0641 -TSMuxerVideo.3=\u0636\u0628\u0637 \u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0644\u0645\u062D\u0631\u0643 tsMuxeR \u0641\u0642\u0637 -TSMuxerVideo.19=MUX \u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0633\u0627\u0631\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 -TrTab2.0=\u062A\u0645\u0643\u064A\u0646 / \u062A\u0639\u0637\u064A\u0644 \u0645\u062D\u0631\u0643 \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A -TrTab2.1=\u0623\u064A \u0636\u0628\u0637 \u0641\u064A \u0627\u0644\u0648\u0642\u062A \u0627\u0644\u0631\u0627\u0647\u0646 -TrTab2.2=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0645\u0639 \u0645\u062D\u0631\u0643\u0627\u062A \u0627\u0644\u062A\u0627\u0644\u064A\u0629: \u0645\u064A\u0646\u0643\u0648\u062F\u0631 / \u0627\u0641\u064A\u0633\u064A\u0646\u062B / FFMPEG -TrTab2.3=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u060C \u062A\u0646\u0637\u0628\u0642 \u0639\u0644\u0649 \u0641\u0643 \u0627\u0644\u0631\u0645\u0648\u0632 \u0627\u0644\u062A\u0627\u0644\u064A\u0629: \u0645\u064A\u0646\u0643\u0648\u062F\u0631 / \u0627\u0641\u064A\u0633\u064A\u0646\u062B / FFMPEG tsMuxeR / -TrTab2.4=\u0636\u0628\u0637 \u062C\u0648\u062F\u0629 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 -TrTab2.5=\u0645\u0634\u062A\u0631\u0643 \u0641\u064A\u0631\u062A \u0625\u0639\u062F\u0627\u062F\u0627\u062A -TrTab2.6=\u0641\u0631\u0632 \u0642\u0627\u0626\u0645\u0629 \u0645\u062D\u0631\u0643\u0627\u062A \u0627\u0644\u062A\u062D\u0648\u064A\u0644. \u0623\u0648\u0644 \u0648\u0638\u0647\u0631 \u0641\u064A \u0645\u062C\u0644\u062F \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0627\u0644\u0623\u0635\u0644\u064A -TrTab2.7=\u0645\u062A\u0641\u0631\u0642\u0627\u062A \u062E\u064A\u0627\u0631\u0627\u062A -TrTab2.8=\u0641\u064A\u0631\u062A \u0644\u062A\u062E\u0637\u064A \u0627\u0644\u0645\u0644\u062D\u0642\u0627\u062A \u0627\u0644\u062A\u0627\u0644\u064A\u0629 (\u0645\u0641\u0635\u0648\u0644\u0629 \u0628\u0641\u0648\u0627\u0635\u0644): -TrTab2.9=\u0641\u064A\u0631\u062A \u0644\u0625\u062C\u0628\u0627\u0631 \u0627\u0644\u0645\u0644\u062D\u0642\u0627\u062A \u0627\u0644\u062A\u0627\u0644\u064A\u0629 (\u0645\u0641\u0635\u0648\u0644\u0629 \u0628\u0641\u0648\u0627\u0635\u0644): -TrTab2.10=\u064A\u0633\u0645\u062D \u0644\u0643 \u0644\u062A\u064A\u0627\u0631 DTS \u0645\u0628\u0627\u0634\u0631\u0629 \u0625\u0644\u0649 \u062C\u0647\u0627\u0632 \u0627\u0644\u0627\u0633\u062A\u0642\u0628\u0627\u0644 \u0627\u0644\u062E\u0627\u0635 \u0628\u0643. \ \u0627\u0644\u0628\u0646\u0643 \u0627\u0644\u0623\u0647\u0644\u064A \u062F\u0642\u064A\u0642\u060C \u0641\u0645\u0646 \u0627\u0644\u0645\u0645\u0643\u0646 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0644\u0647\u0627 \u0635\u0648\u062A \u062B\u0627\u0628\u062A. \u0645\u0644\u0627\u062D\u0638\u0627\u062A: \ \u0646 \u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u062C\u0647\u0627\u0632 \u0627\u0633\u062A\u0642\u0628\u0627\u0644 \u0645\u062A\u0648\u0627\u0641\u0642 DTS\u060C \u0645\u062A\u0635\u0644\u0629 \u0641\u064A \u0643\u064A\u0628\u0644\u0627\u062A \u0623\u0648 HDMI \ \u0646 \u0648\u0631\u0645\u0632 \u0648\u062D\u062F\u0629 \u0627\u0644\u062A\u062E\u0632\u064A\u0646 \u0639\u0644\u0649 XMB \u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0639\u0644\u0649 "\u0637\u0628\u064A\u0639\u064A" \ N-\u0631\u0645\u0632 \u0627\u0644\u0642\u0646\u0648\u0627\u062A \u0639\u0644\u0649 XMB \u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0639\u0644\u0649 '+ \u064A\u0645\u064A\u0646 \u064A\u0633\u0627\u0631' \u0646 \n -TrTab2.11=\u0645\u062D\u0631\u0643\u0627\u062A -TrTab2.12=\u0636\u0628\u0637 \u0641\u0643 \u0645\u0634\u062A\u0631\u0643 -TrTab2.13=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u062A\u0634\u0641\u064A\u0631 \u0645\u0634\u062A\u0631\u0643 -TrTab2.14=\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0645\u062D\u0631\u0643\u0627\u062A -TrTab2.15=\u0627\u0644\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 \u0648\u0645\u062D\u0631\u0643\u0627\u062A -TrTab2.16=\u0645\u062D\u0631\u0643\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0639\u0644\u0649 \u0634\u0628\u0643\u0629 \u0627\u0644\u0625\u0646\u062A\u0631\u0646\u062A \u0627\u0644\u062C\u0631\u064A -TrTab2.17=\u0634\u0628\u0643\u0629 \u0635\u0648\u062A \u0645\u062D\u0631\u0643\u0627\u062A \u0627\u0644\u062C\u0631\u064A -TrTab2.18=\u0645\u062D\u0631\u0643\u0627\u062A \u0645\u062A\u0641\u0631\u0642\u0627\u062A -TrTab2.19=\u0627\u0644\u0645\u062D\u0631\u0643\u0627\u062A \u0641\u064A \u062A\u0646\u0627\u0632\u0644\u064A -TrTab2.20=\u0623\u062C\u0644\u060C \u0648\u0623\u0639\u0644\u0649 \u0647\u0648 \u0623\u0648\u0644\u0627 -TrTab2.21=(\u0627\u0641\u064A\u0633\u064A\u0646\u062B \u063A\u064A\u0631 \u0645\u0639\u062A\u0645\u062F\u0629) -TrTab2.22=\u0627\u0644\u0635\u0648\u062A \u0627\u0644\u062A\u0644\u0642\u0627\u0626\u064A \u0627\u062E\u062A\u0632\u0627\u0644 \u0625\u0644\u0649 44.1 \u0623\u0648 48 \u0643\u064A\u0644\u0648\u0647\u0631\u062A\u0632 -TrTab2.27=DTS / FLAC \u0644\u062A\u062D\u0648\u064A\u0644 LPCM (\u062A\u062D\u062A\u0627\u062C \u0625\u0644\u0649 \u062C\u0647\u0627\u0632 \u0627\u0633\u062A\u0642\u0628\u0627\u0644 \u0644\u062A\u062F\u0641\u0642 HDMI LPCM 5.1) -TrTab2.28=\u0627\u0644\u062D\u0641\u0627\u0638 \u0639\u0644\u0649 \u0627\u0644\u0635\u0648\u062A DTS \u0641\u064A \u062A\u064A\u0627\u0631 (\u0645\u062A\u0648\u0627\u0641\u0642 \u0645\u0639 \u0627\u0644\u0627\u0646\u062A\u0627\u062C \u0627\u0644\u0628\u0635\u0631\u064A\u0629) -TrTab2.29=\u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A \u0627\u0644\u0635\u0648\u062A AC-3 (\u0641\u064A \u0643\u064A\u0644\u0648 \u0628\u0627\u064A\u062A / \u062B\u0627\u0646\u064A\u0629) (\u0645\u062B\u0644\u0627: 384\u060C 576\u060C 640): -TrTab2.32=MPEG-2 \u062E\u064A\u0627\u0631\u0627\u062A: -TrTab2.39=\u0648\u0627\u0644\u0645\u062D\u0648\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0627 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0648\u0645\u0648\u0643\u0633\u064A\u062F \u0625\u0644\u0649 \u0627\u0644\u0635\u0648\u062A MPEG-PS / AC-3 (\u0645\u062A\u0648\u0627\u0641\u0642\u0629 \u0625\u0644\u0649 \u062D\u062F \u0643\u0628\u064A\u0631 \u0639\u0644\u0649 PS3) -TrTab2.40=\n\u064A\u0645\u0643\u0646\u0643 \u0623\u0646 \u062A\u0644\u0639\u0628 \u0645\u0639 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A vqscale\u060C vqmin \u0648keyint \u0625\u0644\u0649 \u062A\u062D\u0642\u064A\u0642 \u0627\u0644\u062E\u064A\u0631\u060C \u0648\u062D\u062A\u0649 \u0628\u0644\u0627 \u062E\u0633\u0627\u0626\u0631 \u062A\u0642\u0631\u064A\u0628\u0627 \u0627\u0644\u062A\u062D\u0648\u064A\u0644 \u062C\u0648\u062F\u0629. -TrTab2.41=\n\u0627\u0644\u0639\u064A\u0628 \u0641\u064A \u0647\u0630\u0627 \u0647\u0648 \u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A VBR\u060C \u0648\u0627\u0644\u062A\u064A \u064A\u0645\u0643\u0646 \u0623\u0646 \u064A\u0635\u0644 \u0625\u0644\u0649 \u0630\u0631\u0648\u062A\u0647 \u0641\u064A \u0628\u0639\u0636 \u0627\u0644\u0623\u062D\u064A\u0627\u0646 \u0641\u0648\u0642 \u0642\u062F\u0631\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0643\u062D\u062F \u0623\u0642\u0635\u0649. -TrTab2.42=\n\u0648\u0647\u0630\u0627 \u0647\u0648 \u0627\u0644\u0633\u0628\u0628 \u064A\u0645\u0643\u0646\u0643 \u0623\u064A\u0636\u0627 \u062A\u0639\u064A\u064A\u0646 \u0639\u0631\u0636 \u0627\u0644\u0646\u0637\u0627\u0642 \u0627\u0644\u062A\u0631\u062F\u062F\u064A \u0625\u0630\u0627 \u0643\u0646\u062A \u0639\u0644\u0649 \u0648\u0627\u064A \u0641\u0627\u064A\u060C \u0648\u0642\u0627\u0646\u0648\u0646 \u0627\u0644\u0625\u062C\u0631\u0627\u0621\u0627\u062A \u0627\u0644\u062C\u0646\u0627\u0626\u064A\u0629\u060C \u0648\u0645\u0627 \u0625\u0644\u0649 \u0630\u0644\u0643\u060C \u0641\u0625\u0646 \u0646\u0648\u0639\u064A\u0629 \u0627\u0644\u0634\u0641\u0631\u0629 -TrTab2.43=\n\u062A\u0648\u0627\u0632\u0646 \u0628\u064A\u0646 \u0633\u0631\u0639\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0648\u0642\u0648\u0629 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062C\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064A\u0629: \u0648\u0627\u0644\u0645\u0632\u064A\u062F \u0645\u0646 \u0627\u0644\u062C\u0648\u062F\u0629 \u0627\u0644\u062A\u064A \u0648\u0636\u0639\u062A \u0641\u064A \u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A \u0645\u0642\u064A\u062F\u0629\u060C -TrTab2.44=\n\u0643\u0644\u0645\u0627 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062C\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064A\u0629 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0643 \u062A\u0639\u0627\u0646\u064A \! \u0623\u064A\u0636\u0627\u060C \u0644\u0627 \u0646\u062A\u0648\u0642\u0639 \u0644\u062A\u062A\u0646\u0627\u0633\u0628 \u0645\u0639 \u0641\u064A\u0644\u0645 \u0627\u0644\u062D\u0631\u0643\u0629 \u0648\u0627\u0644\u0627\u062B\u0627\u0631\u0629 1080P \u0641\u064A \u0623\u0646\u0642\u0649 \u0646\u0648\u0639\u064A\u0629 \u0641\u064A 15Mbps: P -TrTab2.50=\u0627\u0644\u062D\u062F \u0627\u0644\u0623\u0642\u0635\u0649 \u0644\u0639\u062F\u062F \u0645\u0646 \u0627\u0644\u0642\u0646\u0648\u0627\u062A \u0627\u0644\u0633\u0645\u0639\u064A\u0629 \u0625\u0644\u0649 \u0627\u0644\u0625\u062E\u0631\u0627\u062C: -TrTab2.51=\u062A\u0639\u0637\u064A\u0644 \u0628\u0627\u0644\u062A\u0623\u0643\u064A\u062F \u062A\u0631\u062C\u0645\u0627\u062A -TrTab2.52=\u0641\u0635\u0648\u0644 \u0641\u064A\u0631\u062A \u0627\u0644\u062F\u0639\u0645 \u0645\u062C\u0644\u062F / \u0627\u0644\u0641\u0627\u0635\u0644 \u0627\u0644\u0632\u0645\u0646\u064A \u0641\u064A \u062F\u0642\u0627\u0626\u0642: -TrTab2.55=2 \u0642\u0646\u0648\u0627\u062A (\u0633\u062A\u064A\u0631\u064A\u0648) -TrTab2.56=6 \u0642\u0646\u0648\u0627\u062A (5.1) -TrTab2.60=\u0639\u0638\u064A\u0645 \u062C\u0648\u062F\u0629 -TrTab2.61=\u0636\u064A\u0627\u0639 \u062C\u0648\u062F\u0629 -TrTab2.62=\u0630\u0627\u062A \u0646\u0648\u0639\u064A\u0629 \u062C\u064A\u062F\u0629 -TrTab2.63=\u0630\u0627\u062A \u0646\u0648\u0639\u064A\u0629 \u062C\u064A\u062F\u0629 \u0644HD \u0648\u0627\u064A \u0641\u0627\u064A \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A -TrTab2.64=\u0645\u062A\u0648\u0633\u0637\u0629 \u0627\u0644\u062C\u0648\u062F\u0629 \u0644HD \u0648\u0627\u064A \u0641\u0627\u064A \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A -TrTab2.65=\u062C\u0648\u062F\u0629\u060C \u0648\u0627\u0646\u062E\u0641\u0627\u0636 \u0641\u064A \u0646\u0647\u0627\u064A\u0629 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062C\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064A\u0629 \u0623\u0648 HD \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A \u0648\u0627\u064A \u0641\u0627\u064A -TracesTab.3=\u0645\u0633\u062D -TreeNodeSettings.4=\u0644\u0645 \u064A\u062A\u0645 \u062A\u062D\u0645\u064A\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u062D\u0631\u0643 \! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_bg.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_bg.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_bg.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_bg.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,303 +0,0 @@ -DLNAMediaDatabase.0=\u0421 \u0446\u0435\u043b \u043f\u043e\u0434\u043e\u0431\u0440\u044f\u0432\u0430\u043d\u0435 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u0430 \u043d\u0430 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0430\u0442\u0430,\n\u0444\u0430\u0439\u043b\u043e\u0432\u0430\u0442\u0430 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 \u0441\u0435 \u043d\u0443\u0436\u0434\u0430\u0435 \u043e\u0442 \u043e\u0431\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435.\n\u0421\u044a\u0436\u0430\u043b\u044f\u0432\u0430\u043c\u0435 \u0437\u0430 \u043d\u0435\u0443\u0434\u043e\u0431\u0441\u0442\u0432\u043e\u0442\u043e \! -DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z -DLNAMediaDatabase.2=\u041f\u043e\u0447\u0438\u0441\u0442\u0432\u0430\u043d\u0435 \u043d\u0430 \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438... -DLNAMediaDatabase.3=\u0423\u043f\u043b\u044a\u0442\u043d\u044f\u0432\u0430\u043d\u0435 \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043d\u043d\u0438... -DLNAMediaDatabase.4=\u0421\u043a\u0430\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u0430\u043f\u043a\u0430: -FFMpegDVRMSRemux.0=\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d FFmpeg \u043f\u044a\u0442: -FFMpegDVRMSRemux.1=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 DVR-MS \u0440\u0435\u043c\u0443\u043a\u0441\u0438\u0440\u0430\u043d\u0435 -FFMpegVideo.0=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0441\u0430\u043c\u043e \u0437\u0430 \u0434\u0435\u043a\u043e\u0434\u0435\u0440\u0430 AviSynth/FFmpeg (\u041f\u0420\u0415\u0414\u041f\u041e\u0427\u0418\u0422\u0410\u041d AVISYNTH/MENCODER) -FFMpegVideo.1=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0434\u0435\u043a\u043e\u0434\u0435\u0440\u0430 FFmpeg -FoldTab.0=<\u0412\u0441\u0438\u0447\u043a\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430> -FoldTab.1=\u041e\u043f\u0446\u0438\u0438 \u0437\u0430 \u0441\u043f\u043e\u0434\u0435\u043b\u044f\u043d\u0435 -FoldTab.2=\u0421\u043a\u0430\u043d\u0438\u0440\u0430\u0439 \u0432\u0441\u0438\u0447\u043a\u0438 \u0441\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438 \u043f\u0430\u043f\u043a\u0438 -FoldTab.3=\u0421\u043a\u0430\u043d\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u0438 \u0441\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438 \u043f\u0430\u043f\u043a\u0438. \u041c\u043e\u0436\u0435 \u0434\u0430 \u043e\u0442\u043d\u0435\u043c\u0435 \u0438\u0437\u0432\u0435\u0441\u0442\u043d\u043e \u0432\u0440\u0435\u043c\u0435 \!\n -FoldTab.4=\u0421\u0438\u0433\u0443\u0440\u043d\u0438 \u043b\u0438 \u0441\u0442\u0435, \u0447\u0435 \u0438\u0441\u043a\u0430\u0442\u0435 \u0434\u0430 \u0437\u0430\u043f\u043e\u0447\u043d\u0435\u0442\u0435 \u0441\u043a\u0430\u043d\u0438\u0440\u0430\u043d\u0435\u0442\u043e?\n\n -FoldTab.5=\u0421\u043a\u0440\u0438\u0439 \u0444\u0430\u0439\u043b\u043e\u0432\u0438\u0442\u0435 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043d\u0438\u044f -FoldTab.6=\u0421\u043a\u0440\u0438\u0439 \u043f\u0430\u043f\u043a\u0438 \ \u0412\u0438\u0434\u0435\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \ -FoldTab.7=\u0421\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438 \u043f\u0430\u043f\u043a\u0438 -FoldTab.8=\u0421\u043a\u0440\u0438\u0439 \u0438\u043c\u0435\u043d\u0430\u0442\u0430 \u043d\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u0449\u0438\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 -FoldTab.9=\u0414\u043e\u0431\u0430\u0432\u0438 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f -FoldTab.10=\u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u0441\u043f\u0440\u0435\u0442\u0435 \u0441\u043a\u0430\u043d\u0438\u0440\u0430\u043d\u0435\u0442\u043e?\n\n -FoldTab.11=\u0420\u0430\u0437\u0440\u0435\u0448\u0438 \u043a\u043e\u043f\u0438\u0435 \u043e\u0442 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u043e\u0442\u043e \u0432\u0438\u0434\u0435\u043e \u043d\u0430 PS3 (\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435, \u0444\u0430\u0439\u043b\u043e\u0432\u0435\u0442\u0435 \u043d\u044f\u043c\u0430\u0442 \u0444\u0438\u043a\u0441\u0438\u0440\u0430\u043d\u0430 \u0433\u043e\u043b\u0435\u043c\u0438\u043d\u0430 ) -FoldTab.12=\u041f\u043e\u0434\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u0441\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438\u0442\u0435 \u043f\u0430\u043f\u043a\u0438 -FoldTab.13=\u041c\u0438\u043d\u0438 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 -FoldTab.14=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 MPlayer \u0437\u0430 \u0432\u0438\u0434\u0435\u043e \u043c\u0438\u043d\u0438 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438\u0442\u0435 -FoldTab.15=\u041f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435 -FoldTab.16=\u041d\u0430\u0439-\u043d\u043e\u0432\u0438\u0442\u0435 \u043e\u0442\u043f\u0440\u0435\u0434 -FoldTab.17=\u041f\u043e \u0434\u0430\u0442\u0430, \u043d\u0430\u0439-\u0441\u0442\u0430\u0440\u0438\u0442\u0435 \u043e\u0442\u043f\u0440\u0435\u0434 -FoldTab.18=\u041c\u0435\u0442\u043e\u0434 \u043d\u0430 \u043f\u043e\u0434\u0440\u0435\u0436\u0434\u0430\u043d\u0435: -FoldTab.19=DVD ISO \u043c\u0438\u043d\u0438 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 -FoldTab.20=ASCII \u0430\u0437\u0431\u0443\u0447\u043d\u043e -FoldTab.21=\u041c\u0438\u043d\u0438 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 -FoldTab.22=\u0411\u0443\u043a\u0432\u0435\u043d\u043e \u043f\u043e\u0434\u0440\u0435\u0436\u0434\u0430\u043d\u0435 -FoldTab.23=\u0421\u0432\u0430\u043b\u0438 \u043e\u0442 amazon.com -FoldTab.24=\u0421\u0432\u0430\u043b\u0438 \u043e\u0442 discogs.com -FoldTab.26=\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0430\u0443\u0434\u0438\u043e \u043c\u0438\u043d\u0438 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438: -FoldTab.27=\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0430 \u043f\u0430\u043f\u043a\u0430 \u0437\u0430 \u0432\u0438\u0434\u0435\u043e \u043e\u0431\u043b\u043e\u0436\u043a\u0438\u0442\u0435 -FoldTab.28=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043f\u0430\u043f\u043a\u0430 -FoldTab.29=\u041f\u043e\u043a\u0430\u0436\u0438 iPhoto \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 -FoldTab.30=\u041f\u043e\u043a\u0430\u0436\u0438 iTunes \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 -FoldTab.31=\u0421\u043a\u0440\u0438\u0439 \u043f\u0440\u0430\u0437\u043d\u0438/\u043d\u0435 \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u0449\u0438 \u043c\u0435\u0434\u0438\u044f \u043f\u0430\u043f\u043a\u0438 (\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435: \u0437\u0430\u0431\u0430\u0432\u044f \u0442\u044a\u0440\u0441\u0435\u043d\u0435\u0442\u043e) -FoldTab.32=\u0421\u043a\u0440\u0438\u0439 \u043f\u0430\u043f\u043a\u0438\u0442\u0435 \u0441 \u043c\u0435\u0434\u0438\u0439\u043d\u0438 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0438 -FoldTab.33=\u0421\u043a\u0440\u0438\u0439 \u043f\u0430\u043f\u043a\u0438 \ \u041f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \ -FoldTab.34=\u041f\u043e\u043a\u0430\u0436\u0438 \u043e\u0442\u0432\u043e\u0440\u0435\u043d\u0430\u0442\u0430 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 -FoldTab.35=\u041d\u0438\u043a\u043e\u0439 -FontFileFilter.3=Truetype \u0448\u0440\u0438\u0444\u0442\u043e\u0432\u0435 -LinksTab.5=\u041f\u043e\u043c\u043e\u0449\u043d\u0438 \u043b\u0438\u043d\u043a\u043e\u0432\u0435: -LinksTab.6=\u0418\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435: -LooksFrame.5=\u0418\u0437\u0445\u043e\u0434 -LooksFrame.6=\u041f\u043e\u043a\u0430\u0436\u0438 \u043c\u043e\u044f \u043f\u0430\u043d\u0435\u043b -LooksFrame.9=\u0417\u0430\u043f\u0438\u0448\u0438 -LooksFrame.12=\u0420\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 HTTP \u0441\u044a\u0440\u0432\u044a\u0440\u0430 -LooksFrame.13=\u0421\u044a\u0440\u0432\u044a\u0440\u044a\u0442 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d, \u043f\u043e\u0440\u0430\u0434\u0438 \u043f\u0440\u043e\u043c\u044f\u043d\u0430 \u043d\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0442\u0430 -LooksFrame.18=\u0421\u044a\u0441\u0442\u043e\u044f\u043d\u0438\u0435 -LooksFrame.19=\u041f\u0440\u043e\u0441\u043b\u0435\u0434\u044f\u0432\u0430\u043d\u0438\u044f -LooksFrame.20=\u0413\u043b\u0430\u0432\u043d\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 -LooksFrame.21=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 -LooksFrame.22=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f \u0438 \u0441\u043f\u043e\u0434\u0435\u043b\u0435\u043d\u0438 -LooksFrame.24=\u0412\u044a\u043f\u0440\u043e\u0441\u0438 / \u041f\u043e\u043c\u043e\u0449 -LooksFrame.25=\u0417\u0430 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0430\u0442\u0430 -LooksFrame.26=\u0417\u0410 \u0422\u0415\u0421\u0422\u0412\u0410\u041d\u0415 \u0421\u0410\u041c\u041e, \u0412\u042a\u0417\u041c\u041e\u0416\u041d\u041e \u0415 \u0414\u0410 \u0418\u041c\u0410 \u041d\u0415\u0421\u0422\u0410\u0411\u0418\u041b\u041d\u041e\u0421\u0422 -MEncoderAviSynth.2=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e \u0434\u0435\u043a\u043e\u0434\u0435\u0440\u0430 \u0441\u0430\u043c\u043e \u0437\u0430 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 AviSynth -MEncoderAviSynth.3=\u0420\u0430\u0437\u0440\u0435\u0448\u0438 AviSynth \u0434\u0430 \u0437\u0430\u043c\u0435\u043d\u044f \u043d\u0435\u043f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u0430\u0442\u0430 \u043a\u0430\u0434\u0440\u043e\u0432\u0430 \u0447\u0435\u0441\u0442\u043e\u0442\u0430 \u0441 \u043f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u0430 \u0442\u0430\u043a\u0430\u0432\u0430 (convertfps=true) -MEncoderAviSynth.4=\# \u0421\u043a\u0440\u0438\u043f\u0442\u0430 AviSynth \u0441\u0435\u0433\u0430 \u0435 \u043d\u0430\u043f\u044a\u043b\u043d\u043e \u043f\u0440\u0438\u0441\u043f\u043e\u0441\u043e\u0431\u0438\u043c\n -MEncoderAviSynth.5=\# \u0421\u043b\u0435\u0434\u043d\u0438\u0442\u0435 \u043f\u0440\u043e\u043c\u0435\u043d\u0438 \u0441\u0430 \u043d\u0430\u043b\u0438\u0447\u043d\u0438:\n -MEncoderAviSynth.6=\# : \u041f\u044a\u043b\u043d\u0438\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u0438 \u0437\u0430 DirectShowSource , \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440 DirectShowSource(\u0438\u043c\u0435 \u043d\u0430 \u0444\u0430\u0439\u043b, \u0447\u0435\u0441\u0442\u043e\u0442\u0430 \u043d\u0430 \u043a\u043e\u043d\u0432\u0435\u0440\u0442\u0438\u0440\u0430\u043d\u0435)\n -MEncoderAviSynth.7=\# : \u041f\u044a\u043b\u043d\u0438\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u0438 \u0437\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438, \u0430\u043a\u043e \u0438\u043c\u0430 \u0442\u0430\u043a\u0438\u0432\u0430 \u0437\u0430\u0441\u0435\u0447\u0435\u043d\u0438 (SRT/SUB/IDX/ASS/SSA)\n -MEncoderAviSynth.8=\# : \u0418\u043c\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e \u0444\u0430\u0439\u043b\u0430, \u0430\u043a\u043e \u0438\u0441\u043a\u0430\u0442\u0435 \u0434\u0430 \u043f\u0440\u0430\u0432\u0438\u0442\u0435 \u0442\u043e\u0432\u0430 \u0441\u0430\u043c\u0438\n -MEncoderAviSynth.10=<\u0444\u0438\u043b\u043c>\n -MEncoderAviSynth.11=<\u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438>\n -MEncoderVideo.0=\u041f\u0440\u043e\u043f\u0443\u0441\u043d\u0438 loop filter \u0434\u0435\u0431\u043b\u043e\u043a\u0438\u0440\u0430\u043d\u0435 \u0437\u0430 H.264. \u041c\u043e\u0436\u0435 \u0434\u0430 \u0432\u043b\u043e\u0448\u0438 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e\u0442\u043e. -MEncoderVideo.1=\u0412\u0438\u0434\u0435\u043e/\u0410\u0443\u0434\u0438\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u0434\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u0441\u043c\u043e \u0437\u0430 MEncoder \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442. -MEncoderVideo.2=A/V sync \u0430\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u043c\u0435\u0442\u043e\u0434 -MEncoderVideo.3=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u0434\u0435\u0446\u0438\u0442\u0435 \u043d\u0430 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0442\u043e (\u041f\u0440\u0435\u043f\u043e\u0440\u044a\u0447\u0438\u0442\u0435\u043b\u043d\u043e) -MEncoderVideo.4=\u0424\u043e\u0440\u0441\u0438\u0440\u0430\u0439 \u043a\u0430\u0434\u0440\u043e\u0432\u0430\u0442\u0430 \u0447\u0435\u0441\u0442\u043e\u0442\u0430 \u043e\u0442 FFMpeg -MEncoderVideo.5=\u0412\u0438\u0435 \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u043f\u0440\u0438\u0431\u0430\u0432\u0438\u0442\u0435 \u0442\u0443\u043a \u0441\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u043d\u0438 \u043e\u043f\u0446\u0438\u0438, \u043a\u0430\u0442\u043e denoise \u0444\u0438\u043b\u0442\u044a\u0440 \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440: -vf hqdn3d -MEncoderVideo.6=\u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u0438 \u043e\u043f\u0446\u0438\u0438: -MEncoderVideo.7=\u041f\u0440\u0438\u043e\u0440\u0438\u0442\u0435\u0442 \u043d\u0430 \u0435\u0437\u0438\u043a\u0430 \u043d\u0430 \u0430\u0443\u0434\u0438\u043e\u0442\u043e: -MEncoderVideo.8=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 -MEncoderVideo.9=\u041f\u0440\u0438\u043e\u0440\u0438\u0442\u0435\u0442 \u043d\u0430 \u0435\u0437\u0438\u043a\u0430 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438: -MEncoderVideo.10=\u0410\u0443\u0434\u0438\u043e/\u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 \u0435\u0437\u0438\u043a\u043e\u0432 \u043f\u0440\u0438\u043e\u0440\u0438\u0442\u0435\u0442 (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440: en,off;eng,off ) -MEncoderVideo.11=\u041a\u043e\u0434\u043e\u0432\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430 \u0437\u0430 \u043d\u0435-Unicode \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438: -MEncoderVideo.12=\u0417\u0430\u043c\u044f\u043d\u0430 \u043d\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0441\u0442\u0438\u043b \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430: \u0440\u0430\u0437\u043c\u0435\u0440 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 -MEncoderVideo.13=\u041a\u043e\u043d\u0442\u0443\u0440 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 -MEncoderVideo.14=\u0421\u044f\u043d\u043a\u0430 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 -MEncoderVideo.15=\u0413\u043e\u043b\u0435\u043c\u0438\u043d\u0430 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 (px) -MEncoderVideo.16=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438\u0442\u0435 \u0432 \u043e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d \u0442\u0435\u043a\u0441: \u0413\u043e\u043b\u0435\u043c\u0438\u043d\u0430 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442 -MEncoderVideo.17=\u041a\u043e\u043d\u0442\u0443\u0440 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 -MEncoderVideo.18=\u041f\u0440\u043e\u0437\u0440\u0430\u0447\u043d\u043e\u0441\u0442 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 -MEncoderVideo.19=\u0413\u043e\u043b\u0435\u043c\u0438\u043d\u0430 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 (%) -MEncoderVideo.20=ASS/SSA \u0421\u0443\u0431\u0442\u0438\u0442\u0440\u0438 -MEncoderVideo.21=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043d \u0448\u0440\u0438\u0444\u0442 / \u0412\u0433\u0440\u0430\u0434\u0435\u043d\u0438 \u0448\u0440\u0438\u0444\u0442\u043e\u0432\u0435 -MEncoderVideo.22=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 *.srt/*.sub \u0441 \u0438\u0434\u0435\u043d\u0442\u0438\u0447\u043d\u043e \u043d\u0430 \u0444\u0430\u0439\u043b\u0430 \u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435 -MEncoderVideo.23=FriBiDi \u0440\u0435\u0436\u0438\u043c -MEncoderVideo.24=\u0421\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u0435\u043d \u0448\u0440\u0438\u0444\u0442 TrueType (\u0437\u0430 \u0430\u0437\u0438\u0430\u0442\u0441\u043a\u0438 \u0435\u0437\u0438\u0446\u0438): -MEncoderVideo.25=\u0418\u0437\u0431\u0435\u0440\u0438 True \u0422ype \u0448\u0440\u0438\u0444\u0442 -MEncoderVideo.26=Deinterlace \u0444\u0438\u043b\u0442\u044a\u0440 -MEncoderVideo.27=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 \u0432\u0438\u0434\u0435\u043e \u0431\u0440\u043e\u044f\u0447 -MEncoderVideo.28=\u0428\u0438\u0440\u0438\u043d\u0430 -MEncoderVideo.29=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u0435\u043a\u0441\u043f\u0435\u0440\u0442\u0438 : \u0421\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u043d\u0438 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043d\u0430 \u043a\u043e\u0434\u0435\u0446\u0438\u0442\u0435 -MEncoderVideo.30=\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430 -MEncoderVideo.31=\u0422\u0430\u0437\u0438 \u043e\u043f\u0446\u0438\u044f \u0435 \u0435\u043a\u0441\u043f\u0435\u0440\u0438\u043c\u0435\u043d\u0442\u0430\u043b\u043d\u0430 \u0432\u0435\u0440\u0441\u0438\u044f \u043d\u0430 MEncoder, \u043e\u043f\u0442\u0438\u043c\u0438\u0437\u0438\u0440\u0430\u043d\u0430 \u0437\u0430 \u043c\u043d\u043e\u0433\u043e\u044f\u0434\u0440\u0435\u043d\u0438 \u043f\u0440\u043e\u0446\u0435\u0441\u043e\u0440\u0438 \u0438 H264 \u0434\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435.\n\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u0442\u043e\u0432\u0430, \u0441\u0430\u043c\u043e \u0430\u043a\u043e \u043d\u0430\u0438\u0441\u0442\u0438\u043d\u0430 \u0418\u041c\u0410\u0422\u0415 \u043c\u043d\u043e\u0433\u043e\u044f\u0434\u0440\u0435\u043d \u043f\u0440\u043e\u0446\u0435\u0441\u043e\u0440 \u0438 \u0441\u0442\u0435 \u0437\u0430\u0434\u0430\u043b\u0438 2 \u044f\u0434\u0440\u0430 \u0438 \u043f\u043e\u0432\u0435\u0447\u0435 \u0432 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 \u0437\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \!\n\u0421\u044a\u0449\u043e \u0442\u0430\u043a\u0430, \u0442\u043e\u0432\u0430 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043d\u0435\u0441\u0442\u0430\u0431\u0438\u043b\u043d\u043e, \u0442\u0430\u043a\u0430 \u0447\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0432\u044a\u0440\u043d\u0435\u0442\u0435 \u043a\u044a\u043c \u0441\u0442\u0430\u0440\u0438\u044f \u043f\u043e \u0432\u0441\u044f\u043a\u043e \u0432\u0440\u0435\u043c\u0435 ... -MEncoderVideo.32=\u0420\u0435\u043c\u0443\u043a\u0441\u0438\u0440\u0430\u0439 , \u043a\u043e\u0433\u0430\u0442\u043e \u0430\u0443\u0434\u0438\u043e \u0444\u0430\u0439\u043b\u0430 \u0435 AC-3 (\u043d\u0435 \u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430) -MEncoderVideo.33=\u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u0438 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438: -MEncoderVideo.34=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u0441\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u043d\u0438\u0442\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043d\u0430 \u043a\u043e\u0434\u0435\u0446\u0438\u0442\u0435 -MEncoderVideo.35=\u0417\u0430\u0441\u0438\u043b\u0438 \u043c\u043d\u043e\u0433\u043e\u044f\u0434\u0440\u0435\u043d\u0430 \u043f\u043e\u0434\u0434\u0440\u044a\u0436\u043a\u0430 \u0437\u0430 H264 HD \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435 -MEncoderVideo.36=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 ASS \u0441\u0442\u0438\u043b \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435 -MEncoderVideo.37=\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0430 \u043f\u0430\u043f\u043a\u0430 \u0437\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 -MEncoderVideo.38=\u041f\u0440\u0435\u0432\u043a\u043b\u044e\u0447\u0438 \u043d\u0430 tsMuxer \u043a\u043e\u0433\u0430\u0442\u043e H264 \u0432\u0438\u0434\u0435\u043e\u0442\u043e \u0435 P(lay) S(tation) 3 \u0441\u044a\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u043e \u0438 \u043d\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 [TS/M2TS/MOV/MP4/AVI/MKV] -MEncoderVideo.39=\u0420\u0435\u043c\u0443\u043a\u0441\u0438\u0440\u0430\u0439 DVD ISO \u0432\u0438\u0434\u0435\u043e \u0444\u0430\u0439\u043b\u043e\u0432\u0435 (\u043d\u0435 \u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430) -MEncoderVideo.68=\\u0422\u0443\u043a \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u043f\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u0435 \u0441\u043f\u0435\u0446\u0438\u0444\u0438\u0447\u043d\u0438 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u0437\u0430 \u043d\u044f\u043a\u043e\u0438 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u0438 \u043a\u043e\u0434\u0435\u0446\u0438.\n -MEncoderVideo.69=\\u0422\u043e\u0432\u0430 \u0435 \u043f\u043e\u0432\u0435\u0447\u0435 \u0437\u0430 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0438 \u043f\u0440\u0438 \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f \u043d\u0430 A\u0443\u0434\u0438\u043e/\u0412\u0438\u0434\u0435\u043e, \u043d\u043e \u043c\u043e\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430 \u0434\u043e\u0431\u0440\u0435 \u0438 \u0437\u0430 \u0434\u0440\u0443\u0433\u0438 \u0446\u0435\u043b\u0438 \n -MEncoderVideo.70=\\u0421\u0447\u0438\u0442\u0430\u0439\u0442\u0435 \u0442\u043e\u0432\u0430 \u0437\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u0435\u043a\u0441\u043f\u0435\u0440\u0442\u0438, \u0438 \u043d\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435, \u0430\u043a\u043e \u043d\u0435 \u0437\u043d\u0430\u0435\u0442\u0435 \u043a\u0430\u043a\u0432\u043e \u043f\u0440\u0430\u0432\u0438\u0442\u0435 \n -MEncoderVideo.71=\\u0421\u0438\u043d\u0442\u0430\u043a\u0441\u0438\u0441\u0430 \u0435 {java condition} :: {mencoder options} ; \u041c\u043e\u0436\u0435 \u0434\u0430 \u0441\u044a\u0432\u043c\u0435\u0441\u0442\u0438\u0442\u0435 \u043d\u044f\u043a\u043e\u043b\u043a\u043e \u043e\u043f\u0446\u0438\u0438\n -MEncoderVideo.72=\\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438 \u0441\u0438\u043c\u0432\u043e\u043b\u0438 (\u0437\u043d\u0430\u0446\u0438): file-name srt-file container v-codec a-codec sample-rate framerate width height channels duration\n -MEncoderVideo.73=\\u0412\u043d\u0438\u043c\u0430\u0432\u0430\u0439\u0442\u0435, \u0432\u0441\u0435\u043a\u0438 \u0438\u0437\u043a\u0440\u0438\u0432\u0435\u043d (\u0434\u0435\u0444\u043e\u0440\u043c\u0438\u0440\u0430\u043d) \u0440\u0435\u0434, \u0449\u0435 \u0431\u044a\u0434\u0435 \u0443\u043d\u0438\u0449\u043e\u0436\u0435\u043d\n -MEncoderVideo.75=\\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u043d\u0438 \u043e\u043f\u0446\u0438\u0438:\n -MEncoderVideo.76=\ -noass: \u043d\u0430\u043f\u044a\u043b\u043d\u043e \u0438\u0437\u043a\u043b\u044e\u0447\u0438 ASS/SSA \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 \u0430\u043a\u043e \u043c\u043e\u0433\u0430\u0442 \u0434\u0430 \u043f\u043e\u043f\u0440\u0435\u0447\u0430\u0442 \u043d\u0430 A\u0443\u0434\u0438\u043e/\u0412\u0438\u0434\u0435\u043e \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f\n -MEncoderVideo.77=\ -nosync: \u043d\u0430\u043f\u044a\u043b\u043d\u043e \u0438\u0437\u043a\u043b\u044e\u0447\u0438 A\u0443\u0434\u0438\u043e/\u0412\u0438\u0434\u0435\u043e \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f \u0447\u0440\u0435\u0437 \u0430\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u043c\u0435\u0442\u043e\u0434 \u0437\u0430 \u0442\u043e\u0432\u0430 \u0441\u044a\u0441\u0442\u043e\u044f\u043d\u0438\u0435 (-mc \u0449\u0435 \u043d\u0430\u043f\u0440\u0430\u0432\u0438 \u0441\u044a\u0449\u043e\u0442\u043e)\n -MEncoderVideo.78=\ -quality: \u043e\u0442\u043c\u044f\u043d\u0430 \u0432\u0438\u0434\u0435\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 \u0437\u0430 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e\n -MEncoderVideo.79=\ -mt: \u0424\u043e\u0440\u0441\u0438\u0440\u0430\u0439 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u043c\u043d\u043e\u0433\u043e\u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043d\u0430 \u0432\u0435\u0440\u0441\u0438\u044f \u043d\u0430 \u041cencoder (\u0435\u043a\u0441\u043f\u0435\u0440\u0438\u043c\u0435\u043d\u0442\u0430\u043b\u043d\u043e, \u043c\u043e\u0436\u0435 \u0434\u0430 \u043d\u0435 \u0435 \u0441\u0442\u0430\u0431\u0438\u043b\u043d\u043e)\n -MEncoderVideo.80=\\u0422\u043e\u0437\u0438 \u0441\u043f\u0438\u0441\u044a\u043a \u0449\u0435 \u0441\u0435 \u043f\u043e\u0434\u043e\u0431\u0440\u044f\u0432\u0430 \u0441 \u0432\u0440\u0435\u043c\u0435\u0442\u043e: \u041c\u043d\u0435\u043d\u0438\u044f \u0438 \u043e\u0431\u0440\u0430\u0442\u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u0437\u0430 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043d\u0430 \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u0438 \u043a\u043e\u0434\u0435\u0446\u0438/\u0444\u0430\u0439\u043b\u043e\u0432\u0435 \u0441\u0430 \u0432\u0438\u043d\u0430\u0433\u0438 \u0434\u043e\u0431\u0440\u0435 \u0434\u043e\u0448\u043b\u0438 \n -MEncoderVideo.87=\\u0421\u0435\u0433\u0430 \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u043f\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u0435 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u0438 \u0443\u0441\u043b\u043e\u0432\u0438\u044f/\u0432\u044a\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438. \u0415\u0442\u043e \u043d\u044f\u043a\u043e\u0438 \u043f\u0440\u0438\u043c\u0435\u0440\u0438: \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u0434\u0430 \u0441\u0435 \u0434\u0430\u0434\u0435 \u0432\u044a\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442 \u0437\u0430 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 mt \u0432\u0435\u0440\u0441\u0438\u044f \u043d\u0430 mencoder\n -MEncoderVideo.88=\\u0437\u0430 \u0432\u0441\u044f\u043a\u043e H264 HD \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435 (\u0441\u044a\u0432\u043f\u0430\u0434\u0430\u0449\u043e \u0441 \u0433\u043b\u0430\u0432\u043d\u0438\u0442\u0435 \u043e\u043f\u0446\u0438\u0438): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\\u0417\u0430 \u043f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0440\u0435\u043f\u0442\u0435\u043d\u0435\u0442\u043e \u043d\u0430 24 \u043a\u0430\u0434\u044a\u0440\u0430 \u043d\u0430 50hz \u0442\u0435\u043b\u0435\u0432\u0438\u0437\u043e\u0440\u0438: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\\u0417\u0430 \u0440\u0435\u043c\u0443\u043a\u0441\u0438\u0440\u0430\u043d\u0435 , \u043a\u043e\u0433\u0430\u0442\u043e \u0432\u0438\u0434\u0435\u043e\u0442\u043e \u0435 mpeg2 \u043d\u044f\u043c\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=DVD/VOB \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e (0-4) (\u043f\u043e-\u0433\u043e\u043b\u044f\u043c\u043e \u0447\u0438\u0441\u043b\u043e \u0435 \u043f\u043e-\u0434\u043e\u0431\u0440\u043e\u0442\u043e): -MEncoderVideo.93=\u0421\u043b\u043e\u0436\u0438 \u0433\u0440\u0430\u043d\u0438\u0446\u0438 \u0437\u0430 \u043a\u043e\u043c\u043f\u0435\u043d\u0441\u0438\u0440\u0430\u043d (overscan) \u0440\u0435\u0436\u0438\u043c \u043d\u0430 \u0435\u043a\u0440\u0430\u043d\u0430: -MEncoderVideo.94=\u0424\u043e\u0440\u0441\u0438\u0440\u0430\u043d\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 : -MEncoderVideo.95=\u0424\u043e\u0440\u0441\u0438\u0440\u0430\u043d\u0438 \u0442\u0430\u0433\u043e\u0432\u0435 : -MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ -MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ -MEncoderVideo.98=cp1252 /* Windows - Western Europe */ -MEncoderVideo.99=cp1253 /* Windows - Greek */ -MEncoderVideo.100=cp1254 /* Windows - Turkish */ -MEncoderVideo.101=cp1255 /* Windows - Hebrew */ -MEncoderVideo.102=cp1256 /* Windows - Arabic */ -MEncoderVideo.103=cp1257 /* Windows - Baltic */ -MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ -MEncoderVideo.105=ISO-8859-1 /* Western Europe */ -MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ -MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ -MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ -MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ -MEncoderVideo.110=ISO-8859-6 /* Arabic */ -MEncoderVideo.111=ISO-8859-7 /* Greek */ -MEncoderVideo.112=ISO-8859-8 /* Hebrew */ -MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ -MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ -MEncoderVideo.115=ISO-8859-11 /* Thai */ -MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ -MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ -MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ -MEncoderVideo.119=ISO-8859-16 /* Central European languages */ -MEncoderVideo.120=cp932 /* Japanese */ -MEncoderVideo.121=cp936 /* Chinese */ -MEncoderVideo.122=cp949 /* Korean */ -MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */ -MEncoderVideo.124=UTF-8 /* Unicode */ -MEncoderVideo.125=\u0418\u0437\u0431\u0435\u0440\u0438 \u0446\u0432\u044f\u0442 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438\u0442\u0435 -MEncoderVideo.126=bul,eng,fre,jpn,ger,und -MEncoderVideo.127=bul,eng,fre,jpn,ger,und -MEncoderVideo.128=*,* -MEncoderVideo.129=/* \u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e */ -MEncoderVideo.130=enca:ru:cp1251 /* \u0420\u0443\u0441\u043a\u0438 (\u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e) */ -MEncoderVideo.131=enca:pl:cp1250 /* \u0418\u0437\u0442\u043e\u0447\u043d\u0430 \u0415\u0432\u0440\u043e\u043f\u0430 (\u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e) */ -MEncoderVideo.132=enca:zh:big5 /* \u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438 (\u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e) */ -NetworkTab.0=\u0415\u0437\u0438\u043a [\u0438\u0437\u0438\u0441\u043a\u0432\u0430 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0442\u043e]: -NetworkTab.1=\u041f\u0440\u0435\u0433\u043b\u0435\u0434\u0430\u0439 .RAR/.ZIP/.CBR \u0430\u0440\u0445\u0438\u0432\u0438 -NetworkTab.2=\u0413\u0435\u043d\u0435\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043c\u0438\u043d\u0438 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 -NetworkTab.3=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0432 \u043c\u0438\u043d\u0438\u043c\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d \u0440\u0435\u0436\u0438\u043c -NetworkTab.4=\u0418\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u0439 \u043a\u0430\u0442\u043e Windows \u0443\u0441\u043b\u0443\u0433\u0430 -NetworkTab.5=\u0413\u043b\u0430\u0432\u043d\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 -NetworkTab.6=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u043d\u0430 \u0433\u043e\u043b\u0435\u043c\u0438\u043d\u0430 \u043d\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0437\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435, \u0432 megabytes (\u043c\u0430\u043a\u0441\u0438\u043c\u0443\u043c: MAX_BUFFER_SIZE): -NetworkTab.7=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043d\u0430 \u044f\u0434\u0440\u0430\u0442\u0430 \u0437\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 (\u0432 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0432\u0438\u0435 \u0438\u043c\u0430\u0442\u0435 %d) -NetworkTab.8=\u041f\u0440\u043e\u0432\u0435\u0440\u0438 \u0437\u0430 \u043e\u0431\u043d\u043e\u0432\u0435\u043d\u0430 \u0432\u0435\u0440\u0441\u0438\u044f -NetworkTab.9=\u041f\u0440\u043e\u0432\u0435\u0440\u0438 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e -NetworkTab.11=\u0412\u0438\u0435 \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u0445\u0442\u0435 \u0443\u0441\u043b\u0443\u0433\u0430 \u0437\u0430 WINDOWS \u0444\u0443\u043d\u043a\u0446\u0438\u044f\! \u0417\u0430 \u0434\u0430 \u044f \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435, \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0437\u0430\u0442\u0432\u043e\u0440\u0438\u0442\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0435\u0442\u043e,\n -NetworkTab.12=\u043f\u043e\u0441\u043b\u0435 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439\u0442\u0435 (\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435) \u0443\u0441\u043b\u0443\u0433\u0430\u0442\u0430 \u043e\u0442 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043d\u0438\u044f \u043f\u0430\u043d\u0435\u043b \u043d\u0430 Windows .\n\n -NetworkTab.13=\u041c\u0435\u0434\u0438\u0439\u043d\u0430\u0442\u0430 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 \u0449\u0435 \u0441\u0435 \u043e\u0431\u043d\u043e\u0432\u0438 \!\n -NetworkTab.14=\u0413\u0440\u0435\u0448\u043a\u0430 \u043f\u0440\u0438 \u0438\u043d\u0441\u0442\u0430\u043b\u0430\u0446\u0438\u044f\u0442\u0430 \u043d\u0430 \u0443\u0441\u043b\u0443\u0433\u0430\u0442\u0430 \u0437\u0430 WINDOWS \u0444\u0443\u043d\u043a\u0446\u0438\u044f \n -NetworkTab.15=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f/\u043e\u0431\u0449 \u0434\u043e\u0441\u0442\u044a\u043f -NetworkTab.16=\u041f\u043e\u0437\u0438\u0446\u0438\u044f \u043d\u0430 \u0442\u044a\u0440\u0441\u0435\u043d\u0435 \u043d\u0430 \u043c\u0438\u043d\u0438 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 (\u0432 \u0441\u0435\u043a\u0443\u043d\u0434\u0438): -NetworkTab.17=\u0420\u0430\u0437\u0440\u0435\u0448\u0438 \u043c\u0435\u0434\u0438\u0439\u043d\u0430\u0442\u0430 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 / \u043a\u0435\u0448 -NetworkTab.18=\u0420\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u043c\u0435\u0434\u0438\u0439\u043d\u0430\u0442\u0430 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 -NetworkTab.19=\u0421\u0438\u0433\u0443\u0440\u043d\u0438 \u043b\u0438 \u0441\u0442\u0435? -NetworkTab.20=\u0417\u0430\u0441\u0438\u043b\u0438 \u043c\u0440\u0435\u0436\u043e\u0432\u0430 \u0432\u0440\u044a\u0437\u043a\u0430 \u0432 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430: -NetworkTab.22=\u041c\u0440\u0435\u0436\u043e\u0432\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438, \u043f\u0440\u043e\u043c\u0435\u043d\u0435\u0442\u0435 \u0441\u0430\u043c\u043e \u043f\u0440\u0438 \u043f\u0440\u043e\u0431\u043b\u0435\u043c\u0438 -NetworkTab.23=\u0424\u043e\u0440\u0441\u0438\u0440\u0430\u0439 IP \u0430\u0434\u0440\u0435\u0441 \u043d\u0430 \u0441\u044a\u0440\u0432\u044a\u0440\u0430: -NetworkTab.24=\u0424\u043e\u0440\u0441\u0438\u0440\u0430\u0439 \u043f\u043e\u0440\u0442 \u043d\u0430 \u0441\u044a\u0440\u0432\u044a\u0440\u0430 (5001 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435): -NetworkTab.25=PS3 \u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 -NetworkTab.26=\u041a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0441\u0438\u043c\u0432\u043e\u043b\u0438\u0442\u0435 \u043d\u0430 \u0438\u043c\u0435\u043d\u0430\u0442\u0430 \u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432\u0435 \u043d\u0430 PS3 (\u0432\u0438\u0436 XMB->\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438->\u0421\u0438\u043c\u0432\u043e\u043b\u0438 (\u0437\u043d\u0430\u0446\u0438)): -NetworkTab.27=\u041d\u0435\u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u043d\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438, \u043d\u0435 \u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 :p -NetworkTab.28=\u0422\u0443\u0440\u0431\u043e \u0440\u0435\u0436\u0438\u043c (\u0440\u0430\u0437\u0440\u0435\u0448\u0438 tcp_nodelay) / \u0431\u044a\u0434\u0435\u0442\u0435 \u0432\u043d\u0438\u043c\u0430\u0442\u0435\u043b\u043d\u0438, \u043d\u0435 \u0435 \u0441\u0438\u0433\u0443\u0440\u043d\u043e \u0434\u0430\u043b\u0438 \u0440\u0430\u0431\u043e\u0442\u0438 \u0434\u043e\u0431\u0440\u0435 -NetworkTab.29=\u0411\u043b\u043e\u043a\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0432\u0445\u043e\u0434\u044f\u0449\u0438 \u0437\u0430\u044f\u0432\u043a\u0438 \u0438\u0434\u0435\u043d\u0442\u0438\u0447\u043d\u0438 \u0441 \u0444\u0430\u0439\u043b\u0430 \u043e\u0442 PS3, \u043a\u043e\u0433\u0430\u0442\u043e \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435\u0442\u043e \u0435 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043b\u043e -NetworkTab.30=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 IP \u0444\u0438\u043b\u0442\u044a\u0440: -NetworkTab.31=\u0420\u0430\u0437\u0448\u0438\u0440\u0435\u043d\u0438 HTTP \u0438 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 -NetworkTab.32=HTTP \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442 V2 -NetworkTab.33=\u0417\u0430\u0431\u0440\u0430\u043d\u0438 \u0437\u0430\u0441\u043f\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u0430\u0442\u0430, \u0434\u043e\u043a\u0430\u0442\u043e \u0442\u0435\u0447\u0435 \u0441\u0442\u0440\u0438\u0439\u043c\u0438\u043d\u0433 -NetworkTab.34=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u0438 \u0434\u043e\u0431\u0430\u0432\u043a\u0438 -NetworkTab.35=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u0435\u043d \u0442\u0440\u0430\u0444\u0438\u043a \u0432 Mb/s (0 \u043e\u0437\u043d\u0430\u0447\u0430\u0432\u0430, \u0431\u0435\u0437 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0435): -NetworkTab.36=\u0420\u0435\u043d\u0434\u0435\u0440\u0438\u0440\u0430\u043d\u0435 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435, \u043a\u043e\u0433\u0430\u0442\u043e \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e\u0442\u043e \u043e\u0442\u043a\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0435 \u0434\u0430\u0434\u0435 \u0440\u0435\u0437\u0443\u043b\u0442\u0430\u0442: -NetworkTab.37=\u041d\u0435\u043f\u043e\u0437\u043d\u0430\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0437\u0430 \u0440\u0435\u043d\u0434\u0435\u0440\u0438\u0440\u0430\u043d\u0435 -NetworkTab.38=\u0424\u043e\u0440\u0441\u0438\u0440\u0430\u0439 \u0440\u0435\u043d\u0434\u0435\u0440\u0438\u0440\u0430\u043d\u0435 \u043f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435 (\u0438\u0437\u043a\u043b\u044e\u0447\u0432\u0430 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e\u0442\u043e \u043e\u0442\u043a\u0440\u0438\u0432\u0430\u043d\u0435) -PMS.0=PS3 \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u0430. \u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u043b\u0438 \u0435 \u043a\u043e\u043d\u0437\u043e\u043b\u0430\u0442\u0430? \u041c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u043f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u0435 \u0442\u0440\u0430\u0441\u0435\u0442\u0430\u0442\u0430 \u0438/\u0438\u043b\u0438 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f\u0442\u0430, \u0430 \u0441\u044a\u0449\u043e \u0442\u0430\u043a\u0430 \u0438 \u0444\u0430\u0439\u043b\u0430 debug.log -PMS.1=\u0410\u0443\u0434\u0438\u043e -PMS.2=\- \u041c\u0435\u0434\u0438\u0439\u043d\u0430 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430 -\ -PMS.3=\u0410\u0443\u0434\u0438\u043e/\u0432\u0438\u0434\u0435\u043e \u0430\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0430 \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044f -PMS.4=Deinterlace \u0444\u0438\u043b\u0442\u044a\u0440 -PMS.5=PS3 \u043a\u043e\u043d\u0437\u043e\u043b\u0430\u0442\u0430 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d\u0430 \! -PMS.6=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u0437\u0430\u0440\u0435\u0434\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 .srt/.sub -PMS.7=\u041f\u0440\u043e\u043f\u0443\u0441\u043d\u0438 Loop \u0444\u0438\u043b\u0442\u044a\u0440 \u0437\u0430 H264 \u0434\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 [\u041c\u041e\u0416\u0415 \u0414\u0410 \u0412\u041b\u041e\u0428\u0418 \u041a\u0410\u0427\u0415\u0421\u0422\u0412\u041e\u0422\u041e] -PMS.8=\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u0438 -PMS.9=\u0412\u0441\u0438\u0447\u043a\u0438 \u0430\u0443\u0434\u0438\u043e \u043f\u043b\u0435\u0439\u043b\u0438\u0441\u0442\u0438 -PMS.10=\u041f\u0440\u0435\u0446\u0438\u0437\u043d\u043e \u0437\u0430\u0431\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 -PMS.11=\u0412\u0441\u0438\u0447\u043a\u0438 \u0430\u0443\u0434\u0438\u043e \u043f\u043e\u0442\u043e\u0446\u0438 -PMS.12=\u041f\u043e \u0434\u0430\u0442\u0430 -PMS.13=\u041f\u043e \u0430\u0440\u0442\u0438\u0441\u0442 -PMS.130=\u0421\u0432\u044a\u0440\u0437\u0432\u0430\u043d\u0435 \u0441 PS3 \u043a\u043e\u043d\u0437\u043e\u043b\u0430\u0442\u0430... -PMS.14=\u041f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435 \u0440\u0435\u043c\u0443\u043a\u0441\u0438\u0440\u0430\u0439 H264 \u0441 MEncoder -PMS.16=\u041f\u043e \u0430\u043b\u0431\u0443\u043c -PMS.17=\u041d\u0435\u043f\u043e\u0437\u043d\u0430\u0442\u043e \u043c\u0435\u0434\u0438\u0439\u043d\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e -PMS.18=\u0421\u0432\u044a\u0440\u0437\u0430\u043d -PMS.19=\u041f\u043e \u0436\u0430\u043d\u0440 -PMS.21=\u041f\u043e \u043c\u043e\u0434\u0435\u043b \u043d\u0430 \u0444\u043e\u0442\u043e\u0430\u043f\u0430\u0440\u0430\u0442\u0430/\u043a\u0430\u043c\u0435\u0440\u0430\u0442\u0430 -PMS.22=\u041f\u043e \u0438\u0437\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b/\u0430\u043b\u0431\u0443\u043c -PMS.25=\u041f\u043e ISO \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 -PMS.26=\u041f\u043e \u0416\u0430\u043d\u0440/\u0438\u0437\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b/\u0430\u043b\u0431\u0443\u043c -PMS.27=\u0417\u0430\u043f\u0430\u0437\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438\u0442\u0435 -PMS.28=\u041f\u043e \u0430\u0437\u0431\u0443\u0447\u0435\u043d \u0440\u0435\u0434/\u0418\u0437\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b/\u0410\u043b\u0431\u0443\u043c -PMS.31=\u0421\u043d\u0438\u043c\u043a\u0438 -PMS.32=\u0412\u0441\u0438\u0447\u043a\u0438 \u0441\u043d\u0438\u043c\u043a\u0438 -PMS.34=\u0412\u0438\u0434\u0435\u043e -PMS.35=\u0412\u0441\u0438\u0447\u043a\u043e\u0442\u043e \u0432\u0438\u0434\u0435\u043e -PMS.36=HD \u0432\u0438\u0434\u0435\u043e -PMS.37=\- \u0412\u0438\u0434\u0435\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 -\ -PMS.39=SD \u0412\u0438\u0434\u0435\u043e -PMS.40=DVD \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f -PMS.41=(\u041f\u0440\u0435)\u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0443\u0441\u043b\u0443\u0433\u0430\u0442\u0430 Win32 -ProfileChooser.1=PS3 Media Server \u0438\u0437\u0431\u043e\u0440 \u043d\u0430 \u043f\u0440\u043e\u0444\u0438\u043b -ProfileChooser.2=\u0418\u0437\u0431\u0435\u0440\u0438 -ProfileChooser.3=\u041f\u0440\u043e\u0444\u0438\u043b \u0444\u0430\u0439\u043b (.conf) \u0438\u043b\u0438 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f -StatusTab.2=\u0421\u0442\u0430\u0442\u0443\u0441 -StatusTab.3=\u0418\u0437\u0447\u0430\u043a\u0432\u0430\u043d\u0435... -StatusTab.5=\u041f\u0440\u0430\u0437\u043d\u043e -StatusTab.6=\u0421\u0442\u0430\u0442\u0443\u0441 \u043d\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0437\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435: -StatusTab.7=I/O \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430: -StatusTab.8=\u0422\u0435\u043a\u0443\u0449 \u0431\u0438\u0442\u0440\u0435\u0439\u0442: -StatusTab.9=\u041d\u0430\u043c\u0435\u0440\u0435\u043d\u0438 \u043c\u0435\u0434\u0438\u0439\u043d\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430: -StatusTab.10=\ kb/s | \u0412\u044a\u0440\u0445\u043e\u0432 \u0431\u0438\u0442\u0440\u0435\u0439\u0442: -StatusTab.11=\ kb/\u0441 -StatusTab.12=MB -TracesTab.3=\u0418\u0437\u0447\u0438\u0441\u0442\u0438 -TreeNodeSettings.4=\u0422\u043e\u0437\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442 \u043d\u0435 \u0435 \u0437\u0430\u0440\u0435\u0434\u0435\u043d\! -TrTab2.0=\u0420\u0430\u0437\u0440\u0435\u0448\u0438/\u0437\u0430\u0431\u0440\u0430\u043d\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442 \u0437\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 -TrTab2.1=\u041d\u044f\u043c\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 -TrTab2.2=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u0432\u0438\u0434\u0435\u043e \u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u0441\u044a\u0441 \u0441\u043b\u0435\u0434\u043d\u0438\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438: MEncoder/AviSynth/FFmpeg -TrTab2.3=\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439 \u0430\u0443\u0434\u0438\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438, \u0437\u0430 \u0441\u043b\u0435\u0434\u043d\u0438\u0442\u0435 \u0434\u0435\u043a\u043e\u0434\u0435\u0440\u0438: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e\u0442\u043e -TrTab2.5=\u041e\u0431\u0449\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 -TrTab2.6=\u041f\u043e\u0434\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u043b\u0438\u0441\u0442\u0430 \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 \u0437\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435. \u041f\u044a\u0440\u0432\u0438\u044f \u0449\u0435 \u0441\u0435 \u043f\u043e\u044f\u0432\u0438 \u0432 \u043e\u0440\u0438\u0433\u0438\u043d\u0430\u043b\u043d\u0430\u0442\u0430 \u0432\u0438\u0434\u0435\u043e \u043f\u0430\u043f\u043a\u0430 -TrTab2.7=\u0414\u0440\u0443\u0433\u0438 \u043e\u043f\u0446\u0438\u0438 -TrTab2.8=\u041f\u0440\u043e\u043f\u0443\u0441\u043d\u0438 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0441\u043b\u0435\u0434\u043d\u0438\u0442\u0435 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043d\u0438\u044f (\u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438 \u0441\u044a\u0441 \u0437\u0430\u043f\u0435\u0442\u0430\u0439\u043a\u0430): -TrTab2.9=\u0424\u043e\u0440\u0441\u0438\u0440\u0430\u0439 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u0437\u0430 \u0441\u043b\u0435\u0434\u043d\u0438\u0442\u0435 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043d\u0438\u044f (\u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438 \u0441\u044a\u0441 \u0437\u0430\u043f\u0435\u0442\u0430\u0439\u043a\u0430): -TrTab2.10=\u041f\u043e\u0437\u0432\u043e\u043b\u0438 \u0437\u0430\u043f\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 DTS \u043f\u043e\u0442\u043e\u043a\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u043d\u043e \u0432 \u043f\u0440\u0438\u0435\u043c\u043d\u0438\u043a\u0430 \u0432\u0438.\n\u0411\u044a\u0434\u0435\u0442\u0435 \u0432\u043d\u0438\u043c\u0430\u0442\u0435\u043b\u043d\u0438,\u0442\u043e\u0432\u0430 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0434\u043e\u0432\u0435\u0434\u0435 \u0434\u043e \u0441\u0442\u0440\u0430\u043d\u0438\u0447\u0435\u043d \u0448\u0443\u043c. \u0422\u0443\u043a \u0441\u0430 \u043d\u044f\u043a\u043e\u0438 \u0441\u044a\u0432\u0435\u0442\u0438:\n- \u0422\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0438\u043c\u0430\u0442\u0435 DTS \u0441\u044a\u0432\u043c\u0435\u0441\u0442\u0438\u043c \u043f\u0440\u0438\u0435\u043c\u043d\u0438\u043a, \u0441\u0432\u044a\u0440\u0437\u0430\u043d \u0447\u0440\u0435\u0437 TOSLINK \u0438\u043b\u0438 HDMI\n- \u0418\u043a\u043e\u043d\u0430\u0442\u0430 \u0437\u0430 \u0437\u0432\u0443\u043a\u0430 \u043d\u0430 XMB \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0435 \u0432 \u0440\u0435\u0436\u0438\u043c 'Normal'\n- \u0418\u043a\u043e\u043d\u0430\u0442\u0430 \u0437\u0430 \u043a\u0430\u043d\u0430\u043b\u0438\u0442\u0435 \u043d\u0430 XMB \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0435 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u043d\u0430 'Left+Right'\n -TrTab2.11=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 -TrTab2.12=\u041e\u0431\u0449\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0434\u0435\u043a\u043e\u0434\u0435\u0440\u0430 -TrTab2.13=\u041e\u0431\u0449\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 -TrTab2.14=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 \u0437\u0430 \u0432\u0438\u0434\u0435\u043e \u0444\u0430\u0439\u043b\u043e\u0432\u0435 -TrTab2.15=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 \u0437\u0430 \u0430\u0443\u0434\u0438\u043e \u0444\u0430\u0439\u043b\u043e\u0432\u0435 -TrTab2.16=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 \u0437\u0430 \u0441\u0442\u0440\u0438\u0439\u043c\u0432\u0430\u043d\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e \u043e\u0442 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442 -TrTab2.17=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 \u0437\u0430 \u0441\u0442\u0440\u0438\u0439\u043c\u0432\u0430\u043d\u0435 \u043d\u0430 \u0430\u0443\u0434\u0438\u043e \u043e\u0442 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442 -TrTab2.18=\u0414\u0440\u0443\u0433\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 -TrTab2.19=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438 \u0441 \u0443\u0434\u0435\u0431\u0435\u043b\u044f\u0432\u0430\u043d\u0435 \u0449\u0435 \u0431\u044a\u0434\u0430\u0442 \u0441 \u043f\u0440\u0438\u043e\u0440\u0438\u0442\u0435\u0442 -TrTab2.20=\u0438 \u0449\u0435 \u0437\u0430\u043c\u0435\u043d\u0438 \u043e\u0440\u0438\u0433\u0438\u043d\u0430\u043b\u043d\u043e\u0442\u043e \u0432\u0438\u0434\u0435\u043e -TrTab2.21=[Avisynth \u043d\u0435 \u0441\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430] -TrTab2.22=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u043f\u0440\u043e\u0431\u0432\u0430\u0439 \u0430\u0443\u0434\u0438\u043e\u0442\u043e \u043d\u0430 44.1 \u0438\u043b\u0438 48 kHz -TrTab2.27=\u0420\u0435\u043c\u0443\u043a\u0441\u0438\u0440\u0430\u0439 DTS/FLAC -> LPCM (\u041d\u0443\u0436\u0434\u0430\u0435\u0442\u0435 \u0441\u0435 \u043e\u0442 HDMI \u043f\u0440\u0438\u0435\u043c\u043d\u0438\u043a \u0437\u0430 \u0441\u0442\u0440\u0438\u0439\u043c\u0432\u0430\u043d\u0435 \u043d\u0430 LPCM 5.1 \! \u0421\u0440\u0435\u0434\u0435\u043d \u0431\u0438\u0442\u0440\u0435\u0439\u0442 = 4.6Mbps) -TrTab2.28=\u0417\u0430\u043f\u0430\u0437\u0438 DTS \u0430\u0443\u0434\u0438\u043e \u043f\u0440\u0438 \u0441\u0442\u0440\u0438\u0439\u043c\u0432\u0430\u043d\u0435 (\u0421\u044a\u0432\u043c\u0435\u0441\u0442\u0438\u043c \u0441 \u043e\u043f\u0442\u0438\u0447\u0435\u043d \u0438\u0437\u0445\u043e\u0434) -> \u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435, \u0441\u043b\u0430\u0431 \u0431\u0438\u0442\u0440\u0435\u0439\u0442 \u043e\u0442\u0433\u043e\u0440\u0435 -TrTab2.29=AC-3 \u0410\u0443\u0434\u0438\u043e \u0431\u0438\u0442\u0440\u0435\u0439\u0442 (in Kbits/s) (\u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440: 384, 576, 640): -TrTab2.32=Mpeg2 \u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e\u0442\u043e(\u041d\u044f\u043a\u043e\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0441\u0430 \u0434\u043e\u0441\u0442\u044a\u043f\u043d\u0438 \u0432 \u043f\u0430\u0434\u0430\u0449\u043e\u0442\u043e \u043c\u0435\u043d\u044e , \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u043f\u0440\u043e\u043c\u0435\u043d\u044f\u0442\u0435 \u0441\u0442\u043e\u0439\u043d\u043e\u0441\u0442\u0438, \u043d\u043e \u0431\u044a\u0434\u0435\u0442\u0435 \u0432\u043d\u0438\u043c\u0430\u0442\u0435\u043b\u043d\u0438): -TrTab2.39=\u0421\u044a\u0432\u0435\u0442\u0438 \u0437\u0430 \u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435:\n\n\u0412\u0438\u0434\u0435\u043e\u0442\u043e \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u0441\u0435 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430 \u0438 \u0440\u0435\u043c\u0443\u043a\u0441\u0432\u0430 \u0432 MPEG-PS / AC-3 \u0430\u0443\u0434\u0438\u043e (\u0432\u0438\u0441\u043e\u043a\u043e \u0441\u044a\u0432\u043c\u0435\u0441\u0442\u0438\u043c \u0441 PS3 \u043a\u043e\u043d\u0437\u043e\u043b\u0430) -TrTab2.40=\n\u041c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u0432\u044a\u0437\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0436\u0434\u0430\u0442\u0435 \u0441 vqscale, vqmin \u0438 keyint \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u0437\u0430 \u043f\u043e\u0441\u0442\u0438\u0433\u0430\u043d\u0435 \u043d\u0430 \u0434\u043e\u0431\u0440\u043e, \u0434\u043e\u0440\u0438 \u0438 \u043f\u043e\u0447\u0442\u0438 \u0431\u0435\u0437 \u0437\u0430\u0433\u0443\u0431\u0430 \u043d\u0430 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435. -TrTab2.41=\n\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u044a\u043a \u043d\u0430 \u0442\u043e\u0432\u0430 \u0435,\u0447\u0435 VBR-\u0431\u0438\u0442\u0440\u0435\u0439\u0442\u0430 \u043c\u043e\u0436\u0435 \u0434\u0430 \u043d\u0430\u0434\u0445\u0432\u044a\u0440\u043b\u0438 \u043a\u0430\u043f\u0430\u0446\u0438\u0442\u0435\u0442\u0430 \u043d\u0430 \u043c\u0440\u0435\u0436\u0430\u0442\u0430 \u0432\u0438. -TrTab2.42=\n\u0417\u0430\u0442\u043e\u0432\u0430 \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u0430 \u0437\u0430\u0434\u0430\u0434\u0435\u0442\u0435 \u0448\u0438\u0440\u0438\u043d\u0430 \u043d\u0430 \u043b\u0435\u043d\u0442\u0430\u0442\u0430 \u0430\u043a\u043e \u0441\u0442\u0435 \u043d\u0430 WiFi, CPL \u0438 \u0442.\u043d. \u0412\u044a\u043f\u0440\u0435\u043a\u0438 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e\u0442\u043e \u043d\u0430 \u043f\u0440\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 -TrTab2.43=\ \u0441\u0435 \u044f\u0432\u044f\u0432\u0430 \u0431\u0430\u043b\u0430\u043d\u0441 \u043c\u0435\u0436\u0434\u0443 \u0441\u043a\u043e\u0440\u043e\u0441\u0442\u0442\u0430 \u043d\u0430 \u043c\u0440\u0435\u0436\u0430\u0442\u0430 \u0438 \u0441\u0438\u043b\u0430\u0442\u0430 \u043d\u0430 \u043f\u0440\u043e\u0446\u0435\u0441\u043e\u0440\u0430: \u0417\u0430 \u043f\u043e-\u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435\u043d\u043e \u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0430 \u0441\u043a\u043e\u0440\u043e\u0441\u0442 \u043d\u0430 \u0431\u0438\u0442\u0440\u0435\u0439\u0442\u0430, -TrTab2.44=\n\u043f\u043e-\u0432\u0438\u0441\u043e\u043a \u0431\u0438\u0442\u0440\u0435\u0439\u0442 \u0449\u0435 \u0437\u0430\u0442\u043e\u0440\u043c\u043e\u0437\u044f\u0432\u0430 \u043f\u0440\u043e\u0446\u0435\u0441\u043e\u0440\u0430 \u0432\u0438\! \u0421\u044a\u0449\u043e \u0442\u0430\u043a\u0430, \u043d\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u0432\u0430\u0439\u0442\u0435 1080p \u0444\u0438\u043b\u043c\u0438 \u043d\u0430 \u043d\u0430\u0439-\u0432\u0438\u0441\u043e\u043a\u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u0440\u0438 15Mbps \u0441\u043a\u043e\u0440\u043e\u0441\u0442 \u043d\u0430 \u043c\u0440\u0435\u0436\u0430\u0442\u0430 :p -TrTab2.50=\u0411\u0440\u043e\u0439 \u043d\u0430 \u0430\u0443\u0434\u0438\u043e \u043a\u0430\u043d\u0430\u043b\u0438\u0442\u0435: -TrTab2.51=\u041f\u0440\u0435\u0446\u0438\u0437\u043d\u043e \u0437\u0430\u0431\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 -TrTab2.52=\u041f\u043e\u0434\u0434\u0440\u044a\u0436\u043a\u0430 \u043d\u0430 \u0437\u0430\u0433\u043b\u0430\u0432\u0438\u044f \u043e\u0442 \ \u041f\u0420\u0415\u041a\u041e\u0414\u0418\u0420\u0410\u041d\u0415 \ \u043f\u0430\u043f\u043a\u0430\u0442\u0430 / \u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b \u0432 \u043c\u0438\u043d\u0443\u0442\u0438: -TrTab2.55=2 \u043a\u0430\u043d\u0430\u043b\u0430 (Stereo) -TrTab2.56=6 \u043a\u0430\u043d\u0430\u043b\u0430 (5.1) -TrTab2.60=\u041e\u0442\u043b\u0438\u0447\u043d\u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e -TrTab2.61=\u0411\u0435\u0437 \u0437\u0430\u0433\u0443\u0431\u0430 \u043d\u0430 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e -TrTab2.62=\u0414\u043e\u0431\u0440\u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e -TrTab2.63=\u0414\u043e\u0431\u0440\u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u0437\u0430 HD WiFi \u0434\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 -TrTab2.64=\u0421\u0440\u0435\u0434\u043d\u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e \u0437\u0430 HD WiFi \u0434\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 -TrTab2.65=\u041d\u0438\u0441\u043a\u043e \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u043e, \u043d\u0438\u0441\u043a\u043e \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u0435\u043d \u043f\u0440\u043e\u0446\u0435\u0441\u043e\u0440 \u0438\u043b\u0438 \u0441\u043b\u0430\u0431\u043e HD WiFi \u0434\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 -TSMuxerVideo.0=\u0414\u0435\u043c\u0443\u043a\u0441\u0438\u0440\u0430\u0439 \u0441 MEncoder \u0438 \u043a\u043e\u0434\u0438\u0440\u0430\u0439 \u0432\u0441\u0438\u0447\u043a\u0438 \u0430\u0443\u0434\u0438\u043e \u043f\u043e\u0442\u043e\u0446\u0438 \u0432 AC-3 -TSMuxerVideo.1=\u0414\u0435\u043c\u0443\u043a\u0441\u0438\u0440\u0430\u0439 \u0441 MEncoder \u0438 \u043a\u043e\u0434\u0438\u0440\u0430\u0439 DTS/FLAC \u0430\u0443\u0434\u0438\u043e \u043f\u043e\u0442\u043e\u0446\u0438\u0442\u0435 \u0432 LPCM [\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435, \u0442\u044a\u0440\u0441\u0435\u043d\u0435\u0442\u043e \u043d\u044f\u043c\u0430 \u0434\u0430 \u0440\u0430\u0431\u043e\u0442\u0438] -TSMuxerVideo.19=\u041c\u0443\u043a\u0441\u0438\u0440\u0430\u0439 \u0432\u0441\u0438\u0447\u043a\u0438 \u0430\u0443\u0434\u0438\u043e \u043f\u043e\u0442\u043e\u0446\u0438 -TSMuxerVideo.2=\u0424\u043e\u0440\u0441\u0438\u0440\u0430\u0439 FPS (\u0447\u0435\u0441\u0442\u043e\u0442\u0430\u0442\u0430 \u043d\u0430 \u043a\u0430\u0434\u0440\u0438\u0442\u0435) \u0430\u043d\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0438 \u043e\u0442 FFmpeg \u0432 \u043c\u0435\u0442\u0430 \u0444\u0430\u0439\u043b -TSMuxerVideo.3=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u0430 \u0432\u0438\u0434\u0435\u043e \u0434\u0435\u043a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u0441\u0430\u043c\u043e \u0437\u0430 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 TsMuxer -TranscodeVirtualFolder.0=\#--\u0414\u0415\u041a\u041e\u0414\u0418\u0420\u0410\u041d\u0415--\# diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_br.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_br.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_br.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_br.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ -DLNAMediaDatabase.0=Para melhorar o suporte e a qualidade da aplica\u00e7\u00e3o,\na base de dados da biblioteca de m\u00eddia tem de ser reiniciada.\nPedimos desculpa pelo fato \! -FFMpegDVRMSRemux.0=Caminho FFmpeg Alternativo: -FFMpegDVRMSRemux.1=Defini\u00e7\u00f5es para DVR-MS remuxing -FFMpegVideo.0=Defini\u00e7\u00f5es do codificador s\u00f3 para o engine AviSynth/FFmpeg (PREFERIR AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Op\u00e7\u00f5es de Compartilhamento -FoldTab.2=Pesquisar todas as pastas compartilhadas -FoldTab.3=Pesquisar todas as pastas compartilhadas poder\u00e1 demorar muito tempo \!\n -FoldTab.4=Tem a certeza que quer iniciar a pesquisa?\n\n -FoldTab.5=Ocultar extens\u00e3o dos arquivos -FoldTab.6=Ocultar Pasta \#Defini\u00e7\u00f5es de V\u00eddeo\# -FoldTab.7=Pastas Compartilhadas -FoldTab.8=Ocultar nomes dos engines de trasncodifica\u00e7\u00e3o -FoldTab.9=Adicionar Pasta -FoldTab.10=Deseja terminar a pesquisa?\n\n -FoldTab.11=Ativar c\u00f3pia de v\u00eddeo no PS3 / Aten\u00e7\u00e3o, a navega\u00e7\u00e3o poder\u00e1 tornar-se lenta -FoldTab.12=Ordenar as pastas compartilhadas -FoldTab.13=Miniaturas -FoldTab.14=Usar o Mplayer para miniaturas de V\u00eddeo -FoldTab.15=Padr\u00e3o -FoldTab.16=Mais recentes primeiro -FoldTab.18=M\u00e9todo de ordena\u00e7\u00e3o de arquivos: -FoldTab.19=Miniaturas DVD ISO -FoldTab.23=Download de amazon.com -FoldTab.24=Download de discogs.com -FoldTab.26=Miniaturas de \u00c1udio: -FoldTab.27=Pasta de capas de v\u00eddeo alternativa -FoldTab.28=Escolha uma pasta -FoldTab.29=Mostrar biblioteca iPhoto -FoldTab.30=Mostrar biblioteca iTunes -FoldTab.31=Ocultar pastas vazias/sem m\u00eddia (Cuidado: navega\u00e7\u00e3o lenta) -FoldTab.32=Ocultar pasta de biblioteca de m\u00eddia -FoldTab.33=Ocultar Pasta de \#Transcode\# -FoldTab.34=Mostrar biblioteca aperture -FontFileFilter.3=Fontes Truetype -LinksTab.5=Links \u00fateis: -LooksFrame.5=Sair -LooksFrame.6=Painel Principal -LooksFrame.9=Salvar -LooksFrame.12=Reiniciar Servidor -LooksFrame.18=Estado -LooksFrame.19=Registo -LooksFrame.20=Configura\u00e7\u00e3o Geral -LooksFrame.21=Defini\u00e7\u00f5es de Trasncodifica\u00e7\u00e3o -LooksFrame.22=Navega\u00e7\u00e3oo/Defini\u00e7\u00f5es de Compartilhamento -LooksFrame.24=FAQ / Ajuda -LooksFrame.25=Sobre -MEncoderAviSynth.2=Defini\u00e7\u00f5es do Descodificador de V\u00eddeo apenas para o engin AviSynth -MEncoderAviSynth.3=Ativar a mudan\u00e7a do AviSynth para framerate constante (convertfps=true) -MEncoderVideo.0=N\u00e3o usar loop filter deblocking para H.264: PODE DEGRADAR A QUALIDADE, desative se o processador for suficientemente r\u00e1pido\!\! -MEncoderVideo.1=Defini\u00e7\u00f5es do Descodificador apenas para o engine V\u00eddeo/\u00c1udio MEncoder -MEncoderVideo.2=M\u00e9todo alternativo de sincroniza\u00e7\u00e3o A/V -MEncoderVideo.3=Usar par\u00e2metros padr\u00e3o dos codecs (Recomendado\!) -MEncoderVideo.4=For\u00e7ar framerate analizado pelo FFmpeg -MEncoderVideo.5=Aqui pode adicionar op\u00e7\u00e3es espec\u00edficas, tais como um filtro de denoise, por exemplo: -vf hqdn3d -MEncoderVideo.6=Op\u00e7\u00f5es personalizadas: -MEncoderVideo.7=Prioridade da linguagem \u00e1udio: -MEncoderVideo.8=Defini\u00e7\u00f5es de Legendas -MEncoderVideo.9=Prioridade de idioma para Legendas: -MEncoderVideo.10=Prioridade de Linguagem \u00e1udio/Legendas (exemplo: en,off;eng,off ) -MEncoderVideo.11=P\u00e1gina de C\u00f3digo das Legendas: -MEncoderVideo.12=Defini\u00e7\u00f5es de fonte ASS: Escala de Fonte -MEncoderVideo.13=Contorno da Fonte -MEncoderVideo.14=Sombra da Fonte -MEncoderVideo.15=Margem da Fonte -MEncoderVideo.16=Defini\u00e7\u00f5es padr\u00e3o de fontes: Escala de Fonte -MEncoderVideo.17=Contorno da Fonte -MEncoderVideo.18=Borr\u00e3o da Fonte -MEncoderVideo.19=Margem da Fonte -MEncoderVideo.20=Legendas ASS/SSA -MEncoderVideo.21=Fontconfig / Fontes incorporadas -MEncoderVideo.22=Carregar automaticamente legendas *.srt/*.sub com o mesmo nome do arquivo -MEncoderVideo.24=Fonte TrueType espec\u00edfica (para l\u00ednguas asi\u00e1ticas): -MEncoderVideo.25=Selecionar Fonte Truetype -MEncoderVideo.26=Filtro Deinterlace -MEncoderVideo.27=Usar v\u00eddeo scaler -MEncoderVideo.28=Largura -MEncoderVideo.29=Configura\u00e7\u00f5es avan\u00e7adas: Par\u00e2metros espe\u00edficos de Codecs -MEncoderVideo.30=Altura -MEncoderVideo.32=Remux quando a faixa de \u00e1udio for AC-3 (sem recodifica\u00e7\u00e3o) -MEncoderVideo.33=Par\u00e2metros personalizados: -MEncoderVideo.34=Editar par\u00e2metros personalizados de codecs -MEncoderVideo.35=Suporte multicore melhorado para conte\u00fado H.264 HD -MEncoderVideo.36=Usar estilo ASS original -MEncoderVideo.37=Pasta alternativa para legendas -MEncoderVideo.38=Trocar para tsMuxeR quando o v\u00eddeo em H.264 \u00e9 compat\u00edvel com o ps3 e n\u00e3o h\u00e1 legendas configuradas [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.39=Remux faixa de v\u00eddeo DVD ISO (sem recodificar) -MEncoderVideo.68=\#Aqui pode usar par\u00e2metros espec\u00edficos para algumas combina\u00e7\u00f5es de codecs.\n -MEncoderVideo.69=\#\\u00c9 usado principalmente para problemas de sincroniza\u00e7\u00e3o A/V, mas pode ser usado para qualquer outro fim, tamb\u00e9m\n -MEncoderVideo.70=\#Considerar como defini\u00e7\u00f5es avan\u00e7adas, n\u00e3o devendo ser usado se n\u00e3o souber exatamente como\n -MEncoderVideo.71=\#A sintaxe \u00e9 {java condition} :: {mencoder options} ; Pode acumular diversas op\u00e7\u00f5es\n -MEncoderVideo.72=\#Tokens autorizados: nome_do_arquivo arquivo_srt container vcodec acodec samplerate framerate largura altura canais dura\u00e7\u00e3o\n -MEncoderVideo.73=\#Cuidado, qualquer linha mal composta ser\ufffd eliminada\n -MEncoderVideo.75=\#Op\u00e7\u00f5es especiais:\n -MEncoderVideo.76=\# -noass: desativa definitivamente legendas ASS/SSA j\u00e1 que podem interferir com a sincroniza\u00e7\u00e3o A/V\n -MEncoderVideo.77=\# -nosync: desativa definitivamente o m\u00e9todo alternativo de sincroniza\u00e7\u00e3o A/V para esta condi\u00e7\u00e3o (-mc far\u00e1 o mesmo)\n -MEncoderVideo.78=\# -quality: sobrepor defini\u00e7\u00f5es de quailidade de v\u00eddeo\n -MEncoderVideo.79=\# -mt: for\u00e7ar utiliza\u00e7\u00e3o do build mencoder multithreaded (experimental, poder\u00e1 ser inst\u00e1vel)\n -MEncoderVideo.80=\#Esta lista ser\u00e1 melhorada com o tempo: ajustes/feedbacks em v\u00e1rios arquivos/codecs ser\u00e3o sempre bem-vindos\n -MEncoderVideo.87=\#Pode usar aqui as suas pr\u00f3prias condi\u00e7\u00f5es/op\u00e7\u00f5es \! Alguns exemplos: para ativar o build mt do mencoder\n -MEncoderVideo.88=\#para qualquer conte\u00fado HD H.264(redundante com a op\u00e7\u00e3o principal): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#para remover 24p judder numa TV de 50hz: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#para remux quando o v\u00eddeo for MPEG-2 e n\u00e3o houver legendas: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=L\u00edngua [tem de reiniciar a aplica\u00e7\u00e3o]: -NetworkTab.1=Navegar nos arquivos .RAR/.ZIP/.CBR -NetworkTab.2=Gerar miniaturas -NetworkTab.3=Iniciar minimizado -NetworkTab.4=Instalar como Servi\u00e7o do Windows -NetworkTab.5=Configura\u00e7\u00f5es Gerais -NetworkTab.6=Tamanho m\u00e1ximo do buffer de transcode, em megabytes (m\u00e1ximo: MAX_BUFFER_SIZE): -NetworkTab.7=N\u00famero de n\u00facleos usados para trasncodifica\u00e7\u00e3o (parece que tem %d): -NetworkTab.11=Instalou o servi\u00e7o no Windows \! Para usar, tem de sair da aplica\u00e7\u00e3o,\n -NetworkTab.12=depois iniciar (e configurar) o servi\u00e7o pelo painel de administr\u00e7a\u00e3o do Windows.\n\n -NetworkTab.13=A biblioteca de m\u00eddia ser\u00e1 reiniciada \!\n -NetworkTab.14=Erro na instala\u00e7\u00e3o do servi\u00e7o do Windows\!\n -NetworkTab.15=Defini\u00e7\u00f5es de Navega\u00e7\u00e3o/An\u00e1lize -NetworkTab.16=Posi\u00e7\u00e3o de procura de miniatura (em segundos): -NetworkTab.17=Ativar biblioteca de m\u00eddia -NetworkTab.18=Repor biblioteca de m\u00eddia -NetworkTab.19=Tem a certeza? -NetworkTab.20=For\u00e7ar rede na interface: -NetworkTab.22=Defini\u00e7\u00f5es de Rede, mude apenas se tiver problemas -NetworkTab.23=For\u00e7ar IP do servidor: -NetworkTab.24=For\u00e7ar porta do servidor (5001 por padr\u00e3o): -NetworkTab.25=Configura\u00e7\u00f5es do PS3 -NetworkTab.26=Codifica\u00e7\u00e3o de caracteres dos nomes dos arquivos do PS3 (ver XMB->Defini\u00e7\u00f5es de sistema->Charset): -NetworkTab.27=Configura\u00e7\u00f5es n\u00e3o utilizadas que n\u00e3o deve usar :p -NetworkTab.28=Modo Turbo (ativa tcp_nodelay) / use com cuidado, poder\u00e1 n\u00e3o ser bom usar isso -NetworkTab.29=Bloquear pedidos para o mesmo arquivo a partir do PS3 assim que o transcode iniciar -NetworkTab.30=Usar filtro IP: -NetworkTab.31=HTTP avan\u00e7ado e configura\u00e7\u00f5es do sistema -NetworkTab.32=HTTP Engine V2 -NetworkTab.33=Previnir o Sistema Operacional de dormir enquanto estiver transmitindo -NetworkTab.34=Plugins -NetworkTab.35=Largura de banda m\u00e1xima em Mb/s (0 significa sem limite): -PMS.0=O PS3 n\u00e3o foi encontrada. Estar\u00e1 ligada? Verifique o registo e/ou configura\u00e7\u00e3o, ou ent\u00e3o no arquivo debug.log -PMS.1=\u00c1udio -PMS.2=\#- Biblioteca de M\u00eddia -\# -PMS.3=M\u00e9todo alternativo para sincroniza\u00e7\u00e3o A/V -PMS.4=Filtro de Deinterlace -PMS.5=PS3 encontrado \! -PMS.6=Carregar legendas .srt/.sub automaticamente -PMS.7=SkipLoopFilter para Decodifica\u00e7\u00e3o H.264 [PODER\u00c1 DEGRADAR A QUALIDADE] -PMS.8=Legendas -PMS.9=Todas as Playlists de \u00e1udio -PMS.10=Desativar legendas definitivamente -PMS.11=Todas as faixas de \u00e1udio -PMS.12=Por Data -PMS.13=Por Artista -PMS.14=Padr\u00e3o H.264 Remux com MEncoder -PMS.16=Por Album -PMS.19=Por G\u00e9nero -PMS.21=Por modelo de c\u00e2mera -PMS.22=Por Artista/Album -PMS.25=Por defini\u00e7\u00f5es ISO -PMS.26=Por G\u00e9nero/Artista/Album -PMS.27=Salvar configura\u00e7\u00f5es -PMS.31=Foto -PMS.32=Todas as Fotos -PMS.34=V\u00eddeo -PMS.35=Todos os V\u00eddeos -PMS.36=V\u00eddeos HD -PMS.37=\#- Configura\u00e7\u00f5es de V\u00eddeo -\# -PMS.39=V\u00eddeos SD -PMS.41=(Re)instalar servi\u00e7o Win32 -PMS.130=Contatando o PS3... -StatusTab.2=Status -StatusTab.3=Aguardando... -StatusTab.5=Vazio -StatusTab.6=Status do buffer de Trasncodifica\u00e7\u00e3o: -StatusTab.7=Estat\u00edstica de E/S: -StatusTab.8=Bitrate atual: -StatusTab.9=M\u00eddiamedia renderers detectados -StatusTab.10=Pico de bitrate: -TSMuxerVideo.0=For\u00e7ar AC-3 remuxing com todos os arquivos -TSMuxerVideo.1=For\u00e7ar PCM remuxing com \u00e1udio DTS/FLAC -TSMuxerVideo.2=For\u00e7ar FPS analizado pelo FFmpeg no meta-arquivo -TSMuxerVideo.3=Configura\u00e7\u00f5es do Decodificador de V\u00eddeo apenas para o engine TsMuxer -TSMuxerVideo.19=Muxar todas a faixas de audio -TrTab2.0=Ativar/desativar um engine de trasncodifica\u00e7\u00e3o -TrTab2.1=Sem configura\u00e7\u00f5es para configurar por agora -TrTab2.2=Configura\u00e7\u00f5es do codificador de v\u00eddeo com os seguintes engines: MEncoder/AviSynth/FFmpeg -TrTab2.3=Configura\u00e7\u00f5es \u00e1udio, a aplicar aos seguintes decodificadores: MEncoder/AviSynth/FFmpeg -TrTab2.4=Configura\u00e7\u00f5es de qualidade de V\u00eddeo -TrTab2.5=Configura\u00e7\u00f5es comuns de trasncode -TrTab2.6=Ordenar a lista de engines de trasncodifica\u00e7\u00e3o. O primeiro ir\u00e1 aparecer na pasta original de v\u00eddeo -TrTab2.7=V\u00e1rias op\u00e7\u00f5es -TrTab2.8=Saltar transcode para as seguintes extens\u00f5es (separadas por v\u00edrgulas): -TrTab2.9=For\u00e7ar transcode para as seguintes extens\u00f5es (separadas por v\u00edrgulas): -TrTab2.10=Permite fazer stream de DTS diretamente para o receptor.\nAten\u00e7\u00e3o, \u00e9 poss\u00edvel que se ou\u00e7a um som de est\u00e1tica. Conselhos:\n- Tem de ter um receptor compat\u00edvel com DTS, ligado atrav\u00e9s de TOSLINK ou HDMI\n- O \u00edcone de volume no XMB tem de estar em 'Normal'\n- O \u00edcone dos canais no XMB tem de estar 'Left+Right'\n -TrTab2.11=Engines -TrTab2.12=Configura\u00e7\u00f5es comuns do decodificador -TrTab2.13=Configura\u00e7\u00f5es comuns do codificador -TrTab2.14=Engines de arquivos de v\u00eddeo -TrTab2.15=Engines de arquivos de \u00e1udio -TrTab2.16=Engines de streaming de v\u00eddeo web -TrTab2.17=Engines de streaming de \u00e1udio Web -TrTab2.18=Engines v\u00e1rios -TrTab2.19=Engine em negrito ser\u00e1 o priorit\u00e1rio -TrTab2.20=e ir\u00e1 substituir o v\u00eddeo original -TrTab2.21=[AviSynth n\u00e3o suportado] -TrTab2.27=DTS/FLAC -> LPCM remux (Necessita um receptor HDMI para streaming de PCM 5.1 \! Bitrate m\u00e9dio = 4.6Mbps) -TrTab2.28=Manter o \u00e1udio DTS no stream (Compat\u00edvel com sa\u00edda \u00f3ptica) -> Aten\u00e7\u00e3o, ligeiro aumento no bitrate \! -TrTab2.29=Bitrate de \u00e1udio AC-3 (em Kbits/s) (ex: 384, 576, 640): -TrTab2.32=Configura\u00e7\u00f5es MPEG-2: -TrTab2.39=Dicas do codificador:\n\nO v\u00eddeo \u00e9 automaticamente codificado e muxado em MPEG-PS / AC-3 \u00e1udio (altamenta compat\u00edvel na PS3) -TrTab2.40=\nPode tentar mudar o par\u00e2metro vqscale, vqmin e keyint para atingir uma boa, quase sem perda, qualidade de trasncodifica\u00e7\u00e3o. -TrTab2.41=\nO inconveniente \u00e9 que o bitrate VBR poder\u00e1 atingir picos acima da capacidade m\u00e1xima da rede. -TrTab2.42=\nPor essa raz\u00e3o deve ajustar a largura de banda se usar WiFi, CPL, etc. Contudo, a qualidade de trasncodifica\u00e7\u00e3o -TrTab2.43=\n\u00e9 um equil\u00edbrio entre velocidade da rede e capacidade do processador: quanto maior for a qualidade num bitrate reduzido, -TrTab2.44=\nmais o processador ser\u00e1 afetado\! Al\u00e9m disso, n\u00e3o espere que um filme de a\u00e7\u00e3o a 1080p fique com a melhor qualidade a 15Mbps :p -TrTab2.50=N\u00famero de canais de \u00e1udio: -TrTab2.51=Desativar definitivamente as legendas -TrTab2.52=Chapters \#Transcode\# folder support / Intervalos em minutos: -TracesTab.3=Limpar -TreeNodeSettings.4=Este engine n\u00e3o est\u00e1 carregado\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ca.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ca.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ca.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ca.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -DLNAMediaDatabase.0=La memoria de la base de dades s'ha de reinicialitzar.\nPerdoneu les mol\u00e8sties\! -FFMpegDVRMSRemux.0=Ruta Alternativa de FFmpeg: -FFMpegDVRMSRemux.1=Propietats per remuxing DVR-MS -FFMpegVideo.0=Propietats del motor AviSynth/FFmpeg i prou (Preferir AviSynth/MEncoder) -FoldTab.0= -FoldTab.1=Opcions de compartici\u00f3 -FoldTab.2=Escanejar totes les carpetes compartides -FoldTab.3=Escanejar totes les carpetes compartides Pot tardar molt\!\n -FoldTab.4=Esteu segur de voler comen\u00e7ar l'escaneig?\n\n -FoldTab.5=Ocultar les extensions dels arxius -FoldTab.6=Ocultar la Carpeta \#Ajustaments de Video\# -FoldTab.7=Carpetes compartides -FoldTab.8=Ocultar els noms dels motors de transcodificaci\u00f3 -FoldTab.9=Afegir Directori -FoldTab.10=Voleu parar l'escaneig?\n\n -FoldTab.11=Activar la copia de video transcodificat a la PSA3 (Atenci\u00f3, els fitxers no tenen mida fixa \!) -FoldTab.12=Ordenar les carpetes compartides -FoldTab.13=Miniatures -FoldTab.14=Fer servir Mplayer per les Miniatures de Video -FoldTab.15=Alfab\u00e8ticament (A-Z) -FoldTab.16=Per data, els m\u00e9s nous primer -FoldTab.17=Per data, el mes vells primer -FoldTab.18=Ordre dels fitxers: -FoldTab.19=Miniatures dels DVD ISO -FoldTab.20=ASCIIb\u00e8ticament -FoldTab.21=Miniatures de imatge -FoldTab.22=Alfanum\u00e8ric -FoldTab.23=Descarrega d'amazon.com -FoldTab.24=Descarrega de discogs.com -FoldTab.26=Mostra miniatures de so: -FoldTab.27=Carpeta alternativa de cobertes de videos -FoldTab.28=Tria una carpeta -FoldTab.29=Veure la biblioteca de iPhoto -FoldTab.30=Veure la biblioteca de iTunes -FoldTab.31=Hide empty/non-media folders (Careful: slower browsing) -FoldTab.32=Hide cache folder -FoldTab.33=Hide \#Transcode\# Folder -FoldTab.34=Show aperture library -FontFileFilter.3=Fonts Truetype -LinksTab.5=Enlla\u00e7os d'utilitat: -LooksFrame.5=Sortir -LooksFrame.6=Panell Principal -LooksFrame.9=Guardar -LooksFrame.12=Rearrancar el Servidor -LooksFrame.13=El servidor s'ha de reiniciar a causa de un canvi de configuraci\u00f3 -LooksFrame.18=Estat -LooksFrame.19=Rastreig -LooksFrame.20=Configuraci\u00f3 General -LooksFrame.21=Ajustaments de transcodificaci\u00f3 -LooksFrame.22=Ajustaments Navegar/Compartir -LooksFrame.24=Ajuda -LooksFrame.25=Quant a -MEncoderAviSynth.2=Ajustaments de decoder per AviSynth -MEncoderAviSynth.3=Permetre el canvi de n\u02d9mero de fotogrames de variable a constant amb AviSynth (convertfps\=true) -MEncoderVideo.0=Saltar el desbloqueig de filtre de loop per H.264. Pot degradar la qualitat -MEncoderVideo.1=Ajustaments del decoder de Video/Audio per MEncoder solamente -MEncoderVideo.2=M\u00e8tode alternatiu de sincronia A/V -MEncoderVideo.3=Fer servir els par\u00e0metres per defecte dels codecs de l'aplicaci\u00f3 (Recomanat\!) -MEncoderVideo.4=For\u00e7ar n\u02d9mero de fotogrames rebuts del FFmpeg -MEncoderVideo.5=Pot incloure aqu\u00ed opci\u00f3ns espec\u00edfiques, tals como un filtre de soroll per exemple: -vf hqdn3d -MEncoderVideo.6=Opcions personalitzades: -MEncoderVideo.7=Prioritat d'idioma d'\u00e0udio: -MEncoderVideo.8=Configuraci\u00f3 de Subt\u00edtols -MEncoderVideo.9=Prioritat d'idioma de Subt\u00edtols: -MEncoderVideo.10=Prioritat de idioma de \u00e0udio/subt\u00edtols (ex: en,off;eng,off) -MEncoderVideo.11=Codi de p\u00e0gina per subtitols: -MEncoderVideo.12=Ajustaments de font ASS: Escala de font -MEncoderVideo.13=Vora de la font -MEncoderVideo.14=Ombra de font -MEncoderVideo.15=Marge inferior de font -MEncoderVideo.16=Propietats de font por defecte: Escala de font -MEncoderVideo.17=Vora de font -MEncoderVideo.18=Desenfoc de la font -MEncoderVideo.19=Marge inferior de la font -MEncoderVideo.20=Subt\u00edtols ASS/SSA -MEncoderVideo.21=Fontconfig/Fonts incrustades -MEncoderVideo.22=Autocarregar subt\u00edtols *.srt/*.sub amb el mateix nom de fitxer -MEncoderVideo.23=Mode FriBiDi -MEncoderVideo.24=Especificar la Font TrueType (per idiomes asi\u00e0tics): -MEncoderVideo.25=Escollir una font Truetype -MEncoderVideo.26=Filtre de Desentralla\u00e7at -MEncoderVideo.27=Fer servir Escalador de Video -MEncoderVideo.28=Ample -MEncoderVideo.29=Ajustaments per experts : Parametres especifics de Codecs -MEncoderVideo.30=Al\u00e7ada -MEncoderVideo.31=Color dels subtitols -MEncoderVideo.32=Remescla quan cuando la pista de so sigui AC-3 (no recodificar) -MEncoderVideo.33=Par\u00e0metres personalitzats: -MEncoderVideo.34=Editar par\u00e0metres espec\u00edfics de codecs -MEncoderVideo.35=Suport multinucli millorat -MEncoderVideo.36=Estil per defecte ASS -MEncoderVideo.37=Carpeta de subtitols alternativa -MEncoderVideo.38=Fer Remux dels videos amb tsMuxeR quan sigui possible enlloc de fer transcoding -MEncoderVideo.39=Fer Remux del video dels DVD ISO (no recodificar) -MEncoderVideo.68=\#Aqui aqu\u00ed es por posar par\u00e0metres espec\u00edfics per combinacions de codecs.\n -MEncoderVideo.69=\#Utilitza-ho sobretot si hi ha problemes amb la sincronitzaci\u00f3 A/V, per\u00da tamb\u00c8 es pot utilitzar per qualsevol altra cosa\n -MEncoderVideo.70=\#Es un ajust per experts, no ho utilitzis si no saps ben b\u00c8 el que est\u00e0s fent\n -MEncoderVideo.71=\#La sintaxis es {condici\u00f3 java} :: {opcions MEncoder} ; Podeu acumular varies opcions\n -MEncoderVideo.72=\#Tokens permesos: filename srtfile ambtainer vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Compte, qualsevol l\u00ednia mal formada ser\u00e0 esborrada\n -MEncoderVideo.75=\#Opcions especials:\n -MEncoderVideo.76=\# -noass: deshabilitar totalment els Subt\u00edtols ASS/SSA ja que pot afectar a la sincronia A/V\n -MEncoderVideo.77=\# -nosync: deshabilitar totalment els M\u00e8tode alternatiu de sincronia A/V per Aquesta ambdicion (-mc hace lo mismo)\n -MEncoderVideo.78=\# -quality: ignorar la configuraci\u00f3 de cualitat de video\n -MEncoderVideo.79=\# -mt: for\u00e7ar l'\u02d9s del MEncoder multifil (experimental, pot resultar inestable)\n -MEncoderVideo.80=\#Aquesta llista millorar\u00e0 amb el temos: ajustaments i comentaris sobre codecs/fitxers sempre s\u00f3n benvinguts\n\n -MEncoderVideo.87=\#Pot especificar sus propias ambdiciones y opci\u00f3es\! Por ejemplo, per usar el MEncoder multihilo\n -MEncoderVideo.88=\#per qualsevol contingut H.264 en HD (redundant amb la opci\u00f3 principal): vcodec \=\= h264 && width >\= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#per treure judder de 24p en una televisi\u00f3 de 50hz TV: framerate \=\= 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#per fer remux quan el video \u00c8s MPEG-2 sense subt\u00edtols: vcodec \=\= mpeg2 && srtfile \=\= null :: -ovc copy -nosync -MEncoderVideo.92=Qualitat dels subtitols per DVD/VOBsub (0-4) (m\u00c8s alt \u00c8s millor) -MEncoderVideo.93=Afegir marges per compensar overscan: -MEncoderVideo.94=Subtitols for\u00e7ats: -MEncoderVideo.95=Etiquetes for\u00e7ades: -NetworkTab.0=Idioma [necesita rearrancar la aplicacion]: -NetworkTab.1=Examinar arxius comprimits .RAR/.ZIP/.CBR -NetworkTab.2=Genraci\u00f3 de miniatures -NetworkTab.3=Iniciar minimitzat -NetworkTab.4=Instalar como a Servei de Windows -NetworkTab.5=Configuraci\u00f3 General -NetworkTab.6=Tama\u00d2o maximo del buffer de transcodificaci\u00f3, en megabytes (maximo MAX_BUFFER_SIZE): -NetworkTab.7=N\u02d9mero de nuclis usats per transcodificar (sembla que teniu %d): -NetworkTab.8=Buscar actualitzacions -NetworkTab.9=Verificar autom\u00e0ticament -NetworkTab.11=Heu instal\u00b7lat el servei de Windows \! Per fer-lo servir heu de tancar aquesta aplicaci\u00f3\n -NetworkTab.12=llavors iniciar (i configurar) el servei des del panell d'administraci\u00f3 de Windows.\n\n -NetworkTab.13=La cache es reinicialitzar\u00e0 \!\n -NetworkTab.14=Error en la instalaci\u00f3 del servei de Windows\!\n -NetworkTab.15=Propietats de Navegaci\u00f3/Lectura -NetworkTab.16=Cerca de la posici\u00f3 de les miniatures (en segons): -NetworkTab.17=Habilitar la libreria de medios -NetworkTab.18=Reiniciar la memoria -NetworkTab.19=Esteu segur? -NetworkTab.20=For\u00e7ar funcionament de xarxa a l'interf\u00edcie: -NetworkTab.22=Configuraci\u00f3 de xarxa (avan\u00e7at) -NetworkTab.23=For\u00e7ar IP del servidor: -NetworkTab.24=For\u00e7ar el port del servidor (5001 per defecte): -NetworkTab.25=Caracter\u00edstiques de la PS3 -NetworkTab.26=Juego de caracteres per archivos de su PS3 (see XMB->Ajustaments del sistema->Juego de caracteres): -NetworkTab.27=Caracteristicas no usadas que no deberia usar :p -NetworkTab.28=Modo Turbo (habilita tcp_nodelay) / cuidado, noestoy seguro si se debe hacer -NetworkTab.29=Bloquear peticiones entrantes per el mismo archivo desde la PS3 cuando haya empezado la transcodificaci\u00f3 -NetworkTab.30=Posar un filtre de IP: -NetworkTab.31=Configuracions HTTP i de sistema avan\u00e7ades -NetworkTab.32=Motor HTTP v2 -NetworkTab.33=Impedir que el sistema hiberni mentre estem fent sreaming -NetworkTab.34=Plugins -NetworkTab.35=Ample de banda maxim en Mb/s (0 significa ilimitado): -PMS.0=La PS3 no s'ha trobat. \u2026s encesa? Pot tamb\u00c8 mirar en Rastreig, Configuraci\u00f3 o l'arxiu debug.log -PMS.1=\u00c0udio -PMS.2=\#- Llibreria de Medios -\# -PMS.3=M\u00e8tode alternatiu de sincronia A/V -PMS.4=Filtre de Desentrella\u00e7at -PMS.5=PS3 trobada \! -PMS.6=Autocarregar Subt\u00edtols .srt/.sub -PMS.7=Saltar filtre de bucle per la descodificaci\u00f3 H.264 [Pot DEGRADAR LA qualitat] -PMS.8=Subtitols -PMS.9=Todas las listas de reproduccion de Audio -PMS.10=Desactivar definitivament els subtitols -PMS.11=Totes las Pistas de Audio -PMS.12=Per Data -PMS.13=Per Artista -PMS.14=Per defecte fer el Remux d'H.264 amb MEncoder -PMS.16=Per Album -PMS.17=Renderitzador desconegut -PMS.18=Connectat -PMS.19=Per G\u00e8nere -PMS.21=Per model de c\u00e0mara -PMS.22=Per Artista/Album -PMS.25=Per ajustes ISO -PMS.26=Per G\u00e8nere/Artista/\u00c0lbum -PMS.27=Guardar configuraci\u00f3 -PMS.31=Foto -PMS.32=Totes les Fotos -PMS.34=Video -PMS.35=Tots els Videos -PMS.36=Videos HD -PMS.37=\#- Ajustaments de Video -\# -PMS.39=Videos SD -PMS.41=(Re)instalando el servicio Win32 -PMS.130=Contactant amb la PS3... -ProfileChooser.1=Triar del perfil de PS3 Media Server -ProfileChooser.2=Triar -ProfileChooser.3=Fitxer (.conf) o directori amb el perfils -StatusTab.2=Estat -StatusTab.3=Esperant... -StatusTab.5=Buit -StatusTab.6=Estat del bufer de transcodificaci\u00f3: -StatusTab.7=Estad\u00edstiques de E/S: -StatusTab.8=Bitrate actual: -StatusTab.9=Renderitzadors de media detectats -StatusTab.10=Bitrate m\u00e0xim: -StatusTab.11=Mb/s -TSMuxerVideo.0=For\u00e7ar remescla AC-3 amb tots els arxius -TSMuxerVideo.1=For\u00e7ar remescla PCM amb audio DTS/FLAC -TSMuxerVideo.2=For\u00e7ar FPS de FFmpeg en l'arxiu meta -TSMuxerVideo.3=Ajustaments de decodificador de video nom\u00c8s per al motor TsMuxer -TSMuxerVideo.19=Mesclar totes les pistes de so -TrTab2.0=Habilitar/deshabilitar un motor de transcodificaci\u00f3 -TrTab2.1=Sense ajusts de moment -TrTab2.2=Ajustaments de codificador amb els seg\u00b8ents Motors: MEncoder/AviSynth/FFmpeg -TrTab2.3=Ajustaments de Audio, aplicables als decodificadores seg\u00b8ents: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Ajustaments de cualitat de video -TrTab2.5=Ajustaments de transcodificaci\u00f3 -TrTab2.6=Ordenar amb els Motors de transcodificaci\u00f3 primer. El primer apareixer\u00e0 a la carpeta del video original -TrTab2.7=Opcions v\u00e0ries -TrTab2.8=Saltar la transcodificaci\u00f3 per les extensions seg\u00b8ents (separades per comes): -TrTab2.9=For\u00e7ar la transcodificaci\u00f3 per les extensions seg\u00b8ents (separades por comes): -TrTab2.10=Permet fer stream de DTS directament al receptro.\nAlerta, \u00c8s possible que tingueu un so est\u00e0tic. Notes:\n- Cal que tingueu un receptor compatible DTS, connectat amb TOSLINK o HDMI\n- La icona del volum a XMB ha d'estar en 'Normal'\n- La icona dels canala a XMB ha d'estar a 'Esquerra+Dreta'\n -TrTab2.11=Motors -TrTab2.12=Ajustaments comuns del decodificador -TrTab2.13=Ajustaments comuns del codificador -TrTab2.14=Motors de Archivos de Video -TrTab2.15=Motors de Archivos de Audio -TrTab2.16=Motors de Video Web -TrTab2.17=Motors de Audio Web -TrTab2.18=Motors varis -TrTab2.19=El motor en negreta t\u00c8 prioritat -TrTab2.20=i sustituir\u00e0 al video original -TrTab2.21=(AviSynth no suportat) -TrTab2.22=Remostreig autom\u00e0tic del so a 44.1 o 48 kHz -TrTab2.27=Remux DTS/FLAC -> LPCM (Necesita un receptor A/V amb HDMI per enviar PCM 5.1 \! Bitrate mig \= 4.6Mbps) -TrTab2.28=Mantenir el so DTS en l'stream (Compatible amb la sortida optica) -TrTab2.29=Bitrate de Audio AC-3 (en Kbits/s) (ej: 384, 576, 640): -TrTab2.32=Ajustaments MPEG-2: -TrTab2.39=El video es codifica i mescla automaticament com MPEG-PS amb audio AC-3 (molt compatible amb PS3) -TrTab2.40=\nPodeu modificar els par\u00e0metres vqscale, vqmin i keyint per obtenir una bona cualitat de transcodificaci\u00f3, gaireb\u00e9 sense p\u00e8rdues. -TrTab2.41=\n L'inconvenient es que el bitrate de VBR Pot a vegades superar la capacidat de la vostra xarxa. -TrTab2.42=\nPer aix\u00f2 pot tamb\u00e9 modificar l'Ample de banda si aneu per WiFi, CPL, etc. Tanmateix, la qualitat de transcodificaci\u00f3 -TrTab2.43=\n\u00e9s un equilibri entre velocitat de xarxa i potencia de cpu: contra m\u00e9s qualitat vulgui amb un ample de banda ajustat, -TrTab2.44=\nm\u00e9s patir\u00e0 la vostra cpu\! A m\u00e9s, no pretingui reproduir una pelicula d'acci\u00f3 a 1080p amb la millor qualitat en 15Mbps :p -TrTab2.50=N\u00famero de canals de audio: -TrTab2.51=Deshabilitar Subt\u00edtols definitivament -TrTab2.52=Suport de \#Transcodificaci\u00f2\# de carpetes de cap\u00edtols / Interval en minuts: -TracesTab.3=Netejar -TreeNodeSettings.4=Aquest motor no est\u00e0 carregat\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_cz.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_cz.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_cz.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_cz.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,305 +0,0 @@ -Dialog.Confirm=Potvrdit -Dialog.Error=Chyba -Dialog.Information=Informace -Dialog.Options=Mo\u017enosti -Dialog.Question=Dotaz -DLNAMediaDatabase.0=Pro lep\u0161\u00ed podporu a zdokonalen\u00ed aplikace,\ndatab\u00e1zi knihovny m\u00e9di\u00ed je t\u0159eba znovu inicializovat.\nOmlouv\u00e1me se za nep\u0159\u00edjemnosti \! -DLNAMediaDatabase.1=A,\u00c1,B,C,\u010c,D,\u010e,E,\u00c9,F,G,H,I,\u00cd,J,K,L,M,N,O,\u00d3,P,Q,R,\u0158,S,\u0160,T,\u0164,U,\u00da,V,W,X,Y,Z,\u017d -DLNAMediaDatabase.2=\u010ci\u0161t\u011bn\u00ed datab\u00e1ze... -DLNAMediaDatabase.3=Zhu\u0161t\u011bn\u00ed datab\u00e1ze... -DLNAMediaDatabase.4=Hled\u00e1n\u00ed v adres\u00e1\u0159i: -DLNAMediaDatabase.5=Po\u0161kozen\u00e1 cache mus\u00ed b\u00fdt smaz\u00e1na, ale program to nemohl ud\u011blat.\nUkon\u010dete program a sma\u017ete adres\u00e1\u0159 %s ru\u010dn\u011b. -FFMpegDVRMSRemux.0=Alternativn\u00ed cesta k FFmpeg: -FFMpegDVRMSRemux.1=Nastaven\u00ed pro DVR-MS remuxing -FFMpegVideo.0=Nastaven\u00ed enkod\u00e9ru pouze pro AviSynth/FFmpeg (preferuj pou\u017eit\u00ed AviSynth/MEncoder) -FFMpegVideo.1=Nastaven\u00ed enkod\u00e9ru pro FFmpeg -FoldTab.0= -FoldTab.1=Nastaven\u00ed sd\u00edlen\u00ed -FoldTab.2=Skenovat v\u0161echny sd\u00edlen\u00e9 adres\u00e1\u0159e -FoldTab.3=Skenov\u00e1n\u00ed v\u0161ech sd\u00edlen\u00fdch slo\u017eek m\u016f\u017ee zabrat hodn\u011b \u010dasu \!\n -FoldTab.4=Opravdu chcete spustit skenov\u00e1n\u00ed?\n\n -FoldTab.5=Skr\u00fdt p\u0159\u00edpony soubor\u016f -FoldTab.6=Skr\u00fdt adres\u00e1\u0159 \#Nastaven\u00ed videa\# -FoldTab.7=Sd\u00edlen\u00e9 adres\u00e1\u0159e -FoldTab.8=Skr\u00fdt jm\u00e9na transk\u00f3dovac\u00edch n\u00e1stroj\u016f -FoldTab.9=P\u0159idat adres\u00e1\u0159 -FoldTab.10=Chcete zastavit skenov\u00e1n\u00ed?\n\n -FoldTab.11=Povolit transk\u00f3dov\u00e1n\u00edkopie videa na PS3 (Pozor, soubory nemaj\u00ed pevnou velikost !) -FoldTab.12=\u0158adit sd\u00edlen\u00e9 slo\u017eky -FoldTab.13=Miniatury -FoldTab.14=Pou\u017e\u00edt Mplayer pro miniatury videa -FoldTab.15=Z\u00e1kladn\u00ed -FoldTab.16=Nejd\u0159\u00edve naposledy p\u0159idan\u00e9 -FoldTab.17=Nejd\u0159\u00edve nejstar\u0161\u00ed -FoldTab.18=Metoda \u0159azen\u00ed soubor\u016f: -FoldTab.19=DVD ISO n\u00e1hledy -FoldTab.20=ASCII -FoldTab.21=N\u00e1hledy obr\u00e1zk\u016f -FoldTab.22=Alfanumericky -FoldTab.23=Stahovat z amazon.com -FoldTab.24=Stahovat z discogs.com -FoldTab.26=Stahov\u00e1n\u00ed miniatur audia: -FoldTab.27=Alternativn\u00ed adres\u00e1\u0159 s obaly videa -FoldTab.28=Zvolte adres\u00e1\u0159 -FoldTab.29=Zobraz knihovnu iPhoto -FoldTab.30=Zabraz knihovnu iTunes -FoldTab.31=Skr\u00fdt pr\u00e1zdn\u00e9/ne-media adres\u00e1\u0159e (Pozor: pomalej\u0161\u00ed proch\u00e1zen\u00ed) -FoldTab.32=Skr\u00fdt slo\u017eku cache -FoldTab.33=Skr\u00fdt slo\u017eku \#Transcode\# -FoldTab.34=Zobrazit knihovnu Apple Aperture -FoldTab.35=\u017d\u00e1dn\u00e9 -FontFileFilter.3=P\u00edsmo TrueType -LinksTab.5=U\u017eite\u010dn\u00e9 odkazy: -LinksTab.6=Verze: -LooksFrame.5=Konec -LooksFrame.6=Hlavn\u00ed panel -LooksFrame.9=Ulo\u017eit -LooksFrame.12=Restart Serveru -LooksFrame.13=Server mus\u00ed b\u00fdt restarov\u00e1n z d\u016fvodu zm\u011bn nastaven\u00ed -LooksFrame.18=Stav -LooksFrame.19=Logov\u00e1n\u00ed -LooksFrame.20=Z\u00e1kladn\u00ed nastaven\u00ed -LooksFrame.21=Nastaven\u00ed transk\u00f3dov\u00e1n\u00ed -LooksFrame.22=Navigace/Nastaven\u00ed sd\u00edlen\u00ed -LooksFrame.24=N\u00e1pov\u011bda -LooksFrame.25=O programu -LooksFrame.26=POUZE PRO TESTOV\u00c1N\u00cd, MO\u017dN\u00c1 NESTABILN\u00cd -MEncoderAviSynth.2=Nastaven\u00ed video dekod\u00e9ru jen pro n\u00e1stroj AviSynth -MEncoderAviSynth.3=Povolte v AviSynth zm\u011bnu variabiln\u00edho datov\u00e9ho toku na konstantn\u00ed datov\u00fd tok (convertfps=true) -MEncoderAviSynth.4=# Script pro AviSynth je nyn\u00ed pln\u011b ukonfigurovateln\u00fd.\n -MEncoderAviSynth.5=# K dispozici jsou n\u00e1sleduj\u00edc\u00ed prom\u011bnn\u00e9:\n -MEncoderAviSynth.6=# : kompletn\u00ed instrukce DirectShowSource, nap\u0159. DirectShowSource(filename, convertfps)\n -MEncoderAviSynth.7=# : kompletn\u00ed instrukce pro titulky, pokud jsou n\u011bjak\u00e9 detekovan\u00e9 (SRT/SUB/IDX/ASS/SSA)\n -MEncoderAviSynth.8=# : n\u00e1zev filmu, pokud chcete v\u0161e nastavit sami\n -MEncoderAviSynth.10=\n -MEncoderAviSynth.11=\n -MEncoderVideo.0=P\u0159esko\u010d\u00ed smy\u010dku deblocking filtru pro H.264. M\u016f\u017ee degradovat jakost -MEncoderVideo.1=Nastaven\u00ed video/audio dekod\u00e9ru jen pro MEncoder -MEncoderVideo.2=Alternativn\u00ed metoda A/V synchronizace -MEncoderVideo.3=Pou\u017e\u00edt pro kodeky z\u00e1kladn\u00ed paramatry aplikace (Doporu\u010deno!) -MEncoderVideo.4=Vynutit rychlost sn\u00edmk\u016f analyzovanou FFmpeg -MEncoderVideo.5=Zde m\u016f\u017eete p\u0159idat konkr\u00e9tn\u00ed mo\u017enosti, jako je nap\u0159\u00edklad filtr denoise: -vf hqdn3d -MEncoderVideo.6=U\u017eivatelsk\u00e9 nastaven\u00ed: -MEncoderVideo.7=Priorita jazyka zvuku: -MEncoderVideo.8=Nastaven\u00ed titulk\u016f -MEncoderVideo.9=Priorita jazyka titulk\u016f: -MEncoderVideo.10=Priorita jazyka audia/titulk\u016f (nap\u0159: cz,vyp;cze,vyp) -MEncoderVideo.11=K\u00f3dov\u00e1n\u00ed titulk\u016f: -MEncoderVideo.12=ASS nastaven\u00ed p\u00edsma: Rozsah p\u00edsma -MEncoderVideo.13=P\u00edsmo obrysov\u00e9 -MEncoderVideo.14=P\u00edsmo st\u00ednovan\u00e9 -MEncoderVideo.15=P\u00edsmo pod okrajem -MEncoderVideo.16=Default font settings: Rozsah p\u00edsma -MEncoderVideo.17=P\u00edsmo obrysov\u00e9 -MEncoderVideo.18=P\u00edsmo rozmazan\u00e9 -MEncoderVideo.19=P\u00edsmo pod okrajem -MEncoderVideo.20=ASS/SSA titulky -MEncoderVideo.21=Fontconfig/Vlo\u017een\u00e1 p\u00edsma -MEncoderVideo.22=Automatick\u00e9 na\u010dten\u00ed *.srt/*.sub titulk\u016f se stejn\u00fdm n\u00e1zvem jako n\u00e1zev souboru -MEncoderVideo.23=FriBiDi m\u00f3d -MEncoderVideo.24=Specifick\u00e9 p\u00edsmo TrueType font (pro asijsk\u00e9 jazyky): -MEncoderVideo.25=Vyberte p\u00edsmo Truetype -MEncoderVideo.26=Filtr prokl\u00e1d\u00e1n\u00ed -MEncoderVideo.27=Pou\u017e\u00edt Video scaler -MEncoderVideo.28=\u0160\u00ed\u0159ka -MEncoderVideo.29=Pro experty : specifick\u00e9 parametry kodek\u016f -MEncoderVideo.30=V\u00fd\u0161ka -MEncoderVideo.31=Barva titulk\u016f -MEncoderVideo.32=Ponechat AC-3 stopu (bez reenk\u00f3dov\u00e1n\u00ed, m\u016f\u017ee zp\u016fsobit v\u00fdpadky zvuku a probl\u00e9my s A/V synchronizac\u00ed) -MEncoderVideo.33=U\u017eivatelsk\u00e9 parametry: -MEncoderVideo.34=Upravit specifick\u00e9 parametry kodek\u016f -MEncoderVideo.35=Roz\u0161\u00ed\u0159en\u00e1 v\u00edcej\u00e1drov\u00e1 podpora -MEncoderVideo.36=Pou\u017e\u00edt z\u00e1kladn\u00ed ASS styl -MEncoderVideo.37=Alternativn\u00ed adres\u00e1\u0159 s titulky -MEncoderVideo.38=P\u0159epnout na tsMuxeR pokud je H.264 video kompatibiln\u00ed s PS3 a pokud nen\u00ed nutn\u00e9 nastavit titulky [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.39=Remux DVD ISO video stopy (ne p\u0159ek\u00f3dov\u00e1n\u00ed) -MEncoderVideo.68=\# Zde m\u016f\u017eete vlo\u017eit konkr\u00e9tn\u00ed parametry pro kombinace n\u011bkter\u00fdch kodek\u016f.\n -MEncoderVideo.69=\# Jde p\u0159edev\u0161\u00edm o probl\u00e9my s A/V synchronizac\u00ed, ale lze jej pou\u017e\u00edt i pro cokoliv jin\u00e9ho\n -MEncoderVideo.70=\# Jde o expertn\u00ed nastaven\u00ed, proto\u017ee by nem\u011blo b\u00fdt pou\u017e\u00edv\u00e1no pokud nev\u00edte p\u0159esn\u011b co d\u011bl\u00e1te\n -MEncoderVideo.71=\# Syntaxe je {java condition} :: {MEncoder options} ; M\u016f\u017eete slou\u010dit v\u00edce mo\u017enost\u00ed\n -MEncoderVideo.72=\# Povolen\u00e9 v\u00fdrazy: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\# Pozor, v\u0161echny chybn\u011b zapsan\u00e9 \u0159\u00e1dky budou odstran\u011bny\n -MEncoderVideo.75=\# Speci\u00e1ln\u00ed nastaven\u00ed:\n -MEncoderVideo.76=\# -noass: definitivn\u011b zak\u00e1zat ASS/SSA titulky, jak se mohou obr\u00e1tit vzh\u016fru nohama A/V sync\n -MEncoderVideo.77=\# -nosync: definitivn\u011b zak\u00e1zat A/V sync alternativn\u00ed metodu pro tuto podm\u00ednku (-mc will do the same)\n -MEncoderVideo.78=\# -quality: p\u0159epsat nastaven\u00ed video kvality\n -MEncoderVideo.79=\# -mt: vynutit pou\u017eit\u00ed v\u00edcevl\u00e1knov\u00e9 verze MEncoderu (experiment\u00e1ln\u00ed, mo\u017en\u00e1 nestabiln\u00ed)\n -MEncoderVideo.80=\# Tento seznam se bude \u010dasem zlep\u0161ovat: odkazy na r\u016fzn\u00e9 kodeky/soubory jsou v\u017edy v\u00edt\u00e1ny\n -MEncoderVideo.87=\# Nyn\u00ed m\u016f\u017eete vlo\u017eit vlastn\u00ed podm\u00ednky/volby ! Zde n\u011bkter\u00e9 p\u0159\u00edklady: nap\u0159. povolit mt build MEncod\u00e9ru\n -MEncoderVideo.88=\# pro jak\u00fdkoliv obsah H.264 HD (zbyte\u010dn\u00fd p\u0159i hlavn\u00edm nastaven\u00ed): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\# Odstran\u011bn\u00ed kmit\u00e1n\u00ed p\u0159i 24 sn\u00edmc\u00edch/s na 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\# Remux kdy\u017e video je MPEG-2 a neobsahuje titulky: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=DVD/VOBsub kvalita titulk\u016f (0-4) (v\u011bt\u0161\u00ed je lep\u0161\u00ed): -MEncoderVideo.93=P\u0159idat okraje pro kompenzaci overscan: -MEncoderVideo.94=Vynucen\u00ed titulk\u016f: -MEncoderVideo.95=Vynucen\u00ed tag\u016f: -MEncoderVideo.96=cp1250 /* Windows - v\u00fdchodoevropsk\u00e9 */ -MEncoderVideo.97=cp1251 /* Windows - cyrilice */ -MEncoderVideo.98=cp1252 /* Windows - z\u00e1padoevropsk\u00e9 */ -MEncoderVideo.99=cp1253 /* Windows - \u0159eck\u00e9 */ -MEncoderVideo.100=cp1254 /* Windows - tureck\u00e9 */ -MEncoderVideo.101=cp1255 /* Windows - hebrejsk\u00e9 */ -MEncoderVideo.102=cp1256 /* Windows - arabsk\u00e9 */ -MEncoderVideo.103=cp1257 /* Windows - baltick\u00e9 */ -MEncoderVideo.104=cp1258 /* Windows - vietnamsk\u00e9 */ -MEncoderVideo.105=ISO-8859-1 /* z\u00e1padoevropsk\u00e9 */ -MEncoderVideo.106=ISO-8859-2 /* z\u00e1pado a st\u0159edoevropsk\u00e9 */ -MEncoderVideo.107=ISO-8859-3 /* z\u00e1padoevropsk\u00e9 a jihoevropsk\u00e9 */ -MEncoderVideo.108=ISO-8859-4 /* z\u00e1padoevropsk\u00e9 a baltsk\u00e9 zem\u011b */ -MEncoderVideo.109=ISO-8859-5 /* abeceda cyrilice */ -MEncoderVideo.110=ISO-8859-6 /* arabsk\u00e9 */ -MEncoderVideo.111=ISO-8859-7 /* \u0159eck\u00e9 */ -MEncoderVideo.112=ISO-8859-8 /* hebrejsk\u00e9 */ -MEncoderVideo.113=ISO-8859-9 /* z\u00e1padoevropsk\u00e9 s p\u0159idanou ture\u010dtinou */ -MEncoderVideo.114=ISO-8859-10 /* z\u00e1padoevropsk\u00e9 se seversk\u00fdmi jazyky */ -MEncoderVideo.115=ISO-8859-11 /* thajsk\u00e9 */ -MEncoderVideo.116=ISO-8859-13 /* baltick\u00e9 a polsk\u00e9 */ -MEncoderVideo.117=ISO-8859-14 /* keltsk\u00e9 */ -MEncoderVideo.118=ISO-8859-15 /* p\u0159idan\u00fd znak Euro */ -MEncoderVideo.119=ISO-8859-16 /* st\u0159edoevropsk\u00e9 jazyky */ -MEncoderVideo.120=cp932 /* japonsk\u00e9 */ -MEncoderVideo.121=cp936 /* \u010d\u00ednsk\u00e9 */ -MEncoderVideo.122=cp949 /* korejsk\u00e9 */ -MEncoderVideo.123=cp950 /* Big5, tajvansk\u00e9, kantonsk\u00e9 */ -MEncoderVideo.124=UTF-8 /* Unicode */ -MEncoderVideo.125=Vyberte barvu titulk\u016f -MEncoderVideo.126=cze,eng,fre,ger,und -MEncoderVideo.127=cze,eng,fre,ger,und -MEncoderVideo.128=*,* -NetworkTab.0=Jazyk [nutn\u00fd restart aplikace]: -NetworkTab.1=Proch\u00e1zet .RAR/.ZIP/.CBR archivy -NetworkTab.2=Generov\u00e1n\u00ed miniatur -NetworkTab.3=Minimalizovat po startu -NetworkTab.4=Instalovat jako slu\u017ebu Windows -NetworkTab.5=Z\u00e1kladn\u00ed nastaven\u00ed -NetworkTab.6=Transk\u00f3dovac\u00ed vyrovn\u00e1vac\u00ed pam\u011b\u0165 - max. velikost v megabytech (maximum: MAX_BUFFER_SIZE): -NetworkTab.7=Po\u010det jader pou\u017eit\u00fdch pro transk\u00f3dov\u00e1n\u00ed (zd\u00e1 se, \u017ee m\u00e1te %d): -NetworkTab.8=Kontrola updatu -NetworkTab.9=Automatick\u00e1 kontrola -NetworkTab.11=M\u00e1te ninstalovanou slu\u017ebu Windows \! Pro jej\u00ed pou\u017eit\u00ed mus\u00edte ukon\u010dit aplikaci,\n -NetworkTab.12=potom spustit (a nastavit) slu\u017ebu z administrativn\u00edho panelu windows.\n\n -NetworkTab.13=Knihovna m\u00e9di\u00ed bude reinicializov\u00e1na \!\n -NetworkTab.14=Chyba v instalaci slu\u017eby Windows!\n -NetworkTab.15=Nastaven\u00ed navigace/parsingu -NetworkTab.16=Pozice vyhled\u00e1v\u00e1n\u00ed miniatur (v sekund\u00e1ch): -NetworkTab.17=Povolit knihovnu m\u00e9di\u00ed -NetworkTab.18=Resetovat knihovnu m\u00e9di\u00ed -NetworkTab.19=Opravdu? -NetworkTab.20=Vynutit s\u00ed\u0165 na rozhran\u00ed: -NetworkTab.22=Nastaven\u00ed s\u00edt\u011b, m\u011bnit pouze p\u0159i probl\u00e9mech! -NetworkTab.23=Platn\u00e9 IP serveru: -NetworkTab.24=Platn\u00fd port serveru (5001 p\u0159ednastaven\u00fd): -NetworkTab.25=PS3 nastaven\u00ed -NetworkTab.26=K\u00f3dov\u00e1n\u00ed n\u00e1zvu soubor\u016f va\u0161eho PS3 (pod\u00edvejte se na XMB->Syst\u00e9mov\u00e9 nastaven\u00ed->K\u00f3dov\u00e1n\u00ed): -NetworkTab.27=Nezn\u00e1m\u00e1 nastaven\u00ed byste nem\u011bli pou\u017e\u00edvat :p -NetworkTab.28=Turbo m\u00f3d (zapnuto tcp_nodelay) / bu\u010fte opatrn\u00ed, kdy\u017e si nejste jist\u00ed, \u017ee je to v po\u0159\u00e1dku -NetworkTab.29=P\u0159\u00edchoz\u00ed po\u017eadavek na stejn\u00fd soubor z PS3 na za\u010d\u00e1tek trank\u00f3dov\u00e1n\u00ed -NetworkTab.30=Pou\u017e\u00edt IP filtr: -NetworkTab.31=Roz\u0161\u00ed\u0159en\u00e9 HTTP a syst\u00e9mov\u00e9 nastaven\u00ed -NetworkTab.32=HTTP Engine V2 -NetworkTab.33=Zabr\u00e1nit uspan\u00ed OS po dobu streamingu -NetworkTab.34=Pluginy -NetworkTab.35=Maxim\u00e1ln\u00ed \u0161\u00ed\u0159ka p\u00e1sma v Mb/s (0 znamen\u00e1 bez limitu): -NetworkTab.36=Z\u00e1kladn\u00ed p\u0159ehr\u00e1va\u010d kdy\u017e sel\u017ee automatick\u00e1 detekce: -NetworkTab.37=Nezn\u00e1m\u00fd p\u0159ehr\u00e1va\u010d -NetworkTab.38=Vynutit z\u00e1kladn\u00ed p\u0159ehr\u00e1va\u010d (Zak\u00e1zat automatickou detekci) -PMS.0=PS3 nebyla nalezena. Je zapnut\u00e1? M\u016f\u017eete tak\u00e9 zkontrolovat logy a/nebo konfiguraci, nebo tak\u00e9 debug.log soubor -PMS.1=Zvuk -PMS.2=\#- Knihovna m\u00e9di\u00ed -\# -PMS.3=A/V sync alternativn\u00ed metoda -PMS.4=Filtr prokl\u00e1d\u00e1n\u00ed -PMS.5=PS3 byla nalezena \! -PMS.6=Auto load .srt/.sub titulk\u016f -PMS.7=SkipLoop Filtr pro dek\u00f3dov\u00e1n\u00ed H.264 [MO\u017dN\u00c9 SN\u00cd\u017dEN\u00cd KVALITY] -PMS.8=Titulky -PMS.9=V\u0161echny hudebn\u00ed playlisty -PMS.10=Definitivn\u011b zak\u00e1zat titulky -PMS.11=V\u0161echny zvukov\u00e9 stopy -PMS.12=Podle data -PMS.13=Podle um\u011blce -PMS.14=Z\u00e1kladn\u00ed H.264 Remux s MEncoder -PMS.16=Podle alba -PMS.17=Nezn\u00e1m\u00fd p\u0159ehr\u00e1va\u010d -PMS.18=P\u0159ipojeno -PMS.19=Podle \u017e\u00e1nru -PMS.21=Podle modelu fotoapar\u00e1tu -PMS.22=Podle um\u011blce/alba -PMS.25=Podle nastaven\u00ed ISO -PMS.26=Podle \u017e\u00e1nru/um\u011blce/alba -PMS.27=Ulo\u017eit konfiguraci -PMS.28=Podle n\u00e1zvu/um\u011blce/alba -PMS.31=Fotografie -PMS.32=V\u0161echny fotografie -PMS.34=Video -PMS.35=V\u0161echna videa -PMS.36=HD videa -PMS.37=\#- Nastaven\u00ed videa -\# -PMS.39=SD videa -PMS.40=DVD obrazy -PMS.41=(Re)instalace slu\u017eby win32 -PMS.42=Chyba p\u0159i inicalizaci PMS! -PMS.130=P\u0159ipojuji se k PS3... -ProfileChooser.1=V\u00fdb\u011br profilu PS3 Media Server -ProfileChooser.2=Vybrat -ProfileChooser.3=Soubor profilu(.conf)nebo adres\u00e1\u0159 -StatusTab.2=Stav -StatusTab.3=\u010cek\u00e1m... -StatusTab.5=Pr\u00e1zdn\u00fd -StatusTab.6=Stav transk\u00f3dovac\u00ed vyrovn\u00e1vac\u00ed pam\u011bti: -StatusTab.7=I/O statistiky: -StatusTab.8=Moment\u00e1ln\u00ed bitrate: -StatusTab.9=Detekovan\u00fd p\u0159ehr\u00e1va\u010d m\u00e9di\u00ed -StatusTab.10=Nejvy\u0161\u0161\u00ed bitrate: -StatusTab.11=Mb/s -StatusTab.12=MB -TracesTab.3=Smazat -TreeNodeSettings.4=Tento n\u00e1stroj nen\u00ed nahr\u00e1n\! -TrTab2.0=Povolit/zak\u00e1zat a transk\u00f3dovac\u00ed n\u00e1stroj -TrTab2.1=V sou\u010dastnosti \u017e\u00e1dn\u00e9 nastaven\u00ed -TrTab2.2=Nastaven\u00ed video enkod\u00e9ru s n\u00e1sleduj\u00edc\u00edmi n\u00e1stroji: MEncoder/AviSynth/FFmpeg -TrTab2.3=Nastaven\u00ed audia, pou\u017eiteln\u00e9 pro n\u00e1sleduj\u00edc\u00ed dekod\u00e9ry: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Nastaven\u00ed kvality videa -TrTab2.5=Obecn\u00e9 nastaven\u00ed transk\u00f3dov\u00e1n\u00ed -TrTab2.6=T\u0159\u00edd\u011bn\u00ed seznamu transk\u00f3dovac\u00edch n\u00e1stroj\u016f. Prvn\u00ed z nich se objevuje v p\u016fvodn\u00ed video slo\u017ece -TrTab2.7=Dal\u0161\u00ed nastaven\u00ed -TrTab2.8=P\u0159esko\u010dit transk\u00f3dov\u00e1n\u00ed pro n\u00e1sleduj\u00edc\u00ed p\u0159\u00edpony (odd\u011blen\u00e9 \u010d\u00e1rkou): -TrTab2.9=Vynutit transk\u00f3dov\u00e1n\u00ed pro n\u00e1sledujic\u00ed p\u0159\u00edpony (odd\u011blen\u00e9 \u010d\u00e1rkou): -TrTab2.10=Umo\u017e\u0148uje pos\u00edlat DTS stream p\u0159\u00edmo na v\u00e1\u0161 p\u0159ehr\u00e1va\u010d.\nBu\u010fte opatrn\u00ed, m\u016f\u017ee se objevit \u0161um ve zvuku. Zde je n\u011bkolik rad:\n- Mus\u00edte m\u00edt DTS kompatibiln\u00ed p\u0159ij\u00edma\u010d, p\u0159ipojen\u00fd p\u0159es TOSLINK nebo HDMI\n- Ikona hlasitosti na XMB mus\u00ed b\u00fdt nastavena na 'Normal'\n- Ikona kan\u00e1lu na XMB mus\u00ed b\u00fdt nastavena na 'Left+Right'\n -TrTab2.11=N\u00e1stroje -TrTab2.12=Obecn\u00e9 nastaven\u00ed dekod\u00e9ru -TrTab2.13=Obecn\u00e9 nastaven\u00ed enkod\u00e9ru -TrTab2.14=N\u00e1stroje Video soubor\u016f -TrTab2.15=N\u00e1stroje Audio soubor\u016f -TrTab2.16=N\u00e1stroje Video Web Streamingu -TrTab2.17=N\u00e1stroje Audio Web Streamingu -TrTab2.18=Dal\u0161\u00ed n\u00e1stroje -TrTab2.19=N\u00e1stroje jsou \u0159azeny sestupn\u011b, -TrTab2.20=tu\u010dn\u011b zv\u00fdrazn\u011bn\u00fd je pou\u017eit prioritn\u011b -TrTab2.21=[AviSynth nen\u00ed podporov\u00e1n] -TrTab2.22=Automatick\u00fd audio resampling na 44.1 nebo 48 kHz -TrTab2.27=DTS/FLAC -> LPCM remux (Pot\u0159ebujete HDMI receiver pro streaming LPCM 5.1 \! Pr\u016fm\u011brn\u00fd Bitrate = 4.6Mbps) -TrTab2.28=Zachovat DTS audio ve streamu (Kompatibiln\u00ed s optick\u00fdm v\u00fdstupem) -> Opatrn\u011b, m\u00edrn\u00e1 zm\u011bna bitrate ! -TrTab2.29=AC-3 Audio datov\u00fd tok (v kbit/s) (volba: 576, 640): -TrTab2.32=MPEG-2 nastaven\u00ed: -TrTab2.39=Video je automaticky transk\u00f3dov\u00e1no a muxov\u00e1no do MPEG-PS/AC-3 audio (vysoce kompatibiln\u00ed s PS3) -TrTab2.40=\nM\u016f\u017eete pou\u017e\u00edt vqscale, vqmin a keyint parametry pro dosa\u017een\u00ed dobr\u00e9, dokonce t\u00e9m\u011b\u0159 bezestr\u00e1tov\u00e9 kvality p\u0159evodu. -TrTab2.41=\nNev\u00fdhodou je to, \u017ee VBR datov\u00fd tok m\u016f\u017ee n\u011bkdy p\u0159esahovat maxim\u00e1ln\u00ed kapacitu va\u0161\u00ed s\u00edt\u011b. -TrTab2.42=\nTo je d\u016fvod, pro\u010d si m\u016f\u017eete tak\u00e9 nastavit \u0161\u00ed\u0159ku p\u00e1sma, pokud jste na WiFi, CPL, atd. Nicm\u00e9n\u011b, kvalita p\u0159evodu -TrTab2.43=\nje rovnov\u00e1ha mezi rychlost\u00ed s\u00edt\u011b a v\u00fdkonem cpu: pro vy\u0161\u0161\u00ed kvalitu budete omezeni rychlost\u00ed datov\u00e9ho toku, -TrTab2.44=\nbez v\u00edce procesor\u016f budete trp\u011bt\! Tak\u017ee budete pot\u0159ebovat pro ak\u010dn\u00ed film v 1080p a v nejvy\u0161\u0161\u00ed kvalit\u011b 15Mbps :p -TrTab2.50=Maxim\u00e1ln\u00ed po\u010det v\u00fdstupn\u00edch zvukov\u00fdch kan\u00e1l\u016f pro AC-3 re-encoding: -TrTab2.51=Definitivn\u011b zak\u00e1zat titulky -TrTab2.52=Tvorba kapitol ve slo\u017ece \#Transcode\# / interval v minut\u00e1ch: -TrTab2.55=2 kan\u00e1ly (Stereo) -TrTab2.56=6 kan\u00e1l\u016f (5.1) -TrTab2.60=Vysok\u00e1 kvalita -TrTab2.61=Bezestr\u00e1tov\u00e1 kvalita -TrTab2.62=Dobr\u00e1 kvalita -TrTab2.63=Dobr\u00e1 kvalita pro HD Wifi transk\u00f3dov\u00e1n\u00ed -TrTab2.64=St\u0159edn\u00ed kvalita pro HD Wifi transk\u00f3dov\u00e1n\u00ed -TrTab2.65=N\u00edzk\u00e1 kvalita, low-end CPU nebo HD Wifi transk\u00f3dov\u00e1n\u00ed -TSMuxerVideo.0=Demux s MEncoderem a enk\u00f3dov\u00e1n\u00ed v\u0161ech zvukov\u00fdch stop do AC-3 -TSMuxerVideo.1=Demux s MEncoderem a enk\u00f3dov\u00e1n\u00ed DTS/FLAC zvukov\u00fdch stop do LPCM [Pozor, hled\u00e1n\u00ed zat\u00edm nefunguje] -TSMuxerVideo.2=Vynutit sn\u00edmkovou frekvenci analyzovanou FFmpeg -TSMuxerVideo.3=Nastaven\u00ed video dekod\u00e9ru pouze pro TsMuxer -TSMuxerVideo.19=Mux v\u0161ech zvukov\u00fdch stop diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_da.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_da.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_da.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_da.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,204 +0,0 @@ -DLNAMediaDatabase.0=For bedre support og forbedring af programmet, \nmedia bilioteket bliver n\u00f8d til at geninitialisere. \n Beklager ulejligheden \! -DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,\u00c6,\u00d8,\u00c5 -FFMpegDVRMSRemux.0=Alternativ FFmpeg Vej: -FFMpegDVRMSRemux.1=Indstillinger for DVR-MS remuxing -FFMpegVideo.0=Encoder indstillinger kun for AviSynth/FFmpeg motor (ANBEFALER AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Delings indstillinger -FoldTab.2=Skan alle delte mapper -FoldTab.3=Skanning af alle delte mapper kan tage meget lang tid \!\n -FoldTab.4=Er du sikker p\u00e5 at du vil skanne?\n\n -FoldTab.5=Skjul filtyper -FoldTab.6=Skjul \#Video indstillinger\# mappe -FoldTab.7=Delte mapper -FoldTab.8=Skjul kodnings motor navne -FoldTab.9=Tilf\u00f8g destination -FoldTab.10=Vil du stoppe med at skanne?\n\n -FoldTab.11=Aktivere kodet video kopiering p\u00e5 PS3 (BEM\u00c6RK, filer har ingen fast st\u00f8rrelse !) -FoldTab.12=Sortere de delte mapper -FoldTab.13=Miniaturer -FoldTab.14=Brug Mplayer for Video miniaturere -FoldTab.15=Standard -FoldTab.16=De senere f\u00f8rst -FoldTab.18=Fil sorteringsmetode: -FoldTab.23=Download fra amazon.com -FoldTab.24=Download fra discogs.com -FoldTab.26=Lyd miniature vis: -FoldTab.27=Alternative videocover art mapper -FoldTab.28=V\u00e6lg en mappe -FoldTab.29=Vis iPhoto bibliotek -FoldTab.30=Vis iTunes bibliotek -FontFileFilter.3=TrueType-skrifttyper -LinksTab.5=Hj\u00e6lpsomme links: -LooksFrame.5=Afslut -LooksFrame.6=Hovedpanel -LooksFrame.9=Gem -LooksFrame.12=Genstart Server -LooksFrame.18=Status -LooksFrame.19=Spor -LooksFrame.20=General Konfiguration -LooksFrame.21=Kodnings indstillinger -LooksFrame.22=Navigation/Dele indstillinger -LooksFrame.24=Hj\u00e6lp -LooksFrame.25=Om -MEncoderAviSynth.2=Video decoder indstillinger kun for AviSynth motor -MEncoderAviSynth.3=Aktiver AviSynth variabel framerate \u00e6ndring til en konstant framerate (convertfps=true) -MEncoderVideo.0=Skip loop filteret afblokering for H.264. Kan formindske kvalitet -MEncoderVideo.1=Video/Lyd afkodningsindstillinger kun for MEncoder motor -MEncoderVideo.2=A/V sync alternativ metode -MEncoderVideo.3=Brug standard codec parametre (Anbefalet!) -MEncoderVideo.4=Tving framerate parses fra FFmpeg -MEncoderVideo.5=Her kan du tilf\u00f8je tilpasset indstillinger, som for eksempel denoise filtert: -vf hqdn3d -MEncoderVideo.6=Tilpasset options: -MEncoderVideo.7=Lydsprog prioritet: -MEncoderVideo.8=Undertekstindstillinger -MEncoderVideo.9=Undertekstssprog prioritet: -MEncoderVideo.10=Lyd/undertekster sprog prioritet (eks: en,off;eng,off) -MEncoderVideo.11=Underteksters kodnings-side: -MEncoderVideo.12=ASS skrifttype indstillinger: Skrifttype skala -MEncoderVideo.13=skrifttype skitse -MEncoderVideo.14=skrifttype skykke -MEncoderVideo.15=skrifttype sub margin -MEncoderVideo.16=Standard skrifttype indstillinger: Skrifttype skala -MEncoderVideo.17=Skrifttype skitse -MEncoderVideo.18=Skrifttype sl\u00f8ring -MEncoderVideo.19=Skrifttype sub margin -MEncoderVideo.20=ASS/SSA Undertekster -MEncoderVideo.21=Fontconfig/Integrerede skrifttyper -MEncoderVideo.22=Autoload *.srt/*.sub undertekster med samme navn -MEncoderVideo.24=Specifik TrueType-Skrifttype (for asian sprog): -MEncoderVideo.25=V\u00e6lg en TrueType-Skrifttype -MEncoderVideo.26=Deinterlace filter -MEncoderVideo.27=Brug Video skala -MEncoderVideo.28=Bredte -MEncoderVideo.29=Expert indstillinger : Codec specifikke parametre -MEncoderVideo.30=H\u00f8jde -MEncoderVideo.32=Remux n\u00e5r lydsporet er AC-3 (ingen reencode) -MEncoderVideo.33=Tilpasset parametre: -MEncoderVideo.34=\u00c6ndre codec specifikke parametre -MEncoderVideo.35=Udvidet flerkernet support -MEncoderVideo.36=Brug ASS Standard stil -MEncoderVideo.37=Alternativ undertekst mappe -MEncoderVideo.38=Skift til tsMuxeR n\u00e5r H.264 video er ps3 kompatibel og ingen konfigureret undertekster [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.68=\#Her kan du s\u00e6tte specifikke parametre for nogle codec kombinationer.\n -MEncoderVideo.69=\#Det er prim\u00e6rt for A/V-synkronisering problemer, men det kan stadig bruges til alt andet\n -MEncoderVideo.70=\#Betragt det ligsom ekspert indstillingerne da denne ikke b\u00f8r anvendes, hvis du ikke ved pr\u00e6cis, hvad du laver\n -MEncoderVideo.71=\#Syntaksen er {java condition} :: {MEncoder options} ; Du kan kumulere flere muligheder\n -MEncoderVideo.72=\#M\u00f8ntefterligninger tilladt: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Forsigtige, enhver malformed linje vil blive udslettet\n -MEncoderVideo.75=\#Special indstillinger:\n -MEncoderVideo.76=\# -noass: Sl\u00e5 ASS/SSA undertekster fra da de kan \u00f8del\u00e6gge A/V-synkronisationen\n -MEncoderVideo.77=\# -nosync: Sl\u00e5 A/V-synkronisationen alternativ metode fra (-mc Vil g\u00f8re det samme)\n -MEncoderVideo.78=\# -quality: overg\u00e5 video kvalitets indstillingerne\n -MEncoderVideo.79=\# -mt: Tving brugen af flertr\u00e5dede MEncoder (eksperimental, kan v\u00e6re ustabil)\n -MEncoderVideo.80=\#Denne liste vil blive bedre med tiden: tweaks/feedbacks p\u00e5 forskellige codecs/filer er altid velkommen\n -MEncoderVideo.87=\#Nu kan du l\u00e6gge dine egne betingelser/indstillinger ind! Her er nogle eksempler: For eksempel, for aktivere mt versionen af mencorder\n -MEncoderVideo.88=\#For alt H.264 HD indhold (redondant med hovedindstillingerne): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#Til at fjerne 24p st\u00f8j p\u00e5 et 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#For at fjerne remux n\u00e5r videoformat er MPEG-2 og der ikke findes undertekster: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=Sprog [Kr\u00e6ver genstart af programmet]: -NetworkTab.1=Browse .RAR/.ZIP/.CBR archives -NetworkTab.2=Miniature generering -NetworkTab.3=Start minimeret -NetworkTab.4=Installer som Windows Tjeneste -NetworkTab.5=Generelle indstillinger -NetworkTab.6=kodnings buffer maks st\u00f8rrelse, i megabytes (maks: MAX_BUFFER_SIZE): -NetworkTab.7=Antal af kerne brugt for kodningen (det ser ud til at du har %d): -NetworkTab.11=Du har installeret Windows tjenesten \! For at bruge det, skal du lukke programmet ned,\n -NetworkTab.12=og s\u00e5 starte tjenesten fra Windows administrationspanelet.\n\n -NetworkTab.13=Media biblioteket bliver geninitialiseret \!\n -NetworkTab.14=Fejl i installationen af Windows tjenesten!\n -NetworkTab.15=Navigation/Parses indstillinger -NetworkTab.16=Miniature s\u00f8gnings position (in seconds): -NetworkTab.17=Aktivere media biblioteket -NetworkTab.18=Nulstil media biblioteket -NetworkTab.19=Er du sikker? -NetworkTab.20=Tving netv\u00e6rk p\u00e5 interface: -NetworkTab.22=Netv\u00e6rksindstillinger, \u00e6ndre kun, hvis problemer -NetworkTab.23=Tving IP af serveren: -NetworkTab.24=Tving port af serveren (5001 by default): -NetworkTab.25=PS3 indstillinger -NetworkTab.26=Tegnkodning af din PS3's filnavne(se XMB->System settings->Charset): -NetworkTab.27=Ubrugte indstillinger du ikke b\u00f8r bruge :p -NetworkTab.28=Turbo mode (aktivere tcp_nodelay) / V\u00e6r forsigtig, er ikke sikker p\u00e5 at det er i orden at g\u00f8re -NetworkTab.29=Blokere indkomne foresp\u00f8rgelse for den samme fil fra PS3 n\u00e5r kodningen er startet -NetworkTab.30=Brug et IP filter: -NetworkTab.35=Maksimum b\u00e5ndbredde i Mb/s (0 betyder ingen begr\u00e6nsning): -PMS.0=PS3 blev ikke fundet. Er den t\u00e6ndt? Du kan ogs\u00e5 tjekke spor og/eller konfiguration, eller ogs\u00e5 debug.log filen -PMS.1=Lyd -PMS.2=\#- Media bibliotek -\# -PMS.3=A/V-synkroniserings alternativ metode -PMS.4=Deinterlace Filter -PMS.5=PS3 blev fundet \! -PMS.6=Auto start .srt/.sub undertekster -PMS.7=SkipLoopFilter for H.264 afkodning [KAN FORMINDSKE KVALITETEN] -PMS.8=Undertekster -PMS.9=Alle Lyd Afspillingslister -PMS.10=Deaktivere undertekster -PMS.11=Alle lydspor -PMS.12=Fra Dato -PMS.13=Fra Artist -PMS.14=Standard H.264 Remux med MEncoder -PMS.16=Fra Album -PMS.19=Fra Genre -PMS.21=Fra kamera model -PMS.22=Fra Artist/Album -PMS.25=Fra ISO indstillinger -PMS.26=Fra Genre/Artist/Album -PMS.31=Foto -PMS.32=Alle billeder -PMS.34=Video -PMS.35=Alle Videoer -PMS.36=HD Videoer -PMS.37=\#- Video Indstillinger -\# -PMS.39=SD Videoer -PMS.41=(gen)isntaller Win32 Tjeneste -PMS.130=Kontakter PS3... -StatusTab.2=Status -StatusTab.3=Venter... -StatusTab.5=Tom -StatusTab.6=Kodnings buffer status: -StatusTab.7=I/O Statistikker: -StatusTab.8=Nuv\u00e6rende bitrate: -StatusTab.10=Peak bitrate: -TSMuxerVideo.0=Demux med MEncoder og indkod alle lydspor til AC-3 -TSMuxerVideo.1=Demux med MEncoder og indkod DTS/FLAC lydspor til LPCM [Forsigtig, s\u00f8gning fungere ikke optimalt] -TSMuxerVideo.2=Tving FPS parses fra FFmpeg i metafiler -TSMuxerVideo.3=Video dekodnings indstillinger kun for TsMuxer motor -TSMuxerVideo.19=Mux Alle lydspor -TrTab2.0=Aktiver/Deaktiver en kodningsmotor -TrTab2.1=Ingen indstillinger for nu -TrTab2.2=Video indkodnings indstilligner med f\u00f8lgende motoere: MEncoder/AviSynth/FFmpeg -TrTab2.3=lydindstillinger g\u00e6lder for f\u00f8lgende dekodere: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Video kvalitetsindstillinger -TrTab2.5=Ofte kodningsindstillinger -TrTab2.6=Sorter kodnings motor listing. Den f\u00f8rste vil vise sig i den originale video mappe -TrTab2.7=Diverse indstillinger -TrTab2.8=Skip kodning for f\u00f8lgende filtyper (ny med komma): -TrTab2.9=Tving kodning for f\u00f8lgende filtyper (ny med komme): -TrTab2.10=Giver den lov til at streamme DTS direkte til din modtager. \nV\u00e6r forsigtig, det er muligt at f\u00e5 statisk lyd. Her er et r\u00e5d:\n- Du skal have en DTS kompatibel modtager forbundet til TOSLINK eller HDMI\n- volume ikonet p\u00e5 XMB skal v\u00e6re p\u00e5 'Normal'\n- Kanalerne ikonet p\u00e5 XMB skal v\u00e6re p\u00e5 'Ventre+H\u00f8jre'\n -TrTab2.11=Motorere -TrTab2.12=Ofte dekodnings indstillinger -TrTab2.13=Ofte indkodnings indstillinger -TrTab2.14=Videofiler motorere -TrTab2.15=Lydfiler motorere -TrTab2.16=Video Web Streaming motorere -TrTab2.17=Lyd Web Streaming motorere -TrTab2.18=Diverse motorere -TrTab2.19=Motoere i fed vil v\u00e6re f\u00f8rste prioritet. -TrTab2.20=og vil erstatte original Video -TrTab2.21=[AviSynth ikke unders\u00f8ttet] -TrTab2.27=DTS/FLAC -> LPCM remux (Du skal bruge en HDMI modtager for streaming LPCM 5.1 \! Gennemsnitlig Bitrate = 4.6Mbps) -TrTab2.28=Beholder DTS lyd i stream (kompatibel med optisk tilslutning) -> Forsigtig, mindre bitrate overbelastning ! -TrTab2.29=AC-3 Lyd bitrate (i Kbits/s) (eks.: 384, 576, 640): -TrTab2.32=MPEG-2 kvalitetsindstillinger: -TrTab2.39=Videon er automatisk indkodedet og muxed til en MPEG-PS / AC-3 audio (Meget kompatibelt p\u00e5 PS3) -TrTab2.40=\nDu kan arbejde med vqscale, vqmin og keyint parametre for at opn\u00e5 en god, selv n\u00e6sten tabsfri kodnings kvalitet. -TrTab2.41=\nUlempen ved dette er VBR bitrate, der undertiden kan toppe over din maks netkapacitet. -TrTab2.42=\nDerfor kan du ogs\u00e5 indstille b\u00e5ndbredden, hvis du er p\u00e5 WiFi, CPL, osv. Men kodnings kvaliteten -TrTab2.43=\ner en balance mellem netv\u00e6rk hastighed og CPU kraft: jo mere kvalitet, -TrTab2.44=\njo mere vil din CPU lide\! Ogs\u00e5, forventer ikke at kunne f\u00e5 1080p film i den reneste kvalitet med 15Mbps :p -TrTab2.50=Antal lyd kanaler: -TrTab2.51=Deaktiver undertekster -TracesTab.3=Fjern -TreeNodeSettings.4=Denne motor er ikke indl\u00e6st\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_de.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_de.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_de.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_de.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,234 +0,0 @@ -DLNAMediaDatabase.0=Aus Kompatibilit\u00e4tsgr\u00fcnden ist es erforderlich\ndie Mediensammlung neu einzulesen.\nEntschuldige bitte die Unannehmlichkeiten\! -FFMpegDVRMSRemux.0=Alternativer FFmpeg Pfad: -FFMpegDVRMSRemux.1=Einstellungen f\u00fcr DVR-MS remuxing -FFMpegVideo.0=Encoder Einstellungen nur f\u00fcr die AviSynth/FFmpeg-Engine (BEVORZUGE AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Freigabeoptionen -FoldTab.2=Scanne alle freigegebenen Ordner -FoldTab.3=Das Scannen aller freigegebenen Ordner kann sehr lange dauern\!\n -FoldTab.4=M\u00f6chtest du den Scan wirklich starten?\n\n -FoldTab.5=Verstecke Dateiendungen -FoldTab.6=Verstecke \#Video Settings\# Ordner -FoldTab.7=Freigegebene Ordner (Achtung, in der Standardeinstellung ist alles freigegeben\, bitte einschr\u00e4nken\!) -FoldTab.8=Verstecke Transcoding-Engine-Namen -FoldTab.9=Verzeichnis hinzuf\u00fcgen -FoldTab.10=M\u00f6chtest du den Scan abbrechen?\n\n -FoldTab.11=Erm\u00f6gliche die Video-Kopierfunktion auf der PS3 (Achtung\! Die transkodierten Dateien haben keine vorher feststellbare Dateigr\u00f6\u00dfe\!) -FoldTab.12=Sortiere die freigegebenen Ordner -FoldTab.13=Miniaturansichten -FoldTab.14=Benutze MPlayer f\u00fcr Video-Miniaturansicht -FoldTab.15=Alphabetisch (A-Z) -FoldTab.16=Nach Datum, neueste Dateien zuerst -FoldTab.17=Nach Datum, \u00e4lteste Dateien zuerst -FoldTab.18=Sortierreihenfolge: -FoldTab.19=DVD ISO Miniaturansicht -FoldTab.20=ASCIIbetical -FoldTab.21=Bilder Miniaturansicht -FoldTab.23=Download von amazon.com -FoldTab.24=Download von discogs.com -FoldTab.26=Darstellung von Miniaturansichten f\u00fcr Audio: -FoldTab.27=Alternativer Ordner f\u00fcr Video cover art -FoldTab.28=W\u00e4hle einen Ordner -FoldTab.29=Zeige iPhoto Sammlung -FoldTab.30=Zeige iTunes Sammlung -FoldTab.31=Verstecke Ordner ohne Medien (langsam\!) -FoldTab.32=Verstecke Mediensammlung-Ordner -FoldTab.33=Verstecke \#Transcode\# Ordner -FoldTab.34=Zeige Aperture Sammlung -FontFileFilter.3=Truetype Schriftarten -LinksTab.5=Hilfreiche Links: -LooksFrame.5=Beenden -LooksFrame.6=Hauptmen\u00fc -LooksFrame.9=Speichern -LooksFrame.12=Server Neustart -LooksFrame.13=Der Server muss aufgrund einer Konfigurations\u00e4nderung neu gestartet werden -LooksFrame.18=Status -LooksFrame.19=Log -LooksFrame.20=Allgemeine Einstellungen -LooksFrame.21=Transkodierungseinstellungen -LooksFrame.22=Navigations-/Freigabeeinstellungen -LooksFrame.24=FAQ / Hilfe -LooksFrame.25=\u00dcber -MEncoderAviSynth.2=Video-Decoder Einstellungen (nur f\u00fcr AviSynth-Engine) -MEncoderAviSynth.3=Aktiviere den Wechsel der variablen Framerate zu einer konstanten Framerate mittels AviSynth (convertfps=true) -MEncoderVideo.0=\u00dcberspringe Deblocking-Filter Schleife f\u00fcr H.264. K\u00f6nnte Qualit\u00e4t vemindern. -MEncoderVideo.1=Video-/Audio-Decoder Einstellungen (nur f\u00fcr MEncoder-Engine) -MEncoderVideo.2=Audio/Video Synchronisation (alternative Methode) -MEncoderVideo.3=Benutze voreingestellte Codec Parameter (empfohlen\!) -MEncoderVideo.4=Erzwinge von FFmpeg analysierte Framerate -MEncoderVideo.5=Hier kannst du spezifische Optionen hinzuf\u00fcgen, z.B. einen denoise Filter: -vf hqdn3d -MEncoderVideo.6=Benutzerdefinierte Optionen: -MEncoderVideo.7=Audio Sprach-Priorit\u00e4t (Beispiel: ger,eng): -MEncoderVideo.8=Untertiteleinstellungen -MEncoderVideo.9=Untertitel Sprachpriorit\u00e4t (Beispiel: ger,eng): -MEncoderVideo.10=Audio/Untertitel Sprachpriorit\u00e4t (Beispiel: de,off;en,de) -MEncoderVideo.11=Untertitel Codepage (Beispiel: cp1252): -MEncoderVideo.12=ASS Schriftart Einstellungen: Schriftart Skalierung -MEncoderVideo.13=Schriftart outline -MEncoderVideo.14=Schriftart shadow -MEncoderVideo.15=Schriftart sub margin -MEncoderVideo.16=Voreingestellte Schriftart Einstellungen: Schriftart Skalierung -MEncoderVideo.17=Schriftart outline -MEncoderVideo.18=Schriftart blur -MEncoderVideo.19=Schriftart sub margin -MEncoderVideo.20=ASS/SSA Untertitel -MEncoderVideo.21=Fontconfig/eingebettete Schriftarten -MEncoderVideo.22=Lade *.srt/*.sub Untertitel automatisch beim selben Dateinamen -MEncoderVideo.23=FriBiDi mode -MEncoderVideo.24=Spezifische TrueType Schriftart (f\u00fcr asiatische Sprachen): -MEncoderVideo.25=W\u00e4hle eine TrueType Schriftart -MEncoderVideo.26=Deinterlace Filter (Vollbilder statt Zeilensprung) -MEncoderVideo.27=Benutze Video Skalierungsfunktion -MEncoderVideo.28=Breite -MEncoderVideo.29=Experteneinstellungen : Codec spezifische Parameter -MEncoderVideo.30=H\u00f6he -MEncoderVideo.31=Farbe der Untertitel -MEncoderVideo.32=Remux wenn AudioTrack AC-3 ist (kein reencode) -MEncoderVideo.33=Benutzerdefinierte Parameter: -MEncoderVideo.34=Bearbeite Codec spezifische Parameter -MEncoderVideo.35=Verwende Multicore Unterst\u00fctzung -MEncoderVideo.36=Benutze ASS Standard-Stil -MEncoderVideo.37=Alternativer Ordner f\u00fcr Untertitel -MEncoderVideo.38=Schalte auf tsMuxeR wenn ein h264-Video PS3-kompatibel ist (AVC Level <= 4.1) und keine Untertitel angezeigt werden m\u00fcssen\n[unterst\u00fctzte Container: TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.39=Remux DVD ISO video track (kein reencode) -MEncoderVideo.68=\#Hier kannst du spezifische Parameter f\u00fcr einige Codec Kombinationen eintragen.\n -MEncoderVideo.69=\#Wird haupts\u00e4chlich f\u00fcr Audio/Video-Synchronisationsfehler benutzt, aber kann auch f\u00fcr alles andere benutzt werden\n -MEncoderVideo.70=\#Betrachte es als Experteneinstellungen, weil es nicht benutzt werden sollte wenn du nicht genau weisst was du tust\n -MEncoderVideo.71=\#Syntax ist {java condition} :: {MEncoder options} ; Du kannst verschiedene Optionen anh\u00e4ufen\n -MEncoderVideo.72=\#erlaubte Tokens: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Achtung, jede falsch geschriebene Zeile wird gel\u00f6scht\n -MEncoderVideo.75=\#Spezielle Optionen:\n -MEncoderVideo.76=\# -noass: Schalte ASS/SSA Untertitel definitiv ab, da sie die A/V-Synchronisation st\u00f6ren k\u00f6nnen\n -MEncoderVideo.77=\# -nosync: Schalte die alternative A/V-Synchronisationsmethode unter dieser Bedingung definitiv ab (-mc macht das gleiche)\n -MEncoderVideo.78=\# -quality: \u00dcberschreibt Video-Qualit\u00e4tseinstellungen\n -MEncoderVideo.79=\# -mt: Erzwingt die Benutzung des Multithread MEncoder Build (experimentell, k\u00f6nnte instabil sein)\n -MEncoderVideo.80=\#Diese Liste verbessert sich mit der Zeit: Verbesserungen/Feedback zu verschiedenen Codecs/Dateien sind immer willkommen\n -MEncoderVideo.87=\#Nun kannst du eigene Bedingungen/Optionen eingeben\! Hier sind ein paar Beispiele: Um z. B. den Multithread build des MEncoder zu aktivieren\n -MEncoderVideo.88=\#f\u00fcr jeglichen H.264 HD-Inhalt (redundant zu den Haupteinstellungen): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#Zum Entfernen des 24p-Ruckelns auf einem 50hz-TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#Zum Remuxen falls das Video MPEG-2 und ohne Untertitel ist: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=Qualit\u00e4t der DDVD-/VOB-Untertitel (0-4) (je gr\u00f6\u00dfer, desto besser) -MEncoderVideo.93=F\u00fcge Rahmen hinzu um Overscan zu kompensieren: -MEncoderVideo.126=ger,jpn,eng,und -MEncoderVideo.127=ger,jpn,eng,und -MEncoderVideo.128=*,* -NetworkTab.0=Sprache [erfordert Neustart von PMS]: -NetworkTab.1=Archiv-Dateien durchsuchen (.rar/.zip/.cbr) -NetworkTab.2=Miniaturansicht-Erstellung -NetworkTab.3=Minimiert starten -NetworkTab.4=Als Windows-Dienst installieren -NetworkTab.5=Allgemeine Einstellungen -NetworkTab.6=Maximale Gr\u00f6\u00dfe des Transcode Puffers in Megabyte (maximum: MAX_BUFFER_SIZE): -NetworkTab.7=Anzahl der Kerne, die f\u00fcr das Transkodieren benutzt werden (deine CPU hat scheinbar %d): -NetworkTab.8=Suche nach Updates -NetworkTab.9=Automatisch suchen -NetworkTab.11=Du hast den Windows Service installiert. Um ihn zu benutzen musst du diese Anwendung schlie\u00dfen,\n -NetworkTab.12=dann den Dienst in der Computerverwaltung starten (und konfigurieren).\n\n -NetworkTab.13=Die Mediensammlung wird nochmals initialisiert\!\n -NetworkTab.14=Fehler beim Installieren des Windows Services\!\n -NetworkTab.15=Navigations/Analyse-Einstellungen -NetworkTab.16=Miniaturansicht-Suchposition (Sekunden): -NetworkTab.17=Aktiviere die Mediensammlung -NetworkTab.18=Neuinitialisierung der Mediensammlung -NetworkTab.19=Bist du sicher? -NetworkTab.20=Erzwinge die Benutzung der folgenden Netzwerkschnittstelle: -NetworkTab.22=Netzwerkeinstellungen (nur bei Problemen \u00e4ndern\!) -NetworkTab.23=Erzwinge IP-Adresse des Servers: -NetworkTab.24=Erzwinge Port des Servers (Standard ist 5001): -NetworkTab.25=PS3 Einstellungen -NetworkTab.26=Zeichenkodierung deiner PS3-Dateinamen (siehe XMB->System-Einstellungen->Zeichensatz): -NetworkTab.27=Unbenutzte Einstellungen, die du nicht benutzen solltest :p -NetworkTab.28=Turbo-Modus (aktiviere tcp_nodelay) / sei vorsichtig, bin nicht sicher ob es in Ordnung ist das zu tun -NetworkTab.29=Blockiere eingehende Anfragen f\u00fcr die selbe Datei von der Ps3 wenn das Transcodieren bereits angefangen hat -NetworkTab.30=Benutze einen IP-Filter: -NetworkTab.31=Erweiterte HTTP- und Systemeinstellungen -NetworkTab.32=HTTP Engine V2 -NetworkTab.33=Energiesparmodus w\u00e4hrend des Streamens abschalten -NetworkTab.34=Plugins -NetworkTab.35=Maximale Bandbreite in Mb/s (0 bedeutet keine Einschr\u00e4nkung): -PMS.0=PS3 wurde nicht gefunden. Ist sie eingeschaltet? Pr\u00fcfe die Meldungen im Karteireiter "Log", die Netzwerkkonfiguration und die debug.log-Datei -PMS.1=Audio -PMS.2=\#- Mediensammlung -\# -PMS.3=Audio/Video-Synchronisation (alternative Methode) -PMS.4=Deinterlace (Zeilenentflechtung) Filter -PMS.5=PS3 wurde gefunden\! -PMS.6=.srt/.sub Untertitel automatisch laden -PMS.7=SkipLoopFilter f\u00fcr H.264-Decoding [K\u00d6NNTE QUALIT\u00c4T VERMINDERN] -PMS.8=Untertitel -PMS.9=Alle Audio-Playlists -PMS.10=Definitiv Untertitel deaktivieren -PMS.11=Alle Audio Tracks -PMS.12=Nach Datum -PMS.13=Nach K\u00fcnstler -PMS.14=Standard H.264 Remux mit MEncoder -PMS.16=Nach Album -PMS.17=Unbekannter DLNA Client -PMS.19=Nach Genre -PMS.21=Nach Kamera Modell -PMS.22=Nach K\u00fcnstler/Album -PMS.25=Nach ISO Einstellungen -PMS.26=Nach Genre/K\u00fcnstler/Album -PMS.27=Konfiguration sichern -PMS.31=Foto -PMS.32=Alle Fotos -PMS.34=Video -PMS.35=Alle Videos -PMS.36=HD-Videos -PMS.37=\#- Video Einstellungen -\# -PMS.39=SD-Videos -PMS.41=(Neu-)Installation Win32-Dienst -PMS.130=Suche nach Ger\u00e4ten... -ProfileChooser.1=PS3 Media Server Profilauswahl -ProfileChooser.2=Ausw\u00e4hlen -ProfileChooser.3=Profile-Datei (.conf) oder Verzeichnis -StatusTab.2=Status -StatusTab.3=Warten... -StatusTab.5=Leer -StatusTab.6=Status des Transkodierungspuffers: -StatusTab.7=I/O-Statistiken: -StatusTab.8=Aktuelle Bitrate: -StatusTab.9=Erkannte Streaming-Clients (media renderer) -StatusTab.10=Max. Bitrate: -TSMuxerVideo.0=Erzwinge AC-3-remuxing f\u00fcr alle Audiospuren -TSMuxerVideo.1=Erzwinge LPCM-remuxing f\u00fcr DTS/FLAC-Audio (Vorsicht, die Suchfunktion l\u00e4uft noch nicht\!) -TSMuxerVideo.2=Erzwinge die von FFmpeg in der meta-Datei analysierten FPS -TSMuxerVideo.3=Videodecoder-Einstellungen (nur f\u00fcr TsMuxer-Engine) -TSMuxerVideo.19=Muxe alle Audiospuren -TrTab2.0=Aktiviere/Deaktiviere eine Transkodierungs-Engine -TrTab2.1=Noch keine Einstellungen -TrTab2.2=Videoencoder-Einstellungen mit den folgenden Engines: MEncoder/AviSynth/FFmpeg -TrTab2.3=Audio Einstellungen, g\u00fcltig f\u00fcr folgende Decoder: MEncoder/AviSynth/FFmpeg/TsMuxer -TrTab2.4=Video Qualit\u00e4tseinstellungen -TrTab2.5=Allgemeine Transkodierungseinstellungen -TrTab2.6=Sortiere die Liste der Transkodierungs-Engines. Die Erste wird im originalen Video-Ordner angezeigt -TrTab2.7=Sonst. Optionen -TrTab2.8=Kein Transkodieren f\u00fcr folgende Dateitypen (Komma getrennte Liste): -TrTab2.9=Erzwinge das Transkodieren f\u00fcr folgende Dateitypen (Komma getrennte Liste): -TrTab2.10=Erm\u00f6glicht es DTS direkt zum Receiver zu streamen.\nSei vorsichtig, es ist m\u00f6glich einen Brummton zu h\u00f6ren. Hier ein paar Ratschl\u00e4ge:\n- Du ben\u00f6tigst einen DTS-kompatiblen Receiver der per TOSLINK ooder HDMI angeschlossen ist.\n-Das Laust\u00e4rkesymbol am XMB muss auf 'Normal' stehen.\n- Das Kanalsymbol am XMB muss auf 'Links+Rechts' stehen.\n -TrTab2.11=Engines -TrTab2.12=Allgemeine Decodereinstellungen -TrTab2.13=Allgemeine Encodereinstellungen -TrTab2.14=Videodateien-Engines -TrTab2.15=Audiodateien-Engines -TrTab2.16=Video/Webstreaming-Engines -TrTab2.17=Audio/Webstreaming-Engines -TrTab2.18=Sonst. Engines -TrTab2.19=Engine in fett wird die prim\u00e4re sein -TrTab2.20=und wird das originale Video ersetzen -TrTab2.21=[AviSynth nicht unterst\u00fctzt] -TrTab2.22=Automatisches Audio Resampling von 44.1 oder 48 kHz -TrTab2.27=DTS/FLAC -> LPCM remux (Du brauchst einen HDMI Receiver um LPCM 5.1 zu streamen\! Durchschnittliche Bitrate = 4.6Mbps) -TrTab2.28=Behalte DTS audio im Stream (Kompatibel mit opt. Ausgang / Toslink) -> Vorsicht, leichter Bitrate Overhead\! -TrTab2.29=AC-3 Audio Bitrate (in Kbits/s) (Bsp: 384, 576, 640): -TrTab2.32=MPEG-2 Qualit\u00e4tseinstellungen: -TrTab2.39=Das Video wird automatisch nach MPEG-PS / AC-3 Audio transkodiert und gemuxt (kompatibel zur PS3) -TrTab2.40=\nDu kannst mit den vqscale, vqmin und keyint Parametern experimentieren um gute, sogar fast verlustfreie Transkodierungsqualit\u00e4t zu erzielen. -TrTab2.41=\nDer Nachteil ist, dass die variable Bitrate (VBR) bei komplexen Szenen deine maximale Netzwerkkapazit\u00e4t \u00fcbersteigen kann. -TrTab2.42=\nDarum kannst du auch die max. Bandbreite angeben wenn du WLAN, DLAN, etc. benutzt. Die Transkodierungsqualit\u00e4t -TrTab2.43=\nist aber die Balance zwischen Netzwerkgeschwindigkeit und CPU-Leistung: Je mehr Qualit\u00e4t du in eine erzwungene Bitrate steckst, -TrTab2.44=\ndesto mehr leidet die CPU darunter\! Erwarte deshalb nicht, dass du einen 1080p-Actionfilm in schlechtester Qualit\u00e4t in 15Mbps unterbringen kannst :p -TrTab2.50=Anzahl der Audiokan\u00e4le: -TrTab2.51=Schalte Untertitel definitiv ab -TrTab2.52=Chapters \#Transcode\#-Ordner Unterst\u00fctzung / Intervall in Minuten: -TracesTab.3=Leeren -TreeNodeSettings.4=Diese Engine ist nicht geladen\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_el.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_el.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_el.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_el.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,180 +0,0 @@ -FFMpegDVRMSRemux.0=\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03b4\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae FFmpeg: -FFMpegDVRMSRemux.1=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 DVR-MS remuxing -FFMpegVideo.0=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c4\u03bf\u03c5 Encoder \u03bc\u03cc\u03bd\u03bf \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae AviSynth/FFmpeg (PREFER AVISYNTH/MENCODER) -FoldTab.0=<\u038c\u03bb\u03b5\u03c2 \u03bf\u03b9 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ad\u03c2> -FoldTab.1=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u039a\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03c9\u03bd \u03c6\u03b1\u03ba\u03ad\u03bb\u03c9\u03bd -FoldTab.2=\u0388\u03c1\u03b5\u03c5\u03bd\u03b1 \u03c3\u03b5 \u03cc\u03bb\u03bf\u03c5\u03c2 \u03c4\u03bf\u03c5\u03c2 \u03ba\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03bf\u03c5\u03c2 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5\u03c2 -FoldTab.3=\u0397 \u0388\u03c1\u03b5\u03c5\u03bd\u03b1 \u03c3\u03b5 \u03cc\u03bb\u03bf\u03c5\u03c2 \u03c4\u03bf\u03c5\u03c2 \u03ba\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03bf\u03c5\u03c2 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5\u03c2 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03b4\u03b9\u03b1\u03c1\u03ba\u03ad\u03c3\u03b5\u03b9 \u03c0\u03bf\u03bb\u03bb\u03ae \u03ce\u03c1\u03b1 \!\n -FoldTab.4=\u0395\u03af\u03c3\u03c4\u03b5 \u03c3\u03af\u03b3\u03bf\u03c5\u03c1\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03ba\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u0388\u03c1\u03b5\u03c5\u03bd\u03b1;\n\n -FoldTab.5=\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03b1\u03c4\u03b1\u03bb\u03ae\u03be\u03b5\u03c9\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd -FoldTab.6=\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5 \#Video Settings\# -FoldTab.7=\u039a\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03bf\u03b9 \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf\u03b9 -FoldTab.8=\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03bf\u03bd\u03bf\u03bc\u03ac\u03c4\u03c9\u03bd \u03bc\u03b7\u03c7\u03b1\u03bd\u03ce\u03bd transcoding -FoldTab.9=\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5 -FoldTab.10=\u039d\u03b1 \u03b1\u03ba\u03c5\u03c1\u03c9\u03b8\u03b5\u03af \u03b7 \u03ad\u03c1\u03b5\u03c5\u03bd\u03b1;\n\n -FoldTab.11=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b1\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd \u03c3\u03c4\u03bf PS3 / \u03a0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae, \u03b7 \u03c0\u03bb\u03bf\u03ae\u03b3\u03b7\u03c3\u03b7 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03b9\u03bf \u03b1\u03c1\u03b3\u03ae -FoldTab.12=\u03a4\u03b1\u03be\u03b9\u03bd\u03cc\u03bc\u03b7\u03c3\u03b7 \u03ba\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03c9\u03bd \u03c6\u03b1\u03ba\u03ad\u03bb\u03c9\u03bd -FontFileFilter.3=\u0393\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ad\u03c2 Truetype -LinksTab.5=\u03a7\u03c1\u03ae\u03c3\u03b9\u03bc\u03bf\u03b9 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03b9: -LooksFrame.5=\u0388\u03be\u03bf\u03b4\u03bf\u03c2 -LooksFrame.6=\u039a\u03b5\u03bd\u03c4\u03c1\u03b9\u03ba\u03cc\u03c2 \u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 -LooksFrame.9=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 -LooksFrame.12=\u0395\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b5\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae -LooksFrame.18=\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 -LooksFrame.19=\u0399\u03c3\u03c4\u03bf\u03c1\u03b9\u03ba\u03cc -LooksFrame.20=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 -LooksFrame.21=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 Transcoding -LooksFrame.22=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03a0\u03bb\u03bf\u03ae\u03b3\u03b7\u03c3\u03b7\u03c2/\u0394\u03b9\u03b1\u03bc\u03bf\u03b9\u03c1\u03b1\u03c3\u03bc\u03bf\u03cd -LooksFrame.24=\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1 -LooksFrame.25=\u03a0\u03b5\u03c1\u03af -MEncoderAviSynth.2=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 Video decoder \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae AviSynth \u03bc\u03cc\u03bd\u03bf -MEncoderAviSynth.3=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03bf\u03c0\u03ae\u03c2 \u03bc\u03b5\u03c4\u03b1\u03b2\u03b1\u03bb\u03bb\u03cc\u03bc\u03b5\u03bd\u03bf\u03c5 framerate change \u03c3\u03b5 \u03c3\u03c4\u03b1\u03b8\u03b5\u03c1\u03cc framerate (convertfps=true) -MEncoderVideo.0=\u0391\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03b1\u03bd\u03b1\u03ba\u03cd\u03ba\u03bb\u03c9\u03c3\u03b7\u03c2 \u03c4\u03bf\u03c5 filter deblocking \u03b3\u03b9\u03b1 H.264. \u039c\u03a0\u039f\u03a1\u0395\u0399 \u039d\u0391 \u039c\u0395\u0399\u03a9\u03a3\u0395\u0399 \u03a4\u0397\u039d \u03a0\u039f\u0399\u039f\u03a4\u0397\u03a4\u0391 \u0395\u0399\u039a\u039f\u039d\u0391\u03a3 -MEncoderVideo.1=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 decoder \u0392\u03af\u03bd\u03c4\u03b5\u03bf/\u0389\u03c7\u03bf\u03c5 \u03bc\u03cc\u03bd\u03bf \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae MEncoder -MEncoderVideo.2=\u0395\u03bd\u03b1\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03bc\u03ad\u03b8\u03bf\u03b4\u03bf\u03c2 \u03c3\u03c5\u03bd\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03bf\u03cd A/V -MEncoderVideo.3=\u03a7\u03c1\u03ae\u03c3\u03b7 \u03c0\u03c1\u03bf\u03b5\u03c0\u03b9\u03bb\u03b5\u03b3\u03bc\u03ad\u03bd\u03c9\u03bd \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03c4\u03c9\u03bd codecs (\u03c3\u03c5\u03c3\u03c4\u03ae\u03bd\u03b5\u03c4\u03b1\u03b9\!) -MEncoderVideo.4=\u0395\u03be\u03b1\u03bd\u03b1\u03b3\u03ba\u03b1\u03c3\u03bc\u03cc\u03c2 framerate \u03c0\u03bf\u03c5 \u03b1\u03bd\u03b1\u03bb\u03cd\u03b8\u03b7\u03ba\u03b5 \u03b1\u03c0\u03cc \u03c4\u03bf FFmpeg -MEncoderVideo.5=\u0395\u03b4\u03ce \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03b5\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03cc\u03c0\u03c9\u03c2 \u03ad\u03bd\u03b1 \u03c6\u03af\u03bb\u03c4\u03c1\u03bf \u03bc\u03b5\u03af\u03c9\u03c3\u03b7\u03c2 \u03b8\u03bf\u03c1\u03cd\u03b2\u03bf\u03c5, \u03b3\u03b9\u03b1 \u03c0\u03b1\u03c1\u03ac\u03b4\u03b5\u03b9\u03b3\u03bc\u03b1: -vf hqdn3d -MEncoderVideo.6=\u0395\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2: -MEncoderVideo.7=\u03a0\u03c1\u03bf\u03c4\u03b1\u03b9\u03c1\u03b5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1 \u0393\u03bb\u03ce\u03c3\u03c3\u03b1\u03c2 \u03ae\u03c7\u03bf\u03c5: -MEncoderVideo.8=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03a5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd -MEncoderVideo.9=\u03a0\u03c1\u03bf\u03c4\u03b1\u03b9\u03c1\u03b5\u03cc\u03c4\u03b7\u03c4\u03b1 \u0393\u03bb\u03ce\u03c3\u03c3\u03b1\u03c2 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd: -MEncoderVideo.10=\u0393\u03bb\u03c9\u03c3\u03c3\u03b9\u03ba\u03ad\u03c2 \u03c0\u03c1\u03bf\u03c4\u03b5\u03c1\u03b1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u0389\u03c7\u03bf\u03c5/\u03a5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd (\u03c0\u03b1\u03c1\u03ac\u03b4\u03b5\u03b9\u03b3\u03bc\u03b1: en,off;eng,off) -MEncoderVideo.11=\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c3\u03b5\u03bb\u03af\u03b4\u03b1 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd: -MEncoderVideo.12=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd ASS: \u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 -MEncoderVideo.13=\u03a0\u03b5\u03c1\u03af\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 -MEncoderVideo.14=\u03a3\u03ba\u03af\u03b1\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 -MEncoderVideo.15=\u03a0\u03b5\u03c1\u03b9\u03b8\u03ce\u03c1\u03b9\u03bf \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd -MEncoderVideo.16=\u03a0\u03c1\u03bf\u03b5\u03c0\u03af\u03bb\u03b5\u03b3\u03bc\u03ad\u03bd\u03b5\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2: \u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 -MEncoderVideo.17=\u03a0\u03b5\u03c1\u03af\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 -MEncoderVideo.18=\u0398\u03ac\u03bc\u03c0\u03c9\u03bc\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 -MEncoderVideo.19=\u03a0\u03b5\u03c1\u03b9\u03b8\u03ce\u03c1\u03b9\u03bf \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd -MEncoderVideo.20=\u03a5\u03c0\u03cc\u03c4\u03b9\u03c4\u03bb\u03bf\u03b9 ASS/SSA -MEncoderVideo.21=Fontconfig/\u0395\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03bf\u03b9 \u03c5\u03c0\u03cc\u03c4\u03b9\u03c4\u03bb\u03bf\u03b9 -MEncoderVideo.22=\u0391\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b7 \u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 *.srt/*.sub \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd \u03bc\u03b5 \u03c4\u03bf \u03af\u03b4\u03b9\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1. -MEncoderVideo.24=\u039a\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 TrueType (\u03b3\u03b9\u03b1 \u0391\u03c3\u03b9\u03b1\u03c4\u03b9\u03ba\u03ad\u03c2 \u03b3\u03bb\u03ce\u03c3\u03c3\u03b5\u03c2): -MEncoderVideo.25=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac Truetype -MEncoderVideo.26=\u03a6\u03b9\u03bb\u03c4\u03c1\u03bf Deinterlace -MEncoderVideo.27=\u03a7\u03c1\u03ae\u03c3\u03b7 Video Scaler -MEncoderVideo.28=\u039c\u03ae\u03ba\u03bf\u03c2 -MEncoderVideo.29=\u0393\u03b9\u03b1 \u03c0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2 : \u03a0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03c9\u03bd Codecs -MEncoderVideo.30=\u038e\u03c8\u03bf\u03c2 -MEncoderVideo.32=Remux \u03cc\u03c4\u03b1\u03bd \u03bf \u03ae\u03c7\u03bf\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 AC-3 (\u03c7\u03c9\u03c1\u03af\u03c2 \u03b5\u03c0\u03b1\u03bd\u03b1\u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7) -MEncoderVideo.33=\u0395\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03c0\u03b1\u03c1\u03ac\u03bc\u03b5\u03c4\u03c1\u03bf\u03b9: -MEncoderVideo.34=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03b4\u03b9\u03ba\u03ce\u03bd \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03c4\u03c9\u03bd codecs -MEncoderVideo.35=\u0392\u03b5\u03bb\u03c4\u03b9\u03c9\u03bc\u03ad\u03bd\u03b7 \u03c5\u03c0\u03bf\u03c3\u03c4\u03ae\u03c1\u03b9\u03be\u03b7 \u03c0\u03bf\u03bb\u03c5\u03c0\u03cd\u03c1\u03b7\u03bd\u03c9\u03bd \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03ce\u03bd -MEncoderVideo.68=\#\u0395\u03b4\u03ce \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03b5\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03bf\u03c5\u03c2 \u03b3\u03b9\u03b1 \u03ba\u03ac\u03c0\u03bf\u03b9\u03bf\u03c5\u03c2 \u03c3\u03c5\u03bd\u03b4\u03c5\u03b1\u03c3\u03bc\u03bf\u03cd\u03c2 codecs.\n -MEncoderVideo.69=\#\u0391\u03c6\u03bf\u03c1\u03ac \u03ba\u03c5\u03c1\u03af\u03c9\u03c2 \u03c4\u03b1 \u03c0\u03c1\u03bf\u03b2\u03bb\u03ae\u03bc\u03b1\u03c4\u03b1 \u03c3\u03c5\u03b3\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03bf\u03cd \u0395\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2/\u0389\u03c7\u03bf\u03c5, \u03b1\u03bb\u03bb\u03ac \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af \u03ba\u03b1\u03b9 \u03b1\u03bb\u03bb\u03bf\u03cd\n -MEncoderVideo.70=\#\u03a0\u03c1\u03bf\u03ba\u03b5\u03b9\u03c4\u03b1\u03af \u03b3\u03b9\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03b3\u03b9\u03b1 \u03c0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2 \u03ba\u03b1\u03b9 \u03b4\u03b5\u03bd \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03bf\u03cd\u03bd \u03b1\u03bd \u03b4\u03b5\u03bd \u03be\u03ad\u03c1\u03b5\u03c4\u03b5 \u03c4\u03b9 \u03b1\u03ba\u03c1\u03b9\u03b2\u03ce\u03c2 \u03ba\u03ac\u03bd\u03b5\u03c4\u03b5\n -MEncoderVideo.71=\#\u0397 \u03c3\u03cd\u03bd\u03c4\u03b1\u03be\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 {\u03c0\u03c1\u03bf\u03cb\u03c0\u03cc\u03b8\u03b5\u03c3\u03b7 java} :: {\u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 MEncoder} ; \u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c0\u03bf\u03bb\u03bb\u03ad\u03c2 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2\n -MEncoderVideo.72=\#\u0395\u03c0\u03b9\u03c4\u03c1\u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03b1 Tokens: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#\u03a0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae, \u03b1\u03bd \u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03bc\u03c0\u03b5\u03c1\u03b9\u03ad\u03c7\u03b5\u03b9 \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1, \u03b8\u03b1 \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03b5\u03af\n -MEncoderVideo.75=\#\u0395\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2:\n -MEncoderVideo.76=\# -noass: \u03b2\u03ad\u03b2\u03b1\u03b9\u03b7 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd ASS/SSA \u03ba\u03b1\u03b8\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03b9\u03b8\u03b1\u03bd\u03cc\u03bd \u03bd\u03b1 \u03b5\u03c0\u03b7\u03c1\u03b5\u03ac\u03c3\u03bf\u03c5\u03bd \u03c4\u03bf \u03c3\u03c5\u03b3\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03cc \u0395\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2/\u0389\u03c7\u03bf\u03c5\n -MEncoderVideo.77=\# -nosync: \u03b2\u03ad\u03b2\u03b1\u03b9\u03b7 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae\u03c2 \u03bc\u03b5\u03b8\u03cc\u03b4\u03bf\u03c5 \u03c3\u03c5\u03b3\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03bf\u03cd \u0395\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2/\u0389\u03c7\u03bf\u03c5 \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03ae\u03bd \u03c4\u03b7\u03bd \u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 (-mc \u03ad\u03c7\u03b5\u03b9 \u03af\u03b4\u03b9\u03bf \u03b1\u03c0\u03bf\u03c4\u03ad\u03bb\u03b5\u03c3\u03bc\u03b1)\n -MEncoderVideo.78=\# -quality: \u03c0\u03b1\u03c1\u03ac\u03ba\u03b1\u03bc\u03c8\u03b7 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c9\u03bd \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2\n -MEncoderVideo.79=\# -mt: \u03a5\u03c0\u03bf\u03c7\u03c1\u03b5\u03c9\u03c4\u03b9\u03ba\u03ae \u03c7\u03c1\u03ae\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03c0\u03bf\u03bb\u03c5\u03c0\u03cd\u03c1\u03b7\u03bd\u03bf\u03c5 MEncoder (\u03c0\u03b5\u03b9\u03c1\u03b1\u03bc\u03b1\u03c4\u03b9\u03ba\u03ae \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1, \u03af\u03c3\u03c9\u03c2 \u03b1\u03c3\u03c4\u03b1\u03b8\u03ae\u03c2)\n -MEncoderVideo.80=\#\u0391\u03c5\u03c4\u03ae \u03b7 \u03bb\u03af\u03c3\u03c4\u03b1 \u03b8\u03b1 \u03b2\u03b5\u03bb\u03c4\u03b9\u03c9\u03b8\u03b5\u03af \u03b5\u03bd \u03ba\u03b1\u03b9\u03c1\u03ce: \u03b2\u03b5\u03bb\u03c4\u03b9\u03ce\u03c3\u03b5\u03b9\u03c2/\u03b1\u03c0\u03b1\u03bd\u03c4\u03ae\u03c3\u03b5\u03b9\u03c2 \u03cc\u03c3\u03bf\u03bd \u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b7\u03bd \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03c4\u03c9\u03bd codecs \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03ac\u03bd\u03c4\u03b1 \u03b1\u03c0\u03bf\u03b4\u03b5\u03ba\u03c4\u03ad\u03c2\n -MEncoderVideo.87=\#\u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03c4\u03ce\u03c1\u03b1 \u03bd\u03b1 \u03b5\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b1\u03b9 \u03c4\u03b9\u03c2 \u03b4\u03b9\u03ba\u03ad\u03c2 \u03c3\u03b1\u03c2 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03b8\u03ad\u03c3\u03b5\u03b9\u03c2 \! \u03a0\u03b1\u03c1\u03b1\u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03b1: \u03c0.\u03c7, \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03c0\u03bf\u03bb\u03c5\u03c0\u03cd\u03c1\u03b7\u03bd\u03bf\u03c5 MEncoder\n -MEncoderVideo.88=\#\u03b3\u03b9\u03b1 \u03bf\u03c0\u03bf\u03b9\u03bf\u03b4\u03ae\u03c0\u03bf\u03c4\u03b5 H.264 HD \u03bc\u03ad\u03c3\u03bf (\u03c0\u03bb\u03b5\u03bf\u03bd\u03b1\u03c3\u03bc\u03cc\u03c2 \u03b5\u03c6\u03cc\u03c3\u03bf\u03bd \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03b5\u03af \u03b7 \u03ba\u03cd\u03c1\u03b9\u03b1 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#\u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03b1\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c4\u03c1\u03b5\u03bc\u03ac\u03bc\u03b5\u03bd\u03b7\u03c2 24p \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03c3\u03b5 50Hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#\u03b3\u03b9\u03b1 remux \u03cc\u03c4\u03b1\u03bd \u03c4\u03bf \u03b2\u03af\u03bd\u03c4\u03b5\u03bf \u03b5\u03af\u03bd\u03b1\u03b9 MPEG-2 \u03ba\u03b1\u03b9 \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd \u03c5\u03c0\u03cc\u03c4\u03b9\u03c4\u03bb\u03bf\u03b9: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=\u0393\u03bb\u03ce\u03c3\u03c3\u03b1 [\u03b5\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 PMS \u03b1\u03c0\u03b1\u03c1\u03b1\u03af\u03c4\u03b7\u03c4\u03b7]: -NetworkTab.1=\u03a5\u03c0\u03bf\u03c3\u03c4\u03ae\u03c1\u03b9\u03be\u03b7 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd .RAR/.ZIP/.CBR -NetworkTab.2=\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03cc\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03c0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7\u03c2 -NetworkTab.3=\u0395\u03bd\u03b1\u03c1\u03be\u03b7 \u03b5\u03bb\u03b1\u03c7\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf -NetworkTab.4=\u0395\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c9\u03c2 \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 Windows -NetworkTab.5=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 -NetworkTab.6=\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03b7 \u03c0\u03c1\u03bf\u03c3\u03c9\u03c1\u03b9\u03bd\u03ae \u03bc\u03bd\u03ae\u03bc\u03b7 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2, \u03c3\u03b5 megabytes (\u03bc\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf: MAX_BUFFER_SIZE): -NetworkTab.7=\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03c0\u03c5\u03c1\u03b7\u03bd\u03ce\u03bd \u03b3\u03b9\u03b1 \u03c7\u03c1\u03ae\u03c3\u03b7 \u03ba\u03b1\u03c4\u03ac \u03c4\u03b7\u03bd \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 (\u03a4\u03bf \u03c3\u03cd\u03c3\u03c4\u03b7\u03bc\u03b1 \u03c3\u03b1\u03c2 \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9 %d): -NetworkTab.9=English -NetworkTab.11=\u0388\u03c7\u03b5\u03c4\u03b5 \u03b5\u03b3\u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03ae\u03c3\u03b5\u03b9 \u03c4\u03b7\u03bd \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 Windows \u03c4\u03bf\u03c5 PMS \! \u0393\u03b9\u03b1 \u03bd\u03b1 \u03c4\u03b7 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5, \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03ba\u03bb\u03b5\u03af\u03c3\u03b5\u03c4\u03b5 \u03c4\u03ce\u03c1\u03b1 \u03b1\u03c5\u03c4\u03ae\u03bd \u03c4\u03b7\u03bd \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae,\n -NetworkTab.12=\u03ba\u03b1\u03b9 \u03bd\u03b1 \u03b5\u03ba\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03c4\u03b5 (\u03ba\u03b1\u03b9 \u03bd\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5) \u03c4\u03b7\u03bd \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 \u03b1\u03c0\u03cc \u03c4\u03bf\u03bd \u03a0\u03af\u03bd\u03b1\u03ba\u03b1 \u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03b9\u03ce\u03bd \u0394\u03b9\u03b1\u03c7\u03b5\u03af\u03c1\u03b9\u03c3\u03b7\u03c2 \u03c4\u03c9\u03bd Windows.\n\n -NetworkTab.13=\u0397 \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7 \u03a0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd \u03b8\u03b1 \u03b5\u03c0\u03b1\u03bd\u03b1\u03c1\u03c7\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af \!\n -NetworkTab.14=\u03a3\u03c6\u03ac\u03bb\u03bc\u03b1 \u03ba\u03b1\u03c4\u03ac \u03c4\u03b7\u03bd \u03b5\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c4\u03b7\u03c2 \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1\u03c2 Windows\!\n -NetworkTab.15=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 \u03a0\u03bb\u03bf\u03ae\u03b3\u03b7\u03c3\u03b7\u03c2/\u0391\u03bd\u03ac\u03bb\u03c5\u03c3\u03b7\u03c2 -NetworkTab.16=\u0394\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf \u03b1\u03c0\u03bf\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03c0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7\u03c2(\u03b2\u03af\u03bd\u03c4\u03b5\u03bf): -NetworkTab.17=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03b7\u03c2 \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7\u03c2 \u03a0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd -NetworkTab.18=\u039d\u03ad\u03b1 \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7 \u03a0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd -NetworkTab.19=\u0395\u03af\u03c3\u03c4\u03b5 \u03c3\u03af\u03b3\u03bf\u03c5\u03c1\u03bf\u03b9; (\u03b7 \u03c0\u03b1\u03bb\u03b9\u03ac \u03b8\u03b1 \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03b5\u03af) -NetworkTab.20=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 \u03b4\u03b9\u03b1\u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03b1\u03c0\u03cc \u03c4\u03bf\u03bd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5: -NetworkTab.22=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u0394\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5, \u03b1\u03bb\u03bb\u03ac\u03be\u03c4\u03b5 \u03bc\u03cc\u03bd\u03bf \u03b5\u03ac\u03bd \u03b1\u03bd\u03c4\u03b9\u03bc\u03b5\u03c4\u03c9\u03c0\u03af\u03b6\u03b5\u03c4\u03b5 \u03c0\u03c1\u03cc\u03b2\u03bb\u03b7\u03bc\u03b1 -NetworkTab.23=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 IP \u0395\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae: -NetworkTab.24=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 \u03c0\u03cc\u03c1\u03c4\u03b1\u03c2 \u0395\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae (5001 \u03b1\u03c0\u03cc \u03c0\u03c1\u03bf\u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae): -NetworkTab.25=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 PS3 -NetworkTab.26=\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03c9\u03bd \u03b3\u03b9\u03b1 \u03c4\u03b1 \u03bf\u03bd\u03cc\u03bc\u03b1\u03c4\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd \u03c3\u03c4\u03bf PS3 (\u03b4\u03b5\u03af\u03c4\u03b5 XMB->System settings->Charset): -NetworkTab.27=\u0386\u03c7\u03c1\u03b7\u03c3\u03c4\u03b5\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bf\u03c5 \u03b4\u03b5\u03bd \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b1\u03b3\u03b3\u03af\u03be\u03b5\u03c4\u03b5 :p -NetworkTab.28=\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 Turbo (\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 tcp_nodelay) / \u03c0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae, \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03c3\u03af\u03b3\u03bf\u03c5\u03c1\u03bf \u03b1\u03bd \u03c3\u03c5\u03bd\u03af\u03c3\u03c4\u03b1\u03c4\u03b1\u03b9 \u03bd\u03b1 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af -NetworkTab.29=\u03a3\u03c4\u03b1\u03bc\u03ac\u03c4\u03b7\u03bc\u03b1 \u03b5\u03b9\u03c3\u03b5\u03c1\u03c7\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03b1\u03b9\u03c4\u03ae\u03c3\u03b5\u03c9\u03bd \u03b3\u03b9\u03b1 \u03c4\u03bf \u03af\u03b4\u03b9\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03cc\u03c4\u03b1\u03bd \u03b7 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03ad\u03c7\u03b5\u03b9 \u03b1\u03c1\u03c7\u03af\u03c3\u03b5\u03b9 -NetworkTab.35=\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf \u03b5\u03cd\u03c1\u03bf\u03c2 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5 \u03c3\u03b5 Mb/s (0 \u03c3\u03b7\u03bc\u03b1\u03af\u03bd\u03b5\u03b9 \u03c7\u03c9\u03c1\u03af\u03c2 \u03cc\u03c1\u03b9\u03bf): -PMS.0=\u0394\u03b5\u03bd \u03ad\u03c7\u03b5\u03b9 \u03b5\u03bd\u03c4\u03bf\u03c0\u03b9\u03c3\u03c4\u03b5\u03af \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1 PS3. \u03a4\u03b7\u03bd \u03ad\u03c7\u03b5\u03c4\u03b5 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03b9; \u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03b5\u03c0\u03af\u03c3\u03b7\u03c2 \u03bd\u03b1 \u03b5\u03bb\u03ad\u03b3\u03be\u03b5\u03c4\u03b5 \u03c4\u03bf \u0399\u03c3\u03c4\u03bf\u03c1\u03b9\u03ba\u03cc \u03ba\u03b1\u03b9/\u03ae \u03c4\u03b9\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c3\u03b1\u03c2, \u03ae \u03ba\u03b1\u03b9 \u03c4\u03bf debug.log file -PMS.1=\u0389\u03c7\u03bf\u03c2 -PMS.2=\#- \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7 \u03a0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd -\# -PMS.3=\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03bc\u03ad\u03b8\u03bf\u03b4\u03bf\u03c2 \u03c3\u03c5\u03b3\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03bf\u03cd \u0395/\u0397 -PMS.4=\u03a6\u03af\u03bb\u03c4\u03c1\u03bf Deinterlace -PMS.5=\u0395\u03bd\u03c4\u03bf\u03c0\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 PS3 \! -PMS.6=\u0391\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03bf \u03c6\u03cc\u03c1\u03c4\u03c9\u03bc\u03b1 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd .srt/.sub -PMS.7=SkipLoopFilter \u03b3\u03b9\u03b1 \u03b1\u03c0\u03bf\u03ba\u03bf\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 H.264 [\u039c\u03a0\u039f\u03a1\u0395\u0399 \u039d\u0391 \u039c\u0395\u0399\u03a9\u03a3\u0395\u0399 \u03a4\u0397\u039d \u03a0\u039f\u0399\u039f\u03a4\u0397\u03a4\u0391] -PMS.9=\u038c\u03bb\u03b5\u03c2 \u03bf\u03b9 \u03b7\u03c7\u03b7\u03c4\u03b9\u03ba\u03ad\u03c2 Playlist -PMS.11=\u038c\u03bb\u03b1 \u03c4\u03b1 \u0397\u03c7\u03b7\u03c4\u03b9\u03ba\u03ac \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9\u03b1 -PMS.12=\u039a\u03b1\u03c4\u03ac \u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1 -PMS.13=\u039a\u03b1\u03c4\u03ac \u039a\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7 -PMS.16=\u039a\u03b1\u03c4\u03ac \u0386\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc -PMS.19=\u039a\u03b1\u03c4\u03ac \u0395\u03af\u03b4\u03bf\u03c2 -PMS.21=\u039a\u03b1\u03c4\u03ac \u03bc\u03bf\u03bd\u03c4\u03ad\u03bb\u03bf \u03a8\u03b7\u03c6. \u039c\u03b7\u03c7\u03b1\u03bd\u03ae\u03c2 -PMS.22=\u039a\u03b1\u03c4\u03ac \u039a\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7/\u0386\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc -PMS.25=\u039a\u03b1\u03c4\u03ac \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 ISO -PMS.26=\u039a\u03b1\u03c4\u03ac \u0395\u03af\u03b4\u03bf\u03c2/\u039a\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7/\u0386\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc -PMS.31=\u03a6\u03c9\u03c4\u03bf\u03b3\u03c1\u03b1\u03c6\u03af\u03b5\u03c2 -PMS.32=\u038c\u03bb\u03b5\u03c2 \u03bf\u03b9 \u03a6\u03c9\u03c4\u03bf\u03b3\u03c1\u03b1\u03c6\u03af\u03b5\u03c2 -PMS.34=\u0392\u03af\u03bd\u03c4\u03b5\u03bf -PMS.35=\u038c\u03bb\u03b1 \u03c4\u03b1 \u0392\u03af\u03bd\u03c4\u03b5\u03bf -PMS.36=HD \u0392\u03af\u03bd\u03c4\u03b5\u03bf -PMS.37=\#- \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u0392\u03af\u03bd\u03c4\u03b5\u03bf -\# -PMS.39=SD \u0392\u03af\u03bd\u03c4\u03b5\u03bf -PMS.41=(\u0395\u03c0\u03b1\u03bd)\u03b5\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1\u03c2 Win32 -PMS.130=\u0395\u03bd\u03c4\u03bf\u03c0\u03b9\u03c3\u03bc\u03cc\u03c2 PS3... -StatusTab.2=\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 -StatusTab.3=\u0391\u03bd\u03b1\u03bc\u03bf\u03bd\u03ae... -StatusTab.5=\u0386\u03b4\u03b5\u03b9\u03bf -StatusTab.6=\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c3\u03c9\u03c1\u03b9\u03bd\u03ae\u03c2 \u03bc\u03bd\u03ae\u03bc\u03b7\u03c2 Transcoder: -StatusTab.7=\u03a3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac \u0395\u03b9\u03c3\u03cc\u03b4\u03bf\u03c5/\u0395\u03be\u03cc\u03b4\u03bf\u03c5: -StatusTab.8=\u03a0\u03b1\u03c1\u03ce\u03bd bitrate: -StatusTab.10=\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf Bitrate: -TSMuxerVideo.0=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 AC-3 remux \u03b3\u03b9\u03b1 \u03cc\u03bb\u03b1 \u03c4\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03b1 -TSMuxerVideo.1=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 PCM remux \u03bc\u03b5 \u03ae\u03c7\u03bf DTS/FLAC -TSMuxerVideo.2=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 framerate \u03c0\u03bf\u03c5 \u03b1\u03bd\u03b1\u03bb\u03cd\u03b8\u03b7\u03ba\u03b5 \u03b1\u03c0\u03bf FFmpeg \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf meta -TSMuxerVideo.3=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03b1\u03c0\u03bf\u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ae \u0392\u03af\u03bd\u03c4\u03b5\u03bf \u03b3\u03b9\u03b1 \u03c4\u03b7 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae TsMuxer \u03bc\u03cc\u03bd\u03bf -TrTab2.0=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7/\u0391\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae\u03c2 transcoding -TrTab2.1=\u0394\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 (\u03b1\u03ba\u03cc\u03bc\u03b1) -TrTab2.2=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ae \u0392\u03af\u03bd\u03c4\u03b5\u03bf \u03bc\u03b5 \u03c4\u03b9\u03c2 \u03b1\u03ba\u03cc\u03bb\u03bf\u03c5\u03b8\u03b5\u03c2 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2: MEncoder/AviSynth/FFmpeg -TrTab2.3=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03ae\u03c7\u03bf\u03c5, \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae \u03c3\u03c4\u03bf\u03c5\u03c2 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03b1\u03c0\u03bf\u03ba\u03bf\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ad\u03c2: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u0392\u03af\u03bd\u03c4\u03b5\u03bf -TrTab2.5=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 transcode -TrTab2.6=\u03a4\u03b1\u03be\u03b9\u03bd\u03cc\u03bc\u03b7\u03c3\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1\u03c2 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ce\u03bd transcoding. \u0397 \u03c0\u03c1\u03ce\u03c4\u03b7 \u03b8\u03b1 \u03b5\u03bc\u03c6\u03b1\u03bd\u03b9\u03c3\u03c4\u03b5\u03af \u03c3\u03c4\u03bf\u03bd \u03b1\u03c1\u03c7\u03b9\u03ba\u03cc \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf \u0392\u03af\u03bd\u03c4\u03b5\u03bf -TrTab2.7=\u0394\u03b9\u03ac\u03c6\u03bf\u03c1\u03b5\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 -TrTab2.8=\u039d\u03b1 \u03bc\u03b7\u03bd \u03b3\u03af\u03bd\u03b5\u03c4\u03b1\u03b9 transcode \u03b3\u03b9\u03b1 \u03c4\u03b9\u03c2 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2 (\u03c7\u03c9\u03c1\u03af\u03c3\u03c4\u03b5 \u03bc\u03b5 \u03ba\u03cc\u03bc\u03b1): -TrTab2.9=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 transcode \u03b3\u03b9\u03b1 \u03c4\u03b9\u03c2 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2 (\u03c7\u03c9\u03c1\u03af\u03c3\u03c4\u03b5 \u03bc\u03b5 \u03ba\u03cc\u03bc\u03b1): -TrTab2.11=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 -TrTab2.12=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03b1\u03c0\u03bf\u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ae -TrTab2.13=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ae -TrTab2.14=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd \u0392\u03af\u03bd\u03c4\u03b5\u03bf -TrTab2.15=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd \u0389\u03c7\u03bf\u03c5 -TrTab2.16=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 \u03b4\u03b9\u03b1\u03b4\u03b9\u03ba\u03c4\u03c5\u03b1\u03ba\u03ae\u03c2 \u03b1\u03bd\u03b1\u03bc\u03b5\u03c4\u03ac\u03b4\u03bf\u03c3\u03b7\u03c2 \u0392\u03af\u03bd\u03c4\u03b5\u03bf -TrTab2.17=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 \u03b4\u03b9\u03b1\u03b4\u03b9\u03ba\u03c4\u03c5\u03b1\u03ba\u03ae\u03c2 \u03b1\u03bd\u03b1\u03bc\u03b5\u03c4\u03ac\u03b4\u03bf\u03c3\u03b7\u03c2 \u0389\u03c7\u03bf\u03c5 -TrTab2.18=\u0394\u03b9\u03ac\u03c6\u03bf\u03c1\u03b5 \u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 -TrTab2.19=\u0397 \u039c\u03b7\u03c7\u03b1\u03bd\u03ae \u03bc\u03b5 Bold \u03ad\u03c7\u03b5\u03b9 \u03c0\u03c1\u03bf\u03c4\u03b1\u03b9\u03c1\u03b5\u03cc\u03c4\u03b7\u03c4\u03b1 -TrTab2.20=\u03ba\u03b1\u03b9 \u03b8\u03b1 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03ae\u03c3\u03b5\u03b9 \u03c4\u03bf \u03b1\u03c1\u03c7\u03b9\u03ba\u03cc \u0392\u03af\u03bd\u03c4\u03b5\u03bf -TrTab2.27=DTS/FLAC -> LPCM remux (\u0391\u03c0\u03b1\u03b9\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03b5\u03bd\u03b9\u03c3\u03c7\u03c5\u03c4\u03ae\u03c2 HDMI \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03b1\u03bd\u03b1\u03bc\u03b5\u03c4\u03ac\u03b4\u03bf\u03c3\u03b7 \u03ae\u03c7\u03bf\u03c5 PCM 5.1 \! \u039c\u03ad\u03c3\u03bf Bitrate = 4.6Mbps) -TrTab2.29=AC-3 bitrate \u03ae\u03c7\u03bf\u03c5 (\u03c3\u03b5 Kbits/s) (\u03c0\u03c7: 384, 576, 640): -TrTab2.32=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 MPEG-2: -TrTab2.39=\u03a4\u03bf \u0392\u03af\u03bd\u03c4\u03b5\u03bf \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9 \u03b1\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b1 \u03c3\u03b5 \u03bc\u03bf\u03c1\u03c6\u03ae MPEG-PS / AC-3 audio (\u03bc\u03b5 \u03c5\u03c8\u03b7\u03bb\u03ae \u03c3\u03c5\u03bc\u03b2\u03b1\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1 \u03bc\u03b5 \u03c4\u03bf PS3) -TrTab2.40=\n\u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03b1\u03af\u03be\u03b5\u03c4\u03b5 \u03bc\u03b5 \u03c4\u03b9\u03c2 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03bf\u03c5\u03c2 vqscale, vqmin and keyint parameters \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03c4\u03cd\u03c7\u03b5\u03c4\u03b5 \u03ba\u03b1\u03bb\u03ae, \u03b1\u03ba\u03bf\u03bc\u03b1 \u03ba\u03b1\u03b9 \u0391\u03c0\u03c9\u03bb\u03b5\u03c3\u03c4\u03b9\u03ba\u03ae \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1 \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03bf\u03c0\u03ae\u03c2. -TrTab2.41=\n\u039c\u03b5\u03b9\u03bf\u03bd\u03ad\u03ba\u03c4\u03b7\u03bc\u03b1 \u03b1\u03c5\u03c4\u03bf\u03cd \u03b5\u03af\u03bd\u03b1\u03b9 \u03cc\u03c4\u03b9 \u03c4\u03bf VBR bitrate \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03ba\u03ac\u03c0\u03bf\u03b9\u03b5\u03c2 \u03c6\u03bf\u03c1\u03ad\u03c2 \u03b1\u03bd \u03be\u03b5\u03c0\u03b5\u03c1\u03ac\u03c3\u03b5\u03b9 \u03c4\u03bf \u03c1\u03c5\u03b8\u03bc\u03cc \u03b4\u03b9\u03b1\u03bc\u03b5\u03c4\u03b1\u03b3\u03c9\u03b3\u03ae\u03c2 \u03c4\u03bf\u03c5 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5 \u03c3\u03b1\u03c2. -TrTab2.42=\n\u0393\u03b9\u03b1 \u03b1\u03c5\u03c4\u03cc \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5 \u03b5\u03c0\u03af\u03c3\u03b7\u03c2 \u03c4\u03bf \u03b5\u03cd\u03c1\u03bf\u03c2 \u03c4\u03bf\u03c5 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5 \u03c3\u03b1\u03c2 \u03b1\u03bd \u03b5\u03af\u03c3\u03c4\u03b5 \u03c3\u03b5 WiFi, CPL \u03ba\u03c4\u03bb. \u03a0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae \u03cc\u03bc\u03c9\u03c2, \u03b7 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1 \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03bf\u03c0\u03ae\u03c2 \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03bf\u03c0\u03ae\u03c2 -TrTab2.43=\n\u03b1\u03c0\u03bf\u03c4\u03b5\u03bb\u03ad\u03b9 \u03b9\u03c3\u03bf\u03c1\u03c1\u03bf\u03c0\u03af\u03b1 \u03bc\u03b5\u03c4\u03b1\u03be\u03cd \u03c4\u03b1\u03c7\u03cd\u03c4\u03b7\u03c4\u03b1\u03c2 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5 \u03ba\u03b1\u03b9 \u03b9\u03c3\u03c7\u03cd \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03ae: \u03cc\u03c3\u03bf \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b7 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1 \u03b2\u03ac\u03b6\u03bf\u03c5\u03bc\u03b5 \u03c3\u03b5 \u03c0\u03b5\u03c1\u03b9\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf bitrate, -TrTab2.44=\n\u03c4\u03cc\u03c3\u03bf \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03bf \u03b8\u03b1 \u03c5\u03c0\u03bf\u03c6\u03ad\u03c1\u03b5\u03b9 \u03bf \u03b5\u03c0\u03b5\u03be\u03ad\u03c1\u03b3\u03b1\u03c3\u03c4\u03ae\u03c2 \u03c3\u03b1\u03c2\! \u0395\u03c0\u03af\u03c3\u03b7\u03c2, \u03bc\u03b7\u03bd \u03c0\u03b5\u03c1\u03b9\u03bc\u03ad\u03bd\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c7\u03c9\u03c1\u03ad\u03c3\u03b5\u03c4\u03b5 \u03bc\u03b9\u03b1 1080p \u03c4\u03b1\u03b9\u03bd\u03af\u03b1 \u03b4\u03c1\u03ac\u03c3\u03b7\u03c2, \u03c3\u03c4\u03b7\u03bd \u03ba\u03b1\u03bb\u03c5\u03c4\u03b5\u03c1\u03b7 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1, \u03c3\u03b5 15Mbps :p -TrTab2.50=\u039a\u03b1\u03bd\u03ac\u03bb\u03b9\u03b1 \u03ae\u03c7\u03bf\u03c5: -TrTab2.51=\u0392\u03ad\u03b2\u03b1\u03b9\u03b7 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd -TracesTab.3=\u039a\u03b1\u03b8\u03ac\u03c1\u03b9\u03c3\u03bc\u03b1 -TreeNodeSettings.4=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae \u03b4\u03b5\u03bd \u03ad\u03c7\u03b5\u03b9 \u03c6\u03bf\u03c1\u03c4\u03c9\u03b8\u03b5\u03af\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_es.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_es.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_es.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_es.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,178 +0,0 @@ -FFMpegDVRMSRemux.0=Ruta Alternativa de FFmpeg: -FFMpegDVRMSRemux.1=Propiedades para remuxing DVR-MS -FFMpegVideo.0=Propiedades de encoder para AviSynth/FFmpeg solamente (AVISYNTH/MENCODER PREFERIDO) -FoldTab.0= -FoldTab.1=Opciones de Uso Compartido -FoldTab.2=Escanear todas las carpetas compartidas -FoldTab.3=Escanear todas las carpetas compartidas puede tardar mucho\!\n -FoldTab.4=Esta seguro de querer empezar el escaneo?\n\n -FoldTab.5=Ocultar extensiones de archivos -FoldTab.6=Ocultar la Carpeta \#Ajustes de Video\# -FoldTab.7=Carpetas compartidas -FoldTab.8=Ocultar los nombres de los motores de transcodificacion -FoldTab.9=A\u00f1adir Directorio -FoldTab.10=Quiere detener el escaneo?\n\n -FoldTab.12=Ordenar las carpetas compartidas -FontFileFilter.3=Fuentes Truetype -LinksTab.5=Enlaces de utilidad: -LooksFrame.5=Salir -LooksFrame.6=Panel Principal -LooksFrame.9=Guardar -LooksFrame.12=Rearrancar el Servidor -LooksFrame.18=Estado -LooksFrame.19=Rastreo -LooksFrame.20=Configuracion General -LooksFrame.21=Ajustes de Transcodificacion -LooksFrame.22=Ajustes Navegar/Compartir -LooksFrame.24=Ayuda -LooksFrame.25=Acerca de -MEncoderAviSynth.2=Ajustes de decoder para AviSynth solamente -MEncoderAviSynth.3=Permitir cambio de numero de fotogramas de variable a constante con AviSynth (convertfps=true) -MEncoderVideo.0=Salta desbloqueo de filtro de loop para H.264. Puede degradar la calidad -MEncoderVideo.1=Ajustes del decoder de Video/Audio para MEncoder solamente -MEncoderVideo.2=Metodo alternativo de sincronia A/V -MEncoderVideo.3=Usar por defecto los parametros de codecs de la aplicacion (Recomendado!) -MEncoderVideo.4=Forzar numero de fotogramas recibido de FFmpeg -MEncoderVideo.5=Pueden a\u00f1adirse aqui opciones especificas, tales como un filtro de ruido por ejemplo: -vf hqdn3d -MEncoderVideo.6=Opciones personalizadas: -MEncoderVideo.7=Prioridad de idioma de audio: -MEncoderVideo.8=Configuracion de subtitulos -MEncoderVideo.9=Prioridad de idioma de subtitulos: -MEncoderVideo.10=Prioridad de idioma de Audio/subtitulos (ej: en,off;eng,off) -MEncoderVideo.11=Codigo de pagina para subtitulos: -MEncoderVideo.12=Ajustes de fuente ASS: Escala de fuente -MEncoderVideo.13=Borde de fuente -MEncoderVideo.14=Sombra de fuente -MEncoderVideo.15=Margen inferior de fuente -MEncoderVideo.16=Propiedades de fuente por defecto: Escala de fuente -MEncoderVideo.17=Borde de fuente -MEncoderVideo.18=Desenfoque de fuente -MEncoderVideo.19=Margen inferior de fuente -MEncoderVideo.20=Subtitulos ASS/SSA -MEncoderVideo.21=Fontconfig/Fuentes imbuidas -MEncoderVideo.22=Autocargar subtitulos *.srt/*.sub con el mismo nombre de archivo -MEncoderVideo.24=Fuente TrueType Especifica (para idiomas asiaticos): -MEncoderVideo.25=Elegir una fuente Truetype -MEncoderVideo.26=Filtro de Desentrelazado -MEncoderVideo.27=Usar Escalador de Video -MEncoderVideo.28=Ancho -MEncoderVideo.29=Ajustes para expertos : Parametros especificos de Codecs -MEncoderVideo.30=Altura -MEncoderVideo.32=Remezcla cuando la pista de audio sea AC-3 (no recodificar) -MEncoderVideo.33=Parametros personalizados: -MEncoderVideo.34=Editar parametros especificos de codecs -MEncoderVideo.35=Soporte multinucleo mejorado -MEncoderVideo.68=\#Aqui se pueden poner parametros especificos para combinaciones de codecs.\n -MEncoderVideo.69=\#Usado sobre todo si hay problemas con la sincronizacion A/V, pero puede usarse para cualquier otra cosa tambien\n -MEncoderVideo.70=\#Considerelo como caracteristicas para expertos, ya que no deberian usarse si no se sabe exactamente que se esta haciendo\n -MEncoderVideo.71=\#La sintaxis es {condicion java} :: {opciones MEncoder} ; Pueden acumularse varias opciones\n -MEncoderVideo.72=\#Tokens permitidos: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Cuidado, cualquier linea mal formada sera borrada\n -MEncoderVideo.75=\#Opciones especiales:\n -MEncoderVideo.76=\# -noass: deshabilitar totalmente los subtitulos ASS/SSA ya que pueden afectar a la sincronia A/V\n -MEncoderVideo.77=\# -nosync: deshabilitar totalmente el metodo alternativo de sincronia A/V para esta condicion (-mc hace lo mismo)\n -MEncoderVideo.78=\# -quality: ignorar la configuracion de calidad de video\n -MEncoderVideo.79=\# -mt: forzar el uso del MEncoder multihilo (experimental, puede resultar inestable)\n -MEncoderVideo.80=\#Esta lista mejorara con el tiempo: ajustes y comentarios sobre codecs/archivos siembre son bienvenidos\n -MEncoderVideo.87=\#Puede especificar sus propias condiciones y opciones! Por ejemplo, para usar el MEncoder multihilo\n -MEncoderVideo.88=\#para cualquier contenido H.264 en HD (redundante con la opcion principal): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#para acelerar un video de 24p a 25p: framerate == 23.976 :: -mpegopts tele_src=24000/1001:tele_dest=25\n -MEncoderVideo.91=\#para hacer remux con video MPEG-2 y sin subtitulos: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=Idioma [necesita rearrancar la aplicacion]: -NetworkTab.1=Examinar archivos .RAR/.ZIP/.CBR -NetworkTab.2=Genracion de imagenes reducidas -NetworkTab.3=Iniciar minimizado -NetworkTab.4=Instalar como Servicio de Windows -NetworkTab.5=Configuracion General -NetworkTab.6=Tama\u00f1o maximo del buffer de transcodificacion, en megabytes (maximo MAX_BUFFER_SIZE): -NetworkTab.7=Number of nucleos usados para transcodificas (parece tener %d): -NetworkTab.11=Ha instalado el servicio de Windows \! Para usarlo, debe salir de esta aplicacion,\n -NetworkTab.12=e iniciar (y configurar) el servicio desde el panel de administracion de Windows.\n\n -NetworkTab.13=La libreria de medios se va a reinicializar \!\n -NetworkTab.14=Error en la instalacion del servicio de Windows!\n -NetworkTab.15=Propiedades de Navegacion/Lectura -NetworkTab.16=Busqueda de imagenes reducidas (en segundos): -NetworkTab.17=Habilitar la libreria de medios -NetworkTab.18=Restaurar la libreria de medios -NetworkTab.19=Esta seguro? -NetworkTab.20=Forzar el siguiente interfaz de red: -NetworkTab.22=Configuracion de red, cambiar solo si tiene problemas -NetworkTab.23=Forzar IP del servidor: -NetworkTab.24=Forzar puerto del servidor (5001 por defecto): -NetworkTab.25=Caracteristicas de la PS3 -NetworkTab.26=Juego de caracteres para archivos de su PS3 (see XMB->Ajustes del sistema->Juego de caracteres): -NetworkTab.27=Caracteristicas no usadas que no deberia usar :p -NetworkTab.28=Modo Turbo (habilita tcp_nodelay) / cuidado, noestoy seguro si se debe hacer -NetworkTab.29=Bloquear peticiones entrantes para el mismo archivo desde la PS3 cuando haya empezado la transcodificacion -NetworkTab.35=Ancho de banda maximo en Mb/s (0 significa ilimitado): -PMS.0=La PS3 no se ha encontrado. Esta encendida? Puede tambien mirar en Rastreo, Configuracion o el archivo debug.log -PMS.1=Audio -PMS.2=\#- Libreria de Medios -\# -PMS.3=metodo alternativo de sincronia A/V -PMS.4=Filtro de Desentrelazado -PMS.5=PS3 encontrada \! -PMS.6=Autocargar subtitulos .srt/.sub -PMS.7=Saltar filtro de bucle para la descodificacion H.264 [PUEDE DEGRADAR LA CALIDAD] -PMS.9=Todas las listas de reproduccion de Audio -PMS.11=Todas las Pistas de Audio -PMS.12=Por Fecha -PMS.13=Por Artista -PMS.16=Por Album -PMS.19=Por Genero -PMS.21=Por modelo de camara -PMS.22=Por Artista/Album -PMS.25=Por ajustes ISO -PMS.26=Por Genero/Artista/Album -PMS.31=Foto -PMS.32=Todas las Fotos -PMS.34=Video -PMS.35=Todos los Videos -PMS.36=Videos HD -PMS.37=\#- Ajustes de Video -\# -PMS.39=Videos SD -PMS.41=(Re)instalando el servicio Win32 -PMS.130=Contactando con la PS3... -StatusTab.2=Estado -StatusTab.3=Esperando... -StatusTab.5=Vacio -StatusTab.6=Estado del bufer de transcodificacion: -StatusTab.7=Estadisticas de E/S: -StatusTab.8=Bitrate actual: -StatusTab.10=Bitrate maximo: -TSMuxerVideo.0=Forzar remezcla AC-3 con todos los archivos -TSMuxerVideo.1=Forzar remezcla PCM con audio DTS/FLAC -TSMuxerVideo.2=Forzar FPS de FFmpeg en el archivo meta -TSMuxerVideo.3=Ajustes de decodificador de video para el motor TsMuxer solamente -TrTab2.0=Habilitar/deshabilitar un motor de transcodificacion -TrTab2.1=Sin ajustes de momento -TrTab2.2=Ajustes de codificador con los siguientes motores: MEncoder/AviSynth/FFmpeg -TrTab2.3=Ajustes de Audio, aplicables a los decodificadores siguientes: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Ajustes de calidad de video -TrTab2.5=Ajustes de transcodificacion comunes -TrTab2.6=Ordenar con los motores de transcodificacion primero. El primero aparecera en la carpeta del video original -TrTab2.7=Opciones varias -TrTab2.8=Saltar la transcodificacion para las extensiones siguientes (separadas por comas): -TrTab2.9=Forzar la transcodificacion para las extensiones siguientes (separadas por comas): -TrTab2.11=Motores -TrTab2.12=Ajustes comunes de decodificador -TrTab2.13=Ajustes comunes de codificador -TrTab2.14=Motores de Archivos de Video -TrTab2.15=Motores de Archivos de Audio -TrTab2.16=Motores de streaming de Video Web -TrTab2.17=Motores de streaming de Audio Web -TrTab2.18=Motores varios -TrTab2.19=El motor en negrita tiene prioridad -TrTab2.20=y sustituira al video original -TrTab2.27=Remux DTS/FLAC -> LPCM (Necesita un receptor A/V con HDMI para enviar PCM 5.1 \! Bitrate medio = 4.6Mbps) -TrTab2.29=Bitrate de Audio AC-3 (en Kbits/s) (ej: 384, 576, 640): -TrTab2.32=Ajustes MPEG-2: -TrTab2.39=El video se codifica y mezcla automaticamente como MPEG-PS con audio AC-3 (muy compatible con PS3) -TrTab2.40=\nPuede jugar con los parametros vqscale, vqmin y keyint para obtener una buena calidad de transcodificacion, casi sin perdidas. -TrTab2.41=\nEl inconveniente es que el bitrate de VBR puede a veces superar la capacidad de su red. -TrTab2.42=\nPor ello puede tambien modificar en ancho de banda si esta en WiFi, CPL, etc. Sin embargo, la calidad de transcodificacion -TrTab2.43=\nes un equilibrio entre velocidad de red y potencia de cpu: cuanta mas calidad quiera en un ancho de banda ajustado, -TrTab2.44=\nmas sufrira su cpu\! Ademas, no pretenda encajar una pelicula de accion a 1080p con la mejor calidad en 15Mbps :p -TrTab2.50=Numero de canales de audio: -TrTab2.51=Deshabilitar subtitulos definitivamente -TracesTab.3=Limpiar -TreeNodeSettings.4=Este motor no esta cargado\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_fi.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_fi.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_fi.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_fi.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,179 +0,0 @@ -FFMpegDVRMSRemux.0=Vaihtoehtoinen FFmpeg -polku: -FFMpegDVRMSRemux.1=Asetukset DVR-MS remuxingia varten -FFMpegVideo.0=Encoder-asetukset AviSynth/FFmpeg prosessoijalle (ainoastaan) (SUOSI AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Jako-optiot -FoldTab.2=Skannaa kaikki jaetut kansiot -FoldTab.3=Kaikkien kansioiden skannaus voi kest\u00e4\u00e4 kauan \!\n -FoldTab.4=Oletko varma ett\u00e4 haluat k\u00e4ynnist\u00e4\u00e4 skannauksen?\n\n -FoldTab.5=Piilota tiedostop\u00e4\u00e4tteet -FoldTab.6=Piilota \#Videoasetukset\# -kansio -FoldTab.7=Jaetut kansiot -FoldTab.8=Piilota transkoodausprosessien nimet -FoldTab.9=Lis\u00e4\u00e4 hakemisto -FoldTab.10=Haluatko keskeytt\u00e4\u00e4 skannauksen?\n\n -FoldTab.11=Mahdollista transkoodatun videon kopioinnin PS3:lle -FoldTab.12=Lajittele jaetut kansiot -FontFileFilter.3=Truetype -kirjasimet -LinksTab.5=Hy\u00f6dyllisi\u00e4 linkkej\u00e4: -LooksFrame.5=Lopeta -LooksFrame.6=P\u00e4\u00e4valikko -LooksFrame.9=Talleta -LooksFrame.12=K\u00e4ynnist\u00e4 Uudelleen -LooksFrame.18=Status -LooksFrame.19=Traces -LooksFrame.20=Yleinen konfiguraatio -LooksFrame.21=Transkoodauksen asetukset -LooksFrame.22=Navigointi/Levyjako -asetukset -LooksFrame.24=Apua -LooksFrame.25=Ohjelman tietoja -MEncoderAviSynth.2=Video-dekooderi asetukset vain AviSynth-prosessia varten -MEncoderAviSynth.3=Aktivoi AviSynthin muunnos muuttuva framerate -> kiinte\u00e4 framerate(convertfps=true) -MEncoderVideo.0=Ohita loop filter deblokkaus H.264:lle. Saattaa huonontaa laatua -MEncoderVideo.1=Video/Audio decoder -asetukset MEncoder -prosessia varten -MEncoderVideo.2=A/V sync vaihtoehtoinen menetelm\u00e4 -MEncoderVideo.3=K\u00e4yt\u00e4 sovelluksen oletusparametrej\u00e4 koodekeille (Suositellaan\!) -MEncoderVideo.4=Pakota framerate FFmpeg'in antamaksi -MEncoderVideo.5=T\u00e4h\u00e4n voit lis\u00e4t\u00e4 erikoisoptioita, kuten esim. h\u00e4iri\u00f6npoistofiltterin: -vf hqdn3d -MEncoderVideo.6=Erikoisoptiot: -MEncoderVideo.7=Audio -kielen prioriteetti: -MEncoderVideo.8=Tekstityksen asetukset -MEncoderVideo.9=Tekstityskielten prioriteetit: -MEncoderVideo.10=Audio/tekstitys -kielivalinta (es: en,off;eng,off) -MEncoderVideo.11=Tekstityksen koodisivu: -MEncoderVideo.12=ASS kirjasinasetukset: kirjasinkoko -MEncoderVideo.13=Kirjasin-outline -MEncoderVideo.14=Kirjasinvarjostus -MEncoderVideo.15=Kirjasimen alimarginaali -MEncoderVideo.16=Oletus kirjasinasetukset: Kirjasinkoko -MEncoderVideo.17=Kirjasimen \u00e4\u00e4riviivat -MEncoderVideo.18=Kirjasimen ep\u00e4tarkkuus (blur) -MEncoderVideo.19=Kirjasimen alimarginaali -MEncoderVideo.20=ASS/SSA Tekstitys -MEncoderVideo.21=Fontconfig/Sis\u00e4llytetyt kirjasimet -MEncoderVideo.22=Lataa automaattisesti *.srt/*.sub -tekstitykset samannimisen tiedoston kanssa -MEncoderVideo.24=Erityinen TrueType -kirjasin (aasialaisille kielille): -MEncoderVideo.25=Valitse Truetype -kirjasin -MEncoderVideo.26=Deinterlace -suodatin -MEncoderVideo.27=K\u00e4yt\u00e4 videoskaalaaja -MEncoderVideo.28=Leveys -MEncoderVideo.29=Asiantuntija-asetukset : Koodekkikohtaiset parametrit -MEncoderVideo.30=Korkeus -MEncoderVideo.32=Remux kun audioraita AC-3 (ilman uutta enkoodausta ) -MEncoderVideo.33=Erikoisparametrit: -MEncoderVideo.34=Muokkaa koodekkikohtaisia parametreja -MEncoderVideo.35=Parannettu moniydintuki -MEncoderVideo.68=\#T\u00e4ss\u00e4 voit antaa erikoisia parametreja joillekin koodekki-kombinaatioille.\n -MEncoderVideo.69=\#T\u00e4m\u00e4 on enimm\u00e4kseen A/V synkronisaatio-ongelmiin, mutta voidaan k\u00e4ytt\u00e4\u00e4 muihin asioihin my\u00f6s\n -MEncoderVideo.70=\#Pid\u00e4 t\u00e4t\u00e4 eksperttiasetuksena koska t\u00e4t\u00e4 ei pit\u00e4is k\u00e4ytt\u00e4\u00e4 ellei todell\u00e4 tied\u00e4 mit\u00e4 tekee\n -MEncoderVideo.71=\#Syntaksi on {java ehto} :: {MEncoder optiot} ; Voit kumuloida useampia optioita\n -MEncoderVideo.72=\#Sallitut tokenit: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Varo, v\u00e4\u00e4rin kirjoitettu rivi tyhjennet\u00e4\u00e4n\n -MEncoderVideo.75=\#Erikoisoptiot:\n -MEncoderVideo.76=\# -noass: ehdottomasti disabloi ASS/SSA tekstitys koska se voi sotkea A/V synkronoinnin\n -MEncoderVideo.77=\# -nosync: ehdottomasti disabloi A/V synkroinoinnin vaihtoehtoismenetelm\u00e4 t\u00e4lle optiolle (-mc tekee saman)\n -MEncoderVideo.78=\# -quality: m\u00e4\u00e4rit\u00e4 erikseen videon laatuasetukset\n -MEncoderVideo.79=\# -mt: pakota k\u00e4ytt\u00f6\u00f6n monis\u00e4ikeinen MEncoder -versio (kokeellinen, voi olla ep\u00e4vakaa)\n -MEncoderVideo.80=\#T\u00e4m\u00e4 lista tulee paranemaan aikaa my\u00f6ten: s\u00e4\u00e4t\u00f6j\u00e4/palautetta eri koodekeista ja tiedostoista ovat aina tervetulleita\n -MEncoderVideo.87=\#Voit nyt antaa omat ehdot/optiot \! T\u00e4ss\u00e4 on esimerkkej\u00e4: esim. ota k\u00e4ytt\u00f6\u00f6n mt-versio MEncoder'ista\n -MEncoderVideo.88=\#kaikille H.264 HD sis\u00e4ll\u00f6ille (p\u00e4\u00e4llekk\u00e4inen p\u00e4\u00e4option kanssa): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#24p v\u00e4rin\u00e4n poistamiseksi 50hz TV:ss\u00e4 : framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#tee remux kun video on MPEG-2 ja tekstitys puuttuu : vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=Kieli [ohjelma pit\u00e4\u00e4 k\u00e4ynnist\u00e4\u00e4 uudelleen]: -NetworkTab.1=Selaa .RAR/.ZIP/.CBR -arkistoja -NetworkTab.2=Thumbnails generointi -NetworkTab.3=Aloita minimoituna -NetworkTab.4=Asenna Windows-palveluna -NetworkTab.5=Yleiset asetukset -NetworkTab.6=Transcode-puskurin suurin koko, megatavuja (maksimi: MAX_BUFFER_SIZE): -NetworkTab.7=Transkoodauksen k\u00e4ytett\u00e4vien ytimien lukum\u00e4\u00e4r\u00e4 (sinulla on n\u00e4k\u00f6j\u00e4\u00e4n %d): -NetworkTab.11=Olet asentanut Windows-palvelun \! Sen k\u00e4ytt\u00e4miseksi sinun t\u00e4ytyy sulkea t\u00e4m\u00e4 sovellus,\n -NetworkTab.12=sitten k\u00e4ynnist\u00e4\u00e4 (ja konfiguroida) palvelu Windowsin hallinta-toiminnoissa.\n\n -NetworkTab.13=Mediakirjasto initialisoidaan uudelleen \!\n -NetworkTab.14=Virhe Windows-palvelun asennuksessa\!\n -NetworkTab.15=Selailu/Parsinta -asetukset -NetworkTab.16=Thumbnail haku (sekuntteja): -NetworkTab.17=Aktivoi mediakirjasto -NetworkTab.18=Resetoi mediakirjasto -NetworkTab.19=Oletko varma? -NetworkTab.20=Pakota verkkok\u00e4ytt\u00f6 : -NetworkTab.22=Verkkoasetukset, muuta vain jos ongelmia -NetworkTab.23=Pakota palvelimen IP-osoite: -NetworkTab.24=Pakota palvelimen portti (5001 oletuksena): -NetworkTab.25=PS3 asetukset -NetworkTab.26=Merkist\u00f6 PS3:n tiedostonimille (katso XMB->J\u00e4rjestelm\u00e4asetukset->Merkist\u00f6): -NetworkTab.27=K\u00e4ytt\u00e4m\u00e4tt\u00f6mi\u00e4 asetuksia joita sinun ei pit\u00e4isi k\u00e4ytt\u00e4\u00e4 :p -NetworkTab.28=Turbo mode (enable tcp_nodelay) / ole varovainen, en ole varma jos t\u00e4m\u00e4 on ihan ok -NetworkTab.29=Est\u00e4 PS3:sta tuleva pyynt\u00f6 joka koskee samaa tiedostoa kun transkoodaus on jo k\u00e4ynniss\u00e4 -NetworkTab.35=Maksimi kaistanleveys Mb/s (0 means no limit): -PMS.0=PS3:a ei l\u00f6ytynyt. Onko se p\u00e4\u00e4ll\u00e4? Voit my\u00f6s tarkistaa tracet ja/tai konfiguraation, tai my\u00f6s debug.log -tiedoston -PMS.1=Audio -PMS.2=\#- Mediakirjasto -\# -PMS.3=A/V synkronoinnin vaihtoehtoinen menetelm\u00e4 -PMS.4=Deinterlace-suodatin -PMS.5=PS3 l\u00f6ytyi \! -PMS.6=Lataa .srt/.sub tekstitys automaattisesti -PMS.7=SkipLoopFilter for H.264 Decoding [SAATTAA HUONONTAA LAATUA] -PMS.9=Kaikki audio -soittolistat -PMS.11=Kaikki audioraidat -PMS.12=P\u00e4iv\u00e4m\u00e4\u00e4r\u00e4n mukaan -PMS.13=Artistin mukaan -PMS.16=Albumin mukaan -PMS.19=Lajin mukaan -PMS.21=Kameramallin mukaan -PMS.22=Artisti/albumin mukaan -PMS.25=ISO-asetusten mukaan -PMS.26=Lajin/artistin/albumin mukaan -PMS.31=Valokuva -PMS.32=Kaikki valokuvat -PMS.34=Video -PMS.35=Kaikki videot -PMS.36=HD -videot -PMS.37=\#- Videoasetukset -\# -PMS.39=SD -videot -PMS.41=(Uudelleen)installoin Win32 -palvelun -PMS.130=Haetaan PS3:a ... -StatusTab.2=Status -StatusTab.3=Odottaa... -StatusTab.5=Tyhj\u00e4 -StatusTab.6=Transkoodauspuskurin tila: -StatusTab.7=I/O tilastoa: -StatusTab.8=Bittinopeus nyt: -StatusTab.10=Huippubittinopeus: -TSMuxerVideo.0=Demuxaa MEncoder'illa ja enkoodaa kaikki audioraidat AC-3 -muotoon -TSMuxerVideo.1=Demuxaa MEncoder'illa ja enkoodaa DTS/FLAC audioraidat LPCM -muotoon [Varo, haku ei toimi viel\u00e4) -TSMuxerVideo.2=Pakota FPS kuten parsittu FFmpeg metatiedostossa -TSMuxerVideo.3=Videodekoodaus -asetukset vain TsMuxer -prosessoijalle -TrTab2.0=P\u00e4\u00e4lle/pois transkoodausprosessoija -TrTab2.1=Ei asetuksia toistaiseksi -TrTab2.2=Video -enkoodausasetukset seuraavilla prosessoijilla: MEncoder/AviSynth/FFmpeg -TrTab2.3=Audioasetukset, koskee seuraavia dekoodereita: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Videon laatuasetukset -TrTab2.5=Yleiset transkoodausasetukset -TrTab2.6=Lajittele transkoodausprosessoijat. Ensimm\u00e4iset ovat alkuper\u00e4isess\u00e4 videokansiossa -TrTab2.7=Sekalaiset optiot -TrTab2.8=Ohita transkoodaus seuraaville tiedostop\u00e4\u00e4tteille (pilkulla erotettu): -TrTab2.9=Pakota transkoodaus seuraaville tiedostop\u00e4\u00e4tteille (pilkulla erotettu): -TrTab2.11=Prosessoijat -TrTab2.12=Yleiset dekoodausasetukset -TrTab2.13=Yleiset enkoodausasetukset -TrTab2.14=Videotiedostoprosessoijat -TrTab2.15=Audiotiedostoprosessoijat -TrTab2.16=Video webstreaming-prosessoijat -TrTab2.17=Audio webstreaming-prosessoijat -TrTab2.18=Muut prosessoijat -TrTab2.19=Prosessoija paksunnettuna on ykk\u00f6svalinta -TrTab2.20=ja korvaa alkuper\u00e4isen videon -TrTab2.27=DTS/FLAC -> LPCM remux (Tarvitset HDMI -vastaanottimen PCM 5.1 -streamaukseen \! Keskim. Bitrate = 4.6Mbps) -TrTab2.29=AC-3 Audio bitrate (Kbits/s) (ex: 384, 576, 640): -TrTab2.32=MPEG-2 -laatuasetukset: -TrTab2.39=Video transkoodataan ja muxataan automaattisesti muotoon MPEG-PS / AC-3 audio (eritt\u00e4in yhteensopiva PS3:n kanssa) -TrTab2.40=\nVoit kokeilla vqscale, vqmin and keyint parametreja saadaksesi hyv\u00e4n, melkein h\u00e4vi\u00f6tt\u00f6m\u00e4n transkoodauslaadun. -TrTab2.41=\nHaittana t\u00e4lle on VBR bitrate joka voi tehd\u00e4 huipun yli verkkosi maksimikapasiteetin. -TrTab2.42=\nT\u00e4m\u00e4n takia voit my\u00f6s asettaa kaistanleveyden jos verkkosi on WiFi, CPL, tms. Joka tapauksessa, transkoodauslaatu -TrTab2.43=\non taspainoilua verkon nopeuden ja cpu-voiman v\u00e4lill\u00e4: mit\u00e4 enem\u00e4n laatua haluat kapasiteetiltaan rajoitettuun verkkoon, -TrTab2.44=\nsit\u00e4 enemm\u00e4n CPUsi k\u00e4rsii\! Siis, \u00e4l\u00e4 luule ett\u00e4 voit mahduttaa 1080p toimintaelokuvan parhaalla laadulla 15Mb/s verkkoon :p -TrTab2.50=Audiokanavien lukum\u00e4\u00e4r\u00e4: -TrTab2.51=Ehdottomasti kytke pois tekstitykset -TracesTab.3=Tyhjenn\u00e4 -TreeNodeSettings.4=T\u00e4m\u00e4 prosessi ei ole ladattu\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_fr.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_fr.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_fr.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_fr.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,190 +0,0 @@ -DLNAMediaDatabase.0=Pour un meilleur support de l'application,\nla biblioth\u00e8que m\u00e9dias doit \u00eatre r\u00e9initialis\u00e9e.\nD\u00e9sol\u00e9 pour le d\u00e9rangement \! -FFMpegDVRMSRemux.0=Chemin alternatif pour ffmpeg -FFMpegDVRMSRemux.1=R\u00e9glages pour le remuxing DVR-MS -FFMpegVideo.0=R\u00e9glages de l'encodage pour AviSynth/FFmpeg (Pr\u00e9f\u00e9rez AviSynth/MEncoder) -FoldTab.0= -FoldTab.1=Options de partage -FoldTab.2=Scan des dossiers -FoldTab.3=Scanner tout les dossiers peut prendre du temps \!\n -FoldTab.4=Etes vous sur?\n\n -FoldTab.5=Cacher les extensions de fichier -FoldTab.6=Cacher le dossier #Options Videos# -FoldTab.7=Dossiers partag\u00e9s -FoldTab.8=Cacher le nom des moteurs de transcodage -FoldTab.9=Ajouter un dossier -FoldTab.10=Voulez vos arretez le scan?\n\n -FoldTab.11=Autorise les copies de vid\u00e9os transcod\u00e9es sur PS3 (Attention, les fichiers n'ont pas de taille fixe !) -FoldTab.12=Tri des dossiers partag\u00e9s -FoldTab.13=Vignettes -FoldTab.14=Utiliser Mplayer pour les vignettes vid\u00e9o -FoldTab.15=Par d\u00e9faut -FoldTab.16=Plus r\u00e9cents d'abord -FoldTab.18=M\u00e9thode de tri des fichiers: -FoldTab.23=T\u00e9l\u00e9charger de amazon.com -FoldTab.24=T\u00e9l\u00e9charger de discogs.com -FoldTab.26=Affichage des pochettes album: -FoldTab.27=Dossier alternatif des vignettes vid\u00e9os -FoldTab.28=Choisissez un dossier -FontFileFilter.3=Fontes TrueType -LinksTab.5=Liens utiles: -LooksFrame.5=Quitter -LooksFrame.6=Panneau principal -LooksFrame.9=Sauver -LooksFrame.12=Red\u00e9marrer Serveur -LooksFrame.13=Le serveur doit \u00eatre red\u00e9marr\u00e9 due \u00e0 un changement de configuration -LooksFrame.18=Statut -LooksFrame.19=Traces -LooksFrame.20=Configuration g\u00e9n\u00e9rale -LooksFrame.21=R\u00e9glages transcodage -LooksFrame.22=Navigation/Partage de dossiers -LooksFrame.24=Aide -LooksFrame.25=A propos -MEncoderAviSynth.2=R\u00e9glages decodage vid\u00e9o pour AviSynth/MEncoder -MEncoderAviSynth.3=Active la conversion d'un taux de rafraichissement variable par AviSynth (convertfps) -MEncoderVideo.0=Acc\u00e9l\u00e8re le d\u00e9codage vid\u00e9o H.264. D\u00e9grade la qualit\u00e9 -MEncoderVideo.1=R\u00e9glages d\u00e9codage vid\u00e9o pour MEncoder seulement -MEncoderVideo.2=M\u00e9thode alternative synchro A/V -MEncoderVideo.3=Utiliser le param\u00e9trage de codec par d\u00e9faut (recommand\u00e9!) -MEncoderVideo.4=Forcer le taux de rafraichissement -MEncoderVideo.5=Vous pouvez ajouter ici des options sp\u00e9cifiques, comme un filtre anti bruit: -vf hqdn3d -MEncoderVideo.6=R\u00e9glages de d\u00e9codage -MEncoderVideo.7=Priorit\u00e9 des langues -MEncoderVideo.8=R\u00e9glages sous-titres -MEncoderVideo.9=Priorit\u00e9 des sous-titres -MEncoderVideo.10=Priorit\u00e9 des langues/sous-titres (ex: fr,off;fre,off) -MEncoderVideo.11=Codepage des sous-titres -MEncoderVideo.12=Sous-titres ASS: Taille de police -MEncoderVideo.13=Taille du d\u00e9tourage -MEncoderVideo.14=Taille de l'ombre -MEncoderVideo.15=Taille de marge inf\u00e9rieure -MEncoderVideo.16=Fontes par d\u00e9faut: Taille de police -MEncoderVideo.17=Taille du d\u00e9tourage -MEncoderVideo.18=Flou -MEncoderVideo.19=Taille de marge inf\u00e9rieure -MEncoderVideo.20=Sous-titres ASS -MEncoderVideo.21=Fontconfig/Fontes embarqu\u00e9s -MEncoderVideo.22=Auto chargement des fichiers .srt/.sub/.ass -MEncoderVideo.24=Police Truetype sp\u00e9cifique (langues asiatiques): -MEncoderVideo.25=S\u00e9lectionner une police -MEncoderVideo.26=Filtre d\u00e9sentrelacement -MEncoderVideo.27=Redimensionner -MEncoderVideo.28=Largeur -MEncoderVideo.29=R\u00e9glages Expert : param\u00e9tres sp\u00e9cifiques codec -MEncoderVideo.30=Hauteur -MEncoderVideo.32=Remuxer quand la piste audio est en AC-3 (pas de r\u00e9encodage) -MEncoderVideo.33=Param\u00e8tres personnalis\u00e9s: -MEncoderVideo.34=Editer les param\u00e8tres sp\u00e9cifiques -MEncoderVideo.35=Support am\u00e9lior\u00e9 du multicoeur -MEncoderVideo.36=Utiliser le style ASS par d\u00e9faut -MEncoderVideo.37=Dossier alternatif des sous titres -MEncoderVideo.38=Remuxer uniquement lorsque la vid\u00e9o est compatible PS3 et qu'il n'y a pas de sous-titres [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.126=fre,jpn,ger,eng,und -MEncoderVideo.127=fre,jpn,ger,eng,und -MEncoderVideo.128=*,* -NetworkTab.0=Langue [red\u00e9marrage obligatoire]: -NetworkTab.1=Parcourir les archives .RAR/.ZIP/.CBR -NetworkTab.2=G\u00e9n\u00e9ration des vignettes -NetworkTab.3=D\u00e9marrer en mode r\u00e9duit -NetworkTab.4=Installer comme service Windows -NetworkTab.5=R\u00e9glages g\u00e9n\u00e9raux -NetworkTab.6=Taille maximum du buffer de transcodage, en m\u00e9gaoctets (maximum: MAX_BUFFER_SIZE): -NetworkTab.7=Nombre de coeurs pour le transcodage (il semble que vous ayez %d): -NetworkTab.11=Vous avez install\u00e9 le service Windows \! Pour l'utiliser, vous devez quitter cette application,\n -NetworkTab.12=puis d\u00e9marrer (et configurer) le service du panneau de configuration windows.\n\n -NetworkTab.13=La m\u00e9diath\u00e8que sera r\u00e9initialis\u00e9e \!\n -NetworkTab.14=Erreur dans l'installation du service Windows!\n -NetworkTab.15=R\u00e9glages navigation/parsing -NetworkTab.16=Positionnement des vignettes (en secondes): -NetworkTab.17=Activer la m\u00e9diath\u00e8que -NetworkTab.18=R\u00e9initialiser la m\u00e9diath\u00e8que -NetworkTab.19=Etes vous sur ? -NetworkTab.20=Forcer l'interface r\u00e9seau: -NetworkTab.22=R\u00e9glages r\u00e9seau -NetworkTab.23=Forcer l'ip du serveur: -NetworkTab.24=Force le port du serveur (5001 par d\u00e9faut): -NetworkTab.25=R\u00e9glages PS3 -NetworkTab.26=Encodage des caract\u00e8res des noms de fichier sur la PS3 (XMB->R\u00e9glages syst\u00e8me): -NetworkTab.27=R\u00e9glages non utilis\u00e9s -NetworkTab.28=Mode turbo (TCP_NODELAY) -NetworkTab.29=Stopper les requetes entrantes pour le m\u00eame fichier -NetworkTab.30=Utiliser un filtre IP -NetworkTab.35=Bande passante maximum en Mb/s (0 = pas de limite): -PMS.0=La PS3 n'a pas \u00e9t\u00e9 trouv\u00e9e. Est-elle en marche? Vous pouvez v\u00e9rifier les r\u00e9glages g\u00e9n\u00e9raux, et consulter le fichier log. -PMS.1=Audio -PMS.2=\#- M\u00e9diath\u00e8que -\# -PMS.3=Synchro A/V alternative -PMS.4=Filtre d\u00e9sentrelacement -PMS.5=La PS3 a \u00e9t\u00e9 trouv\u00e9e ! -PMS.6=Chargement automatique des .srt/.sub -PMS.7=SkipLoopFilter pour D\u00e9codage H.264 (Peut d\u00e9grader la qualit\u00e9) -PMS.8=Sous-titres -PMS.9=Toutes les playlists Audio -PMS.10=D\u00e9sactiver d\u00e9finitivement les sous-titres -PMS.11=Toutes les pistes Audio -PMS.12=Par Date -PMS.13=Par Artiste -PMS.14=Remux par d\u00e9faut avec MEncoder -PMS.16=Par Album -PMS.19=Par Genre -PMS.21=Par mod\u00e8le d'appareil photo -PMS.22=Par Artiste/Album -PMS.25=Par r\u00e9glages ISO -PMS.26=Par Genre/Artiste/Album -PMS.31=Photos -PMS.32=Toutes les photos -PMS.34=Videos -PMS.35=Toutes les Videos -PMS.36=Vid\u00e9os HD -PMS.37=\#- R\u00e9glages Vid\u00e9o -\# -PMS.39=Vid\u00e9os SD -PMS.41=(Re)installation du service Win32 -PMS.130=Contact de la PS3... -StatusTab.2=Statut -StatusTab.3=En attente... -StatusTab.5=Vide -StatusTab.6=Statut du buffer de transcodage: -StatusTab.7=Statistiques I/O: -StatusTab.8=D\u00e9bit courant: -StatusTab.10=D\u00e9bit de cr\u00eate: -TSMuxerVideo.0=Demuxer avec MEncoder et forcer le r\u00e9encodage/remuxing AC-3 pour toutes les pistes audio -TSMuxerVideo.1=Demuxer avec MEncoder et forcer le remuxing LPCM avec le DTS/FLAC pour toutes les pistes audio -TSMuxerVideo.2=Forcer le framerate obtenu de FFmpeg dans le fichier .meta -TSMuxerVideo.3=R\u00e9glages vid\u00e9o pour tsMuxeR seulement -TSMuxerVideo.19=Muxer toutes les pistes audios -TrTab2.0=Activer/D\u00e9sactiver un moteur de transcodage -TrTab2.1=Pas de r\u00e9glages pour l'instant -TrTab2.2=R\u00e9glages encodage valables pour les moteurs suivants: MEncoder/AviSynth/FFmpeg -TrTab2.3=R\u00e9glages audio valables pour les moteurs suivants: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=R\u00e9glages qualit\u00e9 vid\u00e9o -TrTab2.5=R\u00e9glages g\u00e9n\u00e9raux transcodage -TrTab2.6=Trier les moteurs de transcodage. Le premier apparaitra en tant que vid\u00e9o originale -TrTab2.7=Options diverses -TrTab2.8=Ne transcode pas les extensions suivantes (s\u00e9par\u00e9es par une virgule): -TrTab2.9=Force le transcodage des extensions suivantes (s\u00e9par\u00e9es par une virgule): -TrTab2.10=Permet de streamer directement le flux DTS \u00e0 l'ampli\nAttention, il est possible d'avoir un bruit blanc. Voici quelques conseils:\n- Vous devez avoir un ampli compatible DTS, connect\u00e9 en TOSLINK ou HDMI\n- L'icone de volume dans le XMB doit \u00eatre \u00e0 'Normal'\n- L'icone des canaux audio dans le XMB doit \u00eatre sur 'Gauche+Droite'\n -TrTab2.11=Moteurs -TrTab2.12=R\u00e9glages communs de d\u00e9codage -TrTab2.13=R\u00e9glages communs d'encodage -TrTab2.14=Moteurs de fichiers vid\u00e9o -TrTab2.15=Moteurs de fichiers audio -TrTab2.16=Moteurs de fichiers web vid\u00e9o -TrTab2.17=Moteurs de fichiers web audio -TrTab2.18=Moteurs divers -TrTab2.19=Le moteur en gras sera prioritaire -TrTab2.20=et remplacera la vid\u00e9o originale -TrTab2.21=[AviSynth non support\u00e9] -TrTab2.27=DTS/FLAC -> LPCM remux (Vous avez besoin d'un ampli HDMI pour le PCM 5.1 \! D\u00e9bit moyen = 4.6Mbps) -TrTab2.28=Streamer le flux DTS (Compatible avec sortie optique) -> Attention, l\u00e9gere augmentation de bitrate ! -TrTab2.29=D\u00e9bit AC-3 Audio (en Kbits/s) (ex: 384, 576, 640): -TrTab2.32=R\u00e9glages qualit\u00e9 MPEG-2: -TrTab2.39=La vid\u00e9o est automatiquement transcod\u00e9 et mux\u00e9 vers un fichier MPEG-PS / AC-3 (compatible PS3) -TrTab2.40=\nVous pouvez jouer avec les param\u00e8tres vqscale, vqmin et keyint pour atteindre une bonne qualit\u00e9, voire m\u00eame sans perte visible. -TrTab2.41=\nL'inconv\u00e9nient est le d\u00e9bit maximum qui peut parfois atteindre des sommets, d\u00e9passant votre capacit\u00e9 r\u00e9seau. -TrTab2.42=\nC'est pourquoi vous pouvez r\u00e9gler la bande passante si vous \u00eates en WiFi, CPL, etc. Cependant, la qualit\u00e9 du transcoding -TrTab2.43=\nest un \u00e9quilibre entre la vitesse du r\u00e9seau et la puissance du processeur: Plus la qualit\u00e9 sera bonne dans un d\u00e9bit limit\u00e9, -TrTab2.44=\nplus le processeur souffrira\! Et ne vous attendez pas \u00e0 mettre une vid\u00e9o 1080p parfaite dans 15Mbits :p -TrTab2.50=Nombre de canaux audio -TrTab2.51=D\u00e9sactiver d\u00e9finitivement les sous-titres. -TrTab2.52=Dur\u00e9e des chapitres dans le dossier #Transcode# (en minutes) -TracesTab.3=Effacer -TreeNodeSettings.4=Ce moteur n'est pas charg\u00e9! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_is.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_is.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_is.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_is.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,214 +0,0 @@ -DLNAMediaDatabase.0=\u00dev\u00ed mi\u00f0ur er nau\u00f0synlegt a\u00f0 endurskanna allt skr\u00e1arsafni\u00f0\nvegna breytinga \u00ed \u00feessari \u00fatg\u00e1fu.\nAfsaki\u00f0 \u00f3n\u00e6\u00f0i\u00f0\! -FFMpegDVRMSRemux.0=\u00d6nnur sl\u00f3\u00f0 a\u00f0 FFmpeg: -FFMpegDVRMSRemux.1=Stillingar fyrir DVR-MS endurbl\u00f6ndun -FFMpegVideo.0=Stillingar fyrir AviSynth/FFmpeg millik\u00f3\u00f0un (Velji\u00f0 fremur AviSynth/MEncoder) -FoldTab.0=<\u00d6ll Drif> -FoldTab.1=Valkostir deilingar -FoldTab.2=Skanna allar deildar m\u00f6ppur -FoldTab.3=\u00dea\u00f0 a\u00f0 skanna allar deildar m\u00f6ppur g\u00e6ti teki\u00f0 t\u00edma\!\n -FoldTab.4=Ertu viss a\u00f0 \u00fe\u00fa viljir skanna m\u00f6ppurnar n\u00fana?\n\n -FoldTab.5=Fela sk\u00e1arendingar -FoldTab.6=Fela \#- Stillingar -\# m\u00f6ppuna -FoldTab.7=Deildar m\u00f6ppur -FoldTab.8=Fela nafn millik\u00f3\u00f0ara -FoldTab.9=B\u00e6ta vi\u00f0 m\u00f6ppu -FoldTab.10=Viltu st\u00f6\u00f0va sk\u00f6nnun?\n\n -FoldTab.11=Leyfa afritunart\u00f6ku \u00e1 millik\u00f3\u00f0u\u00f0u efni (Athugi\u00f0: Afriti\u00f0 g\u00e6ti or\u00f0i\u00f0 verulega st\u00f3rt) -FoldTab.12=Flokka deildar m\u00f6ppur -FoldTab.13=S\u00fdnishorn -FoldTab.14=Nota Mplayer fyrir s\u00fdnishorn -FoldTab.15=Sj\u00e1lfgefi\u00f0 -FoldTab.16=N\u00fdjast fyrst -FoldTab.18=Ra\u00f0a skr\u00e1m: -FoldTab.19=DVD ISO sm\u00e1myndir -FoldTab.23=Fr\u00e1 amazon.com -FoldTab.24=Fr\u00e1 discogs.com -FoldTab.26=N\u00e1 \u00ed sm\u00e1myndir fyrir hlj\u00f3\u00f0skr\u00e1r: -FoldTab.27=Mappa sem inniheldur sm\u00e1myndir: -FoldTab.28=Veldu m\u00f6ppu -FoldTab.29=S\u00fdna iPhoto safn -FoldTab.30=S\u00fdna iTunes safn -FoldTab.31=Fela m\u00f6ppur me\u00f0 engar gagnlegar skr\u00e1r (Athugi\u00f0: h\u00e6g v\u00f6frun) -FoldTab.32=Fela skr\u00e1arsafni\u00f0 -FoldTab.33=Fela \#Transcode\# M\u00f6ppuna -FontFileFilter.3=TrueType letur -LinksTab.5=Gagnlegir hlekkir: -LooksFrame.5=H\u00e6tta -LooksFrame.6=Stj\u00f3rnbor\u00f0 -LooksFrame.9=Vista -LooksFrame.12=Endurr\u00e6sa \u00fej\u00f3n -LooksFrame.18=Sta\u00f0a -LooksFrame.19=Rekja -LooksFrame.20=Almennar Stillingar -LooksFrame.21=Stillingar Millik\u00f3\u00f0unar -LooksFrame.22=V\u00f6frun/Deiling Stillingar -LooksFrame.24=Hj\u00e1lp -LooksFrame.25=Um PMS -MEncoderAviSynth.2=Stillingar fyrir AviSynth millik\u00f3\u00f0un -MEncoderAviSynth.3=Virkja \u00fe\u00fd\u00f0ingu fr\u00e1 breytilegu framerate yfir \u00ed st\u00f6\u00f0ugt framerate (convertfps=true) -MEncoderVideo.0=Sleppa lykkjus\u00edu afblokkun fyrir H.264 (Minni g\u00e6\u00f0i) -MEncoderVideo.1=Stillingar fyrir MEncoder hlj\u00f3\u00f0 & mynd millik\u00f3\u00f0un -MEncoderVideo.2=Hlj\u00f3\u00f0/Mynd a\u00f0rar lei\u00f0ir til samstillingar -MEncoderVideo.3=Nota sj\u00e1lfgefnar stillingar millik\u00f3\u00f0ara fyrir codec skipanir (M\u00e6li me\u00f0 \u00feessu\!) -MEncoderVideo.4=Ney\u00f0a framerate lesi\u00f0 fr\u00e1 FFmpeg -MEncoderVideo.5=\u00de\u00fa getur b\u00e6tt vi\u00f0 s\u00e9rt\u00e6kum skipunum h\u00e9r, til a\u00f0 mynda su\u00f0 s\u00edunni: -vf hqdn3d -MEncoderVideo.6=S\u00e9rt\u00e6kar skipanir: -MEncoderVideo.7=Forgangsr\u00f6\u00f0un hlj\u00f3\u00f0s: -MEncoderVideo.8=Stillingar texta -MEncoderVideo.9=Forgangsr\u00f6\u00f0un texta: -MEncoderVideo.10=Forgangsr\u00f6\u00f0un hlj\u00f3\u00f0s/texta (D\u00e6mi: en,off;eng,off) -MEncoderVideo.11=Letursett textans: -MEncoderVideo.12=ASS letur stillingar: St\u00e6r\u00f0 leturs -MEncoderVideo.13=\u00datl\u00ednur leturs -MEncoderVideo.14=Skuggar leturs -MEncoderVideo.15=Sp\u00e1ss\u00eda leturs -MEncoderVideo.16=Sj\u00e1lfgefnar letur stillingar: St\u00e6r\u00f0 leturs -MEncoderVideo.17=\u00datl\u00ednur leturs -MEncoderVideo.18=M\u00fdkt leturs -MEncoderVideo.19=Sp\u00e1ss\u00eda leturs -MEncoderVideo.20=ASS/SSA Textar -MEncoderVideo.21=Fontconfig/\u00c1brennt -MEncoderVideo.22=Hla\u00f0a sj\u00e1lfkrafa *.srt/*.sub textaskr\u00e1r me\u00f0 sama nafni -MEncoderVideo.24=S\u00e9rstakt TrueType letur (fyrir as\u00edsk tungum\u00e1l): -MEncoderVideo.25=Velja TrueType letur -MEncoderVideo.26=Af-interlace s\u00eda -MEncoderVideo.27=Nota s\u00e9rstaka st\u00e6r\u00f0 -MEncoderVideo.28=Breidd -MEncoderVideo.29=MEncoder stillingar fyrir lengra komna -MEncoderVideo.30=H\u00e6\u00f0 -MEncoderVideo.32=Endurblanda \u00feegar AC-3 er til sta\u00f0ar (engin millik\u00f3\u00f0un) -MEncoderVideo.33=Eigin skipanir: -MEncoderVideo.34=Breyta skipunum fyrir codeca -MEncoderVideo.35=Aukin fj\u00f6lkjarna stu\u00f0ningur -MEncoderVideo.36=Nota sj\u00e1lfgefi\u00f0 ASS \u00fatlit -MEncoderVideo.37=Sl\u00f3\u00f0 \u00e1 m\u00f6ppu sem inniheldur texta -MEncoderVideo.38=Skipta yfir \u00ed tsMuxeR ef PS3 getur spila\u00f0 H.264 skr\u00e1nna og \u00fea\u00f0 er enginn texti(subtitle) [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.68=\#H\u00e9rna getur \u00fe\u00fa sett \u00fe\u00ednar eigin skipanir og skilyr\u00f0i fyrir hina og \u00feessa codeca.\n -MEncoderVideo.69=\#Oftast er \u00feetta nota\u00f0 ef \u00fea\u00f0 er einvurskonar vesen me\u00f0 hlj\u00f3\u00f0 & mynd, en \u00fea\u00f0 m\u00e1 nota \u00fea\u00f0 fyrir hva\u00f0 sem er.\n -MEncoderVideo.70=\#Ef \u00fe\u00fa veist ekki hva\u00f0 allt \u00feetta er \u00fe\u00e1 \u00fearftu l\u00edklega ekkert a\u00f0 p\u00e6la \u00ed \u00feessu\!\n -MEncoderVideo.71=\#M\u00e1lskipunin er {java skilyr\u00f0i} :: {MEncoder stillingar} ; \u00de\u00fa getur blanda\u00f0 fleiri en einni skipun \u00ed einu.\n -MEncoderVideo.72=\#A\u00f0gengilegar breytur: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Ef einhver l\u00edna er "\u00f3gild" \u00fe\u00e1 er h\u00fan einfaldlega hunsu\u00f0 og eytt \u00fat.\n -MEncoderVideo.75=\#Nokkrar MEncoder stillingar:\n -MEncoderVideo.76=\# -noass: Algj\u00f6rlega afvirkja ASS/SSA texta \u00fear sem \u00feeir geta trufla\u00f0 hlj\u00f3\u00f0 og mynd samstillingu(out of sync)\n -MEncoderVideo.77=\# -nosync: Algj\u00f6rlega afvirkja hlj\u00f3\u00f0 og mynd samstillingu, \u00f6nnur lei\u00f0 til a\u00f0 gera \u00feetta er me\u00f0 -mc, \u00fea\u00f0 virkar eins\n -MEncoderVideo.78=\# -quality: Stillingar \u00e1 g\u00e6\u00f0i\n -MEncoderVideo.79=\# -mt: Ney\u00f0a notkun \u00e1 fj\u00f6l\u00fer\u00e1\u00f0a MEncoder \u00fatg\u00e1fu (tilrauna \u00fatg\u00e1fa, ekki m\u00e6lt me\u00f0 \u00feessu)\n -MEncoderVideo.80=\#\u00deessi listi mun breytast og b\u00e6tast me\u00f0 t\u00edmanum: Allar athugasemdir til a\u00f0 b\u00e6ta listann eru vel \u00feegnar.\n -MEncoderVideo.87=\#\u00de\u00fa getur sett \u00fe\u00edn eigin skilyr\u00f0i/stillingar h\u00e9r \u00ed glugganum fyrir ne\u00f0an\! T\u00f6kum nokkur d\u00e6mi ---\n -MEncoderVideo.88=\#Til a\u00f0 mynda virkja fj\u00f6l\u00fer\u00e1\u00f0a stu\u00f0ning fyrir allar H.264 HD myndskr\u00e1r:\n\# vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#Til a\u00f0 ey\u00f0a 24p hn\u00f6kra \u00e1 50 hertza sj\u00f3nv\u00f6rpum:\n\# framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#Til a\u00f0 endurblanda(remux, hra\u00f0virkari en millik\u00f3\u00f0un) \u00feegar skr\u00e1in er MPEG-2 og \u00fea\u00f0 er enginn texti(subtitle):\n\# vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=Tungum\u00e1l [\u00dearft a\u00f0 endurr\u00e6sa forriti\u00f0]: -NetworkTab.1=Vafra \u00ed gegnum .RAR/.ZIP/.CBR -NetworkTab.2=\u00datb\u00faa s\u00fdnishorn -NetworkTab.3=Byrja minimized -NetworkTab.4=Setja upp sem Windows Service -NetworkTab.5=Almennar stillingar -NetworkTab.6=H\u00e1marks st\u00e6r\u00f0 minnis sem millik\u00f3\u00f0a\u00f0 efni er veitt \u00ed megab\u00e6tum (mest MAX_BUFFER_SIZE): -NetworkTab.7=Fj\u00f6ldi kjarna nota\u00f0ir fyrir millik\u00f3\u00f0un (svo vir\u00f0ist sem \u00fe\u00fa ert me\u00f0 %d): -NetworkTab.11=\u00de\u00fa hefur uppsett forriti\u00f0 sem Windows service\! Til a\u00f0 nota \u00fea\u00f0, loka\u00f0u \u00feessu forriti,\n -NetworkTab.12=r\u00e6stu s\u00ed\u00f0an (og stilltu) servici\u00f0 fr\u00e1 windows administration panel.\n\n -NetworkTab.13=Skr\u00e1arsafni\u00f0 ver\u00f0ur endurstillt \!\n -NetworkTab.14=Villa kom upp vi\u00f0 uppsetningu Windows service\!\n -NetworkTab.15=Stillingar fyrir v\u00f6frun/lestur -NetworkTab.16=Taka s\u00fdnishorn fr\u00e1 \u00feessari sek\u00fandu: -NetworkTab.17=Virkja skr\u00e1arsafni\u00f0 -NetworkTab.18=Endurr\u00e6sa skr\u00e1arsafni\u00f0 -NetworkTab.19=Ertu viss? -NetworkTab.20=Ney\u00f0a notkun \u00e1 \u00feessu netskilfleti: -NetworkTab.22=Stillingar netkerfis, breyti\u00f0 einungis ef \u00ed vanda -NetworkTab.23=Ney\u00f0a IP t\u00f6lu \u00e1 \u00fej\u00f3ni: -NetworkTab.24=Ney\u00f0a port \u00e1 \u00fej\u00f3ni (sj\u00e1lfgefi\u00f0 5001): -NetworkTab.25=PS3 Stillingar -NetworkTab.26=Letursett fyrir skr\u00e1r \u00ed PS3 (Sj\u00e1 XMB->System settings->Charset): -NetworkTab.27=\u00d3nota\u00f0ar stillingar sem \u00fe\u00fa \u00e6ttir ekki a\u00f0 nota -NetworkTab.28=Turbo stilling (virkja tcp_nodelay) / Fara varlega -NetworkTab.29=Hunsa bei\u00f0nir fr\u00e1 PS3 eftir millik\u00f3\u00f0un -NetworkTab.30=Nota IP s\u00edu: -NetworkTab.31=HTTP og kerfis stillingar fyrir lengra komna -NetworkTab.32=HTTP V\u00e9l V2 -NetworkTab.33=Komast framhj\u00e1 svefnham me\u00f0an streymt er -NetworkTab.34=Vi\u00f0b\u00e6tur -NetworkTab.35=H\u00e1marks notkun bandv\u00edddar \u00ed Mb/s (0 \u00fe\u00fd\u00f0ir ekkert h\u00e1mark): -PMS.0=PS3 fannst ekki. Er kveikt \u00e1 henni? \u00de\u00fa getur einnig t\u00e9kka\u00f0 \u00e1 rekjun og/e\u00f0a stillingum, jafnvel debug.log skr\u00e1nna -PMS.1=Hlj\u00f3\u00f0 -PMS.2=\#- Skr\u00e1arsafn -\# -PMS.3=A\u00f0rar Hlj\u00f3\u00f0/Mynd samstillingar a\u00f0fer\u00f0ir -PMS.4=Af-interlace s\u00eda -PMS.5=PS3 v\u00e9lin \u00fe\u00edn fannst \! -PMS.6=Hla\u00f0a sj\u00e1lfkrafa .srt/.sub textaskr\u00e1r -PMS.7=Sleppa lykkju-s\u00edu fyrir H.264 k\u00f3\u00f0un [MINNI G\u00c6\u00d0I] -PMS.8=Texti -PMS.9=Allir Playlistar -PMS.10=Algj\u00f6rlega afvirkja texta -PMS.11=Allar Hlj\u00f3\u00f0skr\u00e1r -PMS.12=Eftir Dagsetningu -PMS.13=Eftir Flytjanda -PMS.14=Sj\u00e1lfgefin H.264 endurbl\u00f6ndun me\u00f0 MEncoder -PMS.16=Eftir Disk -PMS.19=Eftir St\u00edl -PMS.21=Eftir m\u00f3del myndav\u00e9lar -PMS.22=Eftir Flytjanda/Disk -PMS.25=Eftir ISO stillingu -PMS.26=Eftir St\u00edl/Flytjanda/Disk -PMS.27=Vista stillingar -PMS.31=Myndir -PMS.32=Allar Myndir -PMS.34=Myndskr\u00e1r -PMS.35=Allar Myndskr\u00e1r -PMS.36=HD Myndskr\u00e1r -PMS.37=\#- Stillingar -\# -PMS.39=SD Myndskr\u00e1r -PMS.41=(Endur)uppsetning \u00e1 Win32 service -PMS.130=Augnablik, reyni a\u00f0 n\u00e1 sambandi vi\u00f0 PS3... -StatusTab.2=Sta\u00f0a -StatusTab.3=B\u00ed\u00f0a... -StatusTab.5=Engin millik\u00f3\u00f0un \u00ed gangi. -StatusTab.6=Sta\u00f0a millik\u00f3\u00f0unar: -StatusTab.7=I/O sta\u00f0a: -StatusTab.8=Bitafl\u00e6\u00f0i: -StatusTab.9=Fann eftirfarandi t\u00e6ki -StatusTab.10=Mesta bitafl\u00e6\u00f0i: -TSMuxerVideo.0=Ney\u00f0a AC-3 afbl\u00f6ndun fyrir allar skr\u00e1r -TSMuxerVideo.1=Ney\u00f0a PCM afbl\u00f6ndun fyrir DTS/FLAC hlj\u00f3\u00f0 -TSMuxerVideo.2=Ney\u00f0a FPS lestur fr\u00e1 FFmpeg innan s\u00f6mu l\u00fdsiskr\u00e1ar -TSMuxerVideo.3=TsMuxer Mynd/Hlj\u00f3\u00f0 k\u00f3\u00f0unar stillingar -TSMuxerVideo.19=Blanda \u00f6llum hlj\u00f3\u00f0r\u00e1sum -TrTab2.0=Virkja/Afvirkja millik\u00f3\u00f0unar forrit -TrTab2.1=Engar stillingar \u00ed bili -TrTab2.2=Stillingar myndskr\u00e1a k\u00f3\u00f0unar fyrir eftirfarandi forrit: MEncoder/AviSynth/FFmpeg -TrTab2.3=Stillingar hlj\u00f3\u00f0s, virkar fyrir eftirfarandi k\u00f3\u00f0ara: MEncoder/AviSynth/FFmpeg -TrTab2.4=Stillingar fyrir g\u00e6\u00f0i myndskr\u00e1a -TrTab2.5=Almennar stillingar fyrir millik\u00f3\u00f0un -TrTab2.6=Ra\u00f0a millik\u00f3\u00f0unar listanum. S\u00fa fyrsta mun byrtast \u00e1 sama sta\u00f0 og mynskr\u00e1in er -TrTab2.7=A\u00f0rar stillingar -TrTab2.8=Sleppa millik\u00f3\u00f0un fyrir eftirfarandi skr\u00e1arendingar (a\u00f0skilja me\u00f0 kommu): -TrTab2.9=Ney\u00f0a millik\u00f3\u00f0un fyrir eftirfarandi skr\u00e1arendingar (a\u00f0skilja me\u00f0 kommu): -TrTab2.10=Leyfir \u00fe\u00e9r a\u00f0 streyma DTS hlj\u00f3\u00f0 beint \u00ed "gegnum" PS3.\nFari\u00f0 varlega, \u00fea\u00f0 g\u00e6tu myndast hlj\u00f3\u00f0truflanir. Nokkrar r\u00e1\u00f0leggingar ef svo er:\n- \u00de\u00fa ver\u00f0ur a\u00f0 vera me\u00f0 b\u00fana\u00f0 sem getur h\u00f6ndla\u00f0 DTS hlj\u00f3\u00f0(sj\u00f3nvarp e\u00f0a heimab\u00ed\u00f3), og \u00fea\u00f0 ver\u00f0ur a\u00f0 vera tengt me\u00f0 TOSLINK(lj\u00f3s) e\u00f0a HDMI.\n- "Volume" \u00e1 PS3 t\u00f6lvunni ver\u00f0ur a\u00f0 vera stillt \u00e1 0, \u00fe.e.a.s ekki +/- t\u00f6lur\n- Hlj\u00f3\u00f0r\u00e1sinar \u00e1 PS3 ver\u00f0a a\u00f0 vera "Left+Right", ekki anna\u00f0hvort.\n -TrTab2.11=Millik\u00f3\u00f0unar forrit -TrTab2.12=Almennar k\u00f3\u00f0unar stillingar -TrTab2.13=Almennar k\u00f3\u00f0unar stillingar -TrTab2.14=Millik\u00f3\u00f0un myndskr\u00e1a -TrTab2.15=Millik\u00f3\u00f0un hlj\u00f3skr\u00e1a -TrTab2.16=Millik\u00f3\u00f0un vefstreymda myndskr\u00e1a -TrTab2.17=Millik\u00f3\u00f0un vefstreymda hlj\u00f3\u00f0skr\u00e1a -TrTab2.18=\u00d6nnur millik\u00f3\u00f0unar forrit -TrTab2.19=Feitletra\u00f0 nafn s\u00fdnir forgang fyrir -TrTab2.20=millik\u00f3\u00f0un \u00ed s\u00ednum flokk -TrTab2.21=[Enginn stu\u00f0ningur vi\u00f0 AviSynth] -TrTab2.27=DTS/FLAC -> LPCM endurbl\u00f6ndun (\u00de\u00fa \u00fearft HDMI m\u00f3ttakara til a\u00f0 streyma PCM 5.1 \! Bitafl\u00e6\u00f0i a\u00f0 me\u00f0altali = 4.6Mbps) -TrTab2.28=Hafa DTS hlj\u00f3\u00f0 \u00ed streymi (Virkar me\u00f0 optical link) -> Varlega, auka bitafl\u00e6\u00f0i\! -TrTab2.29=AC-3 bitafl\u00e6\u00f0i (\u00ed Kbits/s) (d\u00e6mi: 384, 576, 640): -TrTab2.32=Stillingar fyrir MPEG-2 g\u00e6\u00f0i: -TrTab2.39=Mynskr\u00e1r eru venjulega millik\u00f3\u00f0a\u00f0ar yfir \u00ed MPEG-PS mynd me\u00f0 AC-3 hlj\u00f3\u00f0i (PS3 sty\u00f0ur \u00fea\u00f0 mj\u00f6g vel) -TrTab2.40=\n\u00de\u00fa getur leiki\u00f0 \u00fe\u00e9r me\u00f0 vqscale, vqmin og keyint skipuninar til a\u00f0 n\u00e1 g\u00f3\u00f0um, n\u00e1nast fullkomnum g\u00e6\u00f0um \u00ed millik\u00f3\u00f0un. -TrTab2.41=\nGallin vi\u00f0 \u00feetta er s\u00e1 a\u00f0 breytilegt bitafl\u00e6\u00f0i, sem g\u00e6ti af og til fl\u00e6tt yfir h\u00e1marks getu netkerfis. -TrTab2.42=\n\u00deess vegna getur \u00fe\u00fa stillt bandv\u00edddina s\u00e9r, ef \u00fe\u00fa ert \u00e1 WiFi, CPL, osfr. \u00deannig g\u00e6\u00f0in \u00ed millik\u00f3\u00f0uninni er jafnv\u00e6gi -TrTab2.43=\n\u00e1 milli hra\u00f0a netkerfis og kraft \u00f6rgj\u00f6fans. \u00dev\u00ed h\u00e6rri g\u00e6\u00f0ium sem \u00fe\u00fa reynir a\u00f0 setja \u00ed takmarka\u00f0ri st\u00e6r\u00f0, \u00fev\u00ed meira mun -TrTab2.44=\nCPU \u00fej\u00e1st\! Einnig, ekki gera r\u00e1\u00f0 fyrir \u00fev\u00ed a\u00f0 geta streymt 1080p hasarmynd \u00ed fullum g\u00e6\u00f0um \u00e1 15Mbps :p -TrTab2.50=Fj\u00f6ldi hlj\u00f3\u00f0r\u00e1sa: -TrTab2.51=Ekki nota texta (subtitles) -TrTab2.52=Stu\u00f0ningur fyrir kafla \u00ed \#Transcode\# / Millibil \u00ed m\u00edn\u00fatum: -TracesTab.3=Hreinsa -TreeNodeSettings.4=\u00deetta forrit vir\u00f0ist ekki vera til sta\u00f0ar\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_it.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_it.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_it.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_it.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,214 +0,0 @@ -DLNAMediaDatabase.0=Per un miglior supporto e sviluppo dell'applicazione,\nil database della libreria multimediale deve essere riavviato.\nScusate per l'inconveniente\! -FFMpegDVRMSRemux.0=Cartella altenativa FFmpeg: -FFMpegDVRMSRemux.1=Impostazioni per il remuxing DVR-MS -FFMpegVideo.0=Impostazioni encoder solo per AviSynth/FFmpeg (MEGLIO MENCODER) -FoldTab.0= -FoldTab.1=Opzioni di condivisione -FoldTab.2=Scansiona tutte le cartelle condivise -FoldTab.3=Scansionare tutte le cartelle condivise pu\u00f2 richiedere molto tempo \!\n -FoldTab.4=Sicuro di lanciare la scansione?\n\n -FoldTab.5=Nascondi estensione file -FoldTab.6=Nascondi \#Impostazioni Video\# Cartella -FoldTab.7=Cartelle condivise -FoldTab.8=Nascondi nome del motore di transcodifica -FoldTab.9=Aggiungi Cartella -FoldTab.10=Vuoi fermare la scansione?\n\n -FoldTab.11=Abilita copia transcodificati video su PS3 (Attenzione, i file non hanno dimensione fissa!) -FoldTab.12=Ordina le cartelle condivise -FoldTab.13=Thumbnails -FoldTab.14=Usa MPlayer per anteprima Video -FoldTab.15=Alfabetico (A-Z) -FoldTab.16=Per Data decrescente -FoldTab.17=Per Data decrescente -FoldTab.18=Ordinamento file: -FoldTab.19=Icona DVD ISO -FoldTab.20=ASCIIbetical -FoldTab.21=Immagine anteprima -FoldTab.23=Scarica da amazon.com -FoldTab.24=Scarica da discogs.com -FoldTab.26=Mostra icona Audio: -FoldTab.27=Cartella alternativa per copertine video -FoldTab.28=Scegli una cartella -FoldTab.29=Mostra libreria iPhoto -FoldTab.30=Mostra libreria iTunes -FoldTab.31=Nascondi cartelle vuote/no media (Attenzione: rallenta la navigazione) -FoldTab.32=Nascondi cartella libreria multimediale -FoldTab.33=Nascondi Cartella \#Transcode\# -FoldTab.34=Mostra aperture library -FontFileFilter.3=Truetype Fonts -LinksTab.5=Link utili: -LooksFrame.5=Esci -LooksFrame.6=Pannello Principale -LooksFrame.9=Salva -LooksFrame.12=Riavvia Server -LooksFrame.18=Stato -LooksFrame.19=Traces -LooksFrame.20=Configurazione Generale -LooksFrame.21=Impostazioni Transcodifica -LooksFrame.22=Condivisione Cartelle -LooksFrame.24=Aiuto -LooksFrame.25=Informazioni -MEncoderAviSynth.2=Impostazioni decoder video solo per AviSynth -MEncoderAviSynth.3=Abilita in AviSynth il cambio da framerate variabile a costante (convertfps=true) -MEncoderVideo.0=Salta il ciclo del filtro deblocking per H.264. Possible perdita qualita -MEncoderVideo.1=Impostazioni decoder Video/Audio solo per MEncoder -MEncoderVideo.2=Metodo alternativo sincronizzazione A/V -MEncoderVideo.3=Metodo A/V alternativo specifico (XVID/MP3,RM,FLV) -MEncoderVideo.4=Forza framerate ricavato da FFmpeg -MEncoderVideo.5=Puoi aggiungere opzioni specifiche, come il filtro riduzione disturbo: -vf hqdn3d -MEncoderVideo.6=Impostazioni decoding: -MEncoderVideo.7=Priorit\u00e0 ligua audio: -MEncoderVideo.8=Impostazioni sottotitoli -MEncoderVideo.9=Priorit\u00e0 lingua sottotitoli: -MEncoderVideo.10=Priorit\u00e0 lingua audio/sottotitoli (es: en,off;eng,off) -MEncoderVideo.11=Codifica sottotitoli: -MEncoderVideo.12=Impostazioni font ASS: Dimesione font -MEncoderVideo.13=Contorno font -MEncoderVideo.14=Ombra font -MEncoderVideo.15=Sotto-margine font -MEncoderVideo.16=Impostazioni predefinite font: Dimensione font -MEncoderVideo.17=Margine font -MEncoderVideo.18=Blur font -MEncoderVideo.19=Sotto-margine font -MEncoderVideo.20=Sottotitoli ASS/SSA -MEncoderVideo.21=Fontconfig/Embedded fonts -MEncoderVideo.22=Carica automaticamente sottitoli *.srt/*.sub con lo stesso nome del file -MEncoderVideo.23=FriBiDi mode -MEncoderVideo.24=Specifica font TrueType (per lingue asiatiche): -MEncoderVideo.25=Seleziona una font Truetype -MEncoderVideo.26=Filtro deinterlacciamento -MEncoderVideo.27=Usa Video Scaler -MEncoderVideo.28=Larghezza -MEncoderVideo.29=Impostazioni avanzate: Codec parametri specifici -MEncoderVideo.30=Altezza -MEncoderVideo.31=colore sottotitoli -MEncoderVideo.32=Remuxa quando la traccia audio \u00e8 in formato AC-3 (no re-encode) -MEncoderVideo.33=Parametri personalizzati: -MEncoderVideo.34=Edita i parametri specifici dei codecs -MEncoderVideo.35=Usa CPU multicore -MEncoderVideo.36=Use ASS default style -MEncoderVideo.37=Cartella Alternativa Sottotitoli -MEncoderVideo.38=Passa a tsMuxeR quando il video H.264 \u00e8 compatibile PS3 e non ci sono sottotitoli [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.39=Remuxa tracce video DVD ISO (no re-encode) -MEncoderVideo.92=DVD/VOBsub qualit\u00e0 sottotitoli (0-4) (maggiore \u00e8 megliore): -MEncoderVideo.93=Aggiungere i bordi di compensazione overscan: -NetworkTab.0=Lingua [richiede riavvio applicazione]: -NetworkTab.1=Sfoglia archivi .RAR/.ZIP/.CBR -NetworkTab.2=Generazione anteprime -NetworkTab.3=Esegui minimizzato -NetworkTab.4=Installa come un Servizio di Windows -NetworkTab.5=Impostazioni Generali -NetworkTab.6=Dimensione massima buffer di transcodifica, in MB (max: 650): -NetworkTab.7=Numero di core usati per la transcodifica (sembra che tu abbia %d): -NetworkTab.8=Cerca Aggiornamenti -NetworkTab.9=Ricerca automatica -NetworkTab.11=Hai installato il servizio di Windows\! Per usarlo devi uscire da questa applicazione,\n -NetworkTab.12=quindi avviarlo (e configurarlo) dal pannello di amministrazione di windows.\n\n -NetworkTab.13=Il catalogo multimediale verr\u00e0 reinizializzato \!\n -NetworkTab.14=Errore nell'installazione del servizio Windows!\n -NetworkTab.15=Impostazioni Navigazione/Analisi -NetworkTab.16=Posizione ricerca anteprima (in secondi): -NetworkTab.17=Abilita la libreria multimediale -NetworkTab.18=Resetta libreria multimediale -NetworkTab.19=Sei sicuro? -NetworkTab.20=Forza interfaccia di rete: -NetworkTab.22=Impostazioni di Rete, cambiare solo se ci sono problemi -NetworkTab.23=Forza IP del server: -NetworkTab.24=Forza porta del server (5001 di default): -NetworkTab.25=Impostazioni PS3 -NetworkTab.26=Codifica caratteri per i nomi file PS3 (vedi XMB->Impostazioni di sistema->Codifica Caratteri): -NetworkTab.27=Impostazioni non usate che non dovresti usare :p -NetworkTab.28=Modalit\u00e0 turbo (abilita tcp_nodelay) / attenzione, non sono sicuro se \u00e8 giusto farlo -NetworkTab.29=Blocca richieste per lo stesso file dalla PS3 quando la transcodifica \u00e8 iniziata -NetworkTab.30=Usa un filtro IP: -NetworkTab.31=Advanced HTTP and system settings -NetworkTab.32=HTTP Engine V2 -NetworkTab.33=Previeni lo sleeping del sistema durante lo streaming -NetworkTab.34=Plugins -NetworkTab.35=Massima banda in Mb/s (0 significa senza limite): -PMS.0=La PS3 non \u00e8 stata trovata. E' accesa? Puoi controllare le traces e/o la configurazione, o anche il file debug.log -PMS.1=Audio -PMS.2=\#- Libreria Multimediale -\# -PMS.3=Metodo alternativo sincronizzazione A/V -PMS.4=Filtro Deinterlacciamento -PMS.5=La PS3 \u00e8 stata trovata \! -PMS.6=Carica automaticamente sottotitoli .srt/.sub -PMS.7=SkipLoopFilter for H.264 Decoding [POSSIBILE PERDITA QUALITA'] -PMS.8=Sottotitoli -PMS.9=Tutte le Playlist Audio -PMS.10=Disabilita sottotitoli definitivamente -PMS.11=Tutte le tracce audio -PMS.12=Per Data -PMS.13=Per Artista -PMS.14=Default H.264 Remux with MEncoder -PMS.16=Per Album -PMS.17=renderer sconosciuto -PMS.19=Per Genere -PMS.21=Per modello camera -PMS.22=Per Artista/Album -PMS.25=Per impostazioni ISO -PMS.26=Pr Genere/Artista/Album -PMS.27=Salva configurazione -PMS.31=Foto -PMS.32=Tutte le Foto -PMS.34=Video -PMS.35=Tutti i Video -PMS.36=Video HD -PMS.37=\#- Impostazioni Video -\# -PMS.39=Video SD -PMS.41=(Re)installazione servizio Win32 -PMS.130=Sto Contattando la PS3... -ProfileChooser.1=PS3 Media Server Profile Chooser -ProfileChooser.2=Select -ProfileChooser.3=Profile file (.conf) or directory -StatusTab.2=Stato -StatusTab.3=Attesa... -StatusTab.5=Vuoto -StatusTab.6=Stato buffer transcodifica: -StatusTab.7=Statistiche I/O: -StatusTab.8=Bitrate corrente: -StatusTab.9=Rilevati altri media renderers -StatusTab.10=Bitrate massimo: -TSMuxerVideo.0=Forza il remuxing AC-3 con tutti i file -TSMuxerVideo.1=Forza il remuxing PCM con audio DTS/FLAC -TSMuxerVideo.2=Forza il FPS analizzato da FFmpeg nel meta file -TSMuxerVideo.3=Impostazioni decoder video solo per TsMuxer -TSMuxerVideo.19=Muxa tulle le tracce audio -TrTab2.0=Abilita/disabilita motore di transcodifica -TrTab2.1=Nessuna impostazione per ora -TrTab2.2=Impostazioni encoder video per i seguenti motori: Mencoder/AviSynth/FFmpeg -TrTab2.3=Impostazioni decoder audio, si applica ai seguenti decoder: Mencoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Impostazioni della qualit\u00e0 video -TrTab2.5=Impostazioni di transcodifica comuni -TrTab2.6=Ordina la lista dei motori di transcodifica. I primi appariranno nella cartella originale del video -TrTab2.7=Opzioni varie -TrTab2.8=Salta transcodifica per le seguenti estensioni (separati da virgola): -TrTab2.9=Forza transcodifica per le seguenti estensioni (separati da virgola): -TrTab2.10=Consente di inviare flussi DTS direttamente al riproduttore.\nAttenzione, \u00e8 possibile che si generi un suono statico. Note:\n- dovete avere un riproduttore compatibile con DTS, connesso con TOSLINK o HDMI\n- L'Icona del volume su XMB deve essere su 'Normal'\n- L'Icona dei canali su XMB deve essere su 'Left+Right'\n -TrTab2.11=Motori -TrTab2.12=Impostazioni comuni decoder -TrTab2.13=Impostazioni comuni encoder -TrTab2.14=Motori File Video -TrTab2.15=Motori File Audio -TrTab2.16=Motori Web Streaming Video -TrTab2.17=Motori Web Streaming Audio -TrTab2.18=Altri Motori -TrTab2.19=Il motore in grassetto ha la priorit\u00e0 -TrTab2.20=e rimpiazzera i video originali -TrTab2.21=[AviSynth non supportato] -TrTab2.22=Aaudio ricampionato automaticamente a 44.1 o 48 kHz -TrTab2.27=DTS/FLAC -> LPCM remux (Hai bisogno di un ricevitore HDMI per trasmettere PCM 5.1 \! Bitrate Medio = 4.6Mbps) -TrTab2.28= mantenere DTS audio in stream (Compatibile con uscita ottica) -> Attenzione, facilmente il bitrate va in overhead ! -TrTab2.29=AC-3 Audio bitrate (in Kbits/s) (es: 384, 576, 640): -TrTab2.32=Impostazioni MPEG-2: -TrTab2.39=Il video \u00e8 automaticamente transcodificato e combinato con audio MPEG-PS / AC-3 (molto compatibile con PS3) -TrTab2.40=\nPuoi riprodurre con i parametri vqscale, vqmin e keyint per ottenere una transcodifica quasi senza perdita di qualit\u00e0. -TrTab2.41=\nL'inconveniente a questo \u00e8 che il bitrare VBR pu\u00f2 a volte eccedere la tua banda di rete. -TrTab2.42=\nPer questo puoi anche impostare la banda se sei su WiFi, CPL, etc. Comunque, la qualit\u00e0 di transcodifica -TrTab2.43=\n\u00e8 il bilancio tra velocit\u00e0 di rete e potenza della CPU: pi\u00f9 qualit\u00e0 metti su in un piccolo bitrate, -TrTab2.44=\npi\u00f9 la CPU ne soffrir\u00e0\! Inoltre, non aspettarti che un film in 1080p stia in massima qualit\u00e0 su 15Mbps :p -TrTab2.50=Numero di canali audio: -TrTab2.51=Disabilita definitivamente sottotitoli -TrTab2.52=Capitoli \#Transcode\# Cartella supporto / Intervallo in minuti: -TracesTab.3=Svuota -TreeNodeSettings.4=Questo motore non \u00e8 caricato\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_iw.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_iw.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_iw.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_iw.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,289 +0,0 @@ -DLNAMediaDatabase.0=\u05d1\u05e1\u05d9\u05e1 \u05d4\u05e0\u05ea\u05d5\u05e0\u05d9\u05dd \u05e9\u05dc \u05d4\u05de\u05d8\u05de\u05d5\u05df \u05d3\u05d5\u05e8\u05e9 \u05d4\u05e4\u05e2\u05dc\u05d4 \u05de\u05d7\u05d3\u05e9.\n\u05e1\u05dc\u05d9\u05d7\u05d4 \u05e2\u05dc \u05d0\u05d9 \u05d4\u05e0\u05e2\u05d9\u05de\u05d5\u05ea \! -DLNAMediaDatabase.1=\u05d0,\u05d1,\u05d2,\u05d3,\u05d4,\u05d5,\u05d6,\u05d7,\u05d8,\u05d9,\u05db,\u05dc,\u05de,\u05e0,\u05e1,\u05e2,\u05e4,\u05e6,\u05e7,\u05e8,\u05e9,\u05ea,\u05e5,\u05e3,\u05da,\u05dd -DLNAMediaDatabase.2=\u05e0\u05d9\u05e7\u05d9\u05d5\u05df \u05d1\u05e1\u05d9\u05e1 \u05e0\u05ea\u05d5\u05e0\u05d9\u05dd... -DLNAMediaDatabase.3=\u05d3\u05d5\u05d7\u05e1 \u05d1\u05e1\u05d9\u05e1 \u05e0\u05ea\u05d5\u05e0\u05d9\u05dd... -DLNAMediaDatabase.4=\u05e1\u05d5\u05e8\u05e7 \u05ea\u05d9\u05e7\u05d9\u05d4: -FFMpegDVRMSRemux.0=\u05d3\u05e8\u05da FFmpeg \u05d7\u05dc\u05d5\u05e4\u05d9\u05ea: -FFMpegDVRMSRemux.1=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 remuxing \u05e9\u05dc DVR-MS -FFMpegVideo.0=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e7\u05d9\u05d3\u05d5\u05d3 \u05e2\u05d1\u05d5\u05e8 \u05de\u05e0\u05d5\u05e2\u05d9 AviSynth/FFmpeg \u05d1\u05dc\u05d1\u05d3 (\u05d1\u05e2\u05d3\u05d9\u05e4\u05d5\u05ea AviSynth/MEncoder) -FoldTab.0=<\u05db\u05dc \u05d4\u05db\u05d5\u05e0\u05e0\u05d9\u05dd> -FoldTab.1=\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05e9\u05d9\u05ea\u05d5\u05e3 -FoldTab.2=\u05e1\u05e8\u05d5\u05e7 \u05d0\u05ea \u05db\u05dc \u05d4\u05ea\u05d9\u05e7\u05d9\u05d5\u05ea \u05d4\u05de\u05e9\u05d5\u05ea\u05e4\u05d5\u05ea -FoldTab.3=\u05e1\u05e8\u05d9\u05e7\u05ea \u05db\u05dc \u05d4\u05ea\u05d9\u05e7\u05d9\u05d5\u05ea \u05d4\u05de\u05e9\u05d5\u05ea\u05e4\u05d5\u05ea \u05e2\u05dc\u05d5\u05dc \u05dc\u05e7\u05d7\u05ea \u05dc\u05d0 \u05de\u05e2\u05d8 \u05d6\u05de\u05df \!\n -FoldTab.4=\u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d4\u05e8\u05d9\u05e5 \u05e1\u05e8\u05d9\u05e7\u05d4?\n\n -FoldTab.5=\u05d4\u05e1\u05ea\u05e8 \u05d0\u05ea \u05db\u05dc \u05d4\u05e1\u05d9\u05d5\u05de\u05d5\u05ea -FoldTab.6=\u05d4\u05e1\u05ea\u05e8 \u05ea\u05d9\u05e7\u05d9\u05ea \#\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5\# -FoldTab.7=\u05ea\u05d9\u05e7\u05d9\u05d5\u05ea \u05de\u05e9\u05d5\u05ea\u05e4\u05d5\u05ea -FoldTab.8=\u05d4\u05e1\u05ea\u05e8 \u05e9\u05de\u05d5\u05ea \u05de\u05e0\u05d5\u05e2\u05d9 \u05e7\u05d9\u05d3\u05d5\u05d3 -FoldTab.9=\u05d4\u05d5\u05e1\u05e3 \u05ea\u05d9\u05e7\u05d9\u05d4 -FoldTab.10=\u05d4\u05d0\u05dd \u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05d1\u05d8\u05dc \u05d0\u05ea \u05d4\u05e1\u05e8\u05d9\u05e7\u05d4?\n\n -FoldTab.11=\u05d0\u05e4\u05e9\u05e8 \u05d4\u05e2\u05ea\u05e7\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05de\u05e7\u05d5\u05d3\u05d3 \u05dc PS3 (\u05d6\u05d4\u05d9\u05e8\u05d5\u05ea, \u05dc\u05e7\u05d1\u05e6\u05d9\u05dd \u05de\u05e7\u05d5\u05d3\u05d3\u05d9\u05dd \u05d0\u05d9\u05df \u05d2\u05d5\u05d3\u05dc \u05e7\u05d1\u05d5\u05e2!) -FoldTab.12=\u05de\u05d9\u05d9\u05df \u05d0\u05ea \u05d4\u05ea\u05d9\u05e7\u05d9\u05d5\u05ea \u05d4\u05de\u05e9\u05d5\u05ea\u05e4\u05d5\u05ea -FoldTab.13=\u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05de\u05d5\u05e7\u05d8\u05e0\u05d5\u05ea -FoldTab.14=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1 MPlayer \u05e2\u05d1\u05d5\u05e8 \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05de\u05d5\u05e7\u05d8\u05e0\u05d5\u05ea \u05d1\u05ea\u05e6\u05d5\u05e8\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 -FoldTab.15=\u05d0\u05dc\u05e4\u05d1\u05d9\u05ea\u05d9 (\u05d0-\u05ea) -FoldTab.16=\u05dc\u05e4\u05d9 \u05ea\u05d0\u05e8\u05d9\u05da, \u05d4\u05d7\u05d3\u05e9 \u05d1\u05d9\u05d5\u05ea\u05e8 \u05e8\u05d0\u05e9\u05d5\u05df -FoldTab.17=\u05dc\u05e4\u05d9 \u05ea\u05d0\u05e8\u05d9\u05da, \u05d4\u05d9\u05e9\u05df \u05d1\u05d9\u05d5\u05ea\u05e8 \u05e8\u05d0\u05e9\u05d5\u05df -FoldTab.18=\u05e1\u05d3\u05e8 \u05d4\u05e7\u05d1\u05e6\u05d9\u05dd: -FoldTab.19=\u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05de\u05d5\u05e7\u05d8\u05e0\u05d5\u05ea \u05e9\u05dc DVD ISO -FoldTab.20=ASCIIbetical -FoldTab.21=\u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05de\u05d5\u05e7\u05d8\u05e0\u05d5\u05ea -FoldTab.22=\u05d0\u05dc\u05e4\u05d0\u05e0\u05d5\u05de\u05e8\u05d9 -FoldTab.23=\u05d4\u05d5\u05e8\u05d3 \u05de amazon.com -FoldTab.24=\u05d4\u05d5\u05e8\u05d3 \u05de discogs.com -FoldTab.26=\u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05de\u05d5\u05e7\u05d8\u05e0\u05d5\u05ea \u05dc\u05e7\u05d1\u05e6\u05d9 \u05d0\u05d5\u05d3\u05d9\u05d5: -FoldTab.27=\u05ea\u05d9\u05e7\u05d9\u05ea \u05db\u05d9\u05e1\u05d5\u05d9 \u05d5\u05d9\u05d3\u05d0\u05d5 \u05d7\u05dc\u05d5\u05e4\u05d9\u05ea -FoldTab.28=\u05d1\u05d7\u05e8 \u05ea\u05d9\u05e7\u05d9\u05d4 -FoldTab.29=\u05d4\u05e6\u05d2 \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea iPhoto -FoldTab.30=\u05d4\u05e6\u05d2 \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea iTunes -FoldTab.31=\u05d4\u05e1\u05ea\u05e8 \u05ea\u05d9\u05e7\u05d9\u05d5\u05ea \u05e8\u05d9\u05e7\u05d5\u05ea/\u05d7\u05e1\u05e8\u05d5\u05ea \u05de\u05d3\u05d9\u05d4 (\u05d6\u05d4\u05d9\u05e8\u05d5\u05ea, \u05e2\u05dc\u05d5\u05dc \u05dc\u05d2\u05e8\u05d5\u05dd \u05dc\u05d8\u05e2\u05d9\u05e0\u05d4 \u05d0\u05d9\u05d8\u05d9\u05ea!) -FoldTab.32=\u05d4\u05e1\u05ea\u05e8 \u05ea\u05d9\u05e7\u05d9\u05ea \u05de\u05d8\u05de\u05d5\u05df -FoldTab.33=\u05d4\u05e1\u05ea\u05e8 \u05ea\u05d9\u05e7\u05d9\u05ea \#\u05e7\u05d9\u05d3\u05d5\u05d3\# -FoldTab.34=\u05d4\u05e6\u05d2 \u05e1\u05e4\u05e8\u05d9\u05d9\u05ea aperture -FontFileFilter.3=\u05e4\u05d5\u05e0\u05d8\u05d9\u05dd \u05de\u05e1\u05d5\u05d2 TrueType -LinksTab.5=\u05dc\u05d9\u05e0\u05e7\u05d9\u05dd \u05de\u05d5\u05e2\u05d9\u05dc\u05d9\u05dd: -LinksTab.6=Build: -LooksFrame.5=\u05e6\u05d0 -LooksFrame.6=\u05e4\u05d0\u05e0\u05dc \u05e8\u05d0\u05e9\u05d9 -LooksFrame.9=\u05e9\u05de\u05d5\u05e8 -LooksFrame.12=\u05d4\u05e4\u05e2\u05dc \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05e9\u05e8\u05ea -LooksFrame.13=\u05d9\u05e9 \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05de\u05d7\u05d3\u05e9 \u05d0\u05ea \u05d4\u05e9\u05e8\u05ea \u05e2\u05e7\u05d1 \u05e9\u05d9\u05e0\u05d5\u05d9\u05d9 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e9\u05d5\u05e0\u05d9\u05dd -LooksFrame.18=\u05e1\u05d8\u05d8\u05d5\u05e1 -LooksFrame.19=\u05e2\u05e7\u05d1\u05d5\u05ea -LooksFrame.20=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05db\u05dc\u05dc\u05d9\u05d5\u05ea -LooksFrame.21=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e7\u05d9\u05d3\u05d5\u05d3 -LooksFrame.22=\u05e0\u05d9\u05d5\u05d5\u05d8/\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05e9\u05d9\u05ea\u05d5\u05e3 -LooksFrame.24=\u05e2\u05d6\u05e8\u05d4 -LooksFrame.25=\u05d0\u05d5\u05d3\u05d5\u05ea -LooksFrame.26=\u05dc\u05d1\u05d3\u05d9\u05e7\u05d4 \u05d1\u05dc\u05d1\u05d3! \u05e2\u05dc\u05d5\u05dc \u05dc\u05d4\u05d9\u05d5\u05ea \u05dc\u05d0 \u05d9\u05e6\u05d9\u05d1 -MEncoderAviSynth.2=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea Video decoder \u05e2\u05d1\u05d5\u05e8 \u05de\u05e0\u05d5\u05e2 AviSynth \u05d1\u05dc\u05d1\u05d3 -MEncoderAviSynth.3=\u05d4\u05e4\u05e2\u05dc \u05e7\u05e6\u05d1 \u05e7\u05d1\u05d5\u05e2 \u05d1\u05de\u05e7\u05d5\u05dd \u05e7\u05e6\u05d1 \u05de\u05e9\u05ea\u05e0\u05d4 \u05dc AviSynth (convertfps=true) -MEncoderAviSynth.4=#\u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05ea\u05d0\u05d9\u05dd \u05d1\u05d0\u05d5\u05e4\u05df \u05d0\u05d9\u05e9\u05d9\u05ea \u05d0\u05ea \u05e1\u05e7\u05e8\u05d9\u05e4\u05d8 AviSynth \u05d1\u05e6\u05d5\u05e8\u05d4 \u05de\u05dc\u05d0\u05d4 \u05db\u05e2\u05ea !\n -MEncoderAviSynth.5=#\u05e2\u05dc\u05d9\u05d9\u05da \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e9\u05ea\u05e0\u05d9\u05dd \u05d4\u05d1\u05d0\u05d9\u05dd (\"clip\" \u05d4\u05d9\u05e0\u05dd \u05de\u05e9\u05ea\u05e0\u05d9 \u05d4 avisynth \u05e9\u05dc \u05d4\u05e1\u05e8\u05d8):\n -MEncoderAviSynth.6=#: insert the complete DirectShowSource instruction [ clip=DirectShowSource(movie, convertfps) ]\n -MEncoderAviSynth.7=#: insert the complete TextSub/VobSub instruction if there's any detected srt/sub/idx/ass subtitle file\n -MEncoderAviSynth.8=#: variable of the movie filename, if you want to do all this by yourself\n -MEncoderAviSynth.9=#Be careful, the custom script MUST return the clip object\n -MEncoderAviSynth.10=<\u05e1\u05e8\u05d8>\n -MEncoderAviSynth.11=<\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea>\n -MEncoderAviSynth.12=\u05d4\u05d7\u05d6\u05e8 \u05e7\u05dc\u05d9\u05e4 -MEncoderVideo.0=\u05d3\u05dc\u05d2 \u05e2\u05dc loop filter deblocking \u05e2\u05d1\u05d5\u05e8 \u05e7\u05d1\u05e6\u05d9\u05dd \u05de\u05e1\u05d5\u05d2 h264. \u05e2\u05dc\u05d5\u05dc \u05dc\u05d4\u05d5\u05e8\u05d9\u05d3 \u05de\u05d0\u05d9\u05db\u05d5\u05ea \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5. -MEncoderVideo.1=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5/\u05d0\u05d5\u05d3\u05d9\u05d5 \u05e2\u05d1\u05d5\u05e8 \u05de\u05e0\u05d5\u05e2 MEncoder \u05d1\u05dc\u05d1\u05d3 -MEncoderVideo.2=\u05e9\u05d9\u05d8\u05ea \u05e1\u05e0\u05db\u05e8\u05d5\u05df \u05d0\u05dc\u05d8\u05e8\u05e0\u05d8\u05d9\u05d1\u05d9\u05ea \u05dc A/V -MEncoderVideo.3=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e4\u05e8\u05de\u05d8\u05e8\u05d9 \u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc \u05dc\u05e7\u05d5\u05d3\u05e7\u05d9\u05dd (\u05de\u05d5\u05de\u05dc\u05e5!) -MEncoderVideo.4=\u05db\u05e4\u05d4 \u05e7\u05e6\u05d1 \u05de FFmpeg -MEncoderVideo.5=\u05d1\u05d0\u05e4\u05e9\u05e8\u05d5\u05ea\u05da \u05dc\u05d4\u05d5\u05e1\u05d9\u05e3 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05de\u05e9\u05dc\u05da, \u05dc\u05de\u05e9\u05dc \u05d4\u05e4\u05e2\u05dc\u05ea \u05e4\u05d9\u05dc\u05d8\u05e8 \u05d4\u05e4\u05d7\u05ea\u05ea \u05e8\u05e2\u05e9: -vf hqdn3d -MEncoderVideo.6=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05de\u05d5\u05ea\u05d0\u05de\u05d5\u05ea \u05d0\u05d9\u05e9\u05d9\u05ea: -MEncoderVideo.7=\u05e2\u05d3\u05d9\u05e4\u05d5\u05ea \u05dc\u05e9\u05e4\u05ea \u05d0\u05d5\u05d3\u05d9\u05d5: -MEncoderVideo.8=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea -MEncoderVideo.9=\u05e2\u05d3\u05d9\u05e4\u05d5\u05ea \u05dc\u05e9\u05e4\u05ea \u05ea\u05e8\u05d2\u05d5\u05dd: -MEncoderVideo.10=\u05e2\u05d3\u05d9\u05e4\u05d5\u05ea \u05dc\u05e9\u05e4\u05ea \u05d0\u05d5\u05d3\u05d9\u05d5/\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea (\u05dc\u05d3\u05d5\u05d2\u05de\u05d4: en,off;jpn,eng) -MEncoderVideo.11=\u05e7\u05d5\u05d3 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea (\u05dc\u05e2\u05d1\u05e8\u05d9\u05ea \u05d1\u05d7\u05e8: ISO-8859-8): -MEncoderVideo.12=\u05e2\u05e7\u05d5\u05e3 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05de\u05e2\u05d5\u05e6\u05d1\u05d5\u05ea: \u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df -MEncoderVideo.13=\u05de\u05ea\u05d0\u05e8 \u05d2\u05d5\u05e4\u05df -MEncoderVideo.14=\u05e6\u05dc \u05d2\u05d5\u05e4\u05df -MEncoderVideo.15=\u05de\u05d9\u05d6\u05d5\u05d2 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea (px) -MEncoderVideo.16=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d8\u05e7\u05e1\u05d8 \u05e4\u05e9\u05d5\u05d8 \u05dc\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea: \u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df -MEncoderVideo.17=\u05de\u05ea\u05d0\u05e8 \u05d2\u05d5\u05e4\u05df -MEncoderVideo.18=\u05d8\u05e9\u05d8\u05d5\u05e9 \u05d2\u05d5\u05e4\u05df -MEncoderVideo.19=\u05de\u05d9\u05d6\u05d5\u05d2 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea (%) -MEncoderVideo.20=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e2\u05d9\u05e6\u05d5\u05d1 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05de\u05e1\u05d5\u05d2 ASS/SSA -MEncoderVideo.21=\u05d2\u05d5\u05e4\u05df \u05de\u05d5\u05d8\u05de\u05e2 \u05d1\u05d5\u05d9\u05d3\u05d0\u05d5 -MEncoderVideo.22=\u05d8\u05e2\u05df \u05d1\u05e6\u05d5\u05e8\u05d4 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9\u05ea \u05e7\u05d1\u05e6\u05d9 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05de\u05e1\u05d5\u05d2 *.srt/*.sub \u05d1\u05e2\u05dc\u05d9 \u05d0\u05d5\u05ea\u05d5 \u05e9\u05dd \u05e7\u05d5\u05d1\u05e5 -MEncoderVideo.23=\u05de\u05e6\u05d1 FriBiDi -MEncoderVideo.24=\u05e6\u05d9\u05d9\u05df \u05d2\u05d5\u05e4\u05df \u05de\u05e1\u05d5\u05d2 TrueType (\u05e2\u05d1\u05d5\u05e8 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea): -MEncoderVideo.25=\u05d1\u05d7\u05e8 \u05e4\u05d5\u05e0\u05d8 TrueType -MEncoderVideo.26=\u05e4\u05d9\u05dc\u05d8\u05e8 Deinterlace -MEncoderVideo.27=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e8\u05d6\u05d5\u05dc\u05d5\u05e6\u05d9\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05de\u05d5\u05ea\u05d0\u05de\u05ea \u05d0\u05d9\u05e9\u05d9\u05ea -MEncoderVideo.28=\u05e8\u05d5\u05d7\u05d1 -MEncoderVideo.29=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05de\u05d5\u05de\u05d7\u05d9\u05dd : \u05e4\u05e8\u05de\u05d8\u05e8\u05d9\u05dd \u05e1\u05e4\u05e6\u05d9\u05e4\u05d9\u05dd \u05dc\u05e7\u05d5\u05d3\u05e7\u05d9\u05dd -MEncoderVideo.30=\u05d2\u05d5\u05d1\u05d4 -MEncoderVideo.31=\u05e6\u05d1\u05e2 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea -MEncoderVideo.32=\u05d1\u05e6\u05e2 Remux \u05db\u05d0\u05e9\u05e8 \u05e8\u05e6\u05d5\u05e2\u05ea \u05d4\u05e9\u05de\u05e2 \u05d4\u05d9\u05e0\u05d4 \u05d1\u05e4\u05d5\u05e8\u05de\u05d8 AC-3 (\u05dc\u05dc\u05d0 \u05e7\u05d9\u05d3\u05d5\u05d3 \u05de\u05d7\u05d3\u05e9) -MEncoderVideo.33=\u05e4\u05e8\u05de\u05d8\u05e8\u05d9\u05dd \u05de\u05d5\u05ea\u05d0\u05de\u05d9\u05dd \u05d0\u05d9\u05e9\u05d9\u05ea: -MEncoderVideo.34=\u05e2\u05e8\u05d5\u05da \u05e4\u05e8\u05de\u05d8\u05e8\u05d9\u05dd \u05e1\u05e4\u05e6\u05d9\u05e4\u05d9\u05dd \u05dc\u05e7\u05d5\u05d3\u05e7\u05d9\u05dd -MEncoderVideo.35=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e1\u05e4\u05e8 \u05dc\u05d9\u05d1\u05d5\u05ea -MEncoderVideo.36=\u05e1\u05d2\u05e0\u05d5\u05df \u05de\u05d5\u05d8\u05de\u05e2 -MEncoderVideo.37=\u05ea\u05d9\u05e7\u05d9\u05d9\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05d0\u05dc\u05d8\u05e8\u05e0\u05d8\u05d9\u05d1\u05d9\u05ea: -MEncoderVideo.38=\u05d1\u05e6\u05e2 Remux \u05dc\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d1\u05e2\u05d6\u05e8\u05ea tsMuxeR \u05d1\u05de\u05e7\u05d5\u05dd \u05d4\u05d6\u05e8\u05de\u05d4 (transcoding) \u05d1\u05de\u05d9\u05d3\u05d4 \u05d5\u05d0\u05e4\u05e9\u05e8. -MEncoderVideo.39=\u05d4\u05d6\u05e8\u05dd \u05e7\u05d1\u05e6\u05d9 \u05d5\u05d9\u05d3\u05d0\u05d5 \u05de\u05e1\u05d5\u05d2 DVD ISO (\u05dc\u05dc\u05d0 \u05e7\u05d9\u05d3\u05d5\u05d3) -MEncoderVideo.68=\#\u05db\u05d0\u05df \u05d1\u05d0\u05e4\u05e9\u05e8\u05d5\u05ea\u05da \u05dc\u05ea\u05ea \u05e4\u05e8\u05de\u05d8\u05e8\u05d9\u05dd \u05e1\u05e4\u05e6\u05d9\u05e4\u05d9\u05d9\u05dd \u05e2\u05d1\u05d5\u05e8 \u05e7\u05d5\u05de\u05d1\u05d9\u05e0\u05e6\u05d9\u05d5\u05ea \u05e9\u05dc \u05e7\u05d5\u05d3\u05e7\u05d9\u05dd \u05de\u05e1\u05d5\u05d9\u05de\u05d9\u05d9\u05dd.\n -MEncoderVideo.69=\#\u05d6\u05d4 \u05d1\u05e2\u05d9\u05e7\u05e8 \u05dc\u05e1\u05e0\u05db\u05e8\u05d5\u05df \u05d0\u05d5\u05d3\u05d9\u05d5/\u05d5\u05d9\u05d3\u05d0\u05d5, \u05d0\u05d1\u05dc \u05e0\u05d9\u05ea\u05df \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05d6\u05d4 \u05dc\u05db\u05dc \u05d3\u05d1\u05e8 \u05d0\u05d7\u05e8\n -MEncoderVideo.70=\#\u05d9\u05e9 \u05dc\u05d4\u05ea\u05d9\u05d9\u05d7\u05e1 \u05dc\u05d6\u05d4 \u05db\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05de\u05d5\u05de\u05d7\u05d9\u05dd, \u05de\u05d5\u05de\u05dc\u05e5 \u05dc\u05d0 \u05dc\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05d6\u05d4 \u05d1\u05de\u05d9\u05d3\u05d4 \u05d5\u05d0\u05ea\u05d4 \u05dc\u05d0 \u05d9\u05d5\u05d3\u05e2 \u05de\u05d4 \u05d0\u05ea\u05d4 \u05e2\u05d5\u05e9\u05d4\n -MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n -MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#\u05d6\u05d4\u05d9\u05e8\u05d5\u05ea, \u05e9\u05d5\u05e8\u05d4 \u05e4\u05d2\u05d5\u05de\u05d4 \u05ea\u05d9\u05de\u05d7\u05e7\n -MEncoderVideo.75=\#\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05de\u05d9\u05d5\u05d7\u05d3\u05d5\u05ea:\n -MEncoderVideo.76=\# -noass: \u05d1\u05d8\u05dc \u05d1\u05e6\u05d5\u05e8\u05d4 \u05de\u05d5\u05d7\u05dc\u05d8\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05de\u05e1\u05d5\u05d2 ASS/SSA \u05de\u05db\u05d9\u05d5\u05d5\u05df \u05e9\u05d4\u05dd \u05e2\u05dc\u05d5\u05dc\u05d9\u05dd \u05dc\u05d2\u05e8\u05d5\u05dd \u05dc\u05e1\u05e0\u05db\u05e8\u05d5\u05df \u05d5\u05d9\u05d3\u05d0\u05d5/\u05d0\u05d5\u05d3\u05d9\u05d5 \u05e9\u05d2\u05d5\u05d9\n -MEncoderVideo.77=\# -nosync: \u05d1\u05d8\u05dc \u05d1\u05e6\u05d5\u05e8\u05d4 \u05de\u05d5\u05d7\u05dc\u05d8\u05ea \u05e9\u05d9\u05d8\u05ea \u05e1\u05e0\u05db\u05e8\u05d5\u05df \u05d5\u05d9\u05d3\u05d0\u05d5/\u05d0\u05d5\u05d3\u05d9\u05d5 \u05d0\u05dc\u05d8\u05e8\u05e0\u05d8\u05d9\u05d1\u05d9\u05ea \u05d1\u05de\u05e6\u05d1 \u05d6\u05d4 (-mc \u05d9\u05d1\u05e6\u05e2 \u05d0\u05ea \u05d0\u05d5\u05ea\u05d4 \u05e4\u05e2\u05d5\u05dc\u05d4)\n -MEncoderVideo.78=\# -quality: \u05e2\u05d5\u05e7\u05e3 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d0\u05d9\u05db\u05d5\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5\n -MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n -MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n -MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n -MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=\u05d0\u05d9\u05db\u05d5\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05de\u05e1\u05d5\u05d2 DVD/VOBsub (\u05d2\u05d1\u05d5\u05d4 \u05d9\u05d5\u05ea\u05e8 \u05d4\u05d9\u05e0\u05d5 \u05d0\u05d9\u05db\u05d5\u05ea\u05d9 \u05d9\u05d5\u05ea\u05e8) (0-4): -MEncoderVideo.93=\u05d4\u05d5\u05e1\u05e3 \u05d2\u05d1\u05d5\u05dc\u05d5\u05ea \u05d1\u05de\u05d9\u05d3\u05d4 \u05d5\u05e6\u05e8\u05d9\u05da: -MEncoderVideo.94=\u05d4\u05db\u05e8\u05d7 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea: -MEncoderVideo.95=\u05d4\u05db\u05e8\u05d7 \u05ea\u05d2\u05d9\u05d5\u05ea: -MEncoderVideo.96=cp1250 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05de\u05d6\u05e8\u05d7 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 */ -MEncoderVideo.97=cp1251 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05e7\u05d9\u05e8\u05d9\u05dc\u05d9\u05ea */ -MEncoderVideo.98=cp1252 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05de\u05e2\u05e8\u05d1 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 */ -MEncoderVideo.99=cp1253 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05d9\u05d5\u05d5\u05e0\u05d9\u05ea*/ -MEncoderVideo.100=cp1254 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05d8\u05d5\u05e8\u05e7\u05d9\u05ea*/ -MEncoderVideo.101=cp1255 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05e2\u05d1\u05e8\u05d9\u05ea */ -MEncoderVideo.102=cp1256 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05e2\u05e8\u05d1\u05d9\u05ea */ -MEncoderVideo.103=cp1257 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05d1\u05dc\u05d8\u05d9\u05ea */ -MEncoderVideo.104=cp1258 /* \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 - \u05d5\u05d9\u05d0\u05d8\u05e0\u05de\u05d9\u05ea */ -MEncoderVideo.105=ISO-8859-1 /* \u05de\u05d6\u05e8\u05d7 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 */ -MEncoderVideo.106=ISO-8859-2 /* \u05de\u05d6\u05e8\u05d7 \u05d5\u05de\u05e8\u05db\u05d6 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 */ -MEncoderVideo.107=ISO-8859-3 /* \u05de\u05d6\u05e8\u05d7 \u05d5\u05de\u05e2\u05e8\u05d1 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 */ -MEncoderVideo.108=ISO-8859-4 /* \u05de\u05e2\u05e8\u05d1 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 \u05d5\u05d4\u05de\u05d3\u05d9\u05e0\u05d5\u05ea \u05d4\u05d1\u05dc\u05d8\u05d9\u05d5\u05ea */ -MEncoderVideo.109=ISO-8859-5 /* \u05d0\u05dc\u05e4\u05d1\u05d9\u05ea \u05e7\u05e8\u05d9\u05dc\u05d9 */ -MEncoderVideo.110=ISO-8859-6 /* \u05e2\u05e8\u05d1\u05d9\u05ea */ -MEncoderVideo.111=ISO-8859-7 /* \u05d9\u05d5\u05d5\u05e0\u05d9\u05ea */ -MEncoderVideo.112=ISO-8859-8 /* \u05e2\u05d1\u05e8\u05d9\u05ea */ -MEncoderVideo.113=ISO-8859-9 /* \u05de\u05e2\u05e8\u05d1 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 \u05d5\u05d8\u05d5\u05e8\u05e7\u05d9\u05ea \u05de\u05ea\u05d5\u05e7\u05e0\u05ea */ -MEncoderVideo.114=ISO-8859-10 /* \u05de\u05e2\u05e8\u05d1 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 \u05d5\u05e9\u05e4\u05d5\u05ea \u05e0\u05d5\u05e8\u05d3\u05d9\u05d5\u05ea */ -MEncoderVideo.115=ISO-8859-11 /* \u05ea\u05d0\u05d9\u05dc\u05e0\u05d3\u05d9\u05ea */ -MEncoderVideo.116=ISO-8859-13 /* \u05e9\u05e4\u05d5\u05ea \u05d1\u05dc\u05d8\u05d9\u05d5\u05ea \u05d5\u05e4\u05d5\u05dc\u05e0\u05d9\u05ea */ -MEncoderVideo.117=ISO-8859-14 /* \u05e9\u05e4\u05d5\u05ea \u05e7\u05dc\u05d8\u05d9\u05d5\u05ea */ -MEncoderVideo.118=ISO-8859-15 /* \u05d1\u05e1\u05d9\u05de\u05df \u05d4\u05d0\u05d9\u05e8\u05d5\u05e4\u05d0\u05d9 */ -MEncoderVideo.119=ISO-8859-16 /* \u05e9\u05e4\u05d5\u05ea \u05de\u05e8\u05db\u05d6 \u05d0\u05d9\u05e8\u05d5\u05e4\u05d4 */ -MEncoderVideo.120=cp932 /* \u05d9\u05e4\u05e0\u05d9\u05ea */ -MEncoderVideo.121=cp936 /* \u05e1\u05d9\u05e0\u05d9\u05ea */ -MEncoderVideo.122=cp949 /* \u05e7\u05d5\u05e8\u05d0\u05e0\u05d9\u05ea */ -MEncoderVideo.123=cp950 /* Big5, \u05d8\u05d9\u05d9\u05d5\u05d5\u05d0\u05e0\u05d9\u05ea, \u05e7\u05e0\u05d8\u05d5\u05e0\u05d6\u05d9\u05ea */ -MEncoderVideo.124=UTF-8 /* \u05d9\u05d5\u05e0\u05d9\u05e7\u05d5\u05d3 */ -MEncoderVideo.125=\u05d1\u05d7\u05e8 \u05e6\u05d1\u05e2 \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea -NetworkTab.0=\u05e9\u05e4\u05d4 [\u05e0\u05d3\u05e8\u05e9 \u05d1\u05d0\u05ea\u05d7\u05d5\u05dc \u05d4\u05ea\u05d5\u05db\u05e0\u05d4]: -NetworkTab.1=\u05d3\u05e4\u05d3\u05e3 \u05d1\u05d0\u05e8\u05db\u05d9\u05d5\u05e0\u05d9\u05dd \u05d3\u05d7\u05d5\u05e1\u05d9\u05dd (.rar/.zip/.cbr) -NetworkTab.2=\u05e6\u05d5\u05e8 \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05de\u05d5\u05e7\u05d8\u05e0\u05d5\u05ea -NetworkTab.3=\u05d4\u05ea\u05d7\u05dc \u05d1\u05de\u05e6\u05d1 \u05de\u05de\u05d5\u05d6\u05e2\u05e8 -NetworkTab.4=\u05d4\u05ea\u05e7\u05df \u05db\u05d9\u05d9\u05e9\u05d5\u05dd \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 -NetworkTab.5=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05db\u05dc\u05dc\u05d9\u05d5\u05ea -NetworkTab.6=\u05d2\u05d5\u05d3\u05dc \u05de\u05e7\u05e1\u05d9\u05de\u05dc\u05d9 \u05e9\u05dc \u05de\u05d2\u05d4 \u05d1\u05d9\u05d9\u05d8 \u05dc\u05d4\u05d6\u05e8\u05de\u05d4 (\u05de\u05e7\u05e1\u05d9\u05de\u05d5\u05dd: MAX_BUFFER_SIZE): -NetworkTab.7=\u05de\u05e1\u05e4\u05e8 \u05dc\u05d9\u05d1\u05d5\u05ea \u05d1\u05d4\u05dd \u05d9\u05e2\u05e9\u05d4 \u05e9\u05d9\u05de\u05d5\u05e9 \u05dc\u05d4\u05d6\u05e8\u05de\u05d4 (\u05e0\u05e8\u05d0\u05d4 \u05e9\u05d9\u05e9 \u05dc\u05da %d): -NetworkTab.8=\u05d1\u05d3\u05d5\u05e7 \u05dc\u05e2\u05d3\u05db\u05d5\u05e0\u05d9\u05dd -NetworkTab.9=\u05d1\u05d3\u05d5\u05e7 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9\u05ea -NetworkTab.11=\u05d4\u05ea\u05e7\u05e0\u05ea \u05d0\u05ea \u05d4PMS \u05db\u05d9\u05d9\u05e9\u05d5\u05dd \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 \! \u05e0\u05d3\u05e8\u05e9\u05ea \u05d4\u05e4\u05e2\u05dc\u05d4 \u05de\u05d7\u05d3\u05e9 \u05e9\u05dc \u05d4\u05ea\u05d5\u05db\u05e0\u05d4,\n -NetworkTab.12=\u05d4\u05e4\u05e2\u05dc (\u05d5\u05d4\u05d2\u05d3\u05e8) \u05d0\u05ea \u05d4\u05d9\u05d9\u05e9\u05d5\u05dd \u05de\u05dc\u05d5\u05d7 \u05d4\u05d1\u05e7\u05e8\u05d4 \u05e9\u05dc \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1.\n\n -NetworkTab.13=\u05d4\u05de\u05d8\u05de\u05d5\u05df \u05d9\u05d5\u05e4\u05e2\u05dc \u05de\u05d7\u05d3\u05e9 \!\n -NetworkTab.14=\u05e9\u05d2\u05d9\u05d0\u05d4 \u05d1\u05d4\u05ea\u05e7\u05e0\u05ea \u05d9\u05e9\u05d5\u05dd \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1!\n -NetworkTab.15=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e0\u05d9\u05d5\u05d5\u05d8/\u05e2\u05d9\u05d1\u05d5\u05d3 -NetworkTab.16=\u05d7\u05d9\u05e4\u05d5\u05e9 \u05ea\u05de\u05d5\u05e0\u05d5\u05ea \u05de\u05d5\u05e7\u05d8\u05e0\u05d5\u05ea (\u05d1\u05e9\u05e0\u05d9\u05d5\u05ea): -NetworkTab.17=\u05d0\u05e4\u05e9\u05e8 \u05d0\u05ea \u05d4\u05de\u05d8\u05de\u05d5\u05df -NetworkTab.18=\u05d0\u05ea\u05d7\u05dc \u05de\u05d8\u05de\u05d5\u05df -NetworkTab.19=\u05d0\u05ea\u05d4 \u05d1\u05d8\u05d5\u05d7? -NetworkTab.20=\u05e7\u05d1\u05e2 \u05e8\u05e9\u05ea \u05dc\u05e9\u05d9\u05de\u05d5\u05e9: -NetworkTab.22=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e8\u05e9\u05ea (\u05de\u05ea\u05e7\u05d3\u05dd) -NetworkTab.23=\u05d4\u05db\u05e8\u05d7 IP \u05e9\u05dc \u05d4\u05e9\u05e8\u05ea: -NetworkTab.24=\u05d4\u05db\u05e8\u05d7 \u05e4\u05d5\u05e8\u05d8 \u05dc\u05e9\u05e8\u05ea (5001 \u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc): -NetworkTab.25=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea PS3 -NetworkTab.26=Character encoding of your PS3 file names (see XMB->System settings->Charset): -NetworkTab.27=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e9\u05dc\u05d0 \u05d1\u05e9\u05d9\u05de\u05d5\u05e9 \u05e9\u05e2\u05d3\u05d9\u05e3 \u05e9\u05dc\u05d0 \u05ea\u05e9\u05ea\u05de\u05e9 \u05d1\u05d4\u05dd :p -NetworkTab.28=\u05de\u05e6\u05d1 \u05d8\u05d5\u05e8\u05d1\u05d5 (enable tcp_nodelay) / \u05d6\u05d4\u05d9\u05e8\u05d5\u05ea, \u05dc\u05d0 \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d6\u05d4 \u05d1\u05e1\u05d3\u05e8 \u05dc\u05d4\u05e4\u05e2\u05d9\u05dc \u05de\u05e6\u05d1 \u05d6\u05d4! -NetworkTab.29=\u05de\u05e0\u05e2 \u05d1\u05e7\u05e9\u05d5\u05ea \u05e0\u05db\u05e0\u05e1\u05d5\u05ea \u05e2\u05d1\u05d5\u05e8 \u05d0\u05d5\u05ea\u05d5 \u05d4\u05e7\u05d5\u05d1\u05e5 \u05de\u05d4 PS3 \u05db\u05d0\u05e9\u05e8 \u05d4\u05d6\u05e8\u05de\u05d4 \u05d4\u05d7\u05dc\u05d4 -NetworkTab.30=\u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05de\u05e1\u05e0\u05df IP: -NetworkTab.31=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea HTTP \u05d5\u05de\u05e2\u05e8\u05db\u05ea \u05de\u05ea\u05e7\u05d3\u05de\u05d5\u05ea -NetworkTab.32=\u05de\u05e0\u05d5\u05e2 HTTP V2 -NetworkTab.33=\u05de\u05e0\u05e2 \u05de\u05de\u05e2\u05e8\u05db\u05ea \u05d4\u05d4\u05e4\u05e2\u05dc\u05d4 \u05dc\u05d4\u05d9\u05db\u05e0\u05e1 \u05dc\u05de\u05e6\u05d1 \u05e9\u05d9\u05e0\u05d4 \u05d1\u05e2\u05ea \u05d4\u05d6\u05e8\u05de\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 -NetworkTab.34=\u05ea\u05d5\u05e1\u05e4\u05d5\u05ea -NetworkTab.35=\u05e8\u05d5\u05d7\u05d1 \u05de\u05e7\u05e1\u05d9\u05de\u05dc\u05d9 \u05d1\u05de\u05d2\u05d4 \u05d1\u05d9\u05d9\u05d8 \u05dc\u05e9\u05e0\u05d9\u05d9\u05d4 (0 \u05d6\u05d4 \u05dc\u05dc\u05d0 \u05d4\u05d2\u05d1\u05dc\u05d4): -PMS.0=\u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d5 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd -PMS.1=\u05d0\u05d5\u05d3\u05d9\u05d5 -PMS.2=\#- \u05de\u05d8\u05de\u05d5\u05df -\# -PMS.3=\u05e9\u05d9\u05d8\u05d4 \u05d0\u05dc\u05d8\u05e8\u05e0\u05d8\u05d9\u05d1\u05d9\u05ea \u05dc\u05e1\u05e0\u05db\u05e8\u05d5\u05df \u05d5\u05d9\u05d3\u05d0\u05d5/\u05d0\u05d5\u05d3\u05d9\u05d5 -PMS.4=\u05e4\u05d9\u05dc\u05d8\u05e8 Deinterlace -PMS.5=\u05de\u05d7\u05d5\u05d1\u05e8 \u05dc PS3 -PMS.6=\u05d8\u05e2\u05df \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9\u05ea \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05de\u05e1\u05d5\u05d2 .srt/.sub -PMS.7=SkipLoopFilter for H.264 Decoding (Could degrade quality) -PMS.8=\u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea -PMS.9=\u05db\u05dc \u05e8\u05e9\u05d9\u05de\u05d5\u05ea \u05d4\u05d4\u05e9\u05de\u05e2\u05d4 -PMS.10=\u05d1\u05d8\u05dc \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05d1\u05e6\u05d5\u05e8\u05d4 \u05de\u05d5\u05d7\u05dc\u05d8\u05ea -PMS.11=\u05db\u05dc \u05e8\u05e6\u05d5\u05e2\u05d5\u05ea \u05d4\u05e9\u05de\u05e2 -PMS.12=\u05dc\u05e4\u05d9 \u05ea\u05d0\u05e8\u05d9\u05da -PMS.13=\u05dc\u05e4\u05d9 \u05d0\u05de\u05df -PMS.14=Default H.264 Remux with MEncoder -PMS.16=\u05dc\u05e4\u05d9 \u05d0\u05dc\u05d1\u05d5\u05dd -PMS.17=\u05de\u05db\u05e9\u05d9\u05e8 \u05dc\u05d0 \u05de\u05d5\u05db\u05e8 -PMS.18=\u05de\u05d7\u05d5\u05d1\u05e8 -PMS.19=\u05dc\u05e4\u05d9 \u05d6'\u05d0\u05e0\u05e8 -PMS.21=\u05dc\u05e4\u05d9 \u05de\u05d5\u05d3\u05dc \u05d4\u05de\u05e6\u05dc\u05de\u05d4 -PMS.22=\u05dc\u05e4\u05d9 \u05d0\u05de\u05df/\u05d0\u05dc\u05d1\u05d5\u05dd -PMS.25=\u05dc\u05e4\u05d9 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea ISO -PMS.26=\u05dc\u05e4\u05d9 \u05d6'\u05d0\u05e0\u05e8/\u05d0\u05de\u05df/\u05d0\u05dc\u05d1\u05d5\u05dd -PMS.27=\u05e9\u05de\u05d5\u05e8 \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea -PMS.31=\u05ea\u05de\u05d5\u05e0\u05d4 -PMS.32=\u05db\u05dc \u05d4\u05ea\u05de\u05d5\u05e0\u05d5\u05ea -PMS.34=\u05d5\u05d9\u05d3\u05d0\u05d5 -PMS.35=\u05db\u05dc \u05d4\u05e1\u05e8\u05d8\u05d9\u05dd/\u05e1\u05e8\u05d8\u05d5\u05e0\u05d9\u05dd -PMS.36=\u05d5\u05d9\u05d3\u05d0\u05d5 HD -PMS.37=\#- \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 -\# -PMS.39=\u05d5\u05d9\u05d3\u05d0\u05d5 SD -PMS.41=\u05de\u05ea\u05e7\u05d9\u05df \u05db\u05d9\u05d9\u05e9\u05d5\u05dd \u05d5\u05d5\u05d9\u05e0\u05d3\u05d5\u05e1 -PMS.130=\u05de\u05d7\u05e4\u05e9 \u05de\u05db\u05e9\u05d9\u05e8\u05d9\u05dd... -ProfileChooser.1=\u05d1\u05d5\u05e8\u05e8 \u05d4\u05e4\u05e8\u05d5\u05e4\u05d9\u05dc\u05d9\u05dd \u05e9\u05dc PS3 Media Server -ProfileChooser.2=\u05d1\u05d7\u05e8 -ProfileChooser.3=\u05e7\u05d5\u05d1\u05e5 \u05e4\u05e8\u05d5\u05e4\u05d9\u05dc (.conf) \u05d0\u05d5 \u05ea\u05d9\u05e7\u05d9\u05d4 -StatusTab.2=\u05e1\u05d8\u05d8\u05d5\u05e1 -StatusTab.3=\u05de\u05de\u05ea\u05d9\u05df... -StatusTab.5=\u05e8\u05d9\u05e7 -StatusTab.6=\u05de\u05e6\u05d1 \u05d4\u05d6\u05e8\u05de\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5: -StatusTab.7=I/O \u05e1\u05d8\u05d8\u05d9\u05e1\u05d8\u05d9\u05e7\u05d5\u05ea: -StatusTab.8=\u05e7\u05e6\u05d1 \u05e0\u05d5\u05db\u05d7\u05d9: -StatusTab.9=\u05d7\u05d9\u05d1\u05d5\u05e8\u05d9\u05dd \u05e9\u05d4\u05ea\u05d2\u05dc\u05d5 -StatusTab.10=\u05e7\u05e6\u05d1 \u05e9\u05d9\u05d0: -StatusTab.11=\u05de"\u05d1 \u05dc\u05e9\u05e0\u05d9\u05d9\u05d4 -TSMuxerVideo.0=Demux with MEncoder and encode all audio tracks to AC-3 -TSMuxerVideo.1=Demux with MEncoder and encode DTS/FLAC audio tracks to LPCM [Careful, seeking don't work yet] -TSMuxerVideo.2=\u05d1\u05d3\u05d5\u05e7 \u05e7\u05e6\u05d1 \u05e4\u05e8\u05d9\u05d9\u05de\u05d9\u05dd \u05dc\u05e4\u05e0\u05d9 \u05d4\u05e4\u05e2\u05dc\u05d4 \u05c2(\u05e2\u05dc\u05d5\u05dc \u05dc\u05ea\u05e7\u05df \u05d1\u05e2\u05d9\u05d5\u05ea \u05e1\u05e0\u05db\u05e8\u05d5\u05df \u05d0\u05d5\u05d3\u05d9\u05d5/\u05d5\u05d9\u05d3\u05d0\u05d5) -TSMuxerVideo.3=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05e2\u05d1\u05d5\u05e8 \u05de\u05e0\u05d5\u05e2 tsMuxeR \u05d1\u05dc\u05d1\u05d3 -TSMuxerVideo.19=\u05d7\u05e4\u05e9 \u05e2\u05d1\u05d5\u05e8 \u05e8\u05e6\u05d5\u05e2\u05d5\u05ea \u05e9\u05de\u05e2 \u05d1\u05db\u05dc \u05d4\u05e9\u05e4\u05d5\u05ea -TrTab2.0=\u05d4\u05e4\u05e2\u05dc/\u05d1\u05d8\u05dc \u05de\u05e0\u05d5\u05e2 \u05d4\u05d6\u05e8\u05de\u05d4 -TrTab2.1=\u05dc\u05d0 \u05e7\u05d9\u05d9\u05de\u05d5\u05ea \u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05e0\u05db\u05d5\u05df \u05dc\u05e2\u05db\u05e9\u05d9\u05d5 -TrTab2.2=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05e2\u05dd \u05d4\u05de\u05e0\u05d5\u05e2\u05d9\u05dd \u05d4\u05d1\u05d0\u05d9\u05dd: MEncoder/AviSynth/FFmpeg -TrTab2.3=\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05d0\u05d5\u05d3\u05d9\u05d5, \u05d7\u05dc \u05e2\u05dc: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d0\u05d9\u05db\u05d5\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 -TrTab2.5=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05de\u05e9\u05d5\u05ea\u05e4\u05d5\u05ea (\u05db\u05dc \u05d4\u05de\u05e0\u05d5\u05e2\u05d9\u05dd) -TrTab2.6=\u05de\u05d9\u05d9\u05df \u05d0\u05ea \u05ea\u05d9\u05e7\u05d9\u05ea \u05de\u05e0\u05d5\u05e2\u05d9 \u05d4\u05d6\u05e8\u05de\u05ea \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5. \u05d4\u05e8\u05d0\u05e9\u05d5\u05df \u05d9\u05d5\u05e4\u05d9\u05e2 \u05d1\u05ea\u05d9\u05e7\u05d9\u05ea \u05d4\u05d5\u05d9\u05d3\u05d0\u05d5 \u05d4\u05de\u05e7\u05d5\u05e8\u05d9\u05ea -TrTab2.7=\u05e9\u05d5\u05e0\u05d5\u05ea -TrTab2.8=\u05d3\u05dc\u05d2 \u05e2\u05dc \u05d4\u05d6\u05e8\u05de\u05ea \u05e1\u05e8\u05d8\u05d9\u05dd \u05d1\u05e7\u05d1\u05e6\u05d9\u05dd \u05d1\u05e2\u05dc\u05d9 \u05d4\u05e1\u05d9\u05d5\u05de\u05d5\u05ea \u05d4\u05d1\u05d0\u05d5\u05ea (\u05de\u05d5\u05e4\u05e8\u05d3 \u05e2"\u05d9 \u05e4\u05e1\u05d9\u05e7): -TrTab2.9=\u05d4\u05db\u05e8\u05d7 \u05d4\u05d6\u05e8\u05de\u05ea \u05e1\u05e8\u05d8\u05d9\u05dd \u05dc\u05e7\u05d1\u05e6\u05d9\u05dd \u05d1\u05e2\u05dc\u05d9 \u05d4\u05e1\u05d9\u05d5\u05de\u05d5\u05ea \u05d4\u05d1\u05d0\u05d5\u05ea (\u05de\u05d5\u05e4\u05e8\u05d3 \u05e2"\u05d9 \u05e4\u05e1\u05d9\u05e7): -TrTab2.10=Allows you to stream DTS directly to your receiver.\nBe careful, it's possible to have a static sound. Notes:\n- You must have a DTS compatible receiver, connected on TOSLINK or HDMI\n- The volume icon on XMB must be on 'Normal'\n- The channels icon on XMB must be on 'Left+Right'\n -TrTab2.11=\u05de\u05e0\u05d5\u05e2\u05d9\u05dd -TrTab2.12=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05de\u05e4\u05e2\u05e0\u05d7 \u05de\u05e9\u05d5\u05ea\u05e4\u05d5\u05ea -TrTab2.13=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea \u05de\u05e7\u05d5\u05d3\u05d3 \u05de\u05e9\u05d5\u05ea\u05e4\u05d5\u05ea -TrTab2.14=\u05de\u05e0\u05d5\u05e2\u05d9 \u05e7\u05d1\u05e6\u05d9 \u05d5\u05d9\u05d3\u05d0\u05d5 -TrTab2.15=\u05de\u05e0\u05d5\u05e2\u05d9 \u05e7\u05d1\u05e6\u05d9 \u05d0\u05d5\u05d3\u05d9\u05d5 -TrTab2.16=\u05de\u05e0\u05d5\u05e2\u05d9 \u05d4\u05d6\u05e8\u05de\u05ea \u05d5\u05d9\u05d3\u05d0\u05d5 \u05de\u05d4\u05e8\u05e9\u05ea -TrTab2.17=\u05de\u05e0\u05d5\u05e2\u05d9 \u05d4\u05d6\u05e8\u05de\u05ea \u05d0\u05d5\u05d3\u05d9\u05d5 \u05de\u05d4\u05e8\u05e9\u05ea -TrTab2.18=\u05e9\u05d5\u05e0\u05d5\u05ea -TrTab2.19=\u05de\u05e0\u05d5\u05e2\u05d9\u05dd \u05d4\u05d9\u05e0\u05dd \u05d1\u05e1\u05d3\u05e8 \u05d9\u05d5\u05e8\u05d3 -TrTab2.20=\u05e1\u05d3\u05e8; \u05d4\u05d2\u05d1\u05d5\u05d4 \u05d1\u05d9\u05d5\u05ea\u05e8 \u05e8\u05d0\u05e9\u05d5\u05df -TrTab2.21=(AviSynth \u05d0\u05d9\u05e0\u05d5 \u05e0\u05ea\u05de\u05da) -TrTab2.22=\u05d3\u05d2\u05d9\u05de\u05d5\u05ea \u05d0\u05d5\u05d3\u05d9\u05d5 \u05d0\u05d5\u05d8\u05d5\u05de\u05d8\u05d9\u05d5\u05ea \u05dc 44.1 \u05d0\u05d5 48 kHz -TrTab2.27=\u05d4\u05de\u05e8\u05ea DTS/FLAC \u05dc LPCM (\u05ea\u05d6\u05d3\u05e7\u05e7 \u05dc\u05e8\u05e1\u05d9\u05d1\u05e8 HDMI \u05e2\u05dc \u05de\u05e0\u05ea \u05dc\u05d4\u05d6\u05e8\u05d9\u05dd LPCM 5.1) -TrTab2.28=\u05d4\u05e9\u05d0\u05e8 \u05d0\u05d5\u05d3\u05d9\u05d5 \u05de\u05e1\u05d5\u05d2 DTS \u05d1\u05d4\u05d6\u05e8\u05de\u05d4 (\u05d1\u05d7\u05d9\u05d1\u05d5\u05e8 \u05db\u05d1\u05dc \u05d0\u05d5\u05e4\u05d8\u05d9) -TrTab2.29=\u05e7\u05e6\u05d1 \u05d4\u05d6\u05e8\u05de\u05ea \u05d0\u05d5\u05d3\u05d9\u05d5 \u05d1 AC-3 (\u05d1\u05e7"\u05d1 \u05dc\u05e9\u05e0\u05d9\u05d9\u05d4) (\u05d3\u05d5\u05d2\u05de\u05d4: 384, 576, 640): -TrTab2.32=\u05d4\u05d2\u05d3\u05e8\u05d5\u05ea MPEG-2: -TrTab2.39=The video is automatically transcoded and muxed to a MPEG-PS / AC-3 audio (highly compatible on PS3) -TrTab2.40=\nYou can play with the vqscale, vqmin and keyint parameters to achieve good, even almost lossless transcoding quality. -TrTab2.41=\nThe drawback to this is the VBR bitrate, which can sometimes peak above your max network capacity. -TrTab2.42=\nThat's why you can also set the bandwidth if you're on WiFi, CPL, etc. However, the transcoding quality -TrTab2.43=\nis a balance between network speed and CPU power: the more quality you put into a constrained bitrate, -TrTab2.44=\nthe more your CPU will suffer\! Also, don't expect to fit a 1080p action movie in the purest quality in 15Mbps :p -TrTab2.50=\u05de\u05e1\u05e4\u05e8 \u05de\u05e7\u05e1\u05d9\u05de\u05dc\u05d9 \u05e9\u05dc \u05e2\u05e8\u05d5\u05e6\u05d9 \u05d0\u05d5\u05d3\u05d9\u05d5: -TrTab2.51=\u05d1\u05d8\u05dc \u05db\u05ea\u05d5\u05d1\u05d9\u05d5\u05ea \u05d1\u05d0\u05d5\u05e4\u05df \u05de\u05d5\u05d7\u05dc\u05d8 -TrTab2.52=\u05ea\u05de\u05d9\u05db\u05d4 \u05d1\u05d7\u05dc\u05d5\u05e7\u05d4 \u05dc\u05e4\u05e8\u05e7\u05d9\u05dd \u05e9\u05dc \u05e7\u05d1\u05e6\u05d9 \u05d5\u05d9\u05d3\u05d0\u05d5 / \u05de\u05e8\u05d5\u05d5\u05d7 \u05d1\u05d3\u05e7\u05d5\u05ea: -TrTab2.55=2 \u05e2\u05e8\u05d5\u05e6\u05d9\u05dd (\u05e1\u05d8\u05e8\u05d9\u05d0\u05d5) -TrTab2.56=6 \u05e2\u05e8\u05d5\u05e6\u05d9\u05dd (5.1) -TrTab2.60=\u05d0\u05d9\u05db\u05d5\u05ea \u05db\u05de\u05e2\u05d8 \u05d4\u05db\u05d9 \u05d8\u05d5\u05d1\u05d4 -TrTab2.61=\u05d0\u05d9\u05db\u05d5\u05ea \u05d4\u05db\u05d9 \u05d8\u05d5\u05d1\u05d4 -TrTab2.62=\u05d0\u05d9\u05db\u05d5\u05ea \u05d8\u05d5\u05d1\u05d4 -TrTab2.63=\u05d1\u05d0\u05d9\u05db\u05d5\u05ea \u05d8\u05d5\u05d1\u05d4 - WIFI \u05d1\u05d7\u05d9\u05d1\u05d5\u05e8 HD \u05d4\u05d6\u05e8\u05de\u05ea \u05e1\u05e8\u05d8\u05d9 -TrTab2.64=\u05d1\u05d0\u05d9\u05db\u05d5\u05ea \u05d1\u05d9\u05e0\u05d5\u05e0\u05d9\u05ea - WIFI \u05d1\u05d7\u05d9\u05d1\u05d5\u05e8 HD \u05d4\u05d6\u05e8\u05de\u05ea \u05e1\u05e8\u05d8\u05d9 -TrTab2.65=\u05d0\u05d9\u05db\u05d5\u05ea \u05e0\u05de\u05d5\u05db\u05d4, \u05e2\u05d1\u05d5\u05e8 \u05de\u05e2\u05d1\u05d3 \u05d1\u05e8\u05de\u05d4 \u05e0\u05de\u05d5\u05db\u05d4 - WIFI \u05d4\u05d6\u05e8\u05de\u05ea \u05e1\u05e8\u05d8\u05d9\u05dd \u05d1\u05d7\u05d9\u05d1\u05d5\u05e8 -TracesTab.3=\u05e0\u05e7\u05d4 -TreeNodeSettings.4=\u05de\u05e0\u05d5\u05e2 \u05d6\u05d4 \u05dc\u05d0 \u05e0\u05d8\u05e2\u05df\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ja.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ja.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ja.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ja.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,201 +0,0 @@ -DLNAMediaDatabase.0=\u30bd\u30d5\u30c8\u306e\u6539\u826f\u3084\u30b5\u30dd\u30fc\u30c8\u306e\u70ba\u3001\n\u30e1\u30c7\u30a3\u30a2\u30e9\u30a4\u30d6\u30e9\u30ea\u306e\u518d\u69cb\u7bc9\u304c\u5fc5\u8981\u3067\u3059\u3002\n\u3054\u4e0d\u4fbf\u3092\u304a\u304b\u3051\u3057\u3066\u7533\u3057\u8a33\u3042\u308a\u307e\u305b\u3093\u3002 \! -FFMpegDVRMSRemux.0=FFmpeg\u306e\u30d1\u30b9: -FFMpegDVRMSRemux.1=DVR-MS remux\u8a2d\u5b9a -FFMpegVideo.0=AviSynth/FFmpeg\u30a8\u30f3\u30b3\u30fc\u30c9\u8a2d\u5b9a(AviSynth/MEncoder\u306e\u65b9\u304c\u826f\u597d) -FoldTab.0=<\u5168\u30c9\u30e9\u30a4\u30d6> -FoldTab.1=\u5171\u6709\u30aa\u30d7\u30b7\u30e7\u30f3 -FoldTab.2=\u5168\u5171\u6709\u30d5\u30a9\u30eb\u30c0\u3092\u30b9\u30ad\u30e3\u30f3 -FoldTab.3=\u5168\u5171\u6709\u30d5\u30a9\u30eb\u30c0\u3092\u30b9\u30ad\u30e3\u30f3\u4e2d \u6642\u9593\u304c\u304b\u304b\u308a\u307e\u3059 \!\n -FoldTab.4=\u30b9\u30ad\u30e3\u30f3\u3092\u958b\u59cb\u3057\u307e\u3059\u304b?\n\n -FoldTab.5=\u62e1\u5f35\u5b50\u3092\u8868\u793a\u3057\u306a\u3044 -FoldTab.6=\#\u30d3\u30c7\u30aa\u306e\u8a2d\u5b9a\#\u3092\u8868\u793a\u3057\u306a\u3044 -FoldTab.7=\u5171\u6709\u30d5\u30a9\u30eb\u30c0 -FoldTab.8=\u5909\u63db\u30a8\u30f3\u30b8\u30f3\u540d\u3092\u8868\u793a\u3057\u306a\u3044 -FoldTab.9=\u30d5\u30a9\u30eb\u30c0\u8ffd\u52a0 -FoldTab.10=\u30b9\u30ad\u30e3\u30f3\u3092\u4e2d\u6b62\u3057\u307e\u3059\u304b?\n\n -FoldTab.11=PS3\u3078\u306e\u30b3\u30d4\u30fc\u6642\u306b\u3082\u5909\u63db\u3059\u308b (\u30b5\u30a4\u30ba\u306f\u5897\u52a0\u3057\u307e\u3059) -FoldTab.12=\u5171\u6709\u30d5\u30a9\u30eb\u30c0\u306e\u4e26\u3079\u5909\u3048 -FoldTab.13=\u30b5\u30e0\u30cd\u30a4\u30eb -FoldTab.14=\u52d5\u753b\u306e\u30b5\u30e0\u30cd\u30a4\u30eb\u306bMplayer\u3092\u4f7f\u3046 -FoldTab.15=\u6a19\u6e96 -FoldTab.16=\u5c65\u6b74\u9806 -FoldTab.18=\u30d5\u30a1\u30a4\u30eb\u306e\u6574\u5217\u65b9\u6cd5: -FoldTab.23=amazon.com\u304b\u3089\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9 -FoldTab.24=discogs.com\u304b\u3089\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9 -FoldTab.26=\u30a2\u30eb\u30d0\u30e0\u30a2\u30fc\u30c8: -FoldTab.27=\u30d3\u30c7\u30aa\u30ab\u30d0\u30fc\u30a2\u30fc\u30c8 -FoldTab.28=\u30d5\u30a9\u30eb\u30c0\u3092\u9078\u629e -FontFileFilter.3=TrueType\u30d5\u30a9\u30f3\u30c8 -LinksTab.5=\u53c2\u8003\u30ea\u30f3\u30af: -LooksFrame.5=\u7d42\u4e86 -LooksFrame.6=\u30e1\u30a4\u30f3\u30d1\u30cd\u30eb -LooksFrame.9=\u4fdd\u5b58 -LooksFrame.12=\u30b5\u30fc\u30d0\u30fc\u3092\u518d\u8d77\u52d5 -LooksFrame.18=\u30b9\u30c6\u30fc\u30bf\u30b9 -LooksFrame.19=\u30c8\u30ec\u30fc\u30b9 -LooksFrame.20=\u57fa\u672c\u8a2d\u5b9a -LooksFrame.21=\u5909\u63db\u8a2d\u5b9a -LooksFrame.22=\u8868\u793a/\u5171\u6709\u8a2d\u5b9a -LooksFrame.24=\u3088\u304f\u3042\u308b\u8cea\u554f -LooksFrame.25=\u6982\u8981 -MEncoderAviSynth.2=AviSynth\u6620\u50cf\u30c7\u30b3\u30fc\u30c9\u8a2d\u5b9a -MEncoderAviSynth.3=AviSynth\u3067VFR\u304b\u3089CFR\u3078\u5909\u63db\u3059\u308b (convertfps=true) -MEncoderVideo.0=H.264\u30c7\u30d6\u30ed\u30c3\u30af\u30d5\u30a3\u30eb\u30bf\u3092\u7121\u52b9\u306b\u3059\u308b:\u6620\u50cf\u54c1\u8cea\u306f\u4f4e\u4e0b\u3057\u307e\u3059 CPU\u304c\u5f37\u529b\u306a\u3089\u4e0d\u8981 -MEncoderVideo.1=MEncoder \u6620\u50cf/\u97f3\u58f0\u30c7\u30b3\u30fc\u30c9\u8a2d\u5b9a -MEncoderVideo.2=\u30d3\u30c7\u30aa\u3068\u97f3\u58f0\u306e\u540c\u671f\u3092\u884c\u3046 -MEncoderVideo.3=\u30b3\u30fc\u30c7\u30c3\u30af\u3054\u3068\u306e\u6a19\u6e96\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u4f7f\u3046 \uff08\u63a8\u5968\uff09 -MEncoderVideo.4=FFmpeg\u304b\u3089\u30d5\u30ec\u30fc\u30e0\u30ec\u30fc\u30c8\u53d6\u5f97 -MEncoderVideo.5=\u30d5\u30a3\u30eb\u30bf\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u8ffd\u52a0\u3067\u304d\u307e\u3059 \u30ce\u30a4\u30ba\u9664\u53bb\u306e\u4f8b: -vfhqdn3d -MEncoderVideo.6=\u8ffd\u52a0\u30d1\u30e9\u30e1\u30fc\u30bf: -MEncoderVideo.7=\u97f3\u58f0\u8a00\u8a9e \u512a\u5148\u9806\u4f4d: -MEncoderVideo.8=\u5b57\u5e55\u8a2d\u5b9a -MEncoderVideo.9=\u5b57\u5e55\u8a00\u8a9e\u306e\u512a\u5148\u9806\u4f4d: -MEncoderVideo.10=\u97f3\u58f0/\u5b57\u5e55\u8a00\u8a9e \u512a\u5148\u5ea6 (\u4f8b en,off;eng,off) -MEncoderVideo.11=\u5b57\u5e55\u306e\u6587\u5b57\u30b3\u30fc\u30c9: -MEncoderVideo.12=ASS\u30d5\u30a9\u30f3\u30c8\u8a2d\u5b9a: \u30d5\u30a9\u30f3\u30c8\u306e\u62e1\u5927\u7387 -MEncoderVideo.13=\u30d5\u30a9\u30f3\u30c8\u306e\u30a2\u30a6\u30c8\u30e9\u30a4\u30f3 -MEncoderVideo.14=\u30d5\u30a9\u30f3\u30c8\u306e\u5f71 -MEncoderVideo.15=\u30d5\u30a9\u30f3\u30c8\u306e\u9593\u9694 -MEncoderVideo.16=\u6a19\u6e96\u30d5\u30a9\u30f3\u30c8\u8a2d\u5b9a: \u30d5\u30a9\u30f3\u30c8\u306e\u62e1\u5927\u7387 -MEncoderVideo.17=\u30d5\u30a9\u30f3\u30c8\u306e\u30a2\u30a6\u30c8\u30e9\u30a4\u30f3 -MEncoderVideo.18=\u30d5\u30a9\u30f3\u30c8\u306e\u307c\u304b\u3057 -MEncoderVideo.19=\u30d5\u30a9\u30f3\u30c8\u306e\u9593\u9694 -MEncoderVideo.20=ASS/SSA \u5b57\u5e55 -MEncoderVideo.21=\u57cb\u8fbc\u30d5\u30a9\u30f3\u30c8\u306e\u8abf\u6574 -MEncoderVideo.22=\u52d5\u753b\u3068\u540c\u540d\u306e.srt.sub\u3092\u81ea\u52d5\u3067\u8aad\u307f\u8fbc\u3080 -MEncoderVideo.24=TrueType\u30d5\u30a9\u30f3\u30c8\u3092\u6307\u5b9a (\u30a2\u30b8\u30a2\u8a00\u8a9e\u7528): -MEncoderVideo.25=TrueType\u30d5\u30a9\u30f3\u30c8\u3092\u9078\u629e -MEncoderVideo.26=\u30a4\u30f3\u30bf\u30fc\u30ec\u30fc\u30b9\u89e3\u9664 -MEncoderVideo.27=\u62e1\u5927\u7e2e\u5c0f\u3059\u308b -MEncoderVideo.28=\u5e45 -MEncoderVideo.29=\u8a73\u7d30\u8a2d\u5b9a\uff1a\u30b3\u30fc\u30c7\u30c3\u30af\u5225\u306b\u30d1\u30e9\u30e1\u30fc\u30bf\u6307\u5b9a -MEncoderVideo.30=\u9ad8\u3055 -MEncoderVideo.32=\u97f3\u58f0\u304cAC3\u306e\u6642 remux\u3059\u308b (\u518d\u30a8\u30f3\u30b3\u30fc\u30c9\u306f\u3057\u306a\u3044) -MEncoderVideo.33=\u8ffd\u52a0\u30d1\u30e9\u30e1\u30fc\u30bf: -MEncoderVideo.34=\u30b3\u30fc\u30c7\u30c3\u30af\u5225\u306b\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u6307\u5b9a -MEncoderVideo.35=\u30de\u30eb\u30c1\u30b3\u30a2\u5bfe\u5fdc\u3092\u6709\u52b9\u306b\u3059\u308b -MEncoderVideo.36=ASS\u5b57\u5e55\u306e\u30b9\u30bf\u30a4\u30eb\u3092\u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u3059\u308b -MEncoderVideo.37=\u5b57\u5e55\u30d5\u30a9\u30eb\u30c0\u306e\u30d1\u30b9 -MEncoderVideo.38=H.264\u304cPS3\u6e96\u62e0\u3067\u5b57\u5e55\u304c\u306a\u3044\u6642\u306ftsMuxeR\u306b\u5207\u308a\u66ff\u3048\u308b [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.68=\#\u5e7e\u3064\u304b\u306e\u30b3\u30fc\u30c7\u30c3\u30af\u306e\u7d44\u307f\u5408\u308f\u305b\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059\u3002\n -MEncoderVideo.69=\#\u4e3b\u306b\u6620\u50cf/\u97f3\u58f0\u540c\u671f\u306e\u4e0d\u5177\u5408\u3092\u4fee\u6b63\u3059\u308b\u305f\u3081\u3067\u3059\u3002\u4ed6\u306e\u76ee\u7684\u306e\u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u6307\u5b9a\u3059\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\n -MEncoderVideo.70=\#\u3053\u308c\u306f\u4e0a\u7d1a\u8005\u5411\u304d\u306e\u8a2d\u5b9a\u3067\u3059\u3002 \u5206\u304b\u3089\u306a\u3044\u5834\u5408\u3001\u7d76\u5bfe\u306b\u5909\u66f4\u3057\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002\n -MEncoderVideo.71=\#\u66f8\u5f0f\uff1a {java\u306e\u72b6\u614b} :: {MEncoder\u306e\u30aa\u30d7\u30b7\u30e7\u30f3} ; \u30d1\u30e9\u30e1\u30fc\u30bf\u3092\u8907\u6570\u7d44\u307f\u5408\u308f\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\n -MEncoderVideo.72=\#java\u306e\u72b6\u614b\u3067\u4f7f\u3048\u308b\u30d1\u30e9\u30e1\u30fc\u30bf\u4e00\u89a7: filename srtfile container vcodec acodec samplerate framerate width height channelsduration\n -MEncoderVideo.73=\#\u6ce8\u610f\u3057\u3066\u66f8\u3044\u3066\u304f\u3060\u3055\u3044\uff01\u5909\u306a\u884c\u304c\u3042\u308c\u3070\u5f37\u5236\u7d42\u4e86\u3057\u307e\u3059\u3002\n -MEncoderVideo.75=\#\u7279\u6b8a\u306a\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc:\n -MEncoderVideo.76=\# -noass: ASS/SSA\u5b57\u5e55\u3092\u7121\u52b9\u306b\u3057\u307e\u3059\u3002\u6620\u50cf/\u97f3\u58f0\u540c\u671f\u304c\u3046\u307e\u304f\u3044\u304b\u306a\u3044\u5834\u5408\u306b\u4f7f\u3063\u3066\u304f\u3060\u3055\u3044\u3002\n -MEncoderVideo.77=\# -nosync: \u30d3\u30c7\u30aa/\u97f3\u58f0\u540c\u671f\u3092\u7121\u52b9\u306b\u3057\u307e\u3059 (-mc\u3082\u540c\u69d8\u306e\u6a5f\u80fd\u3067\u3059)\n -MEncoderVideo.78=\# -quality: \u30d3\u30c7\u30aa\u306e\u54c1\u8cea\u8a2d\u5b9a\n -MEncoderVideo.79=\# -mt: MEncoder\u306e\u30de\u30eb\u30c1\u30b9\u30ec\u30c3\u30c9\u7248\u3092\u5f37\u5236\u7684\u306b\u4f7f\u3044\u307e\u3059(\u5b9f\u9a13\u4e2d\u3067\u4e0d\u5b89\u5b9a)\n -MEncoderVideo.80=\#\u3053\u306e\u30ea\u30b9\u30c8\u306f\u6539\u826f\u3057\u3066\u3044\u304f\u4e88\u5b9a\u3067\u3059\u3002\u30b3\u30fc\u30c7\u30c3\u30af\u3084\u30d5\u30a1\u30a4\u30eb\u306e\u8abf\u6574\u65b9\u6cd5/\u30d5\u30a3\u30fc\u30c9\u30d0\u30c3\u30af\u306f\u3044\u3064\u3067\u3082\u6b53\u8fce\u3067\u3059\u3002\n -MEncoderVideo.87=\#\u3042\u306a\u305f\u306f\u3082\u3046\u81ea\u5206\u306e\u8a2d\u5b9a\u3092\u66f8\u304f\u3053\u3068\u304c\u3067\u304d\u307e\u3059! \u30de\u30eb\u30c1\u30b9\u30ec\u30c3\u30c9\u7248MEncoder\u3092\u4f7f\u3046\u4f8b\n -MEncoderVideo.88=\#H.264 HD\u30d3\u30c7\u30aa\u306e\u4f8b: vcodec == h264 && width >= 1280 ::-mt -lavdopts fast\n -MEncoderVideo.89=\#50hz\u30c6\u30ec\u30d3\u3067\u306e24p\u306e\u63fa\u308c\u3092\u53d6\u308a\u9664\u304f\u4f8b: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#MPEG-2\u30d3\u30c7\u30aa\u3067\u5b57\u5e55\u304c\u7121\u3051\u308c\u3070remux\u3059\u308b\u4f8b: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=\u8868\u793a\u8a00\u8a9e [\u30bd\u30d5\u30c8\u306e\u518d\u8d77\u52d5\u304c\u5fc5\u8981]: -NetworkTab.1=\u5727\u7e2e\u30d5\u30a1\u30a4\u30eb(.rar/.zip/.cbr)\u306e\u4e2d\u8eab\u3092\u8868\u793a\u3059\u308b -NetworkTab.2=\u30b5\u30e0\u30cd\u30a4\u30eb\u3092\u751f\u6210\u3059\u308b -NetworkTab.3=\u8d77\u52d5\u6642\u306b\u6700\u5c0f\u5316 -NetworkTab.4=Windows\u30b5\u30fc\u30d3\u30b9\u306b\u767b\u9332 -NetworkTab.5=\u4e00\u822c\u8a2d\u5b9a -NetworkTab.6=\u5909\u63db\u7528\u30d0\u30c3\u30d5\u30a1\u306e\u6700\u5927\u30b5\u30a4\u30ba \u5358\u4f4d\u306fMB(\u6700\u5927\uff1a MAX_BUFFER_SIZE) -NetworkTab.7=\u5909\u63db\u306b\u4f7f\u7528\u3059\u308bCPU\u30b3\u30a2\u6570 (\u73fe\u5728 %d): -NetworkTab.11=Windows\u30b5\u30fc\u30d3\u30b9\u306b\u767b\u9332\u3057\u307e\u3057\u305f \! \u6709\u52b9\u306b\u3059\u308b\u306b\u306f\u3001\u30bd\u30d5\u30c8\u3092\u7d42\u4e86\u3057,\n -NetworkTab.12=Windows\u306e\u7ba1\u7406\u30d1\u30cd\u30eb\u304b\u3089\u30b5\u30fc\u30d3\u30b9\u3092\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044l.\n\n -NetworkTab.13=\u30e1\u30c7\u30a3\u30a2\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u521d\u671f\u5316\u3057\u307e\u3059 \!\n -NetworkTab.14=Windows\u30b5\u30fc\u30d3\u30b9\u306b\u767b\u9332\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f!\n -NetworkTab.15=\u8868\u793a\u8a2d\u5b9a -NetworkTab.16=\u8868\u793a\u5f85\u3061\u6642\u9593 (\u79d2): -NetworkTab.17=\u30e1\u30c7\u30a3\u30a2\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u6709\u52b9\u306b\u3059\u308b -NetworkTab.18=\u30e1\u30c7\u30a3\u30a2\u30e9\u30a4\u30d6\u30e9\u30ea\u3092\u521d\u671f\u5316\u3059\u308b -NetworkTab.19=\u672c\u5f53\u306b\u3088\u308d\u3057\u3044\u3067\u3059\u304b? -NetworkTab.20=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30c7\u30d0\u30a4\u30b9\u3092\u6307\u5b9a -NetworkTab.22=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u8a2d\u5b9a \u63a5\u7d9a\u306b\u554f\u984c\u304c\u3042\u308b\u6642\u3060\u3051\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044 -NetworkTab.23=\u30b5\u30fc\u30d0\u30fc\u306eIP: [\u30bd\u30d5\u30c8\u306e\u518d\u8d77\u52d5\u304c\u5fc5\u8981] -NetworkTab.24=\u30b5\u30fc\u30d0\u30fc\u306e\u30dd\u30fc\u30c8 (\u6a19\u6e965001) [\u30bd\u30d5\u30c8\u306e\u518d\u8d77\u52d5\u304c\u5fc5\u8981]: -NetworkTab.25=PS3\u8a2d\u5b9a -NetworkTab.26=PS3\u672c\u4f53\u306e\u6587\u5b57\u30bb\u30c3\u30c8\uff08XMB->\u672c\u4f53\u8a2d\u5b9a->\u6587\u5b57\u30bb\u30c3\u30c8\u3067\u78ba\u8a8d\u3067\u304d\u307e\u3059\uff09: -NetworkTab.27=\u5371\u967a\u306a\u8a2d\u5b9a\u3000\u307e\u3060\u4f7f\u3048\u307e\u305b\u3093\uff08\u00b4\u30fb\u03c9\u30fb\uff40\uff09 -NetworkTab.28=\u30bf\u30fc\u30dc\u30e2\u30fc\u30c9(tcp_nodelay\u3092\u6709\u52b9\u306b\u3059\u308b) / \u4f55\u304c\u8d77\u304d\u3066\u3082\u77e5\u308a\u307e\u305b\u3093 -NetworkTab.29=\u30c8\u30e9\u30f3\u30b9\u30b3\u30fc\u30c9\u958b\u59cb\u5f8c\u306b\u540c\u3058\u30d5\u30a1\u30a4\u30eb\u306e\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u30d6\u30ed\u30c3\u30af -NetworkTab.30=IP\u30d5\u30a3\u30eb\u30bf: -NetworkTab.35=\u5e2f\u57df\u5236\u9650\u306e\u6700\u5927\u5024: Mb/s (0\u306f\u5236\u9650\u7121\u3057): -PMS.0=PS3\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002PS3\u306e\u96fb\u6e90\u306f\u5165\u3063\u3066\u3044\u307e\u3059\u304b? \u8a2d\u5b9a\u3001\u30c8\u30ec\u30fc\u30b9\u3001debuglog\u3092\u30c1\u30a7\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044 -PMS.1=\u97f3\u697d -PMS.2=\#- Media\u30e9\u30a4\u30d6\u30e9\u30ea -\# -PMS.3=\u30d3\u30c7\u30aa\u3068\u97f3\u58f0\u306e\u540c\u671f\u3092\u884c\u3046 -PMS.4=\u30a4\u30f3\u30bf\u30fc\u30ec\u30fc\u30b9\u89e3\u9664 -PMS.5=PS3\u3068\u63a5\u7d9a\u4e2d \! -PMS.6=srt.sub\u3092\u81ea\u52d5\u3067\u8aad\u307f\u8fbc\u3080 -PMS.7=H.264\u30c7\u30d6\u30ed\u30c3\u30af\u30d5\u30a3\u30eb\u30bf\u3092\u7121\u52b9\u306b\u3059\u308b [\u6620\u50cf\u54c1\u8cea\u306f\u4e0b\u304c\u308a\u307e\u3059] -PMS.8=\u5b57\u5e55 -PMS.9=\u5168\u3066\u306e\u97f3\u697d\u306e\u30d7\u30ec\u30a4\u30ea\u30b9\u30c8 -PMS.10=\u5b57\u5e55\u3092\u7121\u52b9\u306b\u3059\u308b -PMS.11=\u3059\u3079\u3066\u306e\u97f3\u697d -PMS.12=\u65e5\u4ed8\u5225 -PMS.13=\u30a2\u30fc\u30c6\u30a3\u30b9\u30c8\u5225 -PMS.14=\u6a19\u6e96\u306fMEncoder\u3067H264 remux -PMS.16=\u30a2\u30eb\u30d0\u30e0\u5225 -PMS.19=\u30b8\u30e3\u30f3\u30eb\u5225 -PMS.21=\u30ab\u30e1\u30e9\u5225 -PMS.22=\u30a2\u30fc\u30c6\u30a3\u30b9\u30c8/\u30a2\u30eb\u30d0\u30e0\u5225 -PMS.25=ISO\u306e\u8a2d\u5b9a\u5225 -PMS.26=\u30b8\u30e3\u30f3\u30eb/\u30a2\u30fc\u30c6\u30a3\u30b9\u30c8/\u30a2\u30eb\u30d0\u30e0\u5225 -PMS.31=\u753b\u50cf -PMS.32=\u3059\u3079\u3066\u306e\u753b\u50cf -PMS.34=\u30d3\u30c7\u30aa -PMS.35=\u3059\u3079\u3066\u306e\u30d3\u30c7\u30aa -PMS.36=HD\u30d3\u30c7\u30aa -PMS.37=\#- \u30d3\u30c7\u30aa\u8a2d\u5b9a -\# -PMS.39=SD\u30d3\u30c7\u30aa -PMS.41=Windows\u30b5\u30fc\u30d3\u30b9\u306b(\u518d)\u767b\u9332 -PMS.130=PS3\u3092\u691c\u7d22\u4e2d... -StatusTab.2=\u30b9\u30c6\u30fc\u30bf\u30b9 -StatusTab.3=\u5f85\u6a5f\u4e2d... -StatusTab.5=Empty -StatusTab.6=\u30c8\u30e9\u30f3\u30b9\u30b3\u30fc\u30c9\u30d0\u30c3\u30d5\u30a1\u306e\u72b6\u6cc1 -StatusTab.7=I/O \u7d71\u8a08: -StatusTab.8=\u30d3\u30c3\u30c8\u30ec\u30fc\u30c8: -StatusTab.10=\u6700\u5927\u30d3\u30c3\u30c8\u30ec\u30fc\u30c8: -TSMuxerVideo.0=MEncoder\u3067\u5206\u96e2\u3057\u3001\u5168\u3066\u306e\u97f3\u58f0\u3092AC3\u3078\u518d\u5909\u63db\u3059\u308b -TSMuxerVideo.1=MEncoder\u3067\u5206\u96e2\u3057\u3001DTS/FLAC\u3092LPCM\u306b\u518d\u5909\u63db\u3059\u308b [\u30b7\u30fc\u30af\u3067\u304d\u306a\u304f\u306a\u308a\u307e\u3059] -TSMuxerVideo.2=FFmpeg\u3067\u30e1\u30bf\u30d5\u30a1\u30a4\u30eb\u304b\u3089FPS\u3092\u53d6\u5f97\u3059\u308b -TSMuxerVideo.3=TsMuxer\u6620\u50cf\u30c7\u30b3\u30fc\u30c9\u8a2d\u5b9a -TSMuxerVideo.19=\u5168\u3066\u306e\u97f3\u58f0\u30c8\u30e9\u30c3\u30af\u3092mux -TrTab2.0=\u5909\u63db\u30a8\u30f3\u30b8\u30f3\u3092\u6709\u52b9\u306b\u3059\u308b -TrTab2.1=\u8a2d\u5b9a\u3067\u304d\u308b\u9805\u76ee\u306f\u3042\u308a\u307e\u305b\u3093\u3002 -TrTab2.2=\u30d3\u30c7\u30aa\u306e\u30a8\u30f3\u30b3\u30fc\u30c9\u8a2d\u5b9a: MEncoder/AviSynth/FFmpeg -TrTab2.3=\u97f3\u58f0\u30c7\u30b3\u30fc\u30c9\u306e\u8a2d\u5b9a: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=\u30d3\u30c7\u30aa\u306e\u54c1\u8cea\u8a2d\u5b9a -TrTab2.5=\u57fa\u672c\u8a2d\u5b9a -TrTab2.6=\u5909\u63db\u30a8\u30f3\u30b8\u30f3\u306e\u9806\u5e8f\u3092\u4e26\u3073\u66ff\u3048\u307e\u3059\u3002\u6700\u521d\u306e1\u3064\u304c\u30aa\u30ea\u30b8\u30ca\u30eb\u30d3\u30c7\u30aa\u306e\u30d5\u30a9\u30eb\u30c0\u306b\u73fe\u308c\u307e\u3059\u3002 -TrTab2.7=\u305d\u306e\u4ed6\u306e\u30aa\u30d7\u30b7\u30e7\u30f3 -TrTab2.8=\u5909\u63db\u3057\u306a\u3044\u62e1\u5f35\u5b50 (\u30b3\u30f3\u30de\u3067\u533a\u5207\u3063\u3066\u304f\u3060\u3055\u3044): -TrTab2.9=\u5f37\u5236\u5909\u63db\u3059\u308b\u62e1\u5f35\u5b50 (\u30b3\u30f3\u30de\u3067\u533a\u5207\u3063\u3066\u304f\u3060\u3055\u3044): -TrTab2.10=Allows you to stream DTS directly to your receiver.\nBe careful, it's possible to have a static sound. Here's some advices:\n- You must have a DTS compatible receiver, connected on TOSLINK or HDMI\n- The volume icon on XMB must be on 'Normal'\n- The channels icon on XMB must be on 'Left+Right'\n -TrTab2.11=\u30a8\u30f3\u30b8\u30f3 -TrTab2.12=\u30c7\u30b3\u30fc\u30c9\u8a2d\u5b9a -TrTab2.13=\u30a8\u30f3\u30b3\u30fc\u30c9\u8a2d\u5b9a -TrTab2.14=\u30d3\u30c7\u30aa\u30d5\u30a1\u30a4\u30eb\u30a8\u30f3\u30b8\u30f3 -TrTab2.15=\u97f3\u58f0\u30d5\u30a1\u30a4\u30eb\u30a8\u30f3\u30b8\u30f3 -TrTab2.16=\u30d3\u30c7\u30aa\u30b9\u30c8\u30ea\u30fc\u30df\u30f3\u30b0\u914d\u4fe1\u30a8\u30f3\u30b8\u30f3 -TrTab2.17=\u97f3\u58f0\u30b9\u30c8\u30ea\u30fc\u30df\u30f3\u30b0\u914d\u4fe1\u30a8\u30f3\u30b8\u30f3 -TrTab2.18=\u305d\u306e\u4ed6\u30a8\u30f3\u30b8\u30f3 -TrTab2.19=\u592a\u5b57\u306e\u30a8\u30f3\u30b8\u30f3\u304c\u6700\u512a\u5148\u3055\u308c\u307e\u3059\u3002 -TrTab2.20=\u30d3\u30c7\u30aa\u306e\u5909\u63db\u306b\u4f7f\u7528\u3055\u308c\u307e\u3059\u3002 -TrTab2.21=[AviSynth\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093] -TrTab2.27=DTS/FLAC -> LPCM\u306bremux (HDMI\u53d7\u4fe1\u5074\u304cPCM 5.1\u30b9\u30c8\u30ea\u30fc\u30e0\u3092\u30b5\u30dd\u30fc\u30c8\u3057\u3066\u3044\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059 \! \u5e73\u5747\u30d3\u30c3\u30c8\u30ec\u30fc\u30c8 = 4.6Mbps) -TrTab2.28=DTS\u306e\u307e\u307e\u30b9\u30c8\u30ea\u30fc\u30e0\u51fa\u529b\u3059\u308b (\u5149\u51fa\u529b\u6e96\u62e0) -> \u30d3\u30c3\u30c8\u30ec\u30fc\u30c8\u8d85\u904e\u306b\u6ce8\u610f -TrTab2.29=AC-3\u97f3\u58f0\u306e\u30d3\u30c3\u30c8\u30ec\u30fc\u30c8 (Kbits/s\u5358\u4f4d) (\u4f8b: 384, 576, 640): -TrTab2.32=MPEG-2\u30d3\u30c7\u30aa\u54c1\u8cea\u8a2d\u5b9a: -TrTab2.39=\u6a19\u6e96\u3067\u518d\u751f\u3067\u304d\u306a\u3044\u30d5\u30a1\u30a4\u30eb\u306f\u81ea\u52d5\u7684\u306bMPEG-PS/AC-3(PS3\u3068\u4e92\u63db\u6027\u304c\u9ad8\u3044)\u306b\u5909\u63db\u3055\u308c\u307e\u3059 -TrTab2.40=\n\u74b0\u5883\u306b\u3088\u3063\u3066\u306fvqscale, vqmin, keyint\u3092\u6307\u5b9a\u3059\u308b\u3068\u3044\u3044\u3067\u3057\u3087\u3046\u3002 \u6a19\u6e96\u306f\u3001\u307b\u307c\u30ed\u30b9\u30ec\u30b9\u3067\u5909\u63db\u3057\u307e\u3059 -TrTab2.41=\n\u6b20\u70b9\u3068\u3057\u3066\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u5e2f\u57df\u3092\u304b\u306a\u308a\u5fc5\u8981\u3068\u3057\u307e\u3059 -TrTab2.42=\n\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u304c\u7121\u7dda\u3084\u4e0b\u4f4d\u306e\u898f\u683c\u3067\u3042\u308c\u3070\u30c8\u30e9\u30f3\u30b9\u30b3\u30fc\u30c9\u54c1\u8cea\u3092\u8abf\u6574\u3057\u3066\u304f\u3060\u3055\u3044 -TrTab2.43=\n\u203b\u30d3\u30c3\u30c8\u30ec\u30fc\u30c8\u3092\u5236\u9650\u3059\u308b\u3068CPU\u30d1\u30ef\u30fc\u304c\u5fc5\u8981\u306b\u306a\u308a\u307e\u3059\! -TrTab2.44=\n1080P\u306e\u30a2\u30af\u30b7\u30e7\u30f3\u6620\u753b\u306a\u3069\u306f15Mbps\u3067\u306f\u4e0d\u8db3\u3067\u3059 -TrTab2.50=\u97f3\u58f0\u30c1\u30e3\u30f3\u30cd\u30eb\u6570: -TrTab2.51=\u5168\u3066\u306e\u5b57\u5e55\u3092\u7121\u52b9\u306b\u3059\u308b -TracesTab.3=\u6d88\u53bb -TreeNodeSettings.4=\u3053\u306e\u9805\u76ee\u306f\u8d77\u52d5\u3057\u3066\u3044\u307e\u305b\u3093\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ko.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ko.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ko.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ko.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,221 +0,0 @@ -DLNAMediaDatabase.0=\uc880\ub354 \ub098\uc740 \uc131\ub2a5\uc744 \uc704\ud574\uc11c\ub294,\n\ubbf8\ub514\uc5b4\ub77c\uc774\ube0c\ub7ec\ub9ac \ub370\uc774\ud130\ub97c \ucd08\uae30\ud654 \ud574\uc57c \ud569\ub2c8\ub2e4.\n\ubd88\ud3b8\uc744 \ub4dc\ub824 \uc8c4\uc1a1\ud569\ub2c8\ub2e4\! -FFMpegDVRMSRemux.0=FFmpeg\ub97c \ub300\uccb4\ud558\ub294 \ud504\ub85c\uadf8\ub7a8 \uc704\uce58: -FFMpegDVRMSRemux.1=DVR-MS remuxing \uc124\uc815 -FFMpegVideo.0=\uc778\ucf54\ub354 \uc124\uc815 (AviSynth/FFmpeg engine only, AviSynth/MEncoder\ub97c \ucd94\ucc9c\ud568) -FoldTab.0=<\ubaa8\ub4e0 \ub4dc\ub77c\uc774\ubc84> -FoldTab.1=\uacf5\uc720\uc635\uc158 -FoldTab.2=\ubaa8\ub4e0 \uacf5\uc720\ud3f4\ub354 \uac80\uc0c9 -FoldTab.3=\ubaa8\ub4e0 \uacf5\uc720\ud3f4\ub354\ub97c \uac80\uc0c9\ud558\ub294\ub370 \uc2dc\uac04\uc774 \ub9ce\uc774 \uac78\ub9bd\ub2c8\ub2e4 \!\n -FoldTab.4=\ubbf8\ub514\uc5b4\uc2a4\uce94\uc744 \uc2dc\uc791\ud558\uaca0\uc2b5\ub2c8\uae4c?\n\n -FoldTab.5=\ud30c\uc77c\ud655\uc7a5\uc790 \uc228\uae30\uae30 -FoldTab.6=\#Video Settings\# \ud3f4\ub354 \uc228\uae30\uae30 -FoldTab.7=\uacf5\uc720\ud3f4\ub354 -FoldTab.8=\ucf54\ub371\uc774\ub984 \uc228\uae30\uae30 -FoldTab.9=\ub514\ub809\ud1a0\ub9ac \ucd94\uac00 -FoldTab.10=\uc2a4\uce94\ub3d9\uc791\uc744 \uc815\uc9c0\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?\n\n -FoldTab.11=\ubcc0\ud658\ud558\uc5ec \ube44\ub514\uc624\ud30c\uc77c \ubcf5\uc0ac (\uc8fc\uc758\! \ud30c\uc77c \uc0ac\uc774\uc988\uac00 \ubcc0\uacbd\ub428) -FoldTab.12=\uacf5\uc720\ud3f4\ub354 \uc815\ub82c\ubc29\ubc95 -FoldTab.13=\uc378\ub124\uc77c -FoldTab.14=MPlayer\ub97c \ud1b5\ud55c \ube44\ub514\uc624 \ubbf8\ub9ac\ubcf4\uae30 -FoldTab.15=\uc54c\ud30c\ubcb3\uc21c\uc11c (A-Z) -FoldTab.16=\uc2dc\uac04\uc21c\uc11c, \ucd5c\uc2e0\ud30c\uc77c\uc21c -FoldTab.17=\uc2dc\uac04\uc21c\uc11c, \uc608\uc804\ud30c\uc77c\uc21c -FoldTab.18=\ud30c\uc77c\uc815\ub82c: -FoldTab.19=DVD ISO \uc378\ub124\uc77c -FoldTab.20=ASCII \ubc30\uc5f4\uc21c\uc11c -FoldTab.21=Image \uc378\ub124\uc77c -FoldTab.23=amazon.com \uc5d0\uc11c \ub2e4\uc6b4\ub85c\ub4dc -FoldTab.24=discogs.com \uc5d0\uc11c \ub2e4\uc6b4\ub85c\ub4dc -FoldTab.26=\uc624\ub514\uc624 \uc378\ub124\uc77c \ud45c\uc2dc \ubc29\ubc95: -FoldTab.27=\uac15\uc81c\ud560\ub2f9 \ud560 \ube44\ub514\uc624 \ucee4\ubc84 \ud30c\uc77c \uc704\uce58 -FoldTab.28=\ud3f4\ub354 \uc120\ud0dd -FoldTab.29=iPhoto \ub77c\uc774\ube0c\ub7ec\ub9ac \ubcf4\uae30 -FoldTab.30=iTunes \ub77c\uc774\ube0c\ub7ec\ub9ac \ubcf4\uae30 -FoldTab.31=\ube44\uc5b4\uc788\ub294 \ubbf8\ub514\uc5b4\ud3f4\ub354 \uc228\uae30\uae30 (\uc8fc\uc758\! \ucee4\uc11c\uc774\ub3d9\uc774 \ub290\ub824\uc9d0) -FoldTab.32=\ubbf8\ub514\uc5b4 \ub77c\uc774\ube0c\ub7ec\ub9ac \ud3f4\ub354 \uc228\uae30\uae30 -FoldTab.33=\#Transcode\# \ud3f4\ub354 \uc228\uae30\uae30 -FoldTab.34=Aperture \ub77c\uc774\ube0c\ub7ec\ub9ac \ubcf4\uae30 -FontFileFilter.3=\ud2b8\ub8e8\ud0c0\uc785\uae00\uaf34 -LinksTab.5=\ub3c4\uc6c0\ub418\ub294 \uc0ac\uc774\ud2b8\ub4e4: -LooksFrame.5=Quit -LooksFrame.6=Main Panel -LooksFrame.9=\uc0c1\ud0dc\uc800\uc7a5 -LooksFrame.12=\uc7ac\uc2dc\uc791 -LooksFrame.18=\uc0c1\ud0dc\uc815\ubcf4 -LooksFrame.19=\ub514\ubc84\uae45\ub85c\uadf8 -LooksFrame.20=\uc77c\ubc18\uc124\uc815 -LooksFrame.21=\ube44\ub514\uc624/\uc624\ub514\uc624 \uc124\uc815 -LooksFrame.22=\ud654\uba74\ud45c\uc2dc/\uacf5\uc720\uc124\uc815 -LooksFrame.24=\ub3c4\uc6c0\ub9d0 -LooksFrame.25=\ud504\ub85c\uadf8\ub7a8\uc815\ubcf4 -MEncoderAviSynth.2=\ube44\ub514\uc624 \ub514\ucf54\ub354 \uc124\uc815 (AviSynth engine only) -MEncoderAviSynth.3=AviSynth \ud504\ub808\uc784\uc18d\ub3c4 \ud2b9\uc815\uac12\uc73c\ub85c \uac15\uc81c \uc124\uc815 (convertfps=true) -MEncoderVideo.0=Skip loop filter deblocking for h264. Can degrade quality. -MEncoderVideo.1=\ube44\ub514\uc624/\uc624\ub514\uc624 \ub514\ucf54\ub354 \uc124\uc815 (MEncoder engine only) -MEncoderVideo.2=A/V \ub3d9\uae30\ud654 \ub300\uccb4 \ubc29\ubc95 -MEncoderVideo.3=\uc5b4\ud50c\ub9ac\ucf00\uc774\uc158 \uae30\ubcf8 \ucf54\ub371 \uc124\uc815 \uc0ac\uc6a9 (\uad8c\uc7a5\uc0ac\ud56d!) -MEncoderVideo.4=FFmpeg\uc73c\ub85c\ub9cc \ud504\ub808\uc784\uc18d\ub3c4 \uc81c\uc5b4\ud558\uae30 -MEncoderVideo.5=You can add here specific options, such as a denoise filter for example: -vf hqdn3d -MEncoderVideo.6=\uc0ac\uc6a9\uc790\uc815\uc758 \uc635\uc158: -MEncoderVideo.7=\uc74c\uc131\uc5b8\uc5b4 \uc6b0\uc120\uc21c\uc704: -MEncoderVideo.8=\uc790\ub9c9 \uc124\uc815 -MEncoderVideo.9=\uc790\ub9c9\uc5b8\uc5b4 \uc6b0\uc120\uc21c\uc704: -MEncoderVideo.10=\uc624\ub514\uc624/\uc790\ub9c9 \uc5b8\uc5b4 \ud45c\uc2dc \uc21c\uc11c (ex: en,off;jpn,eng) -MEncoderVideo.11=\uc790\ub9c9 \ucf54\ub4dc\ud398\uc774\uc9c0: -MEncoderVideo.12=ASS \uc790\ub9c9 \uc124\uc815: \uae00\uaf34 \ud06c\uae30 -MEncoderVideo.13=\uc790\ub9c9 \uc678\uacfd\uc120 -MEncoderVideo.14=\uc790\ub9c9 \uadf8\ub9bc\uc790 -MEncoderVideo.15=\uc790\ub9c9 \uc544\ub798 \uc5ec\ubc31 -MEncoderVideo.16=\uae30\ubcf8 \uae00\uaf34 \uc124\uc815: \uae00\uaf34 \ud06c\uae30 -MEncoderVideo.17=\uc790\ub9c9 \uc678\uacfd\uc120 -MEncoderVideo.18=\uc790\ub9c9 \ud750\ub9bc \uc815\ub3c4 -MEncoderVideo.19=\uc790\ub9c9 \uc544\ub798 \uc5ec\ubc31 -MEncoderVideo.20=ASS/SSA \uc790\ub9c9 -MEncoderVideo.21=\uae00\uaf34 \uc124\uc815 -MEncoderVideo.22=\ube44\ub514\uc624\uc640 \uc774\ub984\uc774 \uac19\uc744 \uacbd\uc6b0 \uc790\ub3d9\uc73c\ub85c \uc790\ub9c9 \ub85c\ub4dc\ud558\uae30 *.srt/*.sub -MEncoderVideo.23=FriBiDi \ubaa8\ub4dc -MEncoderVideo.24=\uc790\ub9c9 \ud2b8\ub8e8\ud0c0\uc785 \uae00\uaf34 (\uc544\uc2dc\uc544\uc5b8\uc5b4): -MEncoderVideo.25=\uc790\ub9c9 \ud2b8\ub8e8\ud0c0\uc785 \uae00\uaf34 -MEncoderVideo.26=Deinterlace filter -MEncoderVideo.27=\ube44\ub514\uc624 \ud654\uba74\ud06c\uae30 \uac15\uc81c\uc124\uc815 -MEncoderVideo.28=\uac00\ub85c\ud06c\uae30 -MEncoderVideo.29=\ud658\uacbd\ubcc0\uc218\uac12 \ub0b4\ubcf4\ub0b4\uae30 : \ucf54\ub371\uad00\ub828 \uc124\uc815\uac12 -MEncoderVideo.30=\uc138\ub85c\ud06c\uae30 -MEncoderVideo.31=\uc0c9\uc0c1 -MEncoderVideo.32=AC-3 \uc624\ub514\uc624 \uc778\ucf54\ub529 \ud558\uc9c0 \uc54a\uae30 -MEncoderVideo.33=\uc0ac\uc6a9\uc790\uc815\uc758 \uc124\uc815: -MEncoderVideo.34=\ucf54\ub371 \ubcc0\ud658 \uc124\uc815 -MEncoderVideo.35=\uba40\ud2f0\ucf54\uc5b4 CPU \uc0ac\uc6a9\ud558\uae30 -MEncoderVideo.36=ASS \uae30\ubcf8 \uc2a4\ud0c0\uc77c \uc0ac\uc6a9\ud558\uae30 -MEncoderVideo.37=\uc790\ub9c9\uc744 \ub530\ub85c \uad00\ub9ac\ud558\ub294 \uacbd\uc6b0 \ud3f4\ub354\uc704\uce58 -MEncoderVideo.38=H.264 \ube44\ub514\uc624\uac00 PS3\uc5d0 \uc801\ud569\ud558\uace0 \uc790\ub9c9\uc774 \uc5c6\uc744 \uacbd\uc6b0, tsMuxeR \uc0ac\uc6a9\ud558\uae30 [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.39=DVD ISO \ube44\ub514\uc624 \uc778\ucf54\ub529 \ud558\uc9c0 \uc54a\uae30 -MEncoderVideo.68=\#\uc5ec\uae30\uc5d0 \ub2f9\uc2e0\uc774 \uc6d0\ud558\ub294 \ud2b9\ubcc4\ud55c \ucf54\ub371\ubcc0\ud658 \ud30c\ub77c\uba54\ud130\ub97c \uc9c0\uc815\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.\n -MEncoderVideo.69=\#\ube44\ub514\uc624 \uc624\ub514\uc624\uac04\uc758 \ub3d9\uae30\ud654 \ubb38\uc81c\uac00 \ub9ce\uc9c0\ub9cc, \uac01 \uae30\uae30\ubcc4\ub85c \uc124\uc815\uac12\uc774 \ub2e4\ub97c\ubfd0 \uc218\uc815\uc740 \uac00\ub2a5\ud569\ub2c8\ub2e4\n -MEncoderVideo.70=\#\uc804\ubb38\uac00\uac00 \uc544\ub2c8\ub77c\uba74 \uc138\ubd80\uc124\uc815\uc740 \ud558\uc9c0 \uc54a\uc544\ub3c4 \ucda9\ubd84\ud788 \uc0ac\uc6a9\ud558\ub294\ub370 \ubb38\uc81c\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.\n -MEncoderVideo.71=\#\uc785\ub825 \ud615\uc2dd\uc740 {java condition} :: {MEncoder options} ; \uc785\ub2c8\ub2e4.\n -MEncoderVideo.72=\#\uc0ac\uc6a9\uac00\ub2a5 \ud1a0\ud070\ub4e4: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#\uc8fc\uc758, \ud615\uc2dd\uc774 \ub2e4\ub97c\uacbd\uc6b0 \ud574\ub2f9 \ub77c\uc778\uc740 \ub3d9\uc791\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4\n -MEncoderVideo.75=\#\ud2b9\ubcc4\ud55c \uc635\uc158\ub4e4:\n -MEncoderVideo.92=DVD/VOBsub \uc790\ub9c9 \ud574\uc0c1\ub3c4 (0-4) (\ud070\uac12\uc774 \ub354\uc88b\uc74c): -MEncoderVideo.93=Add borders for overscan compensation: -NetworkTab.0=\uc5b8\uc5b4 [PMS \uc7ac\uc2dc\uc791 \ud544\uc694]: -NetworkTab.1=\uc555\ucd95\ud30c\uc77c \ub0b4\uc6a9\ubcf4\uae30 (.rar/.zip/.cbr) -NetworkTab.2=\uc378\ub124\uc77c \ud45c\uc2dc -NetworkTab.3=\ucd5c\uc18c\ud654 \ubaa8\ub4dc\ub85c \uc2e4\ud589 -NetworkTab.4=\uc708\ub3c4\uc6b0 \uc11c\ube44\uc2a4\ub85c \uc124\uce58 -NetworkTab.5=\uc77c\ubc18 \uc124\uc815 -NetworkTab.6=\ube44\ub514\uc624 \ubcc0\ud658 \ubc84\ud37c \ucd5c\ub300\ud06c\uae30 (\ub2e8\uc704MB, \ucd5c\ub300: MAX_BUFFER_SIZE): -NetworkTab.7=\ubcc0\ud658\uc2dc \uc0ac\uc6a9\ud560 CPU \uc218 (it seems you have %d): -NetworkTab.8=\uc5c5\ub370\uc774\ud2b8 \ud655\uc778 -NetworkTab.9=\uc790\ub3d9 \uc5c5\ub370\uc774\ud2b8 -NetworkTab.11=\uc708\ub3c4\uc6b0 \uc11c\ube44\uc2a4 \ub4f1\ub85d \uc644\ub8cc\! \uc0ac\uc6a9\ud558\ub824\uba74 \uc774 \uc5b4\ud50c\ub9ac\ucf00\uc774\uc158\uc744 \ub2eb\uace0,\n -NetworkTab.12=\uc81c\uc5b4\ud310\uc758 \uc708\ub3c4\uc6b0 \uc11c\ube44\uc2a4 \uad00\ub9ac\uc790\uc5d0\uc11c PMS\ub97c \uc2dc\uc791\ud558\uc2ed\uc2dc\uc694.\n\n -NetworkTab.13=\ubbf8\ub514\uc5b4\ub77c\uc774\ube0c\ub7ec\ub9ac \ub370\uc774\ud130\ub294 \ucd08\uae30\ud654 \ub429\ub2c8\ub2e4\!\n -NetworkTab.14=\uc708\ub3c4\uc6b0 \uc11c\ube44\uc2a4 \ub4f1\ub85d \uc2e4\ud328\!\n -NetworkTab.15=\ub124\ube44\uac8c\uc774\uc158/\ud30c\uc2f1 \uc124\uc815 -NetworkTab.16=\uc378\ub124\uc77c \uac00\uc838\uc62c \ud654\uba74 \uc704\uce58 (\ucd08\ub2e8\uc704): -NetworkTab.17=\ubbf8\ub514\uc5b4 \ub77c\uc774\ube0c\ub7ec\ub9ac/\uce90\uc26c \uc0ac\uc6a9\ud558\uae30 -NetworkTab.18=\ubbf8\ub514\uc5b4 \ub77c\uc774\ube0c\ub7ec\ub9ac \ucd08\uae30\ud654 -NetworkTab.19=\uadf8\ub300\ub85c \uc9c4\ud589\ud574\ub3c4 \uc88b\uc2b5\ub2c8\uae4c? -NetworkTab.20=\ub124\ud2b8\uc6cc\ud06c \uce74\ub4dc: -NetworkTab.22=\ub124\ud2b8\uc6cc\ud06c \uc124\uc815, \ubb38\uc81c\uac00 \uc788\uc744 \uacbd\uc6b0\ub9cc \uc785\ub825 -NetworkTab.23=\uac15\uc81c\ud560\ub2f9 \uc544\uc774\ud53c: -NetworkTab.24=\uac15\uc81c\ud560\ub2f9 \ud3ec\ud2b8 (\uae30\ubcf8\uac12 5001): -NetworkTab.25=PS3 \ud658\uacbd\uc124\uc815 -NetworkTab.26=Character encoding of your PS3 file names (see XMB->System settings->Charset): -NetworkTab.27=Unused settings you shouldn't use :p -NetworkTab.28=Turbo mode (enable tcp_nodelay) / be careful, not sure if that's ok to do this -NetworkTab.29=Block incoming request for the same file from PS3 when transcode has started -NetworkTab.30=IP \ud544\ud130 \uc0ac\uc6a9: -NetworkTab.31=\uc804\ubb38\uc801\uc778 HTTP \uc124\uc815 \ubc0f \uc2dc\uc2a4\ud15c \uc124\uc815 -NetworkTab.32=HTTP \uc5d4\uc9c4 V2 -NetworkTab.33=\ubbf8\ub514\uc5b4 \uc7ac\uc0dd\uc911 \ucef4\ud4e8\ud130 \uaebc\uc9d0 \ubc29\uc9c0 -NetworkTab.34=\ud50c\ub7ec\uadf8\uc778 -NetworkTab.35=\ucd5c\ub300 \ub300\uc5ed\ud3ed Mb/s (0 means no limit): -PMS.0=PS3\ub97c \ucc3e\uc744\uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc804\uc6d0\uc774 \ucf1c\uc838 \uc788\ub294\uc9c0 \ud655\uc778\ud558\uc138\uc694. -PMS.1=\uc624\ub514\uc624 -PMS.2=\#- Cache -\# -PMS.3=A/V \ub3d9\uae30\ud654 \ubc29\ubc95 \uac15\uc81c \ud560\ub2f9 -PMS.4=Deinterlace Filter -PMS.5=PS3\uac00 \uac80\uc0c9 \ub418\uc5c8\uc2b5\ub2c8\ub2e4 \! -PMS.6=\uc790\ub3d9\uc73c\ub85c \uc790\ub9c9 \uac00\uc838\uc624\uae30 (.srt/.sub) -PMS.7=SkipLoopFilter for H.264 Decoding [COULD DEGRADE QUALITY] -PMS.8=\uc790\ub9c9 -PMS.9=\ubaa8\ub4e0 \uc74c\uc545 \ub9ac\uc2a4\ud2b8 -PMS.10=\ubaa8\ub4e0 \uc790\ub9c9 \ubb34\uc2dc -PMS.11=\ubaa8\ub4e0 \uc624\ub514\uc624 \ud2b8\ub799 -PMS.12=\ub0a0\uc9dc\ubcc4 -PMS.13=\uac00\uc218\ubcc4 -PMS.14=Default H.264 Remux with MEncoder -PMS.16=\uc568\ubc94\ubcc4 -PMS.17=Unknown renderer -PMS.19=\uc7a5\ub974\ubcc4 -PMS.21=\uce74\uba54\ub77c\ubaa8\ub378\ubcc4 -PMS.22=\uac00\uc218/\uc568\ubc94\ubcc4 -PMS.25=ISO\uc124\uc815\ubcc4 -PMS.26=\uc7a5\ub974/\uac00\uc218/\uc568\ubc94\ubcc4 -PMS.27=\uc124\uc815 \uc800\uc7a5 -PMS.31=\uc774\ubbf8\uc9c0 -PMS.32=\ubaa8\ub4e0 \uc774\ubbf8\uc9c0 -PMS.34=\ube44\ub514\uc624 -PMS.35=\ubaa8\ub4e0 \ube44\ub514\uc624 -PMS.36=HD \ube44\ub514\uc624 -PMS.37=\#- Video Settings -\# -PMS.39=SD \ube44\ub514\uc624 -PMS.41=Win32 \uc11c\ube44\uc2a4 (\uc7ac)\uc124\uce58 \uc911... -PMS.130=\uc601\uc0c1\ud45c\uc2dc\uc7a5\uce58\ub97c \ucc3e\ub294 \uc911... -ProfileChooser.1=PS3 Media Server Profile Chooser -ProfileChooser.2=Select -ProfileChooser.3=Profile file (.conf) or directory -StatusTab.2=\uc0c1\ud0dc -StatusTab.3=\uae30\ub2e4\ub9ac\ub294\uc911... -StatusTab.5=\ube44\uc5b4\uc788\uc74c -StatusTab.6=\ubcc0\ud658\ubc84\ud37c \uc0c1\ud0dc: -StatusTab.7=I/O \ud1b5\uacc4: -StatusTab.8=\ube44\ud2b8\ub808\uc774\ud2b8: -StatusTab.9=\uac80\uc0c9\ub41c \ubbf8\ub514\uc5b4 \ud45c\uc2dc\uc7a5\uce58 -StatusTab.10=Peak bitrate: -TSMuxerVideo.0=Demux with MEncoder and encode all audio tracks to AC-3 -TSMuxerVideo.1=Demux with MEncoder and encode DTS/FLAC audio tracks to LPCM [\uc8fc\uc758, \uc7ac\uc0dd\uc704\uce58 \uc774\ub3d9\uc774 \uc548\ub428] -TSMuxerVideo.2=\uba54\ud0c0 \ud30c\uc77c\uc5d0\uc11c FPS \uc124\uc815\ud558\uae30 (FFmpeg \uc0ac\uc6a9) -TSMuxerVideo.3=\ube44\ub514\uc624 \ub514\ucf54\ub354 \uc124\uc815\uc744 TsMuxer \uc5d4\uc9c4\uc5d0\ub9cc \uc801\uc6a9\ud558\uae30 -TSMuxerVideo.19=\ubaa8\ub4e0 \uc624\ub514\uc624 \ucc44\ub110\uc744 Mux \ud558\uae30 -TrTab2.0=\uc2e4\uc2dc\uac04 \ube44\ub514\uc624\ubcc0\ud658 \uc0ac\uc6a9\uc5ec\ubd80 -TrTab2.1=\uc9c0\uae08 \uc124\uc815\ud558\uc9c0 \uc54a\uc74c -TrTab2.2=\ube44\ub514\uc624 \uc778\ucf54\ub354 \uc124\uc815 : MEncoder/AviSynth/FFmpeg -TrTab2.3=\uc624\ub514\uc624 \uc778\ucf54\ub354 \uc124\uc815: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=\ube44\ub514\uc624 \ud654\uc9c8 \uc124\uc815 -TrTab2.5=\ube44\ub514\uc624 \ubcc0\ud658 \uc124\uc815 -TrTab2.6=\ube44\ub514\uc624\ubcc0\ud658 \uc5d4\uc9c4 \ub9ac\uc2a4\ud2b8 \uc815\ub82c. \ud3f4\ub354\uc5d0 \uc5d4\uc9c4\ud558\ub098\uac00 \ud45c\uc2dc\ub428 -TrTab2.7=\uae30\ud0c0 \uc635\uc158 -TrTab2.8=\ube44\ub514\uc624\ubcc0\ud658\uc744 \ubb34\uc2dc\ud560 \ud655\uc7a5\uc790 (\uc27c\ud45c\ub85c \uad6c\ubd84): -TrTab2.9=\ube44\ub514\uc624\ubcc0\ud658\u00c0\u00cc \uaf2d \ud544\uc694\ud55c \ud655\uc7a5\uc790 (\uc27c\ud45c\ub85c \uad6c\ubd84): -TrTab2.10=Allows you to stream DTS directly to your receiver.\nBe careful, it's possible to have a static sound. Notes:\n- You must have a DTS compatible receiver, connected on TOSLINK or HDMI\n- The volume icon on XMB must be on 'Normal'\n- The channels icon on XMB must be on 'Left+Right'\n -TrTab2.11=\uc5d4\uc9c4 -TrTab2.12=\ub514\ucf54\ub354 \uc124\uc815 -TrTab2.13=\uc778\ucf54\ub354 \uc124\uc815 -TrTab2.14=\ube44\ub514\uc624 \ud30c\uc77c \uc5d4\uc9c4 -TrTab2.15=\uc624\ub514\uc624 \ud30c\uc77c \uc5d4\uc9c4 -TrTab2.16=\uc6f9\ube44\ub514\uc624 \uc2a4\ud2b8\ub9bc \uc5d4\uc9c4 -TrTab2.17=\uc6f9\uc624\ub514\uc624 \uc2a4\ud2b8\ub9bc \uc5d4\uc9c4 -TrTab2.18=\uae30\ud0c0 \uc5d4\uc9c4 -TrTab2.19=\ub0b4\ub9bc\ucc28\uc21c\uc73c\ub85c \uc5d4\uc9c4\uc815\ub82c -TrTab2.20=\uc815\ub82c; \uac00\uc7a5 \ub192\uc740\uac83\uc774 \uc704\uc5d0 -TrTab2.21=[AviSynth \uc9c0\uc6d0 \uc548\ud568] -TrTab2.22=\uc790\ub3d9 \uc624\ub514\uc624 \ub9ac\uc0d8\ud50c\ub9c1 44.1, 48 kHz -TrTab2.27=DTS/FLAC -> LPCM remux (LPCM 5.1 \uc2a4\ub974\ub9bc\uc744 \uc704\ud55c HDMI \ub9ac\uc2dc\ubc84 \ud544\uc694\! \ud3c9\uade0 \ube44\ud2b8\ub808\uc774\ud2b8 = 4.6Mbps) -TrTab2.28=DTS \uc624\ub514\uc624 \uc2a4\ud2b8\ub9bc \uc720\uc9c0 (\uad11\uc6d0\ub2e8\uc790\ucd9c\ub825\uac00\ub2a5) -> \uc8fc\uc758, \uc624\ubc84\ud5e4\ub4dc \ubc1c\uc0dd \uac00\ub2a5! -TrTab2.29=AC-3 \uc624\ub514\uc624 \ube44\ud2b8\ub808\uc774\ud2b8 (in Kbits/s) (ex: 384, 576, 640): -TrTab2.32=MPEG-2 \ube44\ub514\uc624 \ud654\uc9c8 \uc124\uc815: -TrTab2.39=\ud574\ub2f9 \ube44\ub514\uc624\ub294 MPEG-PS / AC-3 audio \ub85c \uc790\ub3d9 \ubcc0\ud658 \ub418\uc5c8\uc2b5\ub2c8\ub2e4 (highly compatible on PS3) -TrTab2.40=\nYou can play with the vqscale, vqmin and keyint parameters to achieve good, even almost lossless transcoding quality. -TrTab2.41=\nThe drawback to this is the VBR bitrate, which can sometimes peak above your max network capacity. -TrTab2.42=\nThat's why you can also set the bandwidth if you're on WiFi, CPL, etc. However, the transcoding quality -TrTab2.43=\nis a balance between network speed and CPU power: the more quality you put into a constrained bitrate, -TrTab2.44=\nthe more your CPU will suffer\! Also, don't expect to fit a 1080p action movie in the purest quality in 15Mbps :p -TrTab2.50=\ucd5c\ub300 \uc624\ub514\uc624 \ucc44\ub110 \uc218: -TrTab2.51=\ubaa8\ub4e0 \uc790\ub9c9 \ubb34\uc2dc -TrTab2.52=\#Transcode\# \ud3f4\ub354 \uc9c0\uc6d0 / 1\ubd84 \ub2e8\uc704: -TracesTab.3=\uc9c0\uc6b0\uae30 -TreeNodeSettings.4=\ud574\ub2f9 \uc5d4\uc9c4\uc740 \ub85c\ub4dc\ub418\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_nl.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_nl.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_nl.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_nl.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,303 +0,0 @@ -DLNAMediaDatabase.0=De mediabibliotheek moet opnieuw geinitialiseerd worden.\nExcuses voor het ongemak! -DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z -DLNAMediaDatabase.2=Opruimen database... -DLNAMediaDatabase.3=Comprimeren database... -DLNAMediaDatabase.4=Scannen Folder: -FFMpegDVRMSRemux.0=Alternatieve FFmpeg locatie: -FFMpegDVRMSRemux.1=Instellingen voor remuxen van DVR-MS -FFMpegVideo.0=Encoder instellingen (alleen voor de AviSynth/FFmpeg decoder, gebruik bij voorkeur de AviSynth/MEncoder) -FFMpegVideo.1=Encoder instellingen (alleen voor de FFmpeg decoder) -FoldTab.0= -FoldTab.1=Opties voor delen -FoldTab.2=Scan alle gedeelde mappen -FoldTab.3=Het scannen van alle mappen kan lang duren!\n -FoldTab.4=Weet je zeker dat je de scan wilt starten?\n\n -FoldTab.5=Verberg bestandsextensies -FoldTab.6=Verberg \#- Video Instellingen -\# map -FoldTab.7=Gedeelde mappen -FoldTab.8=Verberg namen van decoders -FoldTab.9=Map toevoegen -FoldTab.10=Wil je de scan stoppen?\n\n -FoldTab.11=Inschakelen getranscodeerde video kopie naar PS3 (let op: bestanden hebben geen vaste grootte!) -FoldTab.12=Sorteer gedeelde mappen -FoldTab.13=Miniaturen -FoldTab.14=Gebruik MPlayer voor video miniaturen -FoldTab.15=Alfabetisch (A-Z) -FoldTab.16=Nieuwste bovenaan -FoldTab.17=Oudste bovenaan -FoldTab.18=Sorteervolgorde: -FoldTab.19=DVD ISO miniaturen -FoldTab.20=ASCII (tekenset) volgorde -FoldTab.21=Miniaturen van afbeeldingen -FoldTab.22=Alfanumeriek -FoldTab.23=Downloaden van amazon.com -FoldTab.24=Downloaden van discogs.com -FoldTab.26=Audio miniaturen weergeven: -FoldTab.27=Alternatieve map voor video albumhoezen: -FoldTab.28=Kies map -FoldTab.29=Toon iPhoto bibliotheek -FoldTab.30=Toon iTunes bibliotheek -FoldTab.31=Verberg lege mappen en mappen zonder media (let op: langzamer browsen) -FoldTab.32=Verberg \#- Mediabibliotheek -\# map -FoldTab.33=Verberg \#--TRANSCODE--\# map -FoldTab.34=Toon aperture bibliotheek -FoldTab.35=Geen -FontFileFilter.3=Truetype Lettertypen -LinksTab.5=Nuttige links: -LinksTab.6=Build: -LooksFrame.5=Afsluiten -LooksFrame.6=Hoofdscherm -LooksFrame.9=Opslaan -LooksFrame.12=Server herstarten -LooksFrame.13=De server herstarten vanwege een configuratie wijziging -LooksFrame.18=Status -LooksFrame.19=Sporen -LooksFrame.20=Algemene Configuratie -LooksFrame.21=Transcode Instellingen -LooksFrame.22=Navigatie/Delen Instellingen -LooksFrame.24=Help -LooksFrame.25=Over -LooksFrame.26=ALLEEN OM TE TESTEN, MOGELIJK INSTABIEL -MEncoderAviSynth.2=Video decoder instellingen (alleen voor de AviSynth decoder) -MEncoderAviSynth.3=Inschakelen: verander AviSynth variabele framerate in een constante framerate (convertfps=true) -MEncoderAviSynth.4=# AviSynth script kan nu volledig aangepast worden\n -MEncoderAviSynth.5=# De volgende variabelen zijn beschikbaar:\n -MEncoderAviSynth.6=# : De volledige DirectShowSource instructie, bijv. DirectShowSource(filename, convertfps)\n -MEncoderAviSynth.7=# : De volledige instructie voor ondertiteling als deze gedetecteerd wordt (SRT/SUB/IDX/ASS/SSA)\n -MEncoderAviSynth.8=# : De video bestandsnaam, voor als u dit voor een bestand zelf wil doen\n -MEncoderAviSynth.10=\n -MEncoderAviSynth.11=\n -MEncoderVideo.0=Overslaan van "loop filter" deblokkering voor H.264 (kwaliteit kan afnemen) -MEncoderVideo.1=Video/Audio decoder instellingen (alleen voor de MEncoder decoder) -MEncoderVideo.2=A/V synchronisatie alternatieve methode -MEncoderVideo.3=Gebruik de standaard applicatie codec parameters (aanbevolen!) -MEncoderVideo.4=Forceer de ontlede framerate vanuit FFmpeg -MEncoderVideo.5=Hier kunnen specifieke opties toevoegen worden, bijvoorbeeld een denoise filter: -vf hqdn3d -MEncoderVideo.6=Aangepaste opties: -MEncoderVideo.7=Audio taal prioriteit: -MEncoderVideo.8=Ondertiteling instellingen -MEncoderVideo.9=Ondertiteling taal prioriteit: -MEncoderVideo.10=Audio en ondertiteling taal prioriteit (bijv. eng,off;jpn,eng): -MEncoderVideo.11=Codetabel (voor niet-Unicode ondertitels): -MEncoderVideo.12=ASS lettertype instellingen: Lettertype schaal -MEncoderVideo.13=Lettertype omlijning -MEncoderVideo.14=Lettertype schaduw -MEncoderVideo.15=Ondermarge (px) -MEncoderVideo.16=Standaard lettertype instellingen: Lettertype schaal -MEncoderVideo.17=Lettertype omlijning -MEncoderVideo.18=Lettertype vervaging -MEncoderVideo.19=Ondermarge (%) -MEncoderVideo.20=Gebruik ASS/SSA ondertitel vormgeving -MEncoderVideo.21=Lettertype configuratie/ingesloten fonts -MEncoderVideo.22=Automatisch laden van .srt/.sub ondertitels met dezelfde bestandsnaam -MEncoderVideo.23=FriBiDi functie -MEncoderVideo.24=Specifiek TrueType lettertype (voor ondertitels): -MEncoderVideo.25=Selecteer Truetype Lettertype -MEncoderVideo.26=Deinterlace filter -MEncoderVideo.27=Gebruik video verschaling -MEncoderVideo.28=Breedte -MEncoderVideo.29=Expert Instellingen: codec specifieke parameters -MEncoderVideo.30=Hoogte -MEncoderVideo.31=Kleur ondertitels -MEncoderVideo.32=Gebruik originele AC-3 track (niet hercoderen, wat kan leiden tot onhoorbare dialoog en A/V synchronisatie problemen) -MEncoderVideo.33=Aangepaste parameters: -MEncoderVideo.34=Wijzig codecs specifieke parameters -MEncoderVideo.35=Gebruik meerdere CPU cores -MEncoderVideo.36=Gebruik ingesloten stijl -MEncoderVideo.37=Alternatieve map voor ondertitels: -MEncoderVideo.38=Remux video's met tsMuxeR als dat mogelijk is in plaats van transcoderen -MEncoderVideo.39=Remux DVD ISO video track (niet hercoderen) -MEncoderVideo.68=\# Hier kun je specifieke parameters opgeven voor diverse codec combinaties.\n -MEncoderVideo.69=\# Het is vooral voor A/V synchronisatie problemen, maar het kan ook voor andere doeleinden worden gebruikt.\n -MEncoderVideo.70=\# Zie dit als expert instellingen. Deze niet gebruiken als je niet zeker weet wat je doet.\n -MEncoderVideo.71=\# De Syntax is {java voorwaarde} :: {MEncoder optie} (je kunt meerdere opties achter elkaar gebruiken)\n -MEncoderVideo.72=\# Te gebruiken eigenschappen: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\# Let op: elke verkeerde regel wordt gewist.\n -MEncoderVideo.75=\# Speciale opties:\n -MEncoderVideo.76=\# -noass: uitschakelen ASS/SSA ondertitels omdat ze de A/V synchronisatie kunnen ontregelen\n -MEncoderVideo.77=\# -nosync: uitschakelen A/V sync alternatieve methode voor deze voorwaarde (-mc doet hetzelfde)\n -MEncoderVideo.78=\# -quality: overschrijf video kwaliteit instellingen\n -MEncoderVideo.79=\# -mt: forceer gebruik van de multithreaded MEncoder build\n -MEncoderVideo.80=\# Deze lijst zal met de tijd verbeteren. Verbeteringen op verschillende codecs/bestanden zijn altijd welkom.\n -MEncoderVideo.87=\# Je kunt je eigen voorwaarden en opties instellen! Een paar voorbeelden: bijvoorbeeld om de mt build van MEncoder in te schakelen,\n -MEncoderVideo.88=\# voor iedere H.264 HD content (tegelijk met de hoofdoptie): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\# Om 24p judder te verwijderen bij een 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\# Om te remuxen wanneer de video MPEG-2 is en er geen ondertitels zijn: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=DVD/VOBsub ondertitel kwaliteit (0-4) (hoger is beter): -MEncoderVideo.93=Voeg randen toe ter compensatie van overscan: -MEncoderVideo.94=Gedwongen ondertiteling: -MEncoderVideo.95=Gedwongen tags: -MEncoderVideo.96=cp1250 /* Windows - Oost Europa */ -MEncoderVideo.97=cp1251 /* Windows - Cyrillisch */ -MEncoderVideo.98=cp1252 /* Windows - West Europa */ -MEncoderVideo.99=cp1253 /* Windows - Grieks */ -MEncoderVideo.100=cp1254 /* Windows - Turks */ -MEncoderVideo.101=cp1255 /* Windows - Hebreeuws */ -MEncoderVideo.102=cp1256 /* Windows - Arabisch */ -MEncoderVideo.103=cp1257 /* Windows - Baltisch */ -MEncoderVideo.104=cp1258 /* Windows - Vietnamees */ -MEncoderVideo.105=ISO-8859-1 /* West Europa */ -MEncoderVideo.106=ISO-8859-2 /* West en Centraal Europa */ -MEncoderVideo.107=ISO-8859-3 /* West en Zuid Europa */ -MEncoderVideo.108=ISO-8859-4 /* West Europa en Baltische landen */ -MEncoderVideo.109=ISO-8859-5 /* Cyrillisch alfabet */ -MEncoderVideo.110=ISO-8859-6 /* Arabisch */ -MEncoderVideo.111=ISO-8859-7 /* Grieks */ -MEncoderVideo.112=ISO-8859-8 /* Hebreeuws */ -MEncoderVideo.113=ISO-8859-9 /* West Europa en Turks */ -MEncoderVideo.114=ISO-8859-10 /* West Europa en Scandinavische talen */ -MEncoderVideo.115=ISO-8859-11 /* Thai */ -MEncoderVideo.116=ISO-8859-13 /* Baltische talen en Pools */ -MEncoderVideo.117=ISO-8859-14 /* Keltische talen */ -MEncoderVideo.118=ISO-8859-15 /* Met euro teken */ -MEncoderVideo.119=ISO-8859-16 /* Centraal Europese talen */ -MEncoderVideo.120=cp932 /* Japans */ -MEncoderVideo.121=cp936 /* Chinees */ -MEncoderVideo.122=cp949 /* Koreaans */ -MEncoderVideo.123=cp950 /* Big5, Thais, Kantonees */ -MEncoderVideo.124=UTF-8 /* Unicode */ -MEncoderVideo.125=Kies Kleur Ondertitels -MEncoderVideo.126=dut,eng,und -MEncoderVideo.127=dut,eng,und -MEncoderVideo.128=*,* -MEncoderVideo.129=/* Automatisch */ -MEncoderVideo.130=enca:ru:cp1251 /* Russisch (automatisch) */ -MEncoderVideo.131=enca:pl:cp1250 /* Oost Europa (automatisch) */ -MEncoderVideo.132=enca:zh:big5 /* Chinees (automatisch) */ -NetworkTab.0=Taal (opnieuw starten nodig): -NetworkTab.1=Doorzoek ingepakte archieven (.rar/.zip/.cbr) -NetworkTab.2=Miniaturen genereren -NetworkTab.3=Start geminimaliseerd -NetworkTab.4=Installeren als Windows Service -NetworkTab.5=Algemene instellingen -NetworkTab.6=Maximale grootte van de transcode buffer, in megabytes (maximaal: MAX_BUFFER_SIZE): -NetworkTab.7=Aantal cores voor het transcoderen (totaal gedetecteerd: %d): -NetworkTab.8=Controleren op updates -NetworkTab.9=Controleer automatisch -NetworkTab.11=Je hebt de Windows service geinstalleerd! Om deze te gebruiken, moet je deze applicatie sluiten,\n -NetworkTab.12=en daarna de service starten (en configureren) vanuit het Windows Systeembeheer->Services scherm.\n\n -NetworkTab.13=De mediabibliotheek zal opnieuw worden geinitialiseerd!\n -NetworkTab.14=Fout in de installatie van de Windows service!\n -NetworkTab.15=Navigatie/Presentatie instellingen -NetworkTab.16=Miniatuur genereer positie (in seconden): -NetworkTab.17=Inschakelen mediabibliotheek -NetworkTab.18=Reset mediabibliotheek -NetworkTab.19=Weet je het zeker? -NetworkTab.20=Netwerk interface: -NetworkTab.22=Netwerkinstellingen (geavanceerd) -NetworkTab.23=IP-adres van de server: -NetworkTab.24=Poort van de server (standaard 5001): -NetworkTab.25=PS3 Instellingen -NetworkTab.26=Karakterset van PS3 bestandsnamen (zie ook XMB->Systeeminstellingen->Tekenset): -NetworkTab.27=Ongebruikte instellingen die je beter niet kunt gebruiken -NetworkTab.28=Turbo mode (inschakelen tcp_nodelay) (let op: je kunt dit wellicht beter niet gebruiken) -NetworkTab.29=Blokkeer inkomende verzoeken vanaf de PS3 voor hetzelfde bestand als het transcoderen is begonnen -NetworkTab.30=Gebruik een IP filter (whitelist): -NetworkTab.31=Geavanceerde HTTP en systeeminstellingen -NetworkTab.32=HTTP Engine V2 -NetworkTab.33=Voorkom dat het besturingssysteem in slaapstand valt tijdens het streamen -NetworkTab.34=Plugin systeem -NetworkTab.35=Maximale bandbreedte in Mb/s (0 betekent geen limiet): -NetworkTab.36=Standaard renderer als automatische detectie mislukt: -NetworkTab.37=Onbekende renderer -NetworkTab.38=Gebruik de standaard renderer (schakelt automatische detectie uit) -PMS.0=Geen renderers gevonden -PMS.1=Audio -PMS.2=\#- Mediabibliotheek -\# -PMS.3=A/V sync alternatieve methode -PMS.4=Deinterlace Filter -PMS.5=Verbonden met PS3 -PMS.6=Automatisch laden van .srt/.sub ondertitels -PMS.7=Overslaan LoopFilter voor H.264 decoderen (kwaliteit kan afnemen) -PMS.8=Ondertitels -PMS.9=Alle Audio Afspeellijsten -PMS.10=Ondertiteling Uitschakelen -PMS.11=Alle Audio Tracks -PMS.12=Op Datum -PMS.13=Op Artiest -PMS.14=Standaard H.264 Remux met MEncoder -PMS.16=Op Album -PMS.17=Onbekende renderer -PMS.18=Verbonden -PMS.19=Op Genre -PMS.21=Op Camera model -PMS.22=Op Artiest/Album -PMS.25=Op ISO instellingen -PMS.26=Op Genre/Artiest/Album -PMS.27=Configuratie opslaan -PMS.28=Op Letter/Artiest/Album -PMS.31=Foto -PMS.32=Alle Foto's -PMS.34=Video -PMS.35=Alle Video's -PMS.36=HD Video's -PMS.37=\#- Video Instellingen -\# -PMS.39=SD Video's -PMS.40=DVD Images -PMS.41=(Her)installeren Win32 service -PMS.130=Zoeken naar renderers... -ProfileChooser.1=PS3 Media Server Profielkiezer -ProfileChooser.2=Selecteer -ProfileChooser.3=Profielbestand (.conf) of map -StatusTab.2=Status -StatusTab.3=Wachten... -StatusTab.5=Leeg -StatusTab.6=Transcode buffer status: -StatusTab.7=I/O statistieken: -StatusTab.8=Huidige bitrate: -StatusTab.9=Gedetecteerde media renderers -StatusTab.10=Hoogste bitrate: -StatusTab.11=Mb/s -StatusTab.12=MB -TSMuxerVideo.0=Demuxen met MEncoder en encoderen van alle audio tracks naar AC-3 -TSMuxerVideo.1=Demuxen met MEncoder en encoderen van DTS / FLAC audio tracks naar LPCM (let op: het zoeken werkt nog niet) -TSMuxerVideo.2=Gebruik ontlede FPS vanuit FFmpeg in de meta file -TSMuxerVideo.3=Video decoder instellingen (alleen voor de TsMuxeR decoder) -TSMuxerVideo.19=Mux alle audio tracks -TrTab2.0=In- of uitschakelen van een decoder -TrTab2.1=Nog geen instellingen -TrTab2.2=Video encoder instellingen voor de volgende decoders: MEncoder/AviSynth/FFmpeg -TrTab2.3=Audio instellingen, van toepassing op de volgende decoders: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Video kwaliteit instellingen -TrTab2.5=Algemene transcode instellingen -TrTab2.6=Sorteer de decoders lijst. De eerste zal in de originele map gebruikt worden. -TrTab2.7=Diverse opties -TrTab2.8=Niet transcoderen voor deze bestandsextensies (komma gescheiden): -TrTab2.9=Altijd transcoderen voor deze bestandsextensies (komma gescheiden): -TrTab2.10=Laat DTS rechtstreeks naar je receiver streamen.\nLet op: het is mogelijk dat er statische ruis ontstaat. Een paar adviezen:\n- Je moet een geschikte DTS receiver hebben, verbonden met TOSLINK of HDMI.\n- Het volume icoon moet in de XMB op 'Normaal' staan.\n- Het icoon voor kanalen moet in de XMB op 'Links+Rechts' staan.\n -TrTab2.11=Decoders -TrTab2.12=Algemene decoder instellingen -TrTab2.13=Algemene encoder instellingen -TrTab2.14=Decoders voor Videobestanden -TrTab2.15=Decoders voor Audiobestanden -TrTab2.16=Decoders voor Web Video -TrTab2.17=Decoders voor Web Audio -TrTab2.18=Overige Decoders -TrTab2.19=Decoders staan in aflopende -TrTab2.20=volgorde. De bovenste is eerst -TrTab2.21= (niet ondersteund door AviSynth) -TrTab2.22=Automatisch veranderen van de samplingfrequentie naar 44.1 of 48 kHz -TrTab2.27=Gebruik LPCM voor audio (niet hercoderen) -TrTab2.28=Gebruik originele DTS track (niet hercoderen) (te gebruiken met AV receiver door middel van optische of HDMI uitgang) -TrTab2.29=AC-3 audio bitrate voor hercoderen (in kbit/s) (bijv. 576, 640): -TrTab2.32=MPEG-2 instellingen: -TrTab2.39=De video wordt automatisch getranscodeerd en gemuxed naar MPEG-PS / AC-3 audio (zeer geschikt voor de PS3). -TrTab2.40=\nJe kunt spelen met de vscale, vqmin en keyint parameters om goede, bijna perfecte getranscodeerde kwaliteit te bereiken. -TrTab2.41=\nNadeel hiervan is dat de variabele bitrate soms boven je maximale netwerkcapaciteit uitkomt. -TrTab2.42=\nDaarom kun je de bandbreedte instellen als je over een WiFi, CPL, etc. verbinding beschikt. Echter, de kwaliteit van het transcoderen is een -TrTab2.43=\nbalans tussen de snelheid van het netwerk en de kracht van de processor: hoe meer kwaliteit je instelt met een beperkte bitrate, -TrTab2.44=\nhoe zwaarder de processor belast wordt! Verwacht niet dat je een 1080p actie film in perfecte kwaliteit met 15Mbps kunt streamen. -TrTab2.50=Maximum aantal audio kanalen uitvoer voor AC-3 hercoderen: -TrTab2.51=Ondertiteling uitschakelen -TrTab2.52=Hoofdstuk ondersteuning \#--TRANSCODE--\# map (interval in minuten): -TrTab2.55=2 kanalen (stereo) -TrTab2.56=6 kanalen (5.1) -TrTab2.60=Uitstekende kwaliteit -TrTab2.61=Zonder kwaliteitsverlies -TrTab2.62=Goede kwaliteit -TrTab2.63=Goede kwaliteit voor HD Wifi transcoderen -TrTab2.64=Matige kwaliteit voor HD Wifi transcoderen -TrTab2.65=Lage kwaliteit, low-end CPU of HD Wifi transcoderen -TracesTab.3=Wissen -TranscodeVirtualFolder.0=\#--TRANSCODE--\# -TreeNodeSettings.4=Deze decoder is niet geladen! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_no.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_no.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_no.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_no.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -DLNAMediaDatabase.0=Media bibliotekets database m\u00e5 reinitialiseres.\nBeklager tr\u00f8bbelet\! -FFMpegDVRMSRemux.0=Alternativ FFmpeg adresse: -FFMpegDVRMSRemux.1=Instillinger for DVR-MS konvertering -FFMpegVideo.0=Instillinger for konvertering av AviSynth/FFmpeg (Prioriterer AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Instillinger for deling -FoldTab.2=S\u00f8k gjennom alle delte mapper -FoldTab.3=S\u00f8ke gjennom alle mapper kan ta lang tid \!\n -FoldTab.4=Er du sikker p\u00e5 at du vil starte s\u00f8ket?\n\n -FoldTab.5=Ikke vis filendelser -FoldTab.6=Ikke vis \#Video Instillinger\# mapper -FoldTab.7=Delte Mapper -FoldTab.8=Ikke vis transkodingsmetode -FoldTab.9=Sett inn adresse -FoldTab.10=Vil du stoppe s\u00f8ket?\n\n -FoldTab.11=Tillat kopiering av transkodet video til PS3. -FoldTab.12=Sorter delte mapper -FoldTab.13=Miniatyrbilder -FoldTab.14=Bruk Mplayer for video-miniatyrbilder -FoldTab.15=Standard -FoldTab.16=Nyeste f\u00f8rst -FoldTab.18=Sorterings metode: -FoldTab.19=DVD ISO miniatyrbilder -FoldTab.23=Last ned ifra amazon.com -FoldTab.24=Last ned ifra discogs.com -FoldTab.26=Miniatyrbilder for lydfiler: -FoldTab.27=Alternativ mappe for cover bilder: -FoldTab.28=Velg en mappe -FoldTab.29=Vis iPhoto bibliotek -FoldTab.30=Vis iTunes bibliotek -FoldTab.31=Gjem tomme kataloger (Advarsel: gir tregere opplisting) -FoldTab.32=Gjem Media-bibliotek katalogen -FoldTab.33=Gjem \#Transcode\# katalogen -FoldTab.34=Vis aperture bibliotek -FontFileFilter.3=Truetype Font -LinksTab.5=Nyttige lenker: -LooksFrame.5=Slutt -LooksFrame.6=Hoved Panel -LooksFrame.9=Lagre -LooksFrame.12=Omstart av Server -LooksFrame.18=Status -LooksFrame.19=Logging -LooksFrame.20=Hovedkonfigurasjon -LooksFrame.21=Transkodings Instillinger -LooksFrame.22=Deling/Navigerings Instillinger -LooksFrame.24=Hjelp -LooksFrame.25=Om programmet -MEncoderAviSynth.2=Instillinger for video dekoding kun med AviSynth -MEncoderAviSynth.3=Sl\u00e5 p\u00e5 AviSynth variabel til fast bilde per sekund (convertfps=true) -MEncoderVideo.0=Ikke bruk loop filter deblocking for H.264. Kan gi d\u00e5rligere kvalitet -MEncoderVideo.1=Lyd/Bilde transkoding instillinger for MEncoder -MEncoderVideo.2=Lyd/bilde alternativ synkroniserings metode -MEncoderVideo.3=Bruk programmets standard codec parametre (Anbefalt\!) -MEncoderVideo.4=Bestem bilde per sekund for FFmpeg -MEncoderVideo.5=Her kan du legge til spesielle instillinger, slik som et st\u00f8yreduserende filter f.eks: -vf hqdn3d -MEncoderVideo.6=Mine instillinger: -MEncoderVideo.7=Spr\u00e5klyd prioritet: -MEncoderVideo.8=Undertekst instillinger -MEncoderVideo.9=Undertekst spr\u00e5k prioritet: -MEncoderVideo.10=Lyd/Undertekst spr\u00e5k prioritet (eks: en,off;eng,off) -MEncoderVideo.11=Undertekst codepage: -MEncoderVideo.12=ASS skrift instillinger: Skrift st\u00f8rrelse -MEncoderVideo.13=Skrift outline -MEncoderVideo.14=Skrift skygge -MEncoderVideo.15=Skrift margin -MEncoderVideo.16=Normal skrift instillinger: Skrift st\u00f8rrelse -MEncoderVideo.17=Skrift outline -MEncoderVideo.18=Skrift blur -MEncoderVideo.19=Skrift margin -MEncoderVideo.20=ASS/SSA Undertekst -MEncoderVideo.21=Fontconfig/Innbakt skrift -MEncoderVideo.22=Autokj\u00f8r *.srt/*.sub undertekst med samme fil navn -MEncoderVideo.24=Spesifiser TrueType Font (for asiatiske spr\u00e5k): -MEncoderVideo.25=Velg en Truetype Font -MEncoderVideo.26=Deinterlace filter -MEncoderVideo.27=Bruk Video Skalering -MEncoderVideo.28=Bredde -MEncoderVideo.29=Ekspert instillinger : Codec parametre -MEncoderVideo.30=H\u00f8yde -MEncoderVideo.32=Remux n\u00e5r lydfil er AC-3 (ikke konverter) -MEncoderVideo.33=Egne instillinger: -MEncoderVideo.34=Forandre en codecs spesielle instillinger -MEncoderVideo.35=Optimal multikjerne st\u00f8tte -MEncoderVideo.36=Bruk ASS standard stil -MEncoderVideo.37=Alternativ undertekst-katalog -MEncoderVideo.38=Mux kompatibel H.264 video + lyd spor n\u00e5r du ikke har eksterne undertekster. [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.68=\#Her kan du sette inn spesifikke parametre for noen codec kombinasjoner.\n -MEncoderVideo.69=\#Det er mest for lyd/bilde synkroniserings problemer, men kan bli brukt til andre ting\n -MEncoderVideo.70=\#Se p\u00e5 det som ekspert instillinger,du ikke b\u00f8r r\u00f8re dette om du ikke vet hva du gj\u00f8r\n -MEncoderVideo.71=\#Syntax er {java condition} :: {MEncoder options} ; Du kan kombinere flere valg\n -MEncoderVideo.72=\#Parametre akseptert: filnavn srtfil container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Forsiktig, feil skrevet linje blir slettet/ignorert\n -MEncoderVideo.75=\#Spesielle instillinger:\n -MEncoderVideo.76=\# -noass: skru av ASS/SSA undertekst siden det kan \u00f8delegge for lyd/bilde synkroniseringen\n -MEncoderVideo.77=\# -nosync: skru av alternativ lyd/bilde synkroniserings metode for denne tilstand (-mc vil gj\u00f8re det samme)\n -MEncoderVideo.78=\# -kvalitet: overstyr video kvalitets instillinger\n -MEncoderVideo.79=\# -mt: tving frem bruk av flere kjerner til MEncoder(under testing, kan v\u00e6re ustabil)\n -MEncoderVideo.80=\#Denne listen vil bli bedre med tiden: justeringer/tilbakemeldinger p\u00e5 forskjellige codecs/filer er alltid \u00f8nskelig\n -MEncoderVideo.87=\#Du kan n\u00e5 bruke dine egene instillinger. Her er noen eksempler: f.eks, sl\u00e5 p\u00e5 mt build i MEncoder\n -MEncoderVideo.88=\#for all H.264 HD video (overkj\u00f8res i hoved instillinger): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#for \u00e5 fjerne 24p "hakking" p\u00e5 en 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#for og remuxe n\u00e5r video er MPEG-2 og det ikke finnes undertekst: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=Spr\u00e5k [krever omstart av programmet]: -NetworkTab.1=S\u00f8k i .RAR/.ZIP/.CBR/.CBZ arkiver -NetworkTab.2=Lag miniatyrbilder -NetworkTab.3=Start minimert -NetworkTab.4=Installer som en Windows Service -NetworkTab.5=Generelle instillinger -NetworkTab.6=Transkodingsbufferets maks st\u00f8rrelse, i megabytes (maks: MAX_BUFFER_SIZE): -NetworkTab.7=Antall kjerner som skal brukes for transkoding (Det ser ut som du har %d): -NetworkTab.11=Du har installert som Windows service\! For \u00e5 bruke det, s\u00e5 m\u00e5 du avslutte programmet,\n -NetworkTab.12=s\u00e5 starte (og konfigurere) programmet fra kontrollpanelet i Windows.\n\n -NetworkTab.13=Biblioteket vil bli gjennoppbygd\!\n -NetworkTab.14=Feil under installasjonen av Windows service\!\n -NetworkTab.15=Instillinger for Navigering og Mediebibliotek -NetworkTab.16=Lag miniatyrbilde etter X sekunder. X= -NetworkTab.17=Bruk mediebibliotek -NetworkTab.18=Nullstill mediebibliotek -NetworkTab.19=Er du sikker? -NetworkTab.20=Bruk f\u00f8lgene nettverkskort: -NetworkTab.22=Nettverks Instillinger, forandres kun ved problemer -NetworkTab.23=Server IP-adresse: -NetworkTab.24=Server port (5001 som standard): -NetworkTab.25=PS3 Instillinger -NetworkTab.26=Tegnsetting av PS3 fil navn (se XMB->Systeminstillinger->Tegnsett): -NetworkTab.27=Ubrukt instillinger du ikke b\u00f8r r\u00f8re :p -NetworkTab.28=Turbo mode (sl\u00e5 p\u00e5 tcp_nodelay) / v\u00e6r forsiktig, ikke sikkert det er mulig \u00e5 gj\u00f8re dette -NetworkTab.29=Blokker foresp\u00f8sm\u00e5l om samme fil fra PS3 n\u00e5r transkoding har startet -NetworkTab.30=Bruk et IP filter: -NetworkTab.31=Avansert HTTP og system innstillinger -NetworkTab.32=HTTP Motor V2 -NetworkTab.33=Forhindre str\u00f8msparing mens man streamer -NetworkTab.34=Plugins -NetworkTab.35=Maks b\u00e5ndbredde i Mb/s (0 betyr ingen grense): -PMS.0=PS3 har ikke blitt funnet. Er den sl\u00e5tt p\u00e5? Du kan se i loggen og/eller konfigurasjonen, alternativt debug.log filen -PMS.1=Musikk -PMS.2=\#- Media Bibliotek -\# -PMS.3=Lyd/bilde alternativ synkroniserings metode -PMS.4=Deinterlace Filter -PMS.5=PS3 er funnet\! -PMS.6=Bruk automatisk .srt/.sub undertekstfiler -PMS.7=SkipLoopFilter for H.264 Decoding [KAN SVEKKE KVALITETEN] -PMS.8=Undertekster -PMS.9=Alle Musikkspillelister -PMS.10=Definitivt sl\u00e5 av undertekster -PMS.11=Alle musikk filer -PMS.12=Etter Dato -PMS.13=Etter Artist -PMS.14=Standard H.264 remuxing med MEncoder -PMS.16=Etter Album -PMS.19=Etter Genre -PMS.21=Etter kamera model -PMS.22=Etter Artist/Album -PMS.25=Etter ISO parametre -PMS.26=Etter Genre/Artist/Album -PMS.27=Lagre konfigurasjon -PMS.31=Bilder -PMS.32=Alle Bilder -PMS.34=Video -PMS.35=Alle Videoer -PMS.36=HD Videoer -PMS.37=\#- Video Instillinger -\# -PMS.39=SD Videoer -PMS.41=(Re)installer Windows service -PMS.130=Kontakter PS3... -StatusTab.2=Status -StatusTab.3=Venter... -StatusTab.5=Tom -StatusTab.6=Transkodingsbuffer status: -StatusTab.7=Inn/Ut statistikk: -StatusTab.8=Bitrate akkurat n\u00e5: -StatusTab.9=Detekterte media enheter -StatusTab.10=Maks bitrate: -TSMuxerVideo.0=Bruk AC-3 remuxing for all lyd -TSMuxerVideo.1=Bruk PCM remuxing for DTS/FLAC lyd -TSMuxerVideo.2=Bruk FPS tolket med FFmpeg i metafilen -TSMuxerVideo.3=Video dekoder instillinger for TsMuxer -TSMuxerVideo.19=Mux alle lydspor -TrTab2.0=Sl\u00e5 p\u00e5/av en transkodingsmetode -TrTab2.1=Ingen instillinger for \u00f8yeblikket. -TrTab2.2=Video transkodingsinnstillinger for f\u00f8lgene: MEncoder/AviSynth/FFmpeg -TrTab2.3=Lyd instillinger, for: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Videokvalitets instillinger -TrTab2.5=Generell transkodings instillinger -TrTab2.6=Sorter listen for transkodingsmetoder. Den \u00f8verste vil bli brukt i den orginale video katalogen -TrTab2.7=Diverse instillinger -TrTab2.8=Ingen transkoding for f\u00f8lgende filendelser (skill med komma): -TrTab2.9=Obligatorisk transkoding for f\u00f8lgende filendelser (skill med komma): -TrTab2.10=Tillater \u00e5 sende DTS direkte til din surround decoder.\nV\u00e6r forsiktig, det er mulig at lyden kommer som bare st\u00f8y.\nGode r\u00e5d:\n- Skru ned volumet p\u00e5 forsterkeren din f\u00f8r du tester.\n- Du m\u00e5 ha en DTS godkjent dekoder tilkoblet via optisk (TOSLINK) eller HDMI.\n- Volum instillingen i PS3 m\u00e5 v\u00e6re "normal".\n- Kanal instillingen m\u00e5 settes til "left+right".\n -TrTab2.11=Transkodingsmetoder -TrTab2.12=Vanlige dekodingsinnstillinger -TrTab2.13=Vanlige transkodingsinnstillinger -TrTab2.14=Videokonverteringsmetoder -TrTab2.15=Lydkonverteringsmetoder -TrTab2.16=Video Web Streaming -TrTab2.17=Audio Web Streaming -TrTab2.18=Diverse transkodingsmetoder -TrTab2.19=Transkodingsmetoden i fet skrift vil ha h\u00f8yeste prioritet -TrTab2.20=og vil erstattte den orginale filen ved behov. -TrTab2.21=[AviSynth ikke st\u00f8ttet] -TrTab2.27=DTS/FLAC -> LPCM remux (Du trenger en HDMI motager for streaming av PCM 5.1 \! Normal hastighet = 4.6Mbps) -TrTab2.28=Behold DTS lyd, (Fungerer med optisk/digital lydutganger) -> Forsiktig, krever litt ekstra b\u00e5ndbredde\! -TrTab2.29=AC-3 Audio bitrate (i Kbits/s) (ex: 384, 576, 640): -TrTab2.32=MPEG-2 instillinger: -TrTab2.39=Videoene blir automatisk transkodet til MPEG-PS / AC-3 audio (fungerer veldig bra p\u00e5 PS3) -TrTab2.40=\nDu kan forandre p\u00e5 vqscale, vqmin og keyint parameterene slik at du f\u00e5r en god, og nesten tapsl\u00f8s transkodings kvalitet. -TrTab2.41=\nBakdelen med dette er at VBR bitraten av og til kan komme over maks kapasitet p\u00e5 nettverket ditt. -TrTab2.42=\nDerfor kan du ogs\u00e5 sette inn b\u00e5ndbredden om du bruker tr\u00e5dl\u00f8st nettverk, CPL, etc. Men, transkodings kvaliteten -TrTab2.43=\ner en balanse mellom nettverkshastighet og prosessor kraft: jo mer kvalitet du vil bruke med en begrenset b\u00e5ndbredde, -TrTab2.44=\njo mer vil prosessoren din jobbe\! Forvent derfor ikke at du klarer \u00e5 kj\u00f8re en full HD film med beste kvalitet p\u00e5 et 15Mbps nettverk:p -TrTab2.50=Antall lyd kanaler (H\u00f8ytalere): -TrTab2.51=Skru av all undertekst -TrTab2.52=Kapitler i \#Transcode\#-katalog / Oppdeling i minutter: -TracesTab.3=T\u00f8m -TreeNodeSettings.4=Denne transkodingsmetoden er ikke i bruk\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_pl.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_pl.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_pl.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_pl.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,217 +0,0 @@ -DLNAMediaDatabase.0=Dla lepszego wsparcia i poprawy aplikacji,\nbiblioteka musi by\u0107 przeinicjalizowana.\nPrzepraszamy za niedogodno\u015b\u0107\! -FFMpegDVRMSRemux.0=Alternatywna \u015bcie\u017cka FFmpeg: -FFMpegDVRMSRemux.1=Ustawienia demultipleksowania DVR-MS -FFMpegVideo.0=Ustawienia kodera tylko dla silnika AviSynth/FFmpeg (PREFEROWANY AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Opcje udost\u0119pniania -FoldTab.2=Przeskanuj wszystkie udost\u0119pnione foldery -FoldTab.3=Skanowanie wszystkich udost\u0119pnionych folder\u00f3w mo\u017ce zaj\u0105\u0107 bardzo du\u017co czasu \!\n -FoldTab.4=Czy na pewno chcesz rozpocz\u0105\u0107 skanowanie?\n\n -FoldTab.5=Ukryj rozszerzenia plik\u00f3w -FoldTab.6=Ukryj folder \#- Ustawienia Wideo -\# -FoldTab.7=Foldery udost\u0119pnione -FoldTab.8=Ukryj nazwy silnik\u00f3w transkoduj\u0105cych -FoldTab.9=Dodaj \u015bcie\u017ck\u0119 -FoldTab.10=Czy chcesz przerwa\u0107 skanowanie?\n\n -FoldTab.11=W\u0142\u0105cz transkodowan\u0105 kopi\u0119 wideo na PS3 (Ostro\u017cnie, pliki nie maj\u0105 ustalonego rozmiaru\!) -FoldTab.12=Posortuj udost\u0119pnione foldery -FoldTab.13=Miniatury -FoldTab.14=U\u017cywaj MPlayer-a do miniatur wideo -FoldTab.15=Domy\u015blnie -FoldTab.16=Nowsze na pocz\u0105tku -FoldTab.18=Metoda sortowania plik\u00f3w: -FoldTab.19=Miniatury DVD ISO -FoldTab.21=Miniatury zdj\u0119\u0107 -FoldTab.23=Pobierz z amazon.com -FoldTab.24=Pobierz z discogs.com -FoldTab.26=Wy\u015bwietlanie miniatur audio: -FoldTab.27=Alternatywny folder z ok\u0142adkami wideo -FoldTab.28=Wybierz folder -FoldTab.29=Poka\u017c bibliotek\u0119 aperture -FoldTab.29=Poka\u017c bibliotek\u0119 iPhoto -FoldTab.30=Poka\u017c bibliotek\u0119 iTunes -FoldTab.31=Ukryj foldery puste/bez medi\u00f3w (Ostrze\u017cenie: wolniejsze przegl\u0105danie) -FoldTab.32=Ukryj folder biblioteki medi\u00f3w -FoldTab.33=Ukryj folder \#Transcode\# -FontFileFilter.3=Czcionki TrueType -LinksTab.5=Przydatne linki: -LooksFrame.5=Wyj\u015bcie -LooksFrame.6=Panel g\u0142\u00f3wny -LooksFrame.9=Zapisz -LooksFrame.12=Zrestartuj Serwer -LooksFrame.18=Status -LooksFrame.19=\u015aledzenie -LooksFrame.20=Konfiguracja og\u00f3lna -LooksFrame.21=Ustawienia transkodowania -LooksFrame.22=Ustawienia nawigacji/udost\u0119pniania -LooksFrame.24=Cz\u0119ste pytania/pomoc -LooksFrame.25=O programie -MEncoderAviSynth.2=Ustawienia dekodera wideo tylko dla silnika AviSynth -MEncoderAviSynth.3=W AviSynth zamie\u0144 zmienn\u0105 ilo\u015b\u0107 klatek na sta\u0142\u0105 ilo\u015b\u0107 klatek (convertfps=true) -MEncoderVideo.0=Pomi\u0144 filtr deblokowania dla H.264: MO\u017bE POGORSZY\u0106 JAKO\u015a\u0106, wy\u0142\u0105cz je\u015bli tw\u00f3j procesor nie jest zbyt szybki\!\! -MEncoderVideo.1=Ustawienia dekodera d\u017awi\u0119ku/wideo tylko dla silnika MEncoder -MEncoderVideo.2=Alternatywna metoda synchronizacji A/V -MEncoderVideo.3=U\u017cyj domy\u015blnych parametr\u00f3w aplikacji dla kodek\u00f3w (zalecane) -MEncoderVideo.4=Wymu\u015b ilo\u015b\u0107 klatek/sek pobran\u0105 z FFmpeg -MEncoderVideo.5=Tutaj mo\u017cesz doda\u0107 specyficzne opcje, takie jak np. filtr redukcji szum\u00f3w: -vf hqdn3d -MEncoderVideo.6=W\u0142asne opcje: -MEncoderVideo.7=Priorytet j\u0119zyka \u015bcie\u017cki d\u017awi\u0119kowej: -MEncoderVideo.8=Ustawienia napis\u00f3w -MEncoderVideo.9=Priorytet j\u0119zyk\u00f3w napis\u00f3w: -MEncoderVideo.10=Priorytet j\u0119zyk\u00f3w d\u017awi\u0119ku/napis\u00f3w (np: en,off;eng,off) -MEncoderVideo.11=Strona kodowa napis\u00f3w: -MEncoderVideo.12=Ustawienia czcionki dla ASS: Rozmiar czcionki -MEncoderVideo.13=Obrys czcionki -MEncoderVideo.14=Cieniowanie czcionki -MEncoderVideo.15=Margines czcionki -MEncoderVideo.16=Ustawienia domy\u015blne czcionki: Rozmiar czcionki -MEncoderVideo.17=Obrys czcionki -MEncoderVideo.18=Rozmycie czcionki -MEncoderVideo.19=Margines czcionki -MEncoderVideo.20=Napisy ASS/SSA -MEncoderVideo.21=Czcionki Fontconfig/wbudowane -MEncoderVideo.22=Automatycznie \u0142aduj napisy *.srt/*.sub z t\u0105 sam\u0105 nazw\u0105 pliku -MEncoderVideo.24=Specyficzna czcionka TrueType (dla j\u0119zyk\u00f3w azjatyckich): -MEncoderVideo.25=Wybierz czcionk\u0119 TrueType -MEncoderVideo.26=Usuwanie przeplotu -MEncoderVideo.27=Skalowanie obrazu -MEncoderVideo.28=Szeroko\u015b\u0107 -MEncoderVideo.29=Ustawienia dla ekspert\u00f3w: Parametry poszczeg\u00f3lnych kodek\u00f3w -MEncoderVideo.30=Wysoko\u015b\u0107 -MEncoderVideo.32=Demultipleksuj \u015bcie\u017ck\u0119 d\u017awi\u0119kow\u0105 AC-3 (bez przekodowywania) -MEncoderVideo.33=W\u0142asne parametry: -MEncoderVideo.34=Edytuj specyficzne parametry kodek\u00f3w -MEncoderVideo.35=Rozszerzone wsparcie wielordzeniowe dla zawarto\u015bci HD H.264 -MEncoderVideo.36=U\u017cyj domy\u015blny styl ASS -MEncoderVideo.37=Alternatywny folder z napisami -MEncoderVideo.38=Prze\u0142\u0105cz na tsMuxeR gdy wideo jest kompatybilne z PS3 i nie ma skonfigurowanych napis\u00f3w [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.39=Demultipleksuj wideo w obrazach ISO DVD (bez przekodowywania) -MEncoderVideo.68=\#Tutaj mo\u017cesz wpisa\u0107 parametry specyficzne dla niekt\u00f3rych kombinacji kodek\u00f3w.\n -MEncoderVideo.69=\#Wykorzystywane g\u0142\u00f3wnie w przypadku problem\u00f3w z synchronizacj\u0105 A/V , ale mo\u017ce by\u0107 u\u017cyte r\u00f3wnie\u017c do innych ustawie\u0144\n -MEncoderVideo.70=\#Ustawienia eksperckie - nie powinny by\u0107 u\u017cywane je\u015bli nie jeste\u015b absolutnie pewien co robisz\n -MEncoderVideo.71=\#Sk\u0142adnia {warunek java} :: {opcje MEncoder} ; Mo\u017cna po\u0142\u0105czy\u0107 kilka opcji\n -MEncoderVideo.72=\#Dozwolone tokeny: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Ostro\u017cnie, ka\u017cda \u017ale sformatowana linia b\u0119dzie wymazana\n -MEncoderVideo.75=\#Opcje specjalne:\n -MEncoderVideo.76=\# -noass: definitywnie wy\u0142\u0105cz napisy ASS/SSA poniewa\u017c mog\u0105 zepsu\u0107 synchronizacje A/V\n -MEncoderVideo.77=\# -nosync: definitywnie wy\u0142\u0105cz alternatywn\u0105 metod\u0119 synchronizacji A/V (-mc robi to samo)\n -MEncoderVideo.78=\# -quality: nadpisz ustawienia jako\u015bci obrazu\n -MEncoderVideo.79=\# -mt: wymu\u015b u\u017cycie wielow\u0105tkowego MEncoder (eksperymentalne, mo\u017ce by\u0107 niestabilne)\n -MEncoderVideo.80=\#Ta lista z czasem zostanie poprawiona: wszystkie opinie/rady na temat kodek\u00f3w/plik\u00f3w s\u0105 mile widziane\n -MEncoderVideo.87=\#Tutaj mo\u017cesz wpisa\u0107 w\u0142asne warunki/opcje\! Oto przyk\u0142ady: np. do w\u0142\u0105czenia wielow\u0105tkowej wersji MEncoder\n -MEncoderVideo.88=\#dla ka\u017cdej zawarto\u015bci H.264 HD (zb\u0119dne z g\u0142\u00f3wnymi opcjami): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#do usuni\u0119cia warkotu 24p na 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#remuksuj kiedy obraz jest zakodowany w MPEG-2 i nie ma napis\u00f3w: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=J\u0119zyk [potrzebny restart aplikacji]: -NetworkTab.1=Przegl\u0105daj archiwa .RAR/.ZIP/.CBR -NetworkTab.2=Generowanie miniatur -NetworkTab.3=Rozpocznij zminimalizowany -NetworkTab.4=Zainstaluj jako us\u0142ug\u0119 Windows -NetworkTab.5=Ustawienia og\u00f3lne -NetworkTab.6=Maksymalna wielko\u015b\u0107 bufora traskodowania, w megabajtach (maksimum: MAX_BUFFER_SIZE): -NetworkTab.7=Ilo\u015b\u0107 rdzeni u\u017cywana do transkodowania (wygl\u0105da na to, \u017ce masz %d): -NetworkTab.11=Zainstalowa\u0142e\u015b us\u0142ug\u0119 Windows \! Aby j\u0105 u\u017cy\u0107, musisz wyj\u015b\u0107 z programu,\n -NetworkTab.12=a nast\u0119pnie uruchomi\u0107 (i skonfigurowa\u0107) us\u0142ug\u0119 z panelu administracyjnego Windows.\n\n -NetworkTab.13=Biblioteka medi\u00f3w zostanie zainicjalizowana \!\n -NetworkTab.14=B\u0142\u0105d w instalacji us\u0142ugi Windows\!\n -NetworkTab.15=Ustawienia nawigacji/analizy -NetworkTab.16=Moment pobierania miniatury (w sek.): -NetworkTab.17=W\u0142acz bibliotek\u0119 medi\u00f3w / buforowanie -NetworkTab.18=Zresetuj bibliotek\u0119 medi\u00f3w -NetworkTab.19=Jeste\u015b pewien? -NetworkTab.20=Wymu\u015b sie\u0107 na interfejsie: -NetworkTab.22=Ustawienia sieci, zmie\u0144 tylko w przypadku problem\u00f3w -NetworkTab.23=Wymu\u015b IP serwera: -NetworkTab.24=Wymu\u015b port serwera (5001 domy\u015blnie): -NetworkTab.25=Ustawienia PS3 -NetworkTab.26=Kodowanie znak\u00f3w nazw plik\u00f3w twojej PS3 (sprawd\u017a XMB->System settings->Charset): -NetworkTab.27=Niewykorzystywane ustawienia kt\u00f3rych nie powiniene\u015b u\u017cywa\u0107 :p -NetworkTab.28=Tryb turbo (w\u0142\u0105cz tcp_nodelay) / b\u0105d\u017a ostro\u017cny, niewiadomo czy to jest ok -NetworkTab.29=Blokuj przychodz\u0105ce z PS3 pro\u015bby o ten sam plik, gdy rozpocz\u0119\u0142o si\u0119 transkodowanie -NetworkTab.30=U\u017cyj filtr IP: -NetworkTab.31=Ustawienia zawansowane systemu i HTTP -NetworkTab.32=Silnik HTTP V2 -NetworkTab.33=W czasie streamingu zapobiegaj u\u015bpieniu systemu -NetworkTab.34=System wtyczek -NetworkTab.35=Maksymalny transfer w Mb/s (0 oznacz brak limitu): -PMS.0=Konsola PS3 nie zosta\u0142a znaleziona. Czy na pewno jest w\u0142\u0105czona? Mo\u017cesz sprawdzi\u0107 log \u015bledzenia, konfiguracj\u0119 oraz plik debug.log -PMS.1=D\u017awi\u0119k -PMS.2=\#- Biblioteka Medi\u00f3w -\# -PMS.3=Alternatywna metoda synchronizacji A/V -PMS.4=Usuni\u0119cie przeplotu -PMS.5=Konsola PS3 zosta\u0142a znaleziona \! -PMS.6=Automatycznie \u0142aduj napisy .srt/.sub -PMS.7=Wy\u0142\u0105cz filtr deblokowania przy dekodowaniu H.264 [MOZE POGORSZYC JAKOSC] -PMS.8=Napisy -PMS.9=Wszystkie playlisty d\u017awi\u0119kowe -PMS.10=Definitywnie wy\u0142\u0105cz napisy -PMS.11=Wszystkie \u015bcie\u017cki d\u017awi\u0119kowe -PMS.12=Wg daty -PMS.13=Wg artysty -PMS.14=Domy\u015blnie demultipleksuj H.264 MEncoder -PMS.16=Wg albumu -PMS.19=Wg rodzaju -PMS.21=Wg modelu aparatu -PMS.22=Wg artysty/albumu -PMS.25=Wg ustawie\u0144 ISO -PMS.26=Wg gatunku/artysty/albumu -PMS.27=Zapisz konfiguracj\u0119 -PMS.31=Zdj\u0119cie -PMS.32=Wszystkie zdj\u0119cia -PMS.34=Wideo -PMS.35=Wszystkie wideo -PMS.36=Wideo HD -PMS.37=\#- Ustawienia Wideo -\# -PMS.39=Wideo SD -PMS.41=(Re)instalacja us\u0142ugi Windows -PMS.130=Kontaktuj\u0119 si\u0119 z PS3... -StatusTab.2=Status -StatusTab.3=Czekam... -StatusTab.5=Pusty -StatusTab.6=Status bufora transkodowania: -StatusTab.7=Statystyka We/Wy: -StatusTab.8=Aktualna przep\u0142ywno\u015b\u0107: -StatusTab.9=Wykryte odtwarzacze -StatusTab.10=Najwy\u017csza przep\u0142ywno\u015b\u0107: -TSMuxerVideo.0=Demultipleksuj MEncoderem i koduj wszystkie \u015bcie\u017cki audio do AC-3 -TSMuxerVideo.1=Demultipleksuj MEncoderem i koduj \u015bcie\u017cki audio DTS/FLAC do LPCM [Ostro\u017cnie, przewijanie jeszcze nie dzia\u0142a] -TSMuxerVideo.2=Wymu\u015b ilo\u015b\u0107 klatek/sek pobran\u0105 z FFmpeg w pliku meta -TSMuxerVideo.3=Ustawienia dekodera wideo tylko dla silnika TsMuxer -TSMuxerVideo.19=Multipleksuj wszystkie \u015bcie\u017cki audio -TrTab2.0=W\u0142\u0105cz/wy\u0142\u0105cz silnik transkodowania -TrTab2.1=W tej chwili brak ustawie\u0144 -TrTab2.2=Ustawienia kodera wideo dla nast\u0119puj\u0105cych silnik\u00f3w: MEncoder/AviSynth/FFmpeg -TrTab2.3=Ustawienia d\u017awi\u0119ku u\u017cywane dla dekoderow MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Ustawienia jako\u015bci obrazu -TrTab2.5=Wsp\u00f3lne ustawienia transkodowania -TrTab2.6=Sortuj list\u0119 silnik\u00f3w transkodujacych. Pierwszy pojawi si\u0119 w oryginalnym folderze wideo -TrTab2.7=R\u00f3\u017cne opcje -TrTab2.8=Pomi\u0144 transkodowanie dla nast\u0119puj\u0105cych rozszerze\u0144 (rozdzielone przecinkiem): -TrTab2.9=Wymu\u015b transkodowanie dla nast\u0119puj\u0105cych rozszerze\u0144 (rozdzielone przecinkiem): -TrTab2.10=Pozwala na strumieniowanie DTS do odbiornika.\nUwa\u017caj, mo\u017cliwy jest sta\u0142y ton. Oto kilka porad:\n- musisz mie\u0107 odbiornik kompatybilny z DTS, pod\u0142\u0105czony przez TOSLINK lub HDMI\n- ikona g\u0142o\u015bno\u015bci w XMB musi by\u0107 \u2018Normal\u2019\n- ikona kana\u0142\u00f3w w XMB musi by\u0107 \u2018Left+Right\u2019\n -TrTab2.11=Silniki -TrTab2.12=Wsp\u00f3lne ustawienia dekodera -TrTab2.13=Wsp\u00f3lne ustawienia kodera -TrTab2.14=Silniki plik\u00f3w wideo -TrTab2.15=Silniki plik\u00f3w audio -TrTab2.16=Silniki strumieniowania wideo WWW -TrTab2.17=Silniki strumieniowania audio WWW -TrTab2.18=R\u00f3\u017cne silniki -TrTab2.19=Silnik pogrubiony b\u0119dzie mia\u0142 priorytet -TrTab2.20=i zast\u0105pi oryginalne wideo -TrTab2.21=[Nie dzia\u0142a z AviSynth] -TrTab2.27=Multipleksuj DTS/FLAC do LPCM (Musisz mie\u0107 odbiornik HDMI do przesy\u0142ania PCM 5.1 \! \u015arednia przep\u0142ywno\u015b\u0107 = 4.6Mbps) -TrTab2.28=Pozostaw d\u017awi\u0119k DTS w strumieniu (kompatybilne z wyj\u015bciem optycznym) -> Ostro\u017cnie, dodatkowa przep\u0142ywno\u015b\u0107\! -TrTab2.29=Przep\u0142ywno\u015b\u0107 d\u017awieku AC-3 (w Kbits/s) (np: 384, 576, 640): -TrTab2.32=Ustawienia jako\u015bci MPEG-2: -TrTab2.39=Porady dotycz\u0105ce kodera:\n\nWideo jest automatycznie transkodowane i multipleksowane do MPEG-PS / AC-3 (du\u017ca kompatybilno\u015b\u0107 z PS3) -TrTab2.40=\nMo\u017cesz zmienia\u0107 parametry vqscale, vqmin and keyint aby osi\u0105gn\u0105\u0107 dobr\u0105, nawet bezstratn\u0105 jako\u015b\u0107 transkodowania. -TrTab2.41=\nMo\u017ce to powodowa\u0107 problem z przep\u0142ywno\u015bci\u0105 dla VBR, kt\u00f3ra czasami mo\u017ce przekroczy\u0107 mo\u017cliwo\u015bci sieci. -TrTab2.42=\nDlatego, je\u015bli u\u017cywasz WiFi, CPL, itd., mo\u017cesz ustawi\u0107 transfer maksymalny sieci. Musisz wypo\u015brodkowa\u0107 jako\u015b\u0107 transkodowania -TrTab2.43=\npomi\u0119dzy szybko\u015bci\u0105 sieci i moc\u0105 procesora: im wi\u0119ksz\u0105 jako\u015bci w\u0142o\u017cysz w ograniczon\u0105 przep\u0142ywno\u015b\u0107, -TrTab2.44=\ntym wi\u0119cej b\u0119dzie cierpia\u0142 procesor\! Dodatkowo, nie oczekuj \u017ce zmie\u015bcisz film akcji 1080p najlepszej jako\u015bci w 15Mbps :p -TrTab2.50=Ilo\u015b\u0107 kana\u0142\u00f3w audio: -TrTab2.51=Definitywnie wy\u0142\u0105cz napisy -TrTab2.52=U\u017cywaj rozdzia\u0142\u00f3w w folderze \#Transcode\# / Odst\u0119py w minutach: -TracesTab.3=Wyczy\u015b\u0107 -TreeNodeSettings.4=Ten silnik nie jest za\u0142adowany\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_pt.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_pt.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_pt.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_pt.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ -DLNAMediaDatabase.0=Para melhorar o suporte e a qualidade da aplica\u00e7\u00e3o,\na base de dados da biblioteca de media tem de ser reiniciada.\nPedimos desculpa pelo facto \! -FFMpegDVRMSRemux.0=Caminho FFmpeg Alternativo: -FFMpegDVRMSRemux.1=Defini\u00e7\u00f5es para DVR-MS remuxing -FFMpegVideo.0=Defini\u00e7\u00f5es do codificador s\u00f3 para o motor AviSynth/FFmpeg (PREFERIR AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Op\u00e7\u00f5es de Partilha -FoldTab.2=Pesquisar todas as pastas partilhadas -FoldTab.3=Pesquisar todas as pastas partilhadas poder\u00e1 demorar muito tempo \!\n -FoldTab.4=Tem a certeza que quer iniciar a pesquisa?\n\n -FoldTab.5=Esconder extens\u00e3o dos ficheiros -FoldTab.6=Ocultar Pasta \#Defini\u00e7\u00f5es de V\u00eddeo\# -FoldTab.7=Pastas Partilhadas -FoldTab.8=Esconder nomes dos motores de transcoding -FoldTab.9=Adicionar Pasta -FoldTab.10=Deseja terminar a pesquisa?\n\n -FoldTab.11=Activar c\u00f3pia de v\u00eddeo na PS3 / Aten\u00e7\u00e3o, a navega\u00e7\u00e3o poder\u00e1 tornar-se lenta -FoldTab.12=Ordenar as pastas partilhadas -FoldTab.13=Miniaturas -FoldTab.14=Usar Mplayer para miniaturas de V\u00eddeo -FoldTab.15=Padr\u00e3o -FoldTab.16=Mais recentes primeiro -FoldTab.18=M\u00e9todo de ordena\u00e7\u00e3o de ficheiros: -FoldTab.19=Miniaturas DVD ISO -FoldTab.23=Download de amazon.com -FoldTab.24=Download de discogs.com -FoldTab.26=Miniaturas de \u00c1udio: -FoldTab.27=Pasta alternativa para capas de v\u00eddeo -FoldTab.28=Escolha uma pasta -FoldTab.29=Mostrar biblioteca do iPhoto -FoldTab.30=Mostrar biblioteca do iTunes -FoldTab.31=Esconder pastas vazias/n\u00e3o media (Cuidado: navega\u00e7\u00e3o mais lenta) -FoldTab.32=Esconder pasta de biblioteca de media -FoldTab.33=Esconder Pasta \#Transcode\# -FoldTab.34=Mostrar biblioteca do aperture -FontFileFilter.3=Fontes Truetype -LinksTab.5=Links \u00fateis: -LooksFrame.5=Sair -LooksFrame.6=Painel Principal -LooksFrame.9=Guardar -LooksFrame.12=Reiniciar Servidor -LooksFrame.18=Estado -LooksFrame.19=Registo -LooksFrame.20=Configura\u00e7\u00e3o Geral -LooksFrame.21=Defini\u00e7\u00f5es de Transcoding -LooksFrame.22=Navega\u00e7\u00e3o/Defini\u00e7\u00f5es de Partilha -LooksFrame.24=FAQ / Ajuda -LooksFrame.25=Sobre -MEncoderAviSynth.2=Defini\u00e7\u00f5es do Descodificador de V\u00eddeo apenas para o motor AviSynth -MEncoderAviSynth.3=Activar a mudan\u00e7a do AviSynth para framerate constante (convertfps=true) -MEncoderVideo.0=N\u00e3o usar loop filter deblocking para H.264: Pode degradar a qualidade, desactive se o CPU for suficientemente r\u00e1pido\! -MEncoderVideo.1=Defini\u00e7\u00f5es do Descodificador apenas para o motor V\u00eddeo/\u00c1udio MEncoder -MEncoderVideo.2=M\u00e9todo alternativo de sincroniza\u00e7\u00e3o A/V -MEncoderVideo.3=Usar par\u00e2metros padr\u00e3o dos codecs (Recomendado\!\n) -MEncoderVideo.4=For\u00e7ar framerate analizado pelo FFmpeg -MEncoderVideo.5=Aqui pode adicionar op\u00e7\u00e3es espec\u00edficas, tais como um filtro de denoise, por exemplo: -vf hqdn3d -MEncoderVideo.6=Op\u00e7\u00f5es personalizadas: -MEncoderVideo.7=Prioridade da linguagem \u00e1udio: -MEncoderVideo.8=Defini\u00e7\u00f5es de Legendas -MEncoderVideo.9=Prioridade de Linguagem para Legendas: -MEncoderVideo.10=Prioridade de Linguagem \u00e1udio/Legendas (exemplo: en,off;eng,off) -MEncoderVideo.11=P\u00e1gina de C\u00f3digo das Legendas: -MEncoderVideo.12=Defini\u00e7\u00f5es de fonte ASS: Escala de Fonte -MEncoderVideo.13=Contorno da Fonte -MEncoderVideo.14=Sombra da Fonte -MEncoderVideo.15=Margem da Fonte -MEncoderVideo.16=Defini\u00e7\u00f5es padr\u00e3o de fontes: Escala de Fonte -MEncoderVideo.17=Contorno da Fonte -MEncoderVideo.18=Borr\u00e3o da Fonte -MEncoderVideo.19=Margem da Fonte -MEncoderVideo.20=Legendas ASS/SSA -MEncoderVideo.21=Fontconfig/Fontes incorporadas -MEncoderVideo.22=Auto carregar legendas *.srt/*.sub com o mesmo nome do ficheiro -MEncoderVideo.24=Fonte TrueType espec\u00edfica (para l\u00ednguas asi\u00e1ticas): -MEncoderVideo.25=Seleccionar Fonte Truetype -MEncoderVideo.26=Filtro Deinterlace -MEncoderVideo.27=Usar v\u00eddeo scaler -MEncoderVideo.28=Largura -MEncoderVideo.29=Defini\u00e7\u00f5es avan\u00e7adas: Par\u00e2metros espec\u00edficos de Codecs -MEncoderVideo.30=Altura -MEncoderVideo.32=Remux quando a pista de \u00e1udio for AC-3 (sem recodifica\u00e7\u00e3o) -MEncoderVideo.33=Par\u00e2metros personalizados: -MEncoderVideo.34=Editar par\u00e2metros personalizados de codecs -MEncoderVideo.35=Suporte multicore melhorado para conte\u00fado H.264 HD -MEncoderVideo.36=Usar estilo ASS original -MEncoderVideo.37=Pasta alternativa para legendas -MEncoderVideo.38=Trocar para tsMuxeR quando o v\u00eddeo em H.264 \u00e9 compat\u00edvel com a ps3 e n\u00e3o h\u00e1 legendas configuradas [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.39=Remuxar faixa de video DVD ISO (sem reencode) -MEncoderVideo.68=\#Aqui pode usar par\u00e2metros espec\u00edficos para algumas combina\u00e7\u00f5es de codecs.\n -MEncoderVideo.69=\#\\u00c9 usado maioritariamente para problemas de sincroniza\u00e7\u00e3o A/V, mas pode ser usado para qualquer outro fim, tamb\u00e9m\n -MEncoderVideo.70=\#Considerar como defini\u00e7\u00f5es avan\u00e7adas, n\u00e3o devendo ser usado se n\u00e3o souber exactamente como\n -MEncoderVideo.71=\#A sintaxe \u00e9 {java condition} :: {MEncoder options} ; Pode acumular diversas op\u00e7\u00f5es\n -MEncoderVideo.72=\#Tokens autorizados: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Cuidado, qualquer linha mal composta ser\u00e1 eliminada\n -MEncoderVideo.75=\#Op\u00e7\u00f5es especiais:\n -MEncoderVideo.76=\# -noass: desactiva definitivamente legendas ASS/SSA visto poderem interferir com a sincroniza\u00e7\u00e3o A/V\n -MEncoderVideo.77=\# -nosync: desactiva definitivamente m\u00e9todo alternativo de sincroniza\u00e7\u00e3o A/V para esta condi\u00e7\u00e3o (-mc far\u00e1 o mesmo)\n -MEncoderVideo.78=\# -quality: sobrepor defini\u00e7\u00f5es de quailidade de v\u00eddeo\n -MEncoderVideo.79=\# -mt: for\u00e7ar utiliza\u00e7\u00e3o do build MEncoder multithreaded (experimental, poder\u00e1 ser inst\u00e1vel)\n -MEncoderVideo.80=\#Esta lista ser\u00e1 melhorada com o tempo: ajustes/feedbacks em v\u00e1rios ficheiros/codecs ser\u00e3o sempre bem-vindos\n -MEncoderVideo.87=\#Pode usar aqui as suas pr\u00f3prias condi\u00e7\u00f5es/op\u00e7\u00f5es\!\n Alguns exemplos: para activar o build mt do MEncoder\n -MEncoderVideo.88=\#para qualquer conte\u00fado HD H.264(redundante com a op\u00e7\u00e3o principal): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#para remover 24p judder numa TV de 50hz: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#para remux quando o v\u00eddeo for MPEG-2 e n\u00e3o houver legendas: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=L\u00edngua [tem de reiniciar a aplica\u00e7\u00e3o]: -NetworkTab.1=Navegar nos ficheiros .RAR/.ZIP/.CBR -NetworkTab.2=Gerar miniaturas -NetworkTab.3=Iniciar minimizado -NetworkTab.4=Instalar como Servi\u00e7o do Windows -NetworkTab.5=Defini\u00e7\u00f5es Gerais -NetworkTab.6=Tamanho m\u00e1ximo do buffer de transcode, em megabytes (m\u00e1ximo: MAX_BUFFER_SIZE): -NetworkTab.7=N\u00famero de n\u00facleos usados para transcoding (parece que tem %d): -NetworkTab.11=Instalou o servi\u00e7o no Windows \! Para usar, tem de sair da aplica\u00e7\u00e3o,\n -NetworkTab.12=depois iniciar (e configurar) o servi\u00e7o pelo painel de gest\u00e3o do Windows.\n\n -NetworkTab.13=A biblioteca de media ser\u00e1 reiniciada \!\n -NetworkTab.14=Erro na instala\u00e7\u00e3o do servi\u00e7o do Windows\!\n -NetworkTab.15=Defini\u00e7\u00f5es de Navega\u00e7\u00e3o/An\u00e1lize -NetworkTab.16=Posi\u00e7\u00e3o de procura de miniatura (em segundos): -NetworkTab.17=Activar biblioteca de media -NetworkTab.18=Repor biblioteca de media -NetworkTab.19=Tem a certeza? -NetworkTab.20=For\u00e7ar rede no interface: -NetworkTab.22=Defini\u00e7\u00f5es de Rede, mude apenas se tiver problemas -NetworkTab.23=For\u00e7ar IP do servidor: -NetworkTab.24=For\u00e7ar porta do servidor (5001 por defeito): -NetworkTab.25=Defini\u00e7\u00f5es PS3 -NetworkTab.26=Codifica\u00e7\u00e3o de caracteres dos nomes dos da PS3 (ver XMB->Defini\u00e7\u00f5es de sistema->Charset): -NetworkTab.27=Defini\u00e7\u00f5es n\u00e3o utilizadas que n\u00e3o deve usar :p -NetworkTab.28=Modo Turbo (activa tcp_nodelay) / use com cuidado, poder\u00e1 n\u00e3o ser bom usar isto -NetworkTab.29=Bloquear pedidos para o mesmo ficheiro a partir da PS3 assim que o transcode iniciar -NetworkTab.30=Usar filtro IP: -NetworkTab.31=Defini\u00e7\u00f5es avan\u00e7adas de HTTP e do sistema -NetworkTab.32=Motor HTTP V2 -NetworkTab.33=Prevenir modo de suspens\u00e3o enquanto faz stream -NetworkTab.34=Sistema de Plugins -NetworkTab.35=Largura de banda m\u00e1xima em Mb/s (0 significa sem limite): -PMS.0=A PS3 n\u00e3o foi encontrada. Estar\u00e1 ligada? Verifique o registo e/ou configura\u00e7\u00e3o, ou ent\u00e3o no ficheiro debug.log -PMS.1=\u00c1udio -PMS.2=\#- Biblioteca de Media -\# -PMS.3=M\u00e9todo alternativo para sincroniza\u00e7\u00e3o A/V -PMS.4=Filtro de Deinterlace -PMS.5=PS3 encontrada \! -PMS.6=Auto carregar legendas .srt/.sub -PMS.7=SkipLoopFilter para Descodifica\u00e7\u00e3o H.264 [PODER\u00c1 DEGRADAR A QUALIDADE] -PMS.8=Legendas -PMS.9=Todas as Playlists de \u00e1udio -PMS.10=Desactivar legendas definitivamente -PMS.11=Todas as faixas \u00e1udio -PMS.12=Por Data -PMS.13=Por Artista -PMS.14=Default H.264 Remux com MEncoder -PMS.16=Por Album -PMS.19=Por G\u00e9nero -PMS.21=Por modelo de c\u00e2mara -PMS.22=Por Artista/Album -PMS.25=Por defini\u00e7\u00f5es ISO -PMS.26=Por G\u00e9nero/Artista/Album -PMS.27=Guardar configura\u00e7\u00e3o -PMS.31=Foto -PMS.32=Todas as Fotos -PMS.34=V\u00eddeo -PMS.35=Todos os V\u00eddeos -PMS.36=V\u00eddeos HD -PMS.37=\#- Defini\u00e7\u00f5es de V\u00eddeo -\# -PMS.39=V\u00eddeos SD -PMS.41=(Re)instalar servi\u00e7o Win32 -PMS.130=A Contactar a PS3... -StatusTab.2=Estado -StatusTab.3=A aguardar... -StatusTab.5=Vazio -StatusTab.6=Estado do buffer de Transcoding: -StatusTab.7=Estat\u00edstica de E/S: -StatusTab.8=Bitrate actual: -StatusTab.9=Media renderers detectados -StatusTab.10=Pico de bitrate: -TSMuxerVideo.0=For\u00e7ar AC-3 remuxing com todos os ficheiros -TSMuxerVideo.1=For\u00e7ar PCM remuxing com \u00e1udio DTS/FLAC -TSMuxerVideo.2=For\u00e7ar FPS analizado pelo FFmpeg no ficheiro meta -TSMuxerVideo.3=Defini\u00e7\u00f5es do Descodificador de V\u00eddeo apenas para o motor TsMuxer -TSMuxerVideo.19=Muxar todas a faixas de audio -TrTab2.0=Activar/desactivar um motor de transcoding -TrTab2.1=Sem defini\u00e7\u00f5es para configurar por agora -TrTab2.2=Defini\u00e7\u00f5es do codificador de v\u00eddeo com os seguintes motores: MEncoder/AviSynth/FFmpeg -TrTab2.3=Defini\u00e7\u00f5es \u00e1udio, a aplicar aos seguintes descodificadores: MEncoder/AviSynth/FFmpeg -TrTab2.4=Defini\u00e7\u00f5es de qualidade de V\u00eddeo -TrTab2.5=Defini\u00e7\u00f5es comuns de transcode -TrTab2.6=Ordenar a lista de motores de transcoding. O primeiro ir\u00e1 aparecer na pasta original de v\u00eddeo -TrTab2.7=V\u00e1rias op\u00e7\u00f5es -TrTab2.8=Saltar transcode para as seguintes extens\u00f5es (separadas por v\u00edrgulas): -TrTab2.9=For\u00e7ar transcode para as seguintes extens\u00f5es (separadas por v\u00edrgulas): -TrTab2.10=Permite fazer stream de DTS directamente para o receptor.\nAten\u00e7\u00e3o, \u00e9 poss\u00edvel que se ou\u00e7a um som de est\u00e1tica. Conselhos:\n- Tem de ter um receptor compat\u00edvel com DTS, ligado atrav\u00e9s de TOSLINK ou HDMI\n- O \u00edcone de volume no XMB tem de estar em 'Normal'\n- O \u00edcone dos canais no XMB tem de estar 'Left+Right'\n -TrTab2.11=Motores -TrTab2.12=Defini\u00e7\u00f5es comuns do descodificador -TrTab2.13=Defini\u00e7\u00f5es comuns do codificador -TrTab2.14=Motores de ficheiros de v\u00eddeo -TrTab2.15=Motores de ficheiros de \u00e1udio -TrTab2.16=Motores de streaming de v\u00eddeo web -TrTab2.17=Motores de streaming de \u00e1udio Web -TrTab2.18=Motores v\u00e1rios -TrTab2.19=Motor a negrito ser\u00e1 o priorit\u00e1rio -TrTab2.20=e ir\u00e1 substituir o v\u00eddeo original -TrTab2.21=[AviSynth n\u00e3o suportado] -TrTab2.27=DTS/FLAC -> LPCM remux (Necessita um receptor HDMI para streaming de PCM 5.1 \! Bitrate m\u00e9dio = 4.6Mbps) -TrTab2.28=Manter o \u00e1udio DTS no stream (Compat\u00edvel com sa\u00edda \u00f3ptica) -> Aten\u00e7\u00e3o, ligeiro aumento no bitrate \!\n -TrTab2.29=Bitrate de \u00e1udio AC-3 (em Kbits/s) (ex: 384, 576, 640): -TrTab2.32=Defini\u00e7\u00f5es MPEG-2: -TrTab2.39=Dicas do codificador:\n\nO v\u00eddeo \u00e9 automaticamente codificado e muxado em MPEG-PS / AC-3 \u00e1udio (compatibilidade elevada com a PS3) -TrTab2.40=\nPode tentar mudar o par\u00e2metro vqscale, vqmin and keyint para atingir uma boa, quase sem perda, qualidade de transcoding. -TrTab2.41=\nO \u00fanico sen\u00e3o \u00e9 que o bitrate VBR poder\u00e1 atingir picos acima da capacidade m\u00e1xima da rede. -TrTab2.42=\nPor essa raz\u00e3o deve ajustar a largura de banda se usar WiFi, CPL, etc. Contudo, a qualidade de transcoding -TrTab2.43=\n\u00e9 um equilibrio entre velocidade da rede e capacidade do CPU: quanto maior for a qualidade num bitrate reduzido, -TrTab2.44=\nmais o CPU ser\u00e1 afectado\! Al\u00e9m disso, n\u00e3o espere que um filme de ac\u00e7\u00e3o a 1080p fique com a melhor qualidade a 15Mbps :p -TrTab2.50=N\u00famero de canais de \u00e1udio: -TrTab2.51=Desactivar completamente as legendas -TrTab2.52=Intervalo em minutos para a pasta Capitulos \#Transcode\# : -TracesTab.3=Limpar -TreeNodeSettings.4=Este motor n\u00e3o est\u00e1 carregado\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ro.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ro.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ro.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ro.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,182 +0,0 @@ -FFMpegDVRMSRemux.0=cale alternativa pentru FFmpeg: -FFMpegDVRMSRemux.1=Setari pentru DVR-MS remuxing -FFMpegVideo.0=Setari codec pentru AviSynth/FFmpeg doar motorul (RECOMANDAT AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Optiuni Partajare -FoldTab.2=Scanare toate folderele partajate -FoldTab.3=Scanarea tuturor folderelor partajate poate dura mult timp \!\n -FoldTab.4=Sunteti sigur ca vreti sa porniti scanarea?\n\n -FoldTab.5=Ascunde extensia fisierelor -FoldTab.6=Ascunde \#Setari Video\# Folder -FoldTab.7=Foldere Partajate -FoldTab.8=Ascunde numele motoarelor de conversie -FoldTab.9=Adauga Director -FoldTab.10=Doriti oprirea scanarii?\n\n -FoldTab.11=Activare copiere a fisierelor convertite pe PS3 (Atentie, fisierele nu au marime fixa !) -FoldTab.12=Sortare foldere partajate -FontFileFilter.3=Fonturi Truetype -LinksTab.5=Adrese Ajutatoare: -LooksFrame.5=Iesire -LooksFrame.6=Panou De Administrare -LooksFrame.9=Salveaza -LooksFrame.12=Restarteaza Server -LooksFrame.18=Statut -LooksFrame.19=Monitorizare -LooksFrame.20=Configurare Generala -LooksFrame.21=Setari Convertire -LooksFrame.22=Setari Navigare/Partajare -LooksFrame.24=Ajutor -LooksFrame.25=Despre -MEncoderAviSynth.2=Setari decodor video doar pentru motorul AviSynth -MEncoderAviSynth.3=Activeaza AviSynth framerate variabil schimba in framerate constant (convertestefps=adevarat) -MEncoderVideo.0=Sariti peste loop filter deblocking pentru H.264. Poate degrada calitatea -MEncoderVideo.1=Video/Audio setari decodor doar pentru motorul MEncoder -MEncoderVideo.2=A/V sync metoda alternativa -MEncoderVideo.3=Utilizeaza parametrii de decodare standard (Recomandat!) -MEncoderVideo.4=Forteaza framerate analizat de la FFmpeg -MEncoderVideo.5=Puteti adauga aici optiuni specifice, ca a filtrului denoise de exemplu: -vf hqdn3d -MEncoderVideo.6=Optiuni Preferentiale: -MEncoderVideo.7=Prioritate limbaj audio: -MEncoderVideo.8=Setari Subtitrare -MEncoderVideo.9=Limbaj de subtitrare prioritar: -MEncoderVideo.10=Audio/subtitrare prioritara (ex: ro,off;rom,off) -MEncoderVideo.11=Subtitrari, pagina codari: -MEncoderVideo.12=ASS Setari Font: Scala Font -MEncoderVideo.13=Contur Font -MEncoderVideo.14=Umbra Font -MEncoderVideo.15=Margini Font -MEncoderVideo.16=Setari font standard: Scalare Font -MEncoderVideo.17=Contur Font -MEncoderVideo.18=Obscuritate Font -MEncoderVideo.19=Margini Font -MEncoderVideo.20=ASS/SSA Subtitrari -MEncoderVideo.21=Fontconfig/Fonturi Integrate -MEncoderVideo.22=Incarcare automata subtitrari de tip *.srt/*.sub care au aceeiasi denumire cu fisierul video -MEncoderVideo.24=Specificati Fontul (pentru limba asiatica): -MEncoderVideo.25=Selectati Font -MEncoderVideo.26=Deinterlace filter -MEncoderVideo.27=Utilizare scalare video -MEncoderVideo.28=Largime -MEncoderVideo.29=Setari avansate : Parametrii specifici codecuri -MEncoderVideo.30=Inaltime -MEncoderVideo.32=Remuxare cand pista audio este AC# (nu reencoda) -MEncoderVideo.33=Parametrii Preferentiali: -MEncoderVideo.34=Editeaza parametrii codecului -MEncoderVideo.35=Suport multicor -MEncoderVideo.36=Utilizeaza ASS stil standard -MEncoderVideo.68=\#Aici puteti adauga optiuni specifice pentru mai multe combinatii de codecuri.\n -MEncoderVideo.69=\#Neaparat pentru sincronizarea A/V , dar poate fi folosit si pentru aorice altceva cu incredere\n -MEncoderVideo.70=\#Aceste setari necesita un volum mai avansat de cunostinte,daca nu stiti ce faceti mai bine lasati totul asa cum este\n -MEncoderVideo.71=\#Sintaxa este {conditie java} :: {optiuni MEncoder} ; Puteti cumula mai multe optiuni\n -MEncoderVideo.72=\#Liceente autorizate: nume fisier fisier srt retinator vcodec acodec rata simpla framerate latime inaltime durata canale\n -MEncoderVideo.73=\#Atentie, orice linie malformata va fi nefunctionala\n -MEncoderVideo.75=\#Optiuni Speciale:\n -MEncoderVideo.76=\# -faraass: dezactivare definitiva subtitrari ASS/SSA deoarece pot decala sincronizarea audio/video\n -MEncoderVideo.77=\# -farasync: dezactivare definitiva A/V sync metoda alternativa pentru aceasta conditie (-mc va face la fel)\n -MEncoderVideo.78=\# -calitate: suprascrie setarile calitatii video\n -MEncoderVideo.79=\# -mt: forteaza utilizarea pentru multithreaded MEncoder construit (experimental, poate fi instabil)\n -MEncoderVideo.80=\#Aceasta lista se va inbunatati cu timpul: tweaks/feedbacks on various codecs/files are always welcome\n -MEncoderVideo.87=\#Va puteti pune conditiile dumneavoastra/optiunile ! Cateva exemple: de exemplu, pentru a activa mt parte din MEncoder\n -MEncoderVideo.88=\#pentru orice continut H.264 HD (redondant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#pentru a remuxa cand video este MPEG-2 xi nu exista nici-o subtitrare: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=Limbaj [necesita restartarea aplicatiei]: -NetworkTab.1=Navigati in arhive .RAR/.ZIP/.CBR -NetworkTab.2= Generare Thumbnails -NetworkTab.3=Porneste ascuns -NetworkTab.4=Instalare ca serviciu Windows -NetworkTab.5=Setari Generale -NetworkTab.6=Transcodare marime maxima buffer, in megabytes (maximu: MAX_BUFFER_SIZE): -NetworkTab.7=Numarul de coruri folosite pentru transcodare (inseamna ca aveti %d): -NetworkTab.11=Ati instalat serviciul Windows \! Pentru al utiliza, trebuie sa inchideti aplicatia,\n -NetworkTab.12=apoi porniti (si configurati) serviciul din panoul de administrare al Windowsului.\n\n -NetworkTab.13=Libraria media va fi reinitializata \!\n -NetworkTab.14=Eroare la instalarea serviciului in Windows!\n -NetworkTab.15=Navigare/Analizare setari -NetworkTab.16=Thumbnail cautare pozitie (in secunde): -NetworkTab.17=Activare Librarie Media -NetworkTab.18=Resetare Librarie Media -NetworkTab.19=Sunteti Sigur? -NetworkTab.20=Fortare retea pe interfata: -NetworkTab.22=Setari retea, modificati numai daca exista probleme -NetworkTab.23=Fortare Ip server: -NetworkTab.24=Fortare port server (5001 standard): -NetworkTab.25=Setari PS3 -NetworkTab.26=Codare carcater pentru fisierle din PS3 (vezi XMB->System settings->Charset): -NetworkTab.27=Setarile nefolosite nu ar trebui utilizate :p -NetworkTab.28=Modul Turbo (activare tcp_nodelay) / atentie, nu este sigur ca functioneaza aceasta optiune -NetworkTab.29=Blocare cererea de la acelasi fisier din PS3 cand convertirea a inceput -NetworkTab.35=Banda maxima in Mb/s (0 inseamna nelimitat): -PMS.0=PS3 a fost gasit. Este pornit? Puteti verifica si in monitorizare si/sau in configurare, sau in fisierul debug.log -PMS.1=Audio -PMS.2=\#- Librarie Media -\# -PMS.3=A/V sync metoda alternativa -PMS.4=Filtru Deinterlace -PMS.5=PS3 a fost gasit \! -PMS.6=Auto incarcare subtitrari .srt/.sub -PMS.7=SkipLoopFilter pentru decodare H.264 [POATE DEGRADA CALITATEA] -PMS.8=Subtitrari -PMS.9=Toate Playlisturile audio -PMS.10=Dezactivare difinitiva subtitrari -PMS.11=Toate pistele audio -PMS.12=Dupa Data -PMS.13=Dupa Artist -PMS.16=Dupa album -PMS.19=Dupa Gen -PMS.21=Dupa modelul camerei -PMS.22=Dupa Artist/Album -PMS.25=Dupa setari ISO -PMS.26=Dupa Gen/Artist/Album -PMS.31=Poze -PMS.32=Toate Pozele -PMS.34=Video -PMS.35=Toate Videourile -PMS.36=Videouri HD -PMS.37=\#- Setari Video -\# -PMS.39=Videouri SD -PMS.41=(Re)instalare serviciu Win32 -PMS.130=Contactare PS3... -StatusTab.2=Statut -StatusTab.3=In asteptare... -StatusTab.5=Gol -StatusTab.6=Statut buffer transcodare: -StatusTab.7=I/O statistici: -StatusTab.8=Bitrate curent: -StatusTab.10=Alege bitrate: -TSMuxerVideo.0=Demuxare cu MEncoder si encodarea tuturor pistelor audio in AC-3 -TSMuxerVideo.1=Demuxare cu MEncoder si encodarea pistelor audio DTS/FLAC in LPCM [Atentie, seeking este inca nefunctional] -TSMuxerVideo.2=Fortare FPS analizat de la FFmpeg in fisierlu meta -TSMuxerVideo.3=Setarile decoderului video pentru TsMuxer numai pentru motor -TrTab2.0=Activare/dezactivare motor de transcodare -TrTab2.1=Nici o setare pentru moment -TrTab2.2=Setari encoder video cu urmatoarele motoare: MEncoder/AviSynth/FFmpeg -TrTab2.3=Setari audio, pentru urmatoare decodere: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Setari calitate video -TrTab2.5=Setari transcoder comune -TrTab2.6=Sortarea listei motoarelor de transcodare. Primul va fi vizibil in folderul video -TrTab2.7=Optiuni diverse -TrTab2.8=Sariti transcodarea pentru urmatoarele extensii (separate prin virgula): -TrTab2.9=Fortare transcodare pentru urmatoarele extensii (separate prin virgula): -TrTab2.11=Motoare -TrTab2.12=Setari comune decodare -TrTab2.13=Setari comune codare -TrTab2.14=Motoare pentru fisiere video -TrTab2.15=Motoare pentru fisiere audio -TrTab2.16=Motoare Streaming Video Web -TrTab2.17=Motoare Streaming Audio Web -TrTab2.18=Diverse Motoare -TrTab2.19=Motorul cu caracter ingrosat va fi prioritar -TrTab2.20=si vor inlocui video original -TrTab2.27=DTS/FLAC -> LPCM remux (Trebuie sa aveti un receiver HDMI pentru audio PCM 5.1 \! Bitrate foarte mare = 4.6Mbps) -TrTab2.29=AC-3 Audio bitrate (in Kbits/s) (ex: 384, 576, 640): -TrTab2.32=Setari MPEG-2: -TrTab2.39=Fisierul video este automat transcodat si muxat in MPEG-PS / AC-3 audio (de inalta fidelitate compatibl cu PS3) -TrTab2.40=\nPuteti umbla la parametrii vqscale, vqmin si keyint pentru a obtine o mai buna performanta, chiar aproape de o calitate lossless. -TrTab2.41=\nLipsa pentru aceasta este VBR bitrate care cateodata poate alege sa foloseasca capacitatea maxima a retelei dvs. -TrTab2.42=\nDe aceea puteti seta banda daca sunteti intr-o retea WiFi, CPL, etc. Oricum, calitatea transcodarii -TrTab2.43=\neste balansata intre viteza retelei si puterea procesorului: cu cat veti creste calitatea video mai mult veti forta bitrateul, -TrTab2.44=\niar procesorul dvs va suferi mai mult\! Si, nu va asteptati sa vizualizati un film la calitatea 1080p in calitatea pura cu o viteza de 15Mbps :p -TrTab2.50=Numarul de canale audio: -TrTab2.51=Dezactivare subtitrari definitiva -TracesTab.3=Sterge -TreeNodeSettings.4=Acest motor nu este incarcat\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ru.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ru.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_ru.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_ru.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,232 +0,0 @@ -DLNAMediaDatabase.0=\u0412\u0432\u0438\u0434\u0443 \u0434\u0430\u043B\u044C\u043D\u0435\u0439\u0448\u0435\u0439 \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u043A\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\n\u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0437\u0430\u043D\u043E\u0432\u043E \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0431\u0430\u0437\u0443 \u0434\u0430\u043D\u043D\u044B\u0445 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u043C\u0435\u0434\u0438\u0430.\n\u041F\u0440\u0438\u043D\u043E\u0441\u0438\u043C \u0438\u0437\u0432\u0438\u043D\u0435\u043D\u0438\u044F \u0437\u0430 \u043D\u0435\u0443\u0434\u043E\u0431\u0441\u0442\u0432\u0430 \! -FFMpegDVRMSRemux.0=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u043F\u0443\u0442\u044C \u043A FFmpeg: -FFMpegDVRMSRemux.1=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u043B\u044F \u0440\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F DVR-MS -FFMpegVideo.0=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u044D\u043D\u043A\u043E\u0434\u0435\u0440\u0430 \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0434\u0432\u0438\u0436\u043A\u0430 AviSynth/FFmpeg (PREFER AVISYNTH/MENCODER) -FoldTab.0=<\u0412\u0441\u0435 \u0434\u0438\u0441\u043A\u0438> -FoldTab.1=\u041E\u043F\u0446\u0438\u0438 \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 -FoldTab.2=\u0421\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0441\u0435 \u043F\u0430\u043F\u043A\u0438 \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 -FoldTab.3=\u0421\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0432\u0441\u0435\u0445 \u043F\u0430\u043F\u043E\u043A \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u0437\u0430\u0439\u043C\u0435\u0442 \u043C\u043D\u043E\u0433\u043E \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \!\n -FoldTab.4=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u043D\u0430\u0447\u0430\u0442\u044C \u0441\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435?\n\n -FoldTab.5=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0444\u0430\u0439\u043B\u043E\u0432 -FoldTab.6=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \#Video Settings\# -FoldTab.7=\u041F\u0430\u043F\u043A\u0438 \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 -FoldTab.8=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u0438\u043C\u0435\u043D\u0430 \u0434\u0432\u0438\u0436\u043A\u043E\u0432 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F -FoldTab.9=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0430\u043F\u043A\u0443 -FoldTab.10=\u0412\u044B \u0445\u043E\u0442\u0438\u0442\u0435 \u043F\u0440\u0435\u0440\u0432\u0430\u0442\u044C \u0441\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435?\n\n -FoldTab.11=\u0410\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u0443\u044E \u0432\u0438\u0434\u0435\u043E\u043A\u043E\u043F\u0438\u044E \u043D\u0430 PS3 (\u043E\u0441\u0442\u043E\u0440\u043E\u0436\u043D\u043E, \u0443 \u0444\u0430\u0439\u043B\u043E\u0432 \u043D\u0435 \u0444\u0438\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440!) -FoldTab.12=\u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0438 \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 -FoldTab.13=\u041A\u0430\u0434\u0440\u044B \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 -FoldTab.14=Mplayer \u0434\u043B\u044F \u043A\u0430\u0434\u0440\u043E\u0432 \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 -FoldTab.15=\u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E -FoldTab.16=\u041F\u043E \u0434\u0430\u0442\u0435, \u043D\u043E\u0432\u044B\u0435 \u0432 \u043D\u0430\u0447\u0430\u043B\u0435 -FoldTab.17=\u041F\u043E \u0434\u0430\u0442\u0435, \u0441\u0442\u0430\u0440\u044B\u0435 \u0432 \u043D\u0430\u0447\u0430\u043B\u0435 -FoldTab.18=\u041C\u0435\u0442\u043E\u0434 \u0441\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0438 \u0444\u0430\u0439\u043B\u043E\u0432: -FoldTab.19=\u041A\u0430\u0434\u0440\u044B \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0434\u043B\u044F DVD ISO -FoldTab.20=\u041F\u043E \u043A\u043E\u0434\u0443 ASCII -FoldTab.21=\u041F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u0444\u0430\u0439\u043B\u043E\u0432 \u0441 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F\u043C\u0438 -FoldTab.23=\u0421\u043A\u0430\u0447\u0430\u0442\u044C \u0441 amazon.com -FoldTab.24=\u0421\u043A\u0430\u0447\u0430\u0442\u044C \u0441 discogs.com -FoldTab.26=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043A\u0430\u0434\u0440\u044B \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0430\u0443\u0434\u0438\u043E: -FoldTab.27=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0430\u044F \u043F\u0430\u043F\u043A\u0430 \u043E\u0431\u043B\u043E\u0436\u0435\u043A \u0432\u0438\u0434\u0435\u043E -FoldTab.28=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0430\u043F\u043A\u0443 -FoldTab.29=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 iPhoto -FoldTab.30=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 iTunes -FoldTab.31=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0438 \u0431\u0435\u0437 \u043C\u0435\u0434\u0438\u0430 \u0444\u0430\u0439\u043B\u043E\u0432 (\u041C\u0435\u0434\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u043F\u0430\u043F\u043E\u043A) -FoldTab.32=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u043C\u0435\u0434\u0438\u0430 -FoldTab.33=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443 #Transcode# -FoldTab.34=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 Aperture -FontFileFilter.3=\u0428\u0440\u0438\u0444\u0442\u044B Truetype -LinksTab.5=\u041F\u043E\u043B\u0435\u0437\u043D\u044B\u0435 \u0441\u0441\u044B\u043B\u043A\u0438: -LooksFrame.5=\u0412\u044B\u0445\u043E\u0434 -LooksFrame.6=\u0413\u043B\u0430\u0432\u043D\u0430\u044F \u043F\u0430\u043D\u0435\u043B\u044C -LooksFrame.9=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C -LooksFrame.12=\u041F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A C\u0435\u0440\u0432\u0435\u0440\u0430 -LooksFrame.18=\u0421\u0442\u0430\u0442\u0443\u0441 -LooksFrame.19=\u0416\u0443\u0440\u043D\u0430\u043B -LooksFrame.20=\u0413\u043B\u0430\u0432\u043D\u044B\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 -LooksFrame.21=\u041E\u043F\u0446\u0438\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F -LooksFrame.22=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F/\u043E\u0431\u0449\u0438\u0439 \u0434\u043E\u0441\u0442\u0443\u043F -LooksFrame.24=\u0421\u043F\u0440\u0430\u0432\u043A\u0430 -LooksFrame.25=\u041E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0435 -MEncoderAviSynth.2=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0432\u0438\u0434\u0435\u043E \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0434\u0432\u0438\u0436\u043A\u0430 AviSynth -MEncoderAviSynth.3=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u043C\u0435\u043D\u0443 \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0439 \u0447\u0430\u0441\u0442\u043E\u0442\u044B \u043A\u0430\u0434\u0440\u043E\u0432 AviSynth \u0432 \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u043D\u0443\u044E (convertfps\=true) -MEncoderVideo.0=\u041E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0444\u0438\u043B\u044C\u0442\u0440\u0430\u0446\u0438\u044E H.264. \u041A\u0410\u0427\u0415\u0421\u0422\u0412\u041E \u041C\u041E\u0416\u0415\u0422 \u0423\u0425\u0423\u0414\u0428\u0418\u0422\u042C\u0421\u042F -MEncoderVideo.1=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0432\u0438\u0434\u0435\u043E/\u0430\u0443\u0434\u0438\u043E \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0434\u0432\u0438\u0436\u043A\u0430 MEncoder -MEncoderVideo.2=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0438 A/V -MEncoderVideo.3=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0434\u043B\u044F \u043A\u043E\u0434\u0435\u043A\u043E\u0432 (\u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F\!) -MEncoderVideo.4=\u041F\u0440\u0438\u043D\u0443\u0436\u0434\u0430\u0442\u044C \u0447\u0430\u0441\u0442\u043E\u0442\u0443 \u043A\u0430\u0434\u0440\u043E\u0432, \u0441\u0447\u0438\u0442\u0430\u043D\u043D\u0443\u044E \u0438\u0437 FFmpeg -MEncoderVideo.5=\u0417\u0434\u0435\u0441\u044C \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0442\u044C \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u043E\u043F\u0446\u0438\u0438, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0444\u0438\u043B\u044C\u0442\u0440 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u044F \u0448\u0443\u043C\u0430: -vf hqdn3d -MEncoderVideo.6=\u0421\u0432\u043E\u0438 \u043E\u043F\u0446\u0438\u0438: -MEncoderVideo.7=\u041F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 \u044F\u0437\u044B\u043A\u0430 \u0437\u0432\u0443\u043A\u043E\u0432\u043E\u0439 \u0434\u043E\u0440\u043E\u0436\u043A\u0438: -MEncoderVideo.8=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 -MEncoderVideo.9=\u041F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 \u044F\u0437\u044B\u043A\u043E\u0432 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: -MEncoderVideo.10=\u041F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 \u044F\u0437\u044B\u043A\u043E\u0432 \u0437\u0432\u0443\u043A\u0430/\u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 (\u041D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: en,off;jpn,eng) -MEncoderVideo.11=\u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430 \u0434\u043B\u044F \u043D\u0435-\u044E\u043D\u0438\u043A\u043E\u0434 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: -MEncoderVideo.12=\u0421\u0442\u0438\u043B\u044C ASS/SSA \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: \u041C\u0430\u0441\u0448\u0442\u0430\u0431 -MEncoderVideo.13=\u041E\u0431\u0432\u043E\u0434\u043A\u0430 -MEncoderVideo.14=\u0422\u0435\u043D\u044C -MEncoderVideo.15=\u041E\u0442\u0441\u0442\u0443\u043F \u0441\u043D\u0438\u0437\u0443 -MEncoderVideo.16=\u0421\u0442\u0438\u043B\u044C \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0445 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: \u041C\u0430\u0441\u0448\u0442\u0430\u0431 -MEncoderVideo.17=\u041E\u0431\u0432\u043E\u0434\u043A\u0430 -MEncoderVideo.18=\u0420\u0430\u0437\u043C\u044B\u0442\u0438\u0435 -MEncoderVideo.19=\u041E\u0442\u0441\u0442\u0443\u043F \u0441\u043D\u0438\u0437\u0443 -MEncoderVideo.20=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C ASS/SSA \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 -MEncoderVideo.21=Fontconfig/\u0432\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0435 \u0448\u0440\u0438\u0444\u0442\u044B -MEncoderVideo.22=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044C \u043E\u0434\u043D\u043E\u0438\u043C\u0435\u043D\u043D\u044B\u0435 *.srt/*.sub \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B -MEncoderVideo.23=FriBiDi \u0440\u0435\u0436\u0438\u043C -MEncoderVideo.24=\u0428\u0440\u0438\u0444\u0442 TrueType (\u0434\u043B\u044F \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432): -MEncoderVideo.25=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0448\u0440\u0438\u0444\u0442 TrueType -MEncoderVideo.26=\u0424\u0438\u043B\u044C\u0442\u0440 \u0434\u0435\u0438\u043D\u0442\u0435\u0440\u043B\u0435\u0439\u0441\u0438\u043D\u0433\u0430 -MEncoderVideo.27=\u041C\u0430\u0441\u0448\u0442\u0430\u0431\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0438\u0434\u0435\u043E -MEncoderVideo.28=\u0428\u0438\u0440\u0438\u043D\u0430 -MEncoderVideo.29=\u041E\u043F\u0446\u0438\u0438 \u0434\u043B\u044F \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432 : \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0434\u043B\u044F \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u044B\u0445 \u043A\u043E\u0434\u0435\u043A\u043E\u0432 -MEncoderVideo.30=\u0412\u044B\u0441\u043E\u0442\u0430 -MEncoderVideo.31=\u0426\u0432\u0435\u0442 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 -MEncoderVideo.32=\u0421\u043E\u0445\u0440\u0430\u043D\u044F\u0442\u044C AC-3 \u0434\u043E\u0440\u043E\u0436\u043A\u0443 (\u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F, \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0437\u044B\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B \u0441 \u0442\u0438\u0445\u0438\u043C \u0437\u0432\u0443\u043A\u043E\u043C \u0438 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0435\u0439) -MEncoderVideo.33=\u0421\u0432\u043E\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B: -MEncoderVideo.34=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u043A\u043E\u0434\u0435\u043A\u043E\u0432 -MEncoderVideo.35=\u041F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430 \u043C\u043D\u043E\u0433\u043E\u044F\u0434\u0435\u0440\u043D\u044B\u0445 \u0426\u041F\u0423 -MEncoderVideo.36=\u0412\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0439 \u0441\u0442\u0438\u043B\u044C -MEncoderVideo.37=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0430\u044F \u043F\u0430\u043F\u043A\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 -MEncoderVideo.38=\u041F\u0435\u0440\u0435\u043A\u043B\u044E\u0447\u0438\u0442\u044C\u0441\u044F \u043D\u0430 tsMuxeR, \u0435\u0441\u043B\u0438 \u0432\u0438\u0434\u0435\u043E H.264 \u0441\u043E\u0432\u043C\u0435\u0441\u0442\u0438\u043C\u043E \u0441 ps3 \u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B \u043D\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u044E\u0442\u0441\u044F [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.39=\u0414\u0435\u043B\u0430\u0442\u044C \u0440\u0435\u043C\u0443\u043A\u0441 DVD ISO \u0432\u0438\u0434\u0435\u043E \u0434\u043E\u0440\u043E\u0436\u043A\u0438 (\u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F) -MEncoderVideo.68=\#\u0417\u0434\u0435\u0441\u044C \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0442\u044C \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0434\u043B\u044F \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u043A\u043E\u043C\u0431\u0438\u043D\u0430\u0446\u0438\u0439 \u043A\u043E\u0434\u0435\u043A\u043E\u0432.\n -MEncoderVideo.69=\#\u0412 \u043E\u0441\u043D\u043E\u0432\u043D\u043E\u043C \u044D\u0442\u043E \u0434\u0435\u043B\u0430\u0435\u0442\u0441\u044F \u043F\u0440\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u0445 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0438 \u0430\u0443\u0434\u0438\u043E/\u0432\u0438\u0434\u0435\u043E, \u043D\u043E \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u043E \u0438 \u0441 \u0434\u0440\u0443\u0433\u0438\u043C\u0438 \u0446\u0435\u043B\u044F\u043C\u0438\n -MEncoderVideo.70=\#\u0421\u043C\u043E\u0442\u0440\u0438\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u043A\u0430\u043A \u043D\u0430 \u043E\u043F\u0446\u0438\u0438 \u0434\u043B\u044F \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432, \u043D\u0435 \u0442\u0440\u043E\u0433\u0430\u0439\u0442\u0435 \u044D\u0442\u0438 \u043E\u043F\u0446\u0438\u0438, \u0435\u0441\u043B\u0438 \u0442\u043E\u0447\u043D\u043E \u043D\u0435 \u0437\u043D\u0430\u0435\u0442\u0435, \u0447\u0442\u043E \u0434\u0435\u043B\u0430\u0435\u0442\u0435\n -MEncoderVideo.71=\#\u0421\u0438\u043D\u0442\u0430\u043A\u0441: {java condition} :: {MEncoder options} ; \u041C\u043E\u0436\u043D\u043E \u0441\u043E\u0432\u043C\u0435\u0449\u0430\u0442\u044C \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043E\u043F\u0446\u0438\u0439\n -MEncoderVideo.72=\#\u0410\u0432\u0442\u043E\u0440\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0442\u043E\u043A\u0435\u043D\u044B: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#\u041E\u0441\u0442\u043E\u0440\u043E\u0436\u043D\u043E, \u043F\u043B\u043E\u0445\u043E \u0441\u0444\u043E\u0440\u043C\u0443\u043B\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0441\u0442\u0440\u043E\u043A\u0438 \u0431\u0443\u0434\u0443\u0442 \u0443\u0434\u0430\u043B\u0435\u043D\u044B\n -MEncoderVideo.75=\#\u0421\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043E\u043F\u0446\u0438\u0438:\n -MEncoderVideo.76=\# -noass: \u043F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B ASS/SSA, \u0442.\u043A. \u043E\u043D\u0438 \u043C\u043E\u0433\u0443\u0442 \u043F\u043E\u0432\u043B\u0438\u044F\u0442\u044C \u043D\u0430 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u044E \u0430\u0443\u0434\u0438\u043E/\u0432\u0438\u0434\u0435\u043E\n -MEncoderVideo.77=\# -nosync: \u043F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0430\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0438 \u0430\u0443\u0434\u0438\u043E/\u0432\u0438\u0434\u0435\u043E \u0434\u043B\u044F \u044D\u0442\u043E\u0433\u043E \u0443\u0441\u043B\u043E\u0432\u0438\u044F (-mc \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u0435\u0442 \u0442\u0430\u043A \u0436\u0435)\n -MEncoderVideo.78=\# -quality: \u043F\u043E\u0434\u0430\u0432\u043B\u044F\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0432\u0438\u0434\u0435\u043E\n -MEncoderVideo.79=\# -mt: \u043F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u043C\u043D\u043E\u0433\u043E\u0442\u0440\u0435\u0434\u043E\u0432\u043E\u0439 \u0441\u0431\u043E\u0440\u043A\u0438 MEncoder (\u044D\u043A\u0441\u043F\u0435\u0440\u0438\u043C\u0435\u043D\u0442\u0430\u043B\u044C\u043D\u0430\u044F \u043E\u043F\u0446\u0438\u044F, \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043D\u0435\u0441\u0442\u0430\u0431\u0438\u043B\u044C\u043D\u0430)\n -MEncoderVideo.80=\#\u0414\u0430\u043D\u043D\u044B\u0439 \u0441\u043F\u0438\u0441\u043E\u043A \u0441\u043E \u0432\u0440\u0435\u043C\u0435\u043D\u0435\u043C \u0440\u0430\u0441\u0448\u0438\u0440\u0438\u0442\u0441\u044F: \u043F\u0440\u0438\u0441\u044B\u043B\u0430\u0439\u0442\u0435 \u043D\u0430\u043C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0440\u0430\u0437\u043D\u044B\u0445 \u043A\u043E\u0434\u0435\u043A\u043E\u0432/\u0444\u0430\u0439\u043B\u043E\u0432\n -MEncoderVideo.87=\#\u0417\u0434\u0435\u0441\u044C \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0441\u0444\u043E\u0440\u043C\u0443\u043B\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0435 \u0443\u0441\u043B\u043E\u0432\u0438\u044F/\u043E\u043F\u0446\u0438\u0438. \! \u0412\u043E\u0442 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u0438\u043C\u0435\u0440\u043E\u0432: \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0447\u0442\u043E\u0431\u044B \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C mt-\u0441\u0431\u043E\u0440\u043A\u0443 MEncoder\n -MEncoderVideo.88=\#\u0434\u043B\u044F \u0432\u0441\u0435\u0433\u043E \u043A\u043E\u043D\u0442\u0435\u043D\u0442\u0430 H.264 HD (\u0441\u043E\u0432\u043F\u0430\u0434\u0430\u0435\u0442 \u0441 \u0433\u043B\u0430\u0432\u043D\u043E\u0439 \u043E\u043F\u0446\u0438\u0435\u0439): vcodec \=\= h264 && width >\= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#\u0447\u0442\u043E\u0431\u044B \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0434\u0435\u0440\u0433\u0430\u043D\u044C\u0435 24 \u043A\u0430\u0434\u0440\u043E\u0432 \u043D\u0430 \u0442\u0435\u043B\u0435\u0432\u0438\u0437\u043E\u0440\u0435 50-\u0413\u0446: framerate \=\= 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#\u0414\u0435\u043B\u0430\u0442\u044C \u0440\u0435\u043C\u0443\u043A\u0441, \u0435\u0441\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0432 \u0444\u043E\u0440\u043C\u0430\u0442\u0435 MPEG-2 \u0438 \u043D\u0435\u0442 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: vcodec \=\= mpeg2 && srtfile \=\= null :: -ovc copy -nosync -MEncoderVideo.92=\u041A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 DVD/VOBsub (0-4) (\u0431\u043E\u043B\u044C\u0448\u0435 - \u043B\u0443\u0447\u0448\u0435): -MEncoderVideo.93=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0440\u0430\u043C\u043A\u0443 \u0434\u043B\u044F \u043A\u043E\u043C\u043F\u0435\u043D\u0441\u0430\u0446\u0438\u0438 \u043E\u0432\u0435\u0440\u0441\u043A\u0430\u043D\u0430: -MEncoderVideo.94=\u0424\u043E\u0440\u0441. \u0441\u0443\u0431\u0442.: -MEncoderVideo.95=\u0424\u043E\u0440\u0441. \u0442\u044D\u0433\u0438: -MEncoderVideo.129=/* \u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 */ -MEncoderVideo.130=enca:ru:cp1251 /* \u0420\u0443\u0441\u0441\u043A\u0438\u0435 (\u0430\u0432\u0442\u043E) */ -MEncoderVideo.131=enca:pl:cp1250 /* \u0412\u043E\u0441\u0442\u043E\u0447\u043D\u0430\u044F \u0415\u0432\u0440\u043E\u043F\u0430 (\u0430\u0432\u0442\u043E) */ -MEncoderVideo.132=enca:zh:big5 /* \u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u0435 (\u0430\u0432\u0442\u043E) */ -NetworkTab.0=\u042F\u0437\u044B\u043A [\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0443 \u043D\u0443\u0436\u043D\u043E \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0437\u0430\u043D\u043E\u0432\u043E]: -NetworkTab.1=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u0432 \u0430\u0440\u0445\u0438\u0432\u0430\u0445 .RAR/.ZIP/.CBR -NetworkTab.2=\u0413\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043A\u0430\u0434\u0440\u043E\u0432 \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 -NetworkTab.3=\u0417\u0430\u043F\u0443\u0441\u043A\u0430\u0442\u044C \u0432 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043D\u043E\u043C \u0432\u0438\u0434\u0435 -NetworkTab.4=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u043A\u0430\u043A \u0441\u0435\u0440\u0432\u0438\u0441 Windows -NetworkTab.5=\u041E\u0431\u0449\u0438\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 -NetworkTab.6=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u0431\u0443\u0444\u0435\u0440\u0430 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0435\u0440\u0430, \u0432 \u043C\u0435\u0433\u0430\u0431\u0430\u0439\u0442\u0430\u0445 (\u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C: MAX_BUFFER_SIZE): -NetworkTab.7=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u044F\u0434\u0435\u0440 \u0434\u043B\u044F \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F (\u043A\u0430\u0436\u0435\u0442\u0441\u044F, \u0447\u0442\u043E \u0443 \u0412\u0430\u0441 \u0435\u0441\u0442\u044C %d): -NetworkTab.8=\u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044F -NetworkTab.9=\u041F\u0440\u043E\u0432\u0435\u0440\u044F\u0442\u044C \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 -NetworkTab.11=\u0412\u044B \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u043B\u0438 \u0441\u0435\u0440\u0432\u0438\u0441 \u0434\u043B\u044F Windows\! \u0427\u0442\u043E\u0431\u044B \u043D\u0430\u0447\u0430\u0442\u044C \u0438\u043C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F, \u0432\u044B\u0439\u0434\u0438\u0442\u0435 \u0438\u0437 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B,\n -NetworkTab.12=\u0430 \u0437\u0430\u0442\u0435\u043C \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0435 (\u0438 \u043F\u0440\u043E\u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0443\u0439\u0442\u0435) \u0441\u0435\u0440\u0432\u0438\u0441 \u0432 \u043F\u0430\u043D\u0435\u043B\u0438 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F Windows.\n\n -NetworkTab.13=\u0411\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 \u043C\u0435\u0434\u0438\u0430 \u0431\u0443\u0434\u0435\u0442 \u0437\u0430\u043D\u043E\u0432\u043E \u0438\u043D\u0438\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u043D\u0430\!\n -NetworkTab.14=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0435 \u0441\u0435\u0440\u0432\u0438\u0441\u0430 \u0434\u043B\u044F Windows\!\n -NetworkTab.15=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u0438 \u0438 \u0430\u043D\u0430\u043B\u0438\u0437\u0430 -NetworkTab.16=\u041F\u043E\u0437\u0438\u0446\u0438\u044F \u043A\u0430\u0434\u0440\u0430 \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 (\u0432 \u0441\u0435\u043A\u0443\u043D\u0434\u0430\u0445): -NetworkTab.17=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 \u043C\u0435\u0434\u0438\u0430 -NetworkTab.18=\u041F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u043C\u0435\u0434\u0438\u0430 -NetworkTab.19=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B? -NetworkTab.20=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0432\u0430\u043D\u0438\u0435 \u0441\u0435\u0442\u0435\u0432\u043E\u0433\u043E \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430: -NetworkTab.22=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0435\u0442\u0438, \u0438\u0437\u043C\u0435\u043D\u044F\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u0445 -NetworkTab.23=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 IP \u0441\u0435\u0440\u0432\u0435\u0440\u0430: -NetworkTab.24=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u043F\u043E\u0440\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 (\u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439: 5001): -NetworkTab.25=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 PS3 -NetworkTab.26=\u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430 \u0438\u043C\u0435\u043D \u0444\u0430\u0439\u043B\u043E\u0432 PS3 (\u0441\u043C. XMB->\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u044B->\u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430): -NetworkTab.27=\u041D\u0435\u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u043C\u044B\u0435 \u043E\u043F\u0446\u0438\u0438, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043D\u0435 \u043D\u0430\u0434\u043E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C :p -NetworkTab.28=\u0422\u0443\u0440\u0431\u043E-\u0440\u0435\u0436\u0438\u043C (\u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C tcp_nodelay) / \u043E\u0441\u0442\u043E\u0440\u043E\u0436\u043D\u043E, \u043D\u0435 \u0443\u0432\u0435\u0440\u0435\u043D \u0447\u0442\u043E \u044D\u0442\u043E \u043C\u043E\u0436\u043D\u043E -NetworkTab.29=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0445\u043E\u0434\u044F\u0449\u0438\u0439 \u0437\u0430\u043F\u0440\u043E\u0441 \u043D\u0430 \u0442\u043E\u0442 \u0436\u0435 \u0444\u0430\u0439\u043B \u043E\u0442 PS3, \u0435\u0441\u043B\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043D\u0430\u0447\u0430\u043B\u043E\u0441\u044C -NetworkTab.30=\u0424\u0438\u043B\u044C\u0442\u0440 \u043F\u043E IP: -NetworkTab.31=\u041F\u0440\u043E\u0434\u0432\u0438\u043D\u0443\u0442\u044B\u0435 HTTP \u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 -NetworkTab.32=HTTP \u0434\u0432\u0438\u0436\u043E\u043A V2 -NetworkTab.33=\u041D\u0435 \u0434\u043E\u043F\u0443\u0441\u043A\u0430\u0442\u044C "\u0421\u043F\u044F\u0449\u0438\u0439 \u0440\u0435\u0436\u0438\u043C" \u041E\u0421 \u0432\u043E \u0432\u0440\u0435\u043C\u044F \u0441\u0442\u0440\u0438\u043C\u0438\u043D\u0433\u0430 -NetworkTab.34=\u041F\u043B\u0430\u0433\u0438\u043D\u044B -NetworkTab.35=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430\u044F \u0448\u0438\u0440\u0438\u043D\u0430 \u043A\u0430\u043D\u0430\u043B\u0430 \u0432 \u041C\u0431\u0438\u0442/\u0441 (0 \= \u043D\u0435\u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u043D\u043E): -PMS.0=\u041F\u0440\u0438\u0441\u0442\u0430\u0432\u043A\u0430 PS3 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430. \u041E\u043D\u0430 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430? \u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B\u044B \u0438\u043B\u0438 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E, \u0430 \u0442\u0430\u043A\u0436\u0435 \u0444\u0430\u0439\u043B debug.log -PMS.1=\u0410\u0443\u0434\u0438\u043E -PMS.2=\#- Cache -\# -PMS.3=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0438 A/V -PMS.4=\u0424\u0438\u043B\u044C\u0442\u0440 \u0434\u0435\u0438\u043D\u0442\u0435\u0440\u043B\u0435\u0439\u0441\u0438\u043D\u0433\u0430 -PMS.5=\u041F\u0440\u0438\u0441\u0442\u0430\u0432\u043A\u0430 PS3 \u043D\u0430\u0439\u0434\u0435\u043D\u0430\! -PMS.6=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B .srt/.sub -PMS.7=SkipLoopFilter \u0434\u043B\u044F \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F H.264 [\u041C\u041E\u0416\u0415\u0422 \u0423\u0425\u0423\u0414\u0428\u0418\u0422\u042C \u041A\u0410\u0427\u0415\u0421\u0422\u0412\u041E] -PMS.8=\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044B -PMS.9=\u0412\u0441\u0435 \u043F\u043B\u0435\u0439\u043B\u0438\u0441\u0442\u044B \u0430\u0443\u0434\u0438\u043E -PMS.10=\u041F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B -PMS.11=\u0412\u0441\u0435 \u0442\u0440\u0435\u043A\u0438 \u0430\u0443\u0434\u0438\u043E -PMS.12=\u041F\u043E \u0434\u0430\u0442\u0435 -PMS.13=\u041F\u043E \u0430\u0440\u0442\u0438\u0441\u0442\u0443 -PMS.14=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439 \u0440\u0435\u043C\u0443\u043A\u0441 H.264 \u0441 MEncoder -PMS.16=\u041F\u043E \u0430\u043B\u044C\u0431\u043E\u043C\u0443 -PMS.18=\u041C\u0435\u0434\u0438\u0430 \u0441\u0435\u0440\u0432\u0435\u0440 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D -PMS.19=\u041F\u043E \u0436\u0430\u043D\u0440\u0443 -PMS.21=\u041F\u043E \u043C\u043E\u0434\u0435\u043B\u0438 \u043A\u0430\u043C\u0435\u0440\u044B -PMS.22=\u041F\u043E \u0430\u0440\u0442\u0438\u0441\u0442\u0443/\u0430\u043B\u044C\u0431\u043E\u043C\u0443 -PMS.25=\u041F\u043E \u043E\u043F\u0446\u0438\u044F\u043C ISO -PMS.26=\u041F\u043E \u0436\u0430\u043D\u0440\u0443/\u0430\u0440\u0442\u0438\u0441\u0442\u0443/\u0430\u043B\u044C\u0431\u043E\u043C\u0443 -PMS.31=\u0424\u043E\u0442\u043E -PMS.32=\u0412\u0441\u0435 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438 -PMS.34=\u0412\u0438\u0434\u0435\u043E -PMS.35=\u0412\u0441\u0435 \u0432\u0438\u0434\u0435\u043E -PMS.36=\u0412\u0438\u0434\u0435\u043E HD -PMS.37=\#- Video Settings -\# -PMS.39=\u0412\u0438\u0434\u0435\u043E SD -PMS.41=(\u0421\u043D\u043E\u0432\u0430) \u0443\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u0441\u0435\u0440\u0432\u0438\u0441 Win32 -PMS.130=\u041F\u043E\u0438\u0441\u043A \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432... -StatusTab.2=\u0421\u0442\u0430\u0442\u0443\u0441 -StatusTab.3=\u041E\u0436\u0438\u0434\u0430\u043D\u0438\u0435... -StatusTab.5=\u041F\u0443\u0441\u0442\u043E\u0439 -StatusTab.6=\u0421\u0442\u0430\u0442\u0443\u0441 \u0431\u0443\u0444\u0435\u0440\u0430 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F: -StatusTab.7=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 I/O: -StatusTab.8=\u0422\u0435\u043A\u0443\u0449\u0438\u0439 \u0431\u0438\u0442\u0440\u0435\u0439\u0442: -StatusTab.9=\u041E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u043D\u044B\u0435 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430 -StatusTab.10=\u041C\u0430\u043A\u0441. \u0431\u0438\u0442\u0440\u0435\u0439\u0442: -TSMuxerVideo.0=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0440\u0435\u043C\u0443\u043A\u0441\u0438\u043D\u0433 AC-3 \u043D\u0430 \u0432\u0441\u0435\u0445 \u0444\u0430\u0439\u043B\u0430\u0445 -TSMuxerVideo.1=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0440\u0435\u043C\u0443\u043A\u0441\u0438\u043D\u0433 PCM \u0441 \u0430\u0443\u0434\u0438\u043E \u0432 DTS/FLAC -TSMuxerVideo.2=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 FPS \u0438\u0437 FFmpeg \u0432 \u043C\u0435\u0442\u0430\u0444\u0430\u0439\u043B\u0435 -TSMuxerVideo.3=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0432\u0438\u0434\u0435\u043E \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0434\u0432\u0438\u0436\u043A\u0430 TsMuxer -TSMuxerVideo.19=\u041C\u0443\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0441\u0435 \u0430\u0443\u0434\u0438\u043E\u043F\u043E\u0442\u043E\u043A\u0438 -TrTab2.0=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C/\u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0434\u0432\u0438\u0436\u043E\u043A \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F -TrTab2.1=\u041F\u043E\u043A\u0430 \u043E\u043F\u0446\u0438\u0439 \u043D\u0435\u0442 -TrTab2.2=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u044D\u043D\u043A\u043E\u0434\u0435\u0440\u0430 \u0432\u0438\u0434\u0435\u043E \u0434\u043B\u044F \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0434\u0432\u0438\u0436\u043A\u043E\u0432: MEncoder/AviSynth/FFmpeg -TrTab2.3=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0430\u0443\u0434\u0438\u043E \u0434\u043B\u044F \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u043E\u0432: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0432\u0438\u0434\u0435\u043E -TrTab2.5=\u041E\u0431\u0449\u0438\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F -TrTab2.6=\u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0430 \u0441\u043F\u0438\u0441\u043A\u043E\u0432 \u0434\u0432\u0438\u0436\u043A\u043E\u0432 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F. \u041F\u0435\u0440\u0432\u044B\u0439 \u0431\u0443\u0434\u0435\u0442 \u043F\u043E\u044F\u0432\u043B\u044F\u0442\u044C\u0441\u044F \u0432 \u043E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u044C\u043D\u043E\u0439 \u043F\u0430\u043F\u043A\u0435 \u0432\u0438\u0434\u0435\u043E -TrTab2.7=\u0420\u0430\u0437\u043D\u044B\u0435 \u043E\u043F\u0446\u0438\u0438 -TrTab2.8=\u041D\u0435 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B \u0441\u043E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C\u0438 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F\u043C\u0438 (\u0427\u0435\u0440\u0435\u0437 \u0437\u0430\u043F\u044F\u0442\u0443\u044E): -TrTab2.9=\u0412\u0441\u0435\u0433\u0434\u0430 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B \u0441\u043E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C\u0438 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F\u043C\u0438 (\u0427\u0435\u0440\u0435\u0437 \u0437\u0430\u043F\u044F\u0442\u0443\u044E): -TrTab2.10=\u041F\u043E\u0437\u0432\u043E\u043B\u044F\u0435\u0442 \u0441\u0442\u0440\u0438\u043C\u0438\u043D\u0433 \u0437\u0432\u0443\u043A\u0430 DTS \u043F\u0440\u044F\u043C\u043E \u043D\u0430 \u0440\u0435\u0441\u0438\u0432\u0435\u0440.\n\u041E\u0441\u0442\u043E\u0440\u043E\u0436\u043D\u043E, \u0432\u043E\u0437\u043C\u043E\u0436\u0435\u043D \u0437\u0432\u0443\u043A \u043F\u043E\u043C\u0435\u0445. \u0412\u043E\u0442 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0441\u043E\u0432\u0435\u0442\u043E\u0432:\n- \u0412\u0430\u0448 \u0440\u0435\u0441\u0438\u0432\u0435\u0440 \u0434\u043E\u043B\u0436\u0435\u043D \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044C DTS \u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0442\u044C\u0441\u044F \u0447\u0435\u0440\u0435\u0437 TOSLINK \u0438\u043B\u0438 HDMI\n- \u0421\u0438\u043C\u0432\u043E\u043B \u0433\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u0438 \u043D\u0430 XMB \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C 'Normal'\n- \u0421\u0438\u043C\u0432\u043E\u043B \u043A\u0430\u043D\u0430\u043B\u043E\u0432 \u043D\u0430 XMB \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C 'Left+Right'\n -TrTab2.11=\u0414\u0432\u0438\u0436\u043A\u0438 -TrTab2.12=\u041E\u0431\u0449\u0438\u0435 \u043E\u043F\u0446\u0438\u0438 \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u0430 -TrTab2.13=\u041E\u0431\u0449\u0438\u0435 \u043E\u043F\u0446\u0438\u0438 \u044D\u043D\u043A\u043E\u0434\u0435\u0440\u0430 -TrTab2.14=\u0414\u0432\u0438\u0436\u043A\u0438 \u0432\u0438\u0434\u0435\u043E\u0444\u0430\u0439\u043B\u043E\u0432 -TrTab2.15=\u0414\u0432\u0438\u0436\u043A\u0438 \u0430\u0443\u0434\u0438\u043E\u0444\u0430\u0439\u043B\u043E\u0432 -TrTab2.16=\u0414\u0432\u0438\u0436\u043A\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0438\u043C\u0438\u043D\u0433\u0430 \u0432\u0438\u0434\u0435\u043E -TrTab2.17=\u0414\u0432\u0438\u0436\u043A\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0438\u043C\u0438\u043D\u0433\u0430 \u0430\u0443\u0434\u0438\u043E -TrTab2.18=\u0420\u0430\u0437\u043D\u044B\u0435 \u0434\u0432\u0438\u0436\u043A\u0438 -TrTab2.19=\u0414\u0432\u0438\u0436\u043A\u0438 \u0432 \u043F\u043E\u0440\u044F\u0434\u043A\u0435 \u0443\u0431\u044B\u0432\u0430\u043D\u0438\u044F; -TrTab2.20=\u0432\u0435\u0440\u0445\u043D\u0438\u0439 \u0431\u0443\u0434\u0435\u0442 \u043F\u0435\u0440\u0432\u044B\u043C -TrTab2.21=[AviSynth \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F] -TrTab2.22=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u043F\u0435\u0440\u0435\u0434\u0438\u0441\u043A\u0440\u0435\u0442\u0438\u0437\u0430\u0446\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0432 44.1 \u0438\u043B\u0438 48 \u043A\u0413\u0446 -TrTab2.27=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C LPCM \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0430\u0443\u0434\u0438\u043E (\u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F) -TrTab2.28=\u0421\u043E\u0445\u0440\u0430\u043D\u044F\u0442\u044C DTS \u0434\u043E\u0440\u043E\u0436\u043A\u0443 (\u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F, \u0441\u043E\u0432\u043C\u0435\u0441\u0442\u0438\u043C\u043E \u0441 \u0440\u0435\u0441\u0438\u0432\u0435\u0440\u0430\u043C\u0438 \u0447\u0435\u0440\u0435\u0437 \u043E\u043F\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0438\u043B\u0438 HDMI \u0432\u044B\u0445\u043E\u0434) -TrTab2.29=\u0411\u0438\u0442\u0440\u0435\u0439\u0442 \u0430\u0443\u0434\u0438\u043E \u0434\u043B\u044F AC-3 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F (\u0432 \u041A\u0431\u0438\u0442/\u0441) (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 : 576, 640): -TrTab2.32=\u041E\u043F\u0446\u0438\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0432\u0438\u0434\u0435\u043E MPEG-2: -TrTab2.39=\u0412\u0438\u0434\u0435\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u0443\u0435\u0442\u0441\u044F \u0438 \u043C\u0443\u043A\u0441\u0438\u0440\u0443\u0435\u0442\u0441\u044F \u0432 \u0444\u043E\u0440\u043C\u0430\u0442 MPEG-PS / AC-3 \u0430\u0443\u0434\u0438\u043E (\u0432\u044B\u0441\u043E\u043A\u0430\u044F \u0441\u043E\u0432\u043C\u0435\u0441\u0442\u0438\u043C\u043E\u0441\u0442\u044C \u0441 PS3) -TrTab2.40=\n\u041C\u043E\u0436\u0435\u0442\u0435 \u043F\u043E\u0438\u0433\u0440\u0430\u0442\u044C\u0441\u044F \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C\u0438 vqscale, vqmin \u0438 keyint, \u0447\u0442\u043E\u0431\u044B \u0434\u043E\u0441\u0442\u0438\u0447\u044C \u0445\u043E\u0440\u043E\u0448\u0435\u0433\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u043F\u043E\u0447\u0442\u0438 \u0431\u0435\u0437 \u043F\u043E\u0442\u0435\u0440\u044C. -TrTab2.41=\n\u041D\u0435\u0434\u043E\u0441\u0442\u0430\u0442\u043E\u043A \u0432 \u0442\u043E\u043C, \u0447\u0442\u043E \u044D\u0442\u043E VBR-\u0431\u0438\u0442\u0440\u0435\u0439\u0442, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u043C\u043E\u0436\u0435\u0442 \u043F\u0440\u0435\u0432\u044B\u0441\u0438\u0442\u044C \u0448\u0438\u0440\u0438\u043D\u0443 \u043A\u0430\u043D\u0430\u043B\u0430 \u0432\u0430\u0448\u0435\u0439 \u0441\u0435\u0442\u0438. -TrTab2.42=\n\u041F\u043E\u044D\u0442\u043E\u043C\u0443 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0448\u0438\u0440\u0438\u043D\u0443 \u043A\u0430\u043D\u0430\u043B\u0430: \u0435\u0441\u043B\u0438 \u0412\u044B \u043D\u0430 WiFi, CPL, \u0438\u0442\u0434. \u041E\u0434\u043D\u0430\u043A\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F -TrTab2.43=\n\u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0431\u0430\u043B\u0430\u043D\u0441\u043E\u043C \u043C\u0435\u0436\u0434\u0443 \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u044C\u044E \u0441\u0435\u0442\u0438 \u0438 \u043C\u043E\u0449\u043D\u043E\u0441\u0442\u044C\u044E \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\u0430: \u0447\u0435\u043C \u0431\u043E\u043B\u044C\u0448\u0435 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0412\u044B \u0432\u043F\u0438\u0445\u043D\u0435\u0442\u0435 \u0432 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u043D\u044B\u0439 \u0431\u0438\u0442\u0440\u0435\u0439\u0442, -TrTab2.44=\n\u0442\u0435\u043C \u0441\u0438\u043B\u044C\u043D\u0435\u0435 \u0431\u0443\u0434\u0435\u0442 \u0433\u0440\u0443\u0437\u0438\u0442\u044C\u0441\u044F \u0432\u0430\u0448 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\! \u041D\u0435 \u043F\u044B\u0442\u0430\u0439\u0442\u0435\u0441\u044C \u0432\u043F\u0438\u0445\u043D\u0443\u0442\u044C \u0431\u043E\u0435\u0432\u0438\u043A \u0432 1080p \u0432 15Mbps \u0432 \u043B\u0443\u0447\u0448\u0435\u043C \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435\! :p -TrTab2.50=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043A\u0430\u043D\u0430\u043B\u043E\u0432 \u0430\u0443\u0434\u0438\u043E \u0434\u043B\u044F AC-3 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F: -TrTab2.51=\u041F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B -TrTab2.52=\u0413\u043B\u0430\u0432\u044B \u0432 \u043F\u0430\u043F\u043A\u0443 #Transcode# (\u0418\u043D\u0442\u0435\u0440\u0432\u0430\u043B \u0432 \u043C\u0438\u043D\u0443\u0442\u0430\u0445) -TracesTab.3=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C -TreeNodeSettings.4=\u042D\u0442\u043E\u0442 \u0434\u0432\u0438\u0436\u043E\u043A \u043D\u0435 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_sl.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_sl.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_sl.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_sl.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,201 +0,0 @@ -DLNAMediaDatabase.0=Za bolj\u0161o podporo in izbolj\u0161anje aplikacije,\nje potrebno medijsko knji\u017enico podatkovne baze ponovno inicializirati. \nOprostite zaradi neprijetnosti \! -FFMpegDVRMSRemux.0=Nadomestna pot FFmpeg: -FFMpegDVRMSRemux.1=Nastavitve za premultipleksiranje DVR-MS -FFMpegVideo.0=Nastavitve kodiranja za krmilnik AviSynth/FFmpeg (Priporo\u010deno AVISYNTH/MENCODER) -FoldTab.0= -FoldTab.1=Mo\u017enosti skupne rabe -FoldTab.2=Prei\u0161\u010di vse mape v skupni rabi -FoldTab.3=Preglejujem vse mape v skupni rabi, lahko traja precej \u010dasa \!\n -FoldTab.4=Ali ste prepri\u010dani, da \u017eelite zagnati pregledovanje?\n\n -FoldTab.5=Skrij kon\u010dnice datotek -FoldTab.6=Skrij \#Video nastavitve\# Mapa -FoldTab.7=Mape skupne rabe -FoldTab.8=Skrij imena prekodirnih krmilnikov -FoldTab.9=Dodaj imenik -FoldTab.10=Ali \u017eelite ustaviti skeniranje?\n\n -FoldTab.11=Omogo\u010di prekodirano video kopijo na PS3 (Previdno, datoteke nimajo fiksne velikosti !) -FoldTab.12=Razvrsti mape v skupni rabi -FoldTab.13=Sli\u010dice -FoldTab.14=Uporabi Mplayer za video sli\u010dice -FoldTab.15=Privzeto -FoldTab.16=Pogostej\u0161e najprej -FoldTab.18=Na\u010din sortiranja datotek: -FoldTab.23=Prenesi iz Amazon.com -FoldTab.24=Prenesi iz discogs.com -FoldTab.26=Prikaz avdio sli\u010dic: -FoldTab.27=Mapa nadomestnih video ovitkov -FoldTab.28=Izberi mapo -FontFileFilter.3=Pisave TrueType -LinksTab.5=Koristne povezave: -LooksFrame.5=Kon\u010daj -LooksFrame.6=Glavna konzola -LooksFrame.9=Shrani -LooksFrame.12=Ponovni zagon Stre\u017enika -LooksFrame.18=Stanje -LooksFrame.19=Sledenja -LooksFrame.20=Splo\u0161na konfiguracija -LooksFrame.21=Nastavitve prekodiranja -LooksFrame.22=Nastavitve Navigacije/Skupne rabe -LooksFrame.24=Pomo\u010d -LooksFrame.25=Vizitka -MEncoderAviSynth.2=Nastavitve video dekoderja za krmilnik AviSynth -MEncoderAviSynth.3=Omogo\u010di spremembo AviSynth spremenljivo hitrost okvirjev v konstantno hitrost okvirjev (convertfps=true) -MEncoderVideo.0=Presko\u010di ponavljajo\u010di se deblokirni filter za H.264. LAHKO ZMANJ\u0160A KVALITETO -MEncoderVideo.1=video/Avdio dekoder nastavitve za krmilnik MEncoder -MEncoderVideo.2=Alternativni na\u010din A/V sync -MEncoderVideo.3=Uporabi privzete aplikacijske parametre kodekov (Priporo\u010deno!) -MEncoderVideo.4=Vsili hitrost okvirjev raz\u010dlenjenih iz FFmpeg -MEncoderVideo.5=Tukaj lahko dodate specifi\u010dne mo\u017enosti, kot je filter za zmanj\u0161anje \u0161uma, npr:-vf hqdn3d -MEncoderVideo.6=Mo\u017enosti po meri: -MEncoderVideo.7=Prioritete avdio jezika: -MEncoderVideo.8=Nastavitve podnapisov -MEncoderVideo.9=Prioritea jezika podnapisov: -MEncoderVideo.10=Prioriteta jezika Avdio/podnapisi (na primer: en,off;eng,off) -MEncoderVideo.11=Kodna stran podnapisov: -MEncoderVideo.12=Nastavitve pisav ASS: Umerjanje pisave -MEncoderVideo.13=Obris pisave -MEncoderVideo.14=Senca pisave -MEncoderVideo.15=Pisavno podobrobje -MEncoderVideo.16=Privzete nastavitve pisave: Umerjanje pisave -MEncoderVideo.17=Obris pisave -MEncoderVideo.18=Zabris pisave -MEncoderVideo.19=Pisavno podobrobje -MEncoderVideo.20=Podnapisi ASS/SSA -MEncoderVideo.21=Fontconfig/Vgrajene pisave -MEncoderVideo.22=Avtomatsko nalaganje podnapisov *.srt/*.sub z istim imenom datoteke -MEncoderVideo.24=Specifi\u010dne pisave TrueType (za azijske jezike): -MEncoderVideo.25=Izberite pisavo TrueType -MEncoderVideo.26=Filter neprepletenosti -MEncoderVideo.27=Uporabi umerilnik videa -MEncoderVideo.28=\u0160irina -MEncoderVideo.29=Napredne nastavitve: Specifi\u010dni parametri kodekov -MEncoderVideo.30=vi\u0161ina -MEncoderVideo.32=Premultipleksiraj, \u010de je avdio sled AC-3 (ni ponovnega zakodiranja) -MEncoderVideo.33=Parametri po meri: -MEncoderVideo.34=Uredi specifi\u010dne parametre kodekov -MEncoderVideo.35=Izbolj\u0161ana ve\u010djederna podpora -MEncoderVideo.36=Uporabi privzeti slog ASS -MEncoderVideo.37=Nadomestna mapa podnapisov -MEncoderVideo.38=Preklopi na tsMuxeR, ko je video H.264 zdru\u017ejiv s PS3 in ni konfiguriranih podnapisov [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.68=\#Tukaj lahko vnesete specifi\u010dne parametre za nekatere kombinacije kodekov.\n -MEncoderVideo.69=\#Se uporablja ve\u010dinoma za te\u017eave sinhronizacije A/V, vendar se lahko uporabi tudi za karkoli drugega\n -MEncoderVideo.70=\#Smatrajte to kot napredne nastavitve, vendar tega ne uporabljajte, \u010de ne veste to\u010dno kaj delate\n -MEncoderVideo.71=\#Sintaksa je {java pogoj} :: {MEncoder mo\u017enosti} ; lahko zdru\u017eite ve\u010d mo\u017enosti\n -MEncoderVideo.72=\#Avtorizirani \u017eetoni: ime_datoteke srtfile zabojnik vcodec acodec hitrost_vzorca hitrost_okvirja \u0161irina vi\u0161ina kanali trajanje\n -MEncoderVideo.73=\#Previdno, vsaka nepravilna vrstica bo izlo\u010dena\n -MEncoderVideo.75=\#Posebne mo\u017enosti:\n -MEncoderVideo.76=\# -noass: vsekakor onemogo\u010di podnapise ASS/SSA saj lahko desinhronizirajo A/V\n -MEncoderVideo.77=\# -nosync: vsekakor onemogo\u010di alternativno metodo A/V Sync za to stanje (-mc bo storijo enako)\n -MEncoderVideo.78=\# -quality: obidi nastavitve kvalitete videa\n -MEncoderVideo.79=\# -mt: vsili uporabo ve\u010djederne razli\u010dice MEncoder-ja (eksperimentalno, lahko je nestabilna)\n -MEncoderVideo.80=\#Ta seznam bo s \u010dasom izbolj\u0161an: Prilagajanje/Odzivi na razli\u010dne kodeke/datoteke so vedno dobrodo\u0161li\n -MEncoderVideo.87=\#Zdaj lahko vstavite svoje pogoje/mo\u017enosti ! Nekaj primerov: za vklop ve\u010djederne razli\u010dice MEncoder-ja\n -MEncoderVideo.88=\#za katerokoli vesbino HD 264 (nadomestna z glavno mo\u017enostjo): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#za odstranitev tresljajev 24p na 50Hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#remux ko je video MPEG-2 in ni podnapisov: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=jezik [potreben ponovni zagon aplikacije]: -NetworkTab.1=Brskanje po datotekah .RAR / .ZIP / .CBR -NetworkTab.2=Generiranje sli\u010dice -NetworkTab.3=Za\u010dni minimizirano -NetworkTab.4=Namesti kot storitev Windows -NetworkTab.5=Splo\u0161ne nastavitve -NetworkTab.6=Maksimalna velikost prekodirnega medpomnilnika v megabajtih (najve\u010d: MAX_BUFFER_SIZE): -NetworkTab.7=\u0160tevilo jeder, ki se uporabljajo za prekodiranje (zdi se, da imate %d): -NetworkTab.11=Namestili ste kot storitev Windows \! Za uporabo je potrebno zaklju\u010diti to aplikacijo,\n -NetworkTab.12=nato za\u017eenite (in konfigurirajte) storitev iz upraviteljske plo\u0161\u010de Windows.\n\n -NetworkTab.13=Medijska knji\u017enica bo ponovno inicializirana \!\n -NetworkTab.14=Napaka pri namestitvi kot storitev sistema Widnows!\n -NetworkTab.15=Navigacija/Raz\u010dlenjevanje nastavitev -NetworkTab.16=Polo\u017eaj iskanja sli\u010dice (v sekundah): -NetworkTab.17=Omogo\u010di medijsko knji\u017enico -NetworkTab.18=Ponastavi medijsko knji\u017enico -NetworkTab.19=Ali ste prepri\u010dani? -NetworkTab.20=Vsili omre\u017eevanje na vmesniku: -NetworkTab.22=Omre\u017ene nastavitve, spreminjajte samo \u010de so te\u017eave -NetworkTab.23=Vsili IP stre\u017enika: -NetworkTab.24=Vsili vrata stre\u017enika (5001 so privzeta): -NetworkTab.25=Nastavitve PS3 -NetworkTab.26=Znakovno kodiranje imen datotek va\u0161ega PS3 (glej XMB->System settings->Charset): -NetworkTab.27=Neuporabljene nastavitve, katerih ne uporabljati: p -NetworkTab.28=Turbo na\u010din (omogo\u010di tcp_nodelay) / previdno, nisem prepri\u010dan, \u010de je prav, da se to uporablja -NetworkTab.29=Zavrni prihajajo\u010de zahtevke za isto datoteko iz PS3, ko je za\u010deto prekodiranje -NetworkTab.30=Uporabi filter IP: -NetworkTab.35=Najve\u010dja pasovna \u0161irina v Mb/s (0 pomeni brez omejitve): -PMS.0=PS3 ni bilo mogo\u010de najti. Je vklopljen? Lahko pa tudi preverite sledi in/ali konfiguracijo, ter datoteko debug.log -PMS.1=Avdio -PMS.2=\#- Medijska knji\u017enica -\# -PMS.3=Alternativen na\u010din A/V Sync -PMS.4=Filter neprepletenosti -PMS.5=PS3 je najden\! -PMS.6=Avtomatsko nalaganje podnapisov .srt/.sub -PMS.7=SkipLoopFilter za dekodiranje H.264 [lahko zmanj\u0161a kvaliteto] -PMS.8=Podnapisi -PMS.9=Vsi avdio seznami predvajanja -PMS.10=Definitivno onemogo\u010di podnapise -PMS.11=Vse avdio sledi -PMS.12=Po datumu -PMS.13=S Po izvajalcu -PMS.14=Privzeto premultipleksiranje H.264 z MEncoder-jem -PMS.16=Po albumu -PMS.19=Po \u017eanru -PMS.21=Po modelu kamere -PMS.22=Po izvajalcu/albumu -PMS.25=Po nastavitvah ISO -PMS.26=Po \u017eanru/izvajalcu/albumu -PMS.31=Fotografija -PMS.32=Vse fotografije -PMS.34=Video -PMS.35=Vsi videji -PMS.36=HD Videji -PMS.37=\#- Video Nastavitve -\# -PMS.39=SD Videji -PMS.41=(Ponovno) name\u0161\u010danje storitve Win32 -PMS.130=Kontaktiram PS3 ... -StatusTab.2=Stanje -StatusTab.3=\u010cakam ... -StatusTab.5=Prazno -StatusTab.6=Stanje prekodirnega medpomnilnika: -StatusTab.7=Statistika I/O: -StatusTab.8=Trenutni bitna hitrost: -StatusTab.10=Najvi\u0161ja bitna hitrost: -TSMuxerVideo.0=Demultipleksiraj z MEncoder-jem in kodiraj vse audio sledi v AC-3 -TSMuxerVideo.1=Demultipleksiraj z MEncoder-jem in Kodiraj avdio sledi DTS/FLAC v LPCM [Previdno, iskanje \u0161e ne dela] -TSMuxerVideo.2=vsili FPS raz\u010dlenjen iz FFmpeg v meta datoteki -TSMuxerVideo.3=Video dekoder nastavitve za krmilnik TsMuxer -TSMuxerVideo.19=Multipleksiraj vse avdio sledi -TrTab2.0=Omogo\u010di/onemogo\u010di prekodirni krmilnik -TrTab2.1=Trenutno brez nastavitev -TrTab2.2=Video nastavitve kodirnika za naslednje krmilnike: MEncoder/AviSynth/FFmpeg -TrTab2.3=Avdio nastavitve veljajo za naslednje dekodirnike: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=Nastavitve kakovosti videa -TrTab2.5=Splo\u0161ne prekodirne nastavitve -TrTab2.6=Sortiraj seznam krmilnikov prekodiranja. Prvi bo naveden v izvirni mapi Video -TrTab2.7=Razli\u010dne mo\u017enosti -TrTab2.8=Presko\u010di prekodiranje za naslednje raz\u0161iritve (pika je lo\u010dilo): -TrTab2.9=Vsili prekodiranje za naslednje raz\u0161iritve (pika je lo\u010dilo): -TrTab2.10=Omogo\u010da, da po\u0161iljate DTS neposredno na va\u0161 sprejemnik.\nPrevidno, mo\u017een je stati\u010den zvok. Nekaj nasvetov:\n- Imeti morate sprejemnik, ki podpira DTS ,priklju\u010den preko TOSLINK ali HDMI\n- Ikona za glasnost v XMB mora biti na 'Normal'\n- Ikona za kanale v XMB mora biti na 'Left + Right'\n -TrTab2.11=Krmilniki -TrTab2.12=Splo\u0161ne nastavitve dekodirnika -TrTab2.13=Splo\u0161ne nastavitve kodirnika -TrTab2.14=Krmilniki video datotek -TrTab2.15=Krmilniki avdio datotek -TrTab2.16=Krmilniki spletnega pretakanja videa -TrTab2.17=Krmilniki spletnega pretakanja avdia -TrTab2.18=Razli\u010dni krmilniki -TrTab2.19=Povdarjen krmilnik bo imel prednost -TrTab2.20=in bo nadomestil izvirni video -TrTab2.21=[AviSynth ni podprt] -TrTab2.27=DTS/FLAC -> LPCM premultipleksiranje (Potreben sprejemnik HDMI za pretakanje LPCM 5.1 \! Povpre\u010dna bitna hitrost = 4.6Mbps) -TrTab2.28=Obdr\u017ei DTS audio v struji (zdru\u017eljivo z opti\u010dnim izhodom) -> Pazi, majn\u0161i prese\u017eki bitne hitrosti ! -TrTab2.29=Bitna hitrost AC-3 Avdio (v Kbits/s) (npr.: 384, 576, 640): -TrTab2.32=MPEG-2 kakovosti videa: -TrTab2.39=video se samodejno prekodira in multipleksira v MPEG-PS / AC-3 avdio (zelo zdru\u017eljiv z PS3) -TrTab2.40=\nLahko preizku\u0161ate parametre vqscale, vqmin in keyint za dosego dobre, tudi skoraj brez izgub, prekodirne kvalitete. -TrTab2.41=\nSlabost tega je bitna hitrost VBR, ki lahko v\u010dasih prese\u017ee va\u0161o maksimalno zmogljivost omre\u017eja. -TrTab2.42=\nZato lahko nastavite tudi pasovno \u0161irino, \u010de ste preko WiFi, CPL, itd. Vendar pa je prekodirna kvaliteta -TrTab2.43=\nravnovesje med omre\u017eno hitrostjo in zmogljivostjo cpu: \u010dim ve\u010djo kvaliteto boste supstili preko omejene bitne hitrost, -TrTab2.44=\ntem ve\u010d bo va\u0161 cpu trpel\! Prav tako ne pri\u010dakujte, da boste akcijski film v 1080p v najbolj\u0161i kakovosti predvajali s 15Mbps:p -TrTab2.50=\u0160tevilo avdio kanalov: -TrTab2.51=Definitivno onemogo\u010di podnapise -TracesTab.3=Po\u010disti -TreeNodeSettings.4=Krmilnik ni nalo\u017een\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_sv.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_sv.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_sv.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_sv.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -DLNAMediaDatabase.0=F\u00f6r att f\u00f6rb\u00e4ttra prestanda och funktionalitet\n beh\u00f6ver mediabiblioteket \u00e5terst\u00e4llas.\nBeklagar det intr\u00e4ffade\! -FFMpegDVRMSRemux.0=FFmpeg alternativ s\u00f6kv\u00e4g: -FFMpegDVRMSRemux.1=DVR-MS muxningsinst\u00e4llningar -FFMpegVideo.0=AviSynth/FFmpeg konverteringsinst\u00e4llningar -FoldTab.0= -FoldTab.1=Utdelningsinst\u00e4llningar -FoldTab.2=Indexera alla utdelade kataloger -FoldTab.3=Indexering av alla utdelade kataloger kan kr\u00e4va l\u00e5ng tid\!\n -FoldTab.4=Skall indexeringen p\u00e5b\u00f6rjas?\n\n -FoldTab.5=D\u00f6lj fil\u00e4ndelser (t.ex. .avi, .mkv etc.) -FoldTab.6=D\u00f6lj \#Video Inst\u00e4llningar\# i PS3 XMB -FoldTab.7=Utdelade kataloger -FoldTab.8=D\u00f6lj konverteringsmetod i PS3 XMB -FoldTab.9=L\u00e4gg till katalog -FoldTab.10=Skall indexeringen avbrytas?\n\n -FoldTab.11=Aktivera filkopiering till PS3 (OBS\! Filerna konverteras och har ingen fast storlek) -FoldTab.12=Sortera utdelade kataloger -FoldTab.13=Miniatyrbilder -FoldTab.14=Anv\u00e4nd Mplayer f\u00f6r videominiatyrbilder -FoldTab.15=Standard -FoldTab.16=Efter datum -FoldTab.18=Filsortering: -FoldTab.19=DVD ISO miniatyrbild -FoldTab.23=Ladda ner fr\u00e5n amazon.com -FoldTab.24=Ladda ner fr\u00e5n discogs.com -FoldTab.26=Ljudfilsminiatyrbilder: -FoldTab.27=Alternativ mediaomslags katalog -FoldTab.28=V\u00e4lj en katalog -FoldTab.29=Visa iPhoto bibliotek -FoldTab.30=Visa iTunes bibiliotek -FoldTab.31=D\u00f6lj tomma/ej multimedia kataloger (OBS: orsakar l\u00e5ngsammare bl\u00e4ddring) -FoldTab.32=D\u00f6lj mediabibliotek katalogen -FoldTab.33=D\u00f6lj \#Transcode\# katalogen -FoldTab.34=Visa aperture bibliotek -FontFileFilter.3=Truetype typsnitt -LinksTab.5=Hj\u00e4lpfulla l\u00e4nkar: -LooksFrame.5=Avsluta -LooksFrame.6=Huvudpanel -LooksFrame.9=Verkst\u00e4ll -LooksFrame.12=Omstart av Server -LooksFrame.18=Status -LooksFrame.19=Logg -LooksFrame.20=Inst\u00e4llningar -LooksFrame.21=Konverteringsinst\u00e4llningar -LooksFrame.22=Navigations/Utdelningsinst\u00e4llningar -LooksFrame.24=Hj\u00e4lp -LooksFrame.25=Om PMS -MEncoderAviSynth.2=AviSynth videoavkodningsinst\u00e4llningar -MEncoderAviSynth.3=Aktivera AviSynth variabel till konstant framerate (convertfps=true) -MEncoderVideo.0=Avaktivera loop filter deblocking f\u00f6r H.264 (f\u00f6r \u00e4ldre CPU) -MEncoderVideo.1=MEncoder video- och ljudavkodningsinst\u00e4llningar -MEncoderVideo.2=A/V synk. -MEncoderVideo.3=Anv\u00e4nd programmets standard codec parametrar (rekommenderas\!) -MEncoderVideo.4=Tvinga framerate utl\u00e4st fr\u00e5n FFmpeg -MEncoderVideo.5=Valfria inst\u00e4llningar, t.ex ett denoise filter: -vf hqdn3d -MEncoderVideo.6=Valfria inst\u00e4llningar: -MEncoderVideo.7=Ljudsp\u00e5rs spr\u00e5kprioritet: -MEncoderVideo.8=Undertextinst\u00e4llningar -MEncoderVideo.9=Undertext spr\u00e5kprioritering: -MEncoderVideo.10=Ljudsp\u00e5r/undertext spr\u00e5kprioritering (ex. swe,off;eng,swe) -MEncoderVideo.11=Teckenkodning av undertexter: -MEncoderVideo.12=ASS undertextinst\u00e4llningar: Storlek -MEncoderVideo.13=Outline -MEncoderVideo.14=Skugga -MEncoderVideo.15=Marginal -MEncoderVideo.16=\u00d6vriga undertextinst\u00e4llningar: Storlek -MEncoderVideo.17=Outline -MEncoderVideo.18=Skugga -MEncoderVideo.19=Marginal -MEncoderVideo.20=ASS/SSA Undertexter -MEncoderVideo.21=Fontconfig/Inbakade typsnitt -MEncoderVideo.22=Autoladda *.srt/*.sub undertexter med samma filnamn -MEncoderVideo.24=Specifikt TrueType typsnitt (f\u00f6r asiatiska spr\u00e5k): -MEncoderVideo.25=V\u00e4lj ett TrueType typsnitt -MEncoderVideo.26=Deinterlace filter -MEncoderVideo.27=Anv\u00e4nd videouppskalning -MEncoderVideo.28=Bredd -MEncoderVideo.29=Avancerade Inst\u00e4llningar: Codec specifika parametrar -MEncoderVideo.30=H\u00f6jd -MEncoderVideo.32=AC-3 muxning enbart (ingen konvertering) -MEncoderVideo.33=Egna parametrar: -MEncoderVideo.34=Modifiera codec specifika parametrar -MEncoderVideo.35=Optimerat flerk\u00e4rnigt st\u00f6d -MEncoderVideo.36=Anv\u00e4nd ASS standard formatering -MEncoderVideo.37=Alternativ undertextkatalog -MEncoderVideo.38=Anv\u00e4nd tsMuxeR (sker automatiskt) n\u00e4r H.264 video \u00e4r PS3 kompatibelt och det ej finns undertexter [TS/M2T/MOV/MP4/AVI/MKV] -MEncoderVideo.68=\#H\u00e4r kan specifika codec parametrar st\u00e4llas in.\n -MEncoderVideo.69=\#Syftet \u00e4r mestadels f\u00f6r A/V synkroniseringsproblem, men kan \u00e4ven anv\u00e4ndas f\u00f6r andra \u00e4ndam\u00e5l\n -MEncoderVideo.70=\#Avancerade inst\u00e4llningar som ej b\u00f6r modifieras utan ing\u00e5ende kunskap\n -MEncoderVideo.71=\#Syntaxen \u00e4r {java condition} :: {MEncoder options} ; Flera inst\u00e4llningar kan kombineras\n -MEncoderVideo.72=\#Accepterade parametrar: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Observera, felaktig syntax ignoreras\n -MEncoderVideo.75=\#Speciella inst\u00e4llningar:\n -MEncoderVideo.76=\# -noass: avaktivera ASS/SSA undertexter (motverka A/V synk. problem)\n -MEncoderVideo.77=\# -nosync: avaktivera A/V synkronisering f\u00f6r denna codec (-mc g\u00f6r samma sak)\n -MEncoderVideo.78=\# -quality: \u00e5sidos\u00e4tt videokvalitetsinst\u00e4llningar\n -MEncoderVideo.79=\# -mt: tvinga anv\u00e4ndning av flerk\u00e4rning MEncoder (beta, kan vara instabilt)\n -MEncoderVideo.80=\#Denna lista kommer att v\u00e4xa med tiden: f\u00f6rslag/finjusteringar avseende olika codecar tas tacksamt emot\n -MEncoderVideo.87=\#Nedanf\u00f6r finns utrymme f\u00f6r egna inst\u00e4llningar/kombinationer\! N\u00e5gra exempel: f\u00f6r att aktivera flerk\u00e4rning MEncoder\n -MEncoderVideo.88=\#f\u00f6r all H.264 video: vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#f\u00f6r att eliminera 24p judder p\u00e5 en 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#f\u00f6r att remuxa n\u00e4r video \u00e4r MPEG-2 utan undertext: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -NetworkTab.0=Spr\u00e5k [kr\u00e4ver program omstart]: -NetworkTab.1=Bl\u00e4ddra i .RAR/.ZIP/.CBR arkiv -NetworkTab.2=Generering av miniatyrbilder -NetworkTab.3=Starta minimerat (aktivitetsf\u00e4lt) -NetworkTab.4=Installera som Windows service -NetworkTab.5=Generella Inst\u00e4llningar -NetworkTab.6=Konverteringsbuffer max. storlek i megabytes (max. 600): -NetworkTab.7=Antal k\u00e4rnor f\u00f6r konvertering (programmet har uppt\u00e4ckt %d): -NetworkTab.11=Windows service har installerats\! F\u00f6r att anv\u00e4nda den, avsluta programmet,\n -NetworkTab.12=d\u00e4refter starta (och konfigurera) servicen via Windows kontrollpanel.\n\n -NetworkTab.13=Mediabiblioteket kommer att \u00e5terst\u00e4llas\!\n -NetworkTab.14=Ett fel uppstod under installation av Windows service\n\!\n -NetworkTab.15=Navigations/mediebibilioteksinst\u00e4llningar -NetworkTab.16=Miniatyrbilds position (i sekunder): -NetworkTab.17=Aktivera Mediabiblioteket -NetworkTab.18=Nollst\u00e4ll Mediabiblioteket -NetworkTab.19=\u00c4r du s\u00e4ker? -NetworkTab.20=Anv\u00e4nd f\u00f6ljande n\u00e4tverkskort: -NetworkTab.22=N\u00e4tverksinst\u00e4llningar (\u00e4ndra enbart vid problem) -NetworkTab.23=Tvinga server IP: -NetworkTab.24=Tvinga serverport (5001 som standard): -NetworkTab.25=PS3 Inst\u00e4llningar -NetworkTab.26=Teckenkodning av PS3 filnamn (se XMB->Systeminst\u00e4llningar->Teckenkodning): -NetworkTab.27=Oanv\u00e4nda inst\u00e4llningar -NetworkTab.28=Turbo l\u00e4ge (aktivera tcp_nodelay) / ej testat och utv\u00e4rderat -NetworkTab.29=Blockera inkommande beg\u00e4ran f\u00f6r samma fil fr\u00e5n PS3 under konvertering -NetworkTab.30=Anv\u00e4nd IP-filter: -NetworkTab.31=Avancerade HTTP- och systeminst\u00e4llningar -NetworkTab.32=HTTP Motor V2 -NetworkTab.33=Hindra OS fr\u00e5n vilol\u00e4ge under uppspelning -NetworkTab.34=Plugins -NetworkTab.35=Maximal bandbredd i Mb/s (0 inneb\u00e4r ingen begr\u00e4nsning): -PMS.0=PS3 har ej uppt\u00e4ckts. \u00c4r konsollen p\u00e5slagen? Du kan ocks\u00e5 kolla loggen och/eller konfigurationen, alternativt filen debug.log. -PMS.1=Ljud -PMS.2=\#- Mediabibiliotek -\# -PMS.3=A/V synk. -PMS.4=Deinterlace Filter -PMS.5=PS3 har hittats\! -PMS.6=Autoladda .srt/.sub undertexter -PMS.7=SkipLoopFilter f\u00f6r H.264 avkodning [f\u00f6r \u00e4ldre CPU] -PMS.8=Undertexter -PMS.9=Alla Musikspellistor -PMS.10=Avaktivera alla undertexter -PMS.11=All Musik -PMS.12=Efter Datum -PMS.13=Efter Artist -PMS.14=Standard H.264 muxning med MEncoder -PMS.16=Efter Album -PMS.19=Efter Genre -PMS.21=Efter kameramodell -PMS.22=Efter Artist/Album -PMS.25=Efter ISO parametrar -PMS.26=Efter Genre/Artist/Album -PMS.27=Spara konfiguration -PMS.31=Foton -PMS.32=Alla Foton -PMS.34=Film -PMS.35=All Film -PMS.36=HD Film -PMS.37=\#- Film Inst\u00e4llningar -\# -PMS.39=SD Film -PMS.41=(Om)installerar Windows service -PMS.130=S\u00f6ker efter PS3... -StatusTab.2=Status -StatusTab.3=V\u00e4ntar... -StatusTab.5=Tomt -StatusTab.6=Konverteringsbuffer: -StatusTab.7=I/O statistik: -StatusTab.8=Aktuell bitrate: -StatusTab.9=Uppt\u00e4ckta mediaspelare -StatusTab.10=Max. bitrate: -TSMuxerVideo.0=Tvinga AC-3 muxning av allt ljud -TSMuxerVideo.1=Tvinga PCM muxning av DTS/FLAC ljud (kr\u00e4ver HDMI receiver) -TSMuxerVideo.2=Tvinga FPS utl\u00e4st fr\u00e5n FFmpeg i metafilen -TSMuxerVideo.3=TsMuxer videomuxninginst\u00e4llningar -TSMuxerVideo.19=Muxa alla ljudsp\u00e5r -TrTab2.0=Aktivera/avaktivera en konverteringsmetod -TrTab2.1=Inga inst\u00e4llningar f\u00f6rn\u00e4rvarande -TrTab2.2=MEncoder/AviSynth/FFmpeg videokonverteringsinst\u00e4llningar -TrTab2.3=MEncoder/AviSynth/FFmpeg/tsMuxeR ljudinst\u00e4llningar -TrTab2.4=Videokvalit\u00e9inst\u00e4llningar -TrTab2.5=Generella konverteringsinst\u00e4llningar -TrTab2.6=Sortera listan \u00f6ver konverteringsmetoder. Valet h\u00f6gst upp kommer att ers\u00e4tta inkompatibel fil -TrTab2.7=\u00d6vriga inst\u00e4llningar -TrTab2.8=Undvik konvertering av f\u00f6ljande fil\u00e4ndelser (komma separerat): -TrTab2.9=Tvinga konvertering av f\u00f6ljande fil\u00e4ndelser (komma separerat): -TrTab2.10=Till\u00e5ter realtime streaming av DTS till kompatibel receiver.\nVar uppm\u00e4rksam, ljudet kan \u00e5terskapas felaktigt. H\u00e4r f\u00f6ljer n\u00e5gra tips:\n- En DTS-kompatibel receiver kr\u00e4vs, ansluten via Toslink eller HDMI\n- Volym i PS3 XMB m\u00e5ste vara i l\u00e4ge 'Normal'\n- Kanalinst\u00e4llningen i PS3 XMB m\u00e5ste vara i l\u00e4ge 'V\u00e4nster+H\u00f6ger'\n -TrTab2.11=Konverteringsmetoder -TrTab2.12=Generella avkodningsinst\u00e4llningar -TrTab2.13=Generella konverteringsinst\u00e4llningar -TrTab2.14=Video konverteringsmetoder -TrTab2.15=Audio konverteringsmetoder -TrTab2.16=Str\u00f6mmande videokonverteringsmetoder -TrTab2.17=Str\u00f6mmande ljudkonverteringsmetoder -TrTab2.18=\u00d6vriga konverteringsmetoder -TrTab2.19=Konverteringsmetod i fetstilt \u00e4r standard -TrTab2.20=och kommer ers\u00e4tta ej kompatibla filer -TrTab2.21=[AviSynth ej kompatibelt] -TrTab2.27=DTS/FLAC -> LPCM muxning (Du beh\u00f6ver en HDMI receiver f\u00f6r LPCM 5.1\! Genomsnittlig bitrate = 4.6Mbps) -TrTab2.28=Beh\u00e5ll DTS format (kompatibelt med Toslink/HDMI) -> OBS\! En viss bitrate \u00f6kning uppst\u00e5r\! -TrTab2.29=AC-3 Ljud bitrate (i Kbit/s) (ex: 384, 576, 640): -TrTab2.32=MPEG-2 profil: -TrTab2.39=Videon konverteras automatiskt till MPEG-PS / AC-3 video och ljud format (PS3 kompatibelt) -TrTab2.40=\nDu kan modifiera vqscale, vqmin och keyint parametrarna f\u00f6r att \u00e5stadkomma god, tom. f\u00f6rlustfri konvertering. -TrTab2.41=\nNackdelen med detta \u00e4r VBR bitraten som stundvis kan sticka \u00f6ver tillg\u00e4nglig bandbredd. -TrTab2.42=\nD\u00e4rf\u00f6r kan du ange en maximal bandbredd f\u00f6r tex WLAN, observera dock -TrTab2.43=\natt erh\u00e5llen kvalit\u00e9 \u00e4r en balans mellan bandbredd och CPU kraft: ju h\u00f6gre kvalit\u00e9tsprofil du v\u00e4ljer och ju mer du begr\u00e4nsar bandbredden, -TrTab2.44=\ndesto mer m\u00e5ste CPU arbeta\! F\u00f6rv\u00e4nta dig d\u00e4rf\u00f6r inga under, en 1080p HD video p\u00e5 t.ex 15Mbps \u00e4r inget som rekommenderas\! -TrTab2.50=Antal ljudkanaler: -TrTab2.51=Avaktivera undertexter -TrTab2.52=Kapitelgenerering (intervall i minuter): -TracesTab.3=Rensa -TreeNodeSettings.4=Denna konverteringsmetod \u00e4r ej aktiverad\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_tr.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_tr.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_tr.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_tr.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -DLNAMediaDatabase.0=Bellek veritaban\u0131n\u0131n yeniden ba\u015flat\u0131lmas\u0131 gerekiyor.\nRahats\u0131zl\u0131k verdi\u011fim i\u00e7in \u00fczg\u00fcn\u00fcm \! -FFMpegDVRMSRemux.0=Alternatif FFmpeg Yolu: -FFMpegDVRMSRemux.1=DVR-MS remuxing i\u00e7in ayarlar -FFMpegVideo.0=Sadece AviSynth/FFmpeg motoru i\u00e7in enkoder ayarlar\u0131 (AviSynth/MEncoder tercihi yap\u0131n) -FoldTab.0= -FoldTab.1=Payla\u015f\u0131m se\u00e7enekleri -FoldTab.2=Payla\u015f\u0131lan t\u00fcm klas\u00f6rleri tara -FoldTab.3=Payla\u015f\u0131lan t\u00fcm klas\u00f6rleri taramak uzun zaman alabilir\!\n -FoldTab.4=Taramay\u0131 ba\u015flatmak istedi\u011finizden emin misiniz?\n\n -FoldTab.5=Dosya uzant\u0131lar\u0131n\u0131 gizle -FoldTab.6=\#Video Settings\# klas\u00f6r\u00fcn\u00fc gizle -FoldTab.7=Payla\u015f\u0131lan klas\u00f6rler -FoldTab.8=Transcode motoru isimlerini gizle -FoldTab.9=Dizin ekle -FoldTab.10=Taramay\u0131 durdurmak istiyor musunuz?\n\n -FoldTab.11=Transcode i\u015flemi yap\u0131lm\u0131\u015f g\u00f6r\u00fcnt\u00fc dosyas\u0131n\u0131 PS3'e kopyala (Dikkat, dosyalar\u0131n b\u00fcy\u00fckl\u00fc\u011f\u00fc sabit de\u011fildir\!) -FoldTab.12=Payla\u015f\u0131lan klas\u00f6rleri s\u0131rala -FoldTab.13=\u00d6nizleme resmileri -FoldTab.14=G\u00f6r\u00fcnt\u00fc dosyas\u0131n\u0131n \u00f6nizleme resimleri i\u00e7in MPlayer kullan -FoldTab.15=Alfabetik (A-Z) -FoldTab.16=Tarihe g\u00f6re, yeniden eskiye -FoldTab.17=Tarihe g\u00f6re, eskiden yeniye -FoldTab.18=Dosya s\u0131ralmas\u0131: -FoldTab.19=DVD ISO \u00f6nizleme resimleri -FoldTab.20=ASCIIbetical -FoldTab.21=Resim doyalar\u0131n\u0131n \u00f6nizleme resimleri -FoldTab.22=Alfan\u00fcmerik -FoldTab.23=amazon.com \u00fczerinden indir -FoldTab.24=discogs.com \u00fczerinden indir -FoldTab.26=Ses dosyalar\u0131n\u0131n \u00f6nizleme resmi g\u00f6r\u00fcn\u00fcm\u00fc: -FoldTab.27=G\u00f6r\u00fcnt\u00fc dosyalar\u0131n\u0131n alternatif kapak resmi klas\u00f6r\u00fc -FoldTab.28=Bir klas\u00f6r se\u00e7in -FoldTab.29=iPhoto k\u00fct\u00fcphanesini g\u00f6ster -FoldTab.30=iTunes k\u00fct\u00fcphanesini g\u00f6ster -FoldTab.31=Bo\u015f/medya bulunmayan klas\u00f6rleri gizle (Dikkat: daha yava\u015f gezinme) -FoldTab.32=Cache klas\u00f6r\u00fcn\u00fc gizle -FoldTab.33=\#Transcode\# klas\u00f6r\u00fcn\u00fc gizle -FoldTab.34=Aperture klas\u00f6r\u00fcn\u00fc g\u00f6ster -FontFileFilter.3=TrueType Fontlar\u0131 -LinksTab.5=Yard\u0131mc\u0131 linkler: -LooksFrame.5=\u00c7\u0131k\u0131\u015f -LooksFrame.6=Ana Ekran -LooksFrame.9=Kaydet -LooksFrame.12=Sunucuyu Yeniden Ba\u015flat -LooksFrame.13=Yap\u0131land\u0131rma de\u011fi\u015fikli\u011fi nedeniyle sunucunun yeniden ba\u015flat\u0131lmas\u0131 gerekir -LooksFrame.18=Durum -LooksFrame.19=\u0130zler -LooksFrame.20=Genel Ayarlar -LooksFrame.21=Transcode Ayarlar\u0131 -LooksFrame.22=Navigasyon/Payla\u015f\u0131m Ayarlar\u0131 -LooksFrame.24=Yard\u0131m -LooksFrame.25=Hakk\u0131nda -MEncoderAviSynth.2=Sadece AviSynth motoru i\u00e7in g\u00f6r\u00fcnt\u00fc dekoder ayarlar\u0131 -MEncoderAviSynth.3=AviSynth de\u011fi\u015fken kare h\u0131z\u0131n\u0131 sabit kare h\u0131z\u0131na de\u011fi\u015ftir (convertfps=true) -MEncoderVideo.0=H.264 i\u00e7in deblocking filtresini ge\u00e7. Kaliteyi d\u00fc\u015f\u00fcrebilir. -MEncoderVideo.1=Sadece MEncoder motoru i\u00e7in ses/g\u00f6r\u00fcnt\u00fc \u00e7\u00f6z\u00fcc\u00fcs\u00fc ayarlar\u0131 -MEncoderVideo.2=Alternatif A/V senkronlama y\u00f6ntemi -MEncoderVideo.3=Uygulaman\u0131n varsay\u0131lan kodek ayarlar\u0131n\u0131 kullan (\u00d6nerilen\!) -MEncoderVideo.4=Kare h\u0131z\u0131n\u0131n FFmpeg'den ayr\u0131\u015ft\u0131r\u0131lmas\u0131na zorla -MEncoderVideo.5=Buraya \u00f6zel se\u00e7eneklerinizi ekleyebilirsiniz, \u00f6rnek olarak denoise filtresi: -vf hqdn3d -MEncoderVideo.6=\u00d6zel se\u00e7enekler: -MEncoderVideo.7=Ses dili \u00f6nceli\u011fi: -MEncoderVideo.8=Altyaz\u0131 ayarlar\u0131 -MEncoderVideo.9=Altyaz\u0131 dili \u00f6nceli\u011fi: -MEncoderVideo.10=Ses/altyaz\u0131 dili \u00f6nceli\u011fi (\u00f6rn: en,off;jpn,eng) -MEncoderVideo.11=Altyaz\u0131 codepage: -MEncoderVideo.12=ASS i\u00e7in yaz\u0131tipi ayarlar\u0131: B\u00fcy\u00fckl\u00fck -MEncoderVideo.13=D\u0131\u015f \u00e7izgi -MEncoderVideo.14=G\u00f6lge -MEncoderVideo.15=Alt bo\u015fluk -MEncoderVideo.16=Varsay\u0131lan yaz\u0131tipi ayarlar\u0131: B\u00fcy\u00fckl\u00fck -MEncoderVideo.17=D\u0131\u015f \u00e7izgi -MEncoderVideo.18=Donukluk -MEncoderVideo.19=Alt bo\u015fluk -MEncoderVideo.20=ASS/SSA Altyaz\u0131lar\u0131 -MEncoderVideo.21=Fontconfig/G\u00f6m\u00fcl\u00fc yaz\u0131tipleri -MEncoderVideo.22=Dosya ismi ayn\u0131 olan *.srt/*.sub altyaz\u0131 dosyalar\u0131n\u0131 otomatik y\u00fckle -MEncoderVideo.23=FriBiDi modu -MEncoderVideo.24=\u00d6zel TrueType yaz\u0131tipi (Asya dilleri i\u00e7in): -MEncoderVideo.25=Bir TrueType yaz\u0131tipi se\u00e7in -MEncoderVideo.26=Deinterlace filtresi -MEncoderVideo.27=G\u00f6r\u00fcnt\u00fc \u00f6l\u00e7ekleyici kullan -MEncoderVideo.28=Geni\u015flik -MEncoderVideo.29=Uzman ayarlar\u0131 : \u00d6zel kodek parametreleri -MEncoderVideo.30=Y\u00fckseklik -MEncoderVideo.31=Altyaz\u0131 rengi -MEncoderVideo.32=Ses izi AC-3 oldu\u011funda remux yap (Re-encode yok) -MEncoderVideo.33=\u00d6zel parametreler: -MEncoderVideo.34=Kodeklerin \u00f6zel ayarlar\u0131n\u0131 d\u00fczenle -MEncoderVideo.35=\u0130\u015flemcinin b\u00fct\u00fcn \u00e7ekirdeklerini kullan -MEncoderVideo.36=Varsay\u0131lan ASS stilini kullan -MEncoderVideo.37=Alternatif Altyaz\u0131 Klas\u00f6r\u00fc -MEncoderVideo.38=Yap\u0131labildi\u011finde transcode i\u015flemi yerine tsMuxeR ile remux i\u015flemi yap -MEncoderVideo.39=DVD ISO g\u00f6r\u00fcnt\u00fc izine Remux i\u015flemi yap (Re-encode yok) -MEncoderVideo.68=\#Buraya baz\u0131 kodek kombinasyonlar\u0131 i\u00e7in \u00f6zel parametreler ekleyebilirsiniz.\n -MEncoderVideo.69=\#Daha \u00e7ok A/V senkronlama i\u015flemleri i\u00e7in, fakat ba\u015fka i\u015flemler i\u00e7in de kullan\u0131labilir.\n -MEncoderVideo.70=\#Ne yapt\u0131\u011f\u0131n\u0131z\u0131 bilmiyorsan\u0131z kullan\u0131lmamas\u0131 gereken uzman ayarlar\u0131 olarak say\u0131n.\n -MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; Birka\u00e7 se\u00e7ene\u011fi birle\u015ftirebilirsiniz.\n -MEncoderVideo.72=\#Yetkilendirilen i\u015faretler: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Dikkat, bozuk s\u0131ra t\u00fcm\u00fcyle silinecektir.\n -MEncoderVideo.75=\#\u00d6zel se\u00e7enekler:\n -MEncoderVideo.76=\# -noass: ASS/SSA altyaz\u0131lar\u0131n\u0131 t\u00fcm\u00fcyle devre d\u0131\u015f\u0131 b\u0131rak.\n -MEncoderVideo.77=\# -nosync: bu durum i\u00e7in alternatif A/V e\u015fle\u015ftirme y\u00f6ntemini devre d\u0131\u015f\u0131 b\u0131rak (-mc ayn\u0131s\u0131n\u0131 yapar)\n -MEncoderVideo.78=\# -quality: g\u00f6r\u00fcnt\u00fc kalitesi ayarlar\u0131n\u0131 ge\u00e7ersiz k\u0131l \n -MEncoderVideo.79=\# -mt: Multithread MEncoder s\u00fcr\u00fcm\u00fcn\u00fc kullanmaya zorla\n -MEncoderVideo.80=\#Bu liste zamanla geli\u015ftirilecektir: \u00e7e\u015fitli kodek/dosya ayarlar\u0131/geri bildirimleri her zaman ho\u015f kar\u015f\u0131lan\u0131r.\n -MEncoderVideo.87=\#\u015eimdi buraya kendi durumunuzu/se\u00e7eneklerinizi koyabilirsiniz\! Birka\u00e7 \u00f6rnek: \u00f6rne\u011fin, H.264 HD i\u00e7erik i\u00e7in\n -MEncoderVideo.88=\#MEncoder mt s\u00fcr\u00fcm\u00fcn\u00fc etkinle\u015ftir (ana se\u00e7enekle gereksiz): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#50hz TV'de 24p titremesini kald\u0131rmak i\u00e7in: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#G\u00f6r\u00fcnt\u00fc dosyas\u0131 MPEG-2 ise ve altyaz\u0131 yoksa remux i\u015flemi yapmak i\u00e7in: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=DVD/VOBsub altyaz\u0131 kalitesi (0-4) (Rakam b\u00fcy\u00fcd\u00fck\u00e7e kalite artar): -MEncoderVideo.93=Overscan kar\u015f\u0131l\u0131\u011f\u0131 i\u00e7in kenar ekle: -MEncoderVideo.94=Altyaz\u0131lar\u0131 zorla: -MEncoderVideo.95=Etiketleri zorla: -NetworkTab.0=Dil [Yeniden ba\u015flatma gerekir]: -NetworkTab.1=S\u0131k\u0131\u015ft\u0131r\u0131lm\u0131\u015f ar\u015fivleri gez (.rar/.zip/.cbr) -NetworkTab.2=\u00d6nizleme resmi olu\u015ftur -NetworkTab.3=K\u00fc\u00e7\u00fclt\u00fclm\u00fc\u015f durumda ba\u015flat -NetworkTab.4=Windows hizmeti olarak y\u00fckle -NetworkTab.5=Genel ayarlar -NetworkTab.6=Transcode i\u00e7in azami tampon boyutu, megabyte olarak (azami: MAX_BUFFER_SIZE): -NetworkTab.7=Transcode i\u00e7in kullan\u0131lacak \u00e7ekirdek say\u0131s\u0131 (Sizde mevcut olan %d): -NetworkTab.8=G\u00fcncellemeleri denetle -NetworkTab.9=Otomatik denetle -NetworkTab.11=Windows hizmetini y\u00fcklediniz \! Kullanmak i\u00e7in, uygulamadan \u00e7\u0131kmal\u0131,\n -NetworkTab.12=daha sonra windows y\u00f6netim panelinden hizmeti ba\u015flatmal\u0131s\u0131n\u0131z/yap\u0131land\u0131rmal\u0131s\u0131n\u0131z.\n\n -NetworkTab.13=\u00d6nbellek yeniden ba\u015flat\u0131lacak \!\n -NetworkTab.14=Windows hizmeti y\u00fcklenirken hata olu\u015ftu\!\n -NetworkTab.15=Navigasyon/Ayr\u0131\u015ft\u0131rma ayarlar\u0131 -NetworkTab.16=\u00d6nizleme resmi bulma konumu (saniyelerle): -NetworkTab.17=\u00d6nbelle\u011fi etkinle\u015ftir -NetworkTab.18=\u00d6nbelle\u011fi s\u0131f\u0131rla -NetworkTab.19=Emin misiniz? -NetworkTab.20=A\u011f aray\u00fcz\u00fcn\u00fc kullan: -NetworkTab.22=A\u011f ayarlar\u0131 (geli\u015fmi\u015f) -NetworkTab.23=Sunucunun IP adresi: -NetworkTab.24=Sunucunun port'u (Varsay\u0131lan 5001): -NetworkTab.25=PS3 ayarlar\u0131 -NetworkTab.26=PS3 dosya adlar\u0131 karakter kodlamas\u0131 (Bknz. XMB->System settings->Charset): -NetworkTab.27=Kullanmaman\u0131z gereken yepyeni ayarlar :p -NetworkTab.28=Turbo mode (tcp_nodelay etkinle\u015ftir) / Dikkat, ne yapt\u0131\u011f\u0131n\u0131zdan emin de\u011filseniz kullanmay\u0131n -NetworkTab.29=Transcode ba\u015flad\u0131\u011f\u0131nda PS3'den ayn\u0131 dosya i\u00e7in gelen istekleri engelle -NetworkTab.30=IP filter : -NetworkTab.31=Geli\u015fmi\u015f HTTP ve sistem ayarlar\u0131 -NetworkTab.32=HTTP Engine V2 -NetworkTab.33=Dosya sunumu yap\u0131l\u0131yorken sistemin uykuya ge\u00e7mesini engelle -NetworkTab.34=Eklentiler -NetworkTab.35=Azami bant geni\u015fli\u011fi Mb/s olarak (0 s\u0131n\u0131rs\u0131z anlam\u0131na gelir): -PMS.0=Ayg\u0131t bulunamad\u0131 -PMS.1=Ses -PMS.2=\#- Cache -\# -PMS.3=Alternatif A/V senkron y\u00f6ntemi -PMS.4=Deinterlace Filtresi -PMS.5=PS3'e ba\u011fland\u0131 -PMS.6=.srt/.sub altyaz\u0131lar\u0131n\u0131 otomatik y\u00fckle -PMS.7=H.264 \u00e7\u00f6z\u00fcmlemesi i\u00e7in SkipLoopFiltresi (Kaliteyi d\u00fc\u015f\u00fcrebilir) -PMS.8=Altyaz\u0131lar -PMS.9=T\u00fcm Ses \u00c7alma Listeleri -PMS.10=Atyaz\u0131lar\u0131 tamamen devre d\u0131\u015f\u0131 b\u0131rak -PMS.11=T\u00fcm Ses \u0130zleri -PMS.12=Tarihe G\u00f6re -PMS.13=Artiste G\u00f6re -PMS.14=MEncoder ile varsay\u0131lan H.264 remux i\u015flemi -PMS.16=Alb\u00fcme G\u00f6re -PMS.17=Bilinmeyen Ayg\u0131t -PMS.18=Ba\u011fland\u0131 -PMS.19=T\u00fcre G\u00f6re -PMS.21=Kamera modeline g\u00f6re -PMS.22=Artist/Alb\u00fcm'e g\u00f6re -PMS.25=ISO ayarlar\u0131na g\u00f6re -PMS.26=T\u00fcr/Artist/Alb\u00fcm'e g\u00f6re -PMS.27=Yap\u0131land\u0131rmay\u0131 kaydet -PMS.31=Foto\u011fraf -PMS.32=T\u00fcm Foto\u011fraflar -PMS.34=G\u00f6r\u00fcnt\u00fc -PMS.35=T\u00fcm G\u00f6r\u00fcnt\u00fcler -PMS.36=HD G\u00f6r\u00fcnt\u00fcler -PMS.37=\#- Video Settings -\# -PMS.39=SD G\u00f6r\u00fcnt\u00fcler -PMS.41=Win32 hizmeti yeniden y\u00fckleniyor -PMS.130=Ayg\u0131t aran\u0131yor... -ProfileChooser.1=PS3 Medya Sunucusu Profil Se\u00e7im Yard\u0131mc\u0131s\u0131 -ProfileChooser.2=Se\u00e7iniz -ProfileChooser.3=Profil dosyas\u0131 (.conf) ya da klas\u00f6r\u00fc -StatusTab.2=Durum -StatusTab.3=Beklemede... -StatusTab.5=Bo\u015fta -StatusTab.6=Transcode i\u015fleminin tampon durumu: -StatusTab.7=I/O istatistikleri: -StatusTab.8=\u015eu anki ak\u0131\u015f h\u0131z\u0131: -StatusTab.9=Bulunan medya ayg\u0131tlar\u0131 -StatusTab.10=En y\u00fcksek ak\u0131\u015f h\u0131z\u0131: -StatusTab.11=Mb/s -TSMuxerVideo.0=MEncoder ile demux yap ve t\u00fcm ses izlerini AC-3 olarak kodla -TSMuxerVideo.1=MEncoder ile demux yap ve DTS/FLAC olan ses izlerini LPCM olarak kodla [Dikkat, tarama hen\u00fcz \u00e7al\u0131\u015fm\u0131yor] -TSMuxerVideo.2=FFmpeg meta dosyas\u0131ndan ayr\u0131\u015ft\u0131r\u0131lm\u0131\u015f FPS'yi kullan -TSMuxerVideo.3=Sadece tsMuxer motoru i\u00e7in g\u00f6r\u00fcnt\u00fc dekoderi ayarlar\u0131 -TSMuxerVideo.19=T\u00fcm ses izlerine mux i\u015flemi yap -TrTab2.0=Bir transcode motorunu etkinle\u015ftir/devre d\u0131\u015f\u0131 b\u0131rak -TrTab2.1=\u015eimdilik bir ayar yok -TrTab2.2=MEncoder/AviSynth/FFmpeg motorlar\u0131 i\u00e7in g\u00f6r\u00fcnt\u00fc dosyalar\u0131 i\u00e7in enkoder ayarlar\u0131 -TrTab2.3=MEncoder/AviSynth/FFmpeg/tsMuxeR motorlar\u0131 i\u00e7in uygulanacak dekoder ayarlar\u0131 -TrTab2.4=G\u00f6r\u00fcnt\u00fc kalitesi ayarlar\u0131 -TrTab2.5=Genel transcode ayarlar\u0131 -TrTab2.6=Transcode motoru listesini s\u0131rala. \u0130lk s\u0131radaki orjinal g\u00f6r\u00fcnt\u00fc klas\u00f6r\u00fcnde g\u00f6z\u00fckecektir -TrTab2.7=\u00c7e\u015fitli ayarlar -TrTab2.8=Bu uzant\u0131lar i\u00e7in transcode i\u015flemini ge\u00e7 (virg\u00fcl ile ay\u0131r\u0131n): -TrTab2.9=Bu uzant\u0131lar i\u00e7in transcode i\u015flemi yap (virg\u00fcl ile ay\u0131r\u0131n): -TrTab2.10=Do\u011frudan DTS olarak al\u0131c\u0131n\u0131za g\u00f6ndermenize izin verir.\nDikkatli olun, Ses parazitli olabilir. Notlar:\n- DTS uyumlu, TOSLINK veya HDMI ile -ba\u011flanm\u0131\u015f bir al\u0131c\u0131n\u0131z\u0131n olmas\u0131 gerekir\n- XMD'deki ses simgesi "Normal" konumunda olmal\u0131d\u0131r'\n- XMB'deki kanallar simgesi 'Left+Right' konumunda -olmal\u0131d\u0131r.\n -TrTab2.11=Motorlar -TrTab2.12=Genel dekoder ayarlar\u0131 -TrTab2.13=Genel enkoder ayarlar\u0131 -TrTab2.14=G\u00f6r\u00fcnt\u00fc Dosyalar\u0131 Motorlar\u0131 -TrTab2.15=Ses Dosyalar\u0131 Motorlar\u0131 -TrTab2.16=Web Video Streaming Motorlar\u0131 -TrTab2.17=Web Audio Streaming Motorlar\u0131 -TrTab2.18=\u00c7e\u015fitli Motorlar -TrTab2.19=Motorlar\u0131n azalma -TrTab2.20=s\u0131ras\u0131; en y\u00fcksek olan ilk -TrTab2.21=(AviSynth desteklenmiyor) -TrTab2.22=Otomatik 44.1 ya da 48 kHz resample i\u015flemi uygula -TrTab2.27=DTS/FLAC'dan LPCM d\u00f6n\u00fc\u015f\u00fcm\u00fc (LPCM 5.1 stream i\u00e7in HDMI al\u0131c\u0131 gerekir) -TrTab2.28=DTS sesi ak\u0131\u015f\u0131n i\u00e7inde tut (Optic \u00e7\u0131k\u0131\u015f ile uyumlu) -TrTab2.29=AC-3 ses ak\u0131\u015f h\u0131z\u0131 (Kb/s olarak) (\u00f6r: 384, 576, 640): -TrTab2.32=MPEG-2 se\u00e7enekleri: -TrTab2.39=Bu g\u00f6r\u00fcnt\u00fcye otomatik olarak MPEG-PS / AC-3 kodekleri kullan\u0131larak transcode ve mux i\u015flemi yap\u0131ld\u0131 (PS3 ile tam uyum) -TrTab2.40=\nVqscale, vqmin and keyint parametreleri ile iyi bir oynat\u0131m sa\u011flayabilirsiniz, hatta neredeyse transcode i\u015fleminde kalite kayb\u0131 olmaz. -TrTab2.41=\nBazen a\u011f\u0131n\u0131z\u0131n azami h\u0131z kapasitesini a\u015fabilen VBR ak\u0131\u015f h\u0131z\u0131n\u0131 geriye \u00e7ekin. -TrTab2.42=\nBu y\u00fczden e\u011fer WiFi, CPL, vb. kullan\u0131yorsan\u0131z bant geni\u015fli\u011fini sabitleyebilirsiniz. Zaten, transcode kalitesi -TrTab2.43=\na\u011f h\u0131z\u0131 ve i\u015flemci g\u00fcc\u00fcyle dengededir: daha fazla kalite i\u00e7in ak\u0131\u015f h\u0131z\u0131n\u0131 daha fazla zorlayacak, -TrTab2.44=\ni\u015flemciniz daha fazla ac\u0131 \u00e7ekecek\! Ayr\u0131ca, 1080p aksiyon filminin en temiz g\u00f6r\u00fcnt\u00fc kalitesi ile 15Mbps'ye s\u0131\u011fmas\u0131n\u0131 beklemeyin.:p -TrTab2.50=Ses \u00e7\u0131k\u0131\u015f\u0131 i\u00e7in azami kanal say\u0131s\u0131: -TrTab2.51=Altyaz\u0131lar\u0131 t\u00fcm\u00fcyle devre d\u0131\u015f\u0131 b\u0131rak -TrTab2.52=\#Transcode\# klas\u00f6r\u00fcnde b\u00f6l\u00fcm deste\u011fi / Dakika aral\u0131\u011f\u0131: -TracesTab.3=Temizle -TreeNodeSettings.4=Bu motor ba\u015flat\u0131lmad\u0131\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_zhs.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_zhs.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_zhs.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_zhs.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,298 +0,0 @@ -DLNAMediaDatabase.0=\u9700\u8981\u91cd\u65b0\u521b\u5efa\u7f13\u5b58\u6570\u636e\u5e93\u3002\n\u62b1\u6b49\u7ed9\u60a8\u5e26\u6765\u4e0d\u4fbf\! -DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z -DLNAMediaDatabase.2=\u6e05\u7406\u6570\u636e\u5e93... -DLNAMediaDatabase.3=\u538b\u7f29\u6570\u636e\u5e93... -DLNAMediaDatabase.4=\u626b\u63cf\u6587\u4ef6\u5939: -FFMpegDVRMSRemux.0=\u53ef\u9009 FFmpeg \u8def\u5f84: -FFMpegDVRMSRemux.1=\u7528\u4e8e DVR-MS \u91cd\u5c01\u88c5\u7684\u8bbe\u5b9a -FFMpegVideo.0=\u4ec5\u7528\u4e8e AviSynth/FFmpeg \u5f15\u64ce\u7684\u7f16\u7801\u5668\u8bbe\u5b9a(\u9996\u9009 AviSynth/MEncoder) -FFMpegVideo.1=\u7528\u4e8e FFmpeg \u5f15\u64ce\u7684\u7f16\u7801\u5668\u8bbe\u5b9a -FoldTab.0= -FoldTab.1=\u5171\u4eab\u9009\u9879 -FoldTab.2=\u626b\u63cf\u6240\u6709\u5171\u4eab\u6587\u4ef6\u5939 -FoldTab.3=\u626b\u63cf\u5168\u90e8\u5171\u4eab\u6587\u4ef6\u5939\u9700\u8981\u5927\u91cf\u65f6\u95f4\!\n -FoldTab.4=\u60a8\u786e\u5b9a\u8981\u542f\u52a8\u626b\u63cf?\n\n -FoldTab.5=\u9690\u85cf\u6587\u4ef6\u6269\u5c55\u540d -FoldTab.6=\u9690\u85cf \#Video Settings\# \u6587\u4ef6\u5939 -FoldTab.7=\u5171\u4eab\u6587\u4ef6\u5939 -FoldTab.8=\u9690\u85cf\u8f6c\u7801\u5f15\u64ce\u540d -FoldTab.9=\u6dfb\u52a0\u76ee\u5f55 -FoldTab.10=\u60a8\u60f3\u8981\u505c\u6b62\u626b\u63cf\u5417?\n\n -FoldTab.11=\u542f\u7528\u5411 PS3 \u590d\u5236\u8f6c\u7801\u8fc7\u7684\u89c6\u9891 (\u6ce8\u610f, \u6587\u4ef6\u6ca1\u6709\u56fa\u5b9a\u5c3a\u5bf8!\uff09 -FoldTab.12=\u6392\u5e8f\u5171\u4eab\u6587\u4ef6\u5939 -FoldTab.13=\u7f29\u7565\u56fe -FoldTab.14=\u4f7f\u7528 MPlayer \u751f\u6210\u89c6\u9891\u7f29\u7565\u56fe -FoldTab.15=\u5b57\u6bcd\u987a\u5e8f (A-Z) -FoldTab.16=\u6309\u7167\u65e5\u671f, \u6700\u65b0\u5728\u524d -FoldTab.17=\u6309\u7167\u65e5\u671f, \u6700\u8001\u5728\u524d -FoldTab.18=\u6587\u4ef6\u987a\u5e8f: -FoldTab.19=DVD ISO \u7f29\u7565\u56fe -FoldTab.20=ASCII \u987a\u5e8f -FoldTab.21=\u56fe\u50cf\u7f29\u7565\u56fe -FoldTab.22=\u5b57\u6bcd\u6570\u5b57\u987a\u5e8f -FoldTab.23=\u4ece amazon.com \u4e0b\u8f7d -FoldTab.24=\u4ece discogs.com \u4e0b\u8f7d -FoldTab.26=\u97f3\u9891\u7f29\u7565\u56fe\u5bfc\u5165: -FoldTab.27=\u53ef\u9009\u89c6\u9891\u5c01\u9762\u56fe\u6587\u4ef6\u5939 -FoldTab.28=\u9009\u62e9\u4e00\u4e2a\u6587\u4ef6\u5939 -FoldTab.29=\u663e\u793a iPhoto \u76f8\u7247\u5e93 -FoldTab.30=\u663e\u793a iTunes \u5a92\u4f53\u5e93 -FoldTab.31=\u9690\u85cf\u7a7a\u7684\u6216\u65e0\u5a92\u4f53\u6587\u4ef6\u5939 (\u6ce8\u610f: \u51cf\u6162\u6d4f\u89c8\u901f\u5ea6) -FoldTab.32=\u9690\u85cf\u7f13\u5b58\u6587\u4ef6\u5939 -FoldTab.33=\u9690\u85cf \#Transcode\# \u6587\u4ef6\u5939 -FoldTab.34=\u663e\u793a aperture \u5e93 -FoldTab.35=\u65e0 -FontFileFilter.3=TrueType \u5b57\u4f53 -LinksTab.5=\u5e2e\u52a9\u94fe\u63a5: -LinksTab.6=\u6784\u5efa: -LooksFrame.5=\u9000\u51fa -LooksFrame.6=\u4e3b\u9762\u677f -LooksFrame.9=\u4fdd\u5b58 -LooksFrame.12=\u91cd\u542f\u670d\u52a1\u5668 -LooksFrame.13=\u7531\u4e8e\u914d\u7f6e\u53d8\u66f4\u5fc5\u987b\u91cd\u542f\u670d\u52a1\u5668 -LooksFrame.18=\u72b6\u6001 -LooksFrame.19=\u8ffd\u6eaf -LooksFrame.20=\u5e38\u7528\u914d\u7f6e -LooksFrame.21=\u8f6c\u7801\u8bbe\u5b9a -LooksFrame.22=\u6d4f\u89c8/\u5171\u4eab\u8bbe\u5b9a -LooksFrame.24=\u5e2e\u52a9 -LooksFrame.25=\u5173\u4e8e -LooksFrame.26=\u4ec5\u7528\u4e8e\u6d4b\u8bd5\uff0c\u53ef\u80fd\u4e0d\u7a33\u5b9a -MEncoderAviSynth.2=\u4ec5\u9002\u7528\u4e8e AviSynth \u5f15\u64ce\u7684\u89c6\u9891\u89e3\u7801\u8bbe\u5b9a -MEncoderAviSynth.3=Enable AviSynth variable framerate change into a constant framerate (convertfps=true) -MEncoderAviSynth.4=# AviSynth script is now fully customisable\n -MEncoderAviSynth.5=# The following variables are available:\n -MEncoderAviSynth.6=# : The complete DirectShowSource instruction, e.g. DirectShowSource(filename, convertfps)\n -MEncoderAviSynth.7=# : The complete subtitle instruction if there's any detected (SRT/SUB/IDX/ASS/SSA)\n -MEncoderAviSynth.8=# : The video filename for if you want to do all this by yourself\n -MEncoderAviSynth.10=\n -MEncoderAviSynth.11=\n -MEncoderVideo.0=\u8df3\u8fc7 H.264 \u73af\u5185\u53bb\u5757\u6ee4\u955c. \u4f1a\u964d\u4f4e\u8d28\u91cf. -MEncoderVideo.1=\u4ec5\u9002\u7528\u4e8e MEncoder \u5f15\u64ce\u7684\u89c6\u9891\u97f3\u9891\u89e3\u7801\u8bbe\u5b9a -MEncoderVideo.2=\u97f3\u89c6\u9891\u540c\u6b65\u53ef\u9009\u65b9\u6cd5 -MEncoderVideo.3=\u4f7f\u7528\u7a0b\u5e8f\u9ed8\u8ba4\u7f16\u7801\u5668\u53c2\u6570 (\u63a8\u8350!) -MEncoderVideo.4=\u5f3a\u5236\u4f7f\u7528\u4ece FFmpeg \u4f20\u9012\u6765\u7684\u5e27\u7387 -MEncoderVideo.5=\u60a8\u53ef\u4ee5\u5728\u8fd9\u91cc\u6dfb\u52a0\u7279\u522b\u9009\u9879, \u6bd4\u5982\u964d\u566a\u6ee4\u955c: -vf hqdn3d -MEncoderVideo.6=\u81ea\u5b9a\u4e49\u9009\u9879: -MEncoderVideo.7=\u97f3\u9891\u8bed\u8a00\u4f18\u5148\u7ea7: -MEncoderVideo.8=\u5b57\u5e55\u8bbe\u5b9a -MEncoderVideo.9=\u5b57\u5e55\u8bed\u8a00\u4f18\u5148\u7ea7: -MEncoderVideo.10=\u97f3\u9891\u6216\u5b57\u5e55\u8bed\u8a00\u4f18\u5148\u7ea7 (\u4e3e\u4f8b: en,off;jpn,eng) -MEncoderVideo.11=\u5b57\u5e55\u5b57\u7b26\u96c6: -MEncoderVideo.12=\u8986\u76d6\u6837\u5f0f\u5b57\u5e55\u8bbe\u5b9a: \u5b57\u4f53\u7f29\u653e -MEncoderVideo.13=\u5b57\u4f53\u5916\u5f62 -MEncoderVideo.14=\u5b57\u4f53\u9634\u5f71 -MEncoderVideo.15=\u5b50\u8fb9\u8ddd (px) -MEncoderVideo.16=\u7eaf\u6587\u672c\u5b57\u5e55\u8bbe\u5b9a: \u5b57\u4f53\u7f29\u653e -MEncoderVideo.17=\u5b57\u4f53\u5916\u5f62 -MEncoderVideo.18=\u5b57\u4f53\u6a21\u7cca -MEncoderVideo.19=\u5b50\u8fb9\u8ddd (%) -MEncoderVideo.20=\u4f7f\u7528 ASS/SSA \u5b57\u5e55\u6837\u5f0f -MEncoderVideo.21=Fontconfig/\u5d4c\u5165\u5f0f \u5b57\u4f53 -MEncoderVideo.22=\u81ea\u52a8\u52a0\u8f7d\u5177\u6709\u76f8\u540c\u6587\u4ef6\u540d\u7684 *.srt/*.sub \u5b57\u5e55 -MEncoderVideo.23=FriBiDi \u6a21\u5f0f -MEncoderVideo.24=\u6307\u5b9a TrueType \u5b57\u4f53 (\u7528\u4e8e\u5b57\u5e55): -MEncoderVideo.25=\u9009\u62e9\u4e00\u6b3e TrueType \u5b57\u4f53 -MEncoderVideo.26=\u9010\u884c\u626b\u63cf\u7b5b\u9009\u5668 -MEncoderVideo.27=\u4f7f\u7528\u89c6\u9891\u7f29\u653e\u5668 -MEncoderVideo.28=\u5bbd\u5ea6 -MEncoderVideo.29=\u4e13\u5bb6\u8bbe\u5b9a : \u7f16\u7801\u5668\u7279\u5b9a\u53c2\u6570 -MEncoderVideo.30=\u9ad8\u5ea6 -MEncoderVideo.31=\u5b50\u8272\u5f69 -MEncoderVideo.32=\u4fdd\u7559 AC-3 \u97f3\u8f68 (\u4e0d\u91cd\u65b0\u7f16\u7801, \u53ef\u80fd\u5bfc\u81f4\u5bf9\u8bdd\u65e0\u58f0\u6216\u8005\u97f3\u89c6\u9891\u540c\u6b65\u95ee\u9898) -MEncoderVideo.33=\u81ea\u5b9a\u4e49\u53c2\u6570: -MEncoderVideo.34=\u7f16\u8f91\u7f16\u7801\u5668\u7279\u5b9a\u53c2\u6570 -MEncoderVideo.35=\u4f7f\u7528\u591a\u6838 CPU -MEncoderVideo.36=\u9009\u62e9\u5d4c\u5165\u6837\u5f0f -MEncoderVideo.37=\u53ef\u9009\u5b57\u5e55\u6587\u4ef6\u5939 -MEncoderVideo.38=\u5982\u679c\u53ef\u80fd\u4f7f\u7528 tsMuxeR \u91cd\u65b0\u5c01\u88c5\u89c6\u9891\u800c\u4e0d\u8f6c\u7801 -MEncoderVideo.39=\u91cd\u65b0\u5c01\u88c5 DVD ISO \u89c6\u9891\u8f68 (\u65e0\u91cd\u7f16\u7801) -MEncoderVideo.68=\#Here you can put specific parameters for some codec combinations.\n -MEncoderVideo.69=\#It's mostly for A/V synchronization issues, but it can be used for anything else as well\n -MEncoderVideo.70=\#Consider it like expert settings as this shouldn't be used if you don't know exactly what you're doing\n -MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n -MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#Careful, any malformed line will be wiped out\n -MEncoderVideo.75=\#Special options:\n -MEncoderVideo.76=\# -noass: definitely disable ASS/SSA subtitles as they can mess up A/V sync\n -MEncoderVideo.77=\# -nosync: definitely disable A/V sync alternative method for this condition (-mc will do the same)\n -MEncoderVideo.78=\# -quality: override video quality settings\n -MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n -MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n -MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n -MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=DVD/VOBsub \u5b57\u5e55\u8d28\u91cf (0-4) (\u8d8a\u9ad8\u8d8a\u597d): -MEncoderVideo.93=\u4e3a\u8fc7\u8865\u507f\u589e\u52a0\u8fb9\u6846: -MEncoderVideo.94=\u5f3a\u5236\u5b57\u5e55: -MEncoderVideo.95=\u5f3a\u5236\u6807\u7b7e: -MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ -MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ -MEncoderVideo.98=cp1252 /* Windows - Western Europe */ -MEncoderVideo.99=cp1253 /* Windows - Greek */ -MEncoderVideo.100=cp1254 /* Windows - Turkish */ -MEncoderVideo.101=cp1255 /* Windows - Hebrew */ -MEncoderVideo.102=cp1256 /* Windows - Arabic */ -MEncoderVideo.103=cp1257 /* Windows - Baltic */ -MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ -MEncoderVideo.105=ISO-8859-1 /* Western Europe */ -MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ -MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ -MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ -MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ -MEncoderVideo.110=ISO-8859-6 /* Arabic */ -MEncoderVideo.111=ISO-8859-7 /* Greek */ -MEncoderVideo.112=ISO-8859-8 /* Hebrew */ -MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ -MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ -MEncoderVideo.115=ISO-8859-11 /* Thai */ -MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ -MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ -MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ -MEncoderVideo.119=ISO-8859-16 /* Central European languages */ -MEncoderVideo.120=cp932 /* \u65e5\u8bed */ -MEncoderVideo.121=cp936 /* \u7b80\u4f53\u4e2d\u6587 */ -MEncoderVideo.122=cp949 /* \u97e9\u8bed */ -MEncoderVideo.123=cp950 /* Big5, \u53f0\u6e7e\u8bdd, \u7ca4\u8bed */ -MEncoderVideo.124=UTF-8 /* Unicode */ -MEncoderVideo.125=\u9009\u62e9\u5b57\u5e55\u989c\u8272 -MEncoderVideo.126=cht,tw,chi,chs -MEncoderVideo.127=cht,tw,chi,chs -MEncoderVideo.128=*,* -NetworkTab.0=\u8bed\u8a00 [\u9700\u8981\u91cd\u542f\u7a0b\u5e8f]: -NetworkTab.1=\u6d4f\u89c8\u538b\u7f29\u6863\u6848 (.rar/.zip/.cbr) -NetworkTab.2=\u751f\u6210\u7f29\u7565\u56fe -NetworkTab.3=\u542f\u52a8\u540e\u6700\u5c0f\u5316 -NetworkTab.4=\u5b89\u88c5\u4e3a Windows \u670d\u52a1 -NetworkTab.5=\u5e38\u7528\u8bbe\u5b9a -NetworkTab.6=\u8f6c\u7801\u7f13\u5b58\u6700\u5927\u5c3a\u5bf8, \u4ee5\u5146\u5b57\u8282\u4e3a\u5355\u4f4d (\u6700\u5927\u503c: MAX_BUFFER_SIZE): -NetworkTab.7=\u7528\u4e8e\u8f6c\u7801\u7684\u6838\u5fc3\u6570 (\u60a8\u4f3c\u4e4e\u6709 %d): -NetworkTab.8=\u68c0\u67e5\u66f4\u65b0 -NetworkTab.9=\u81ea\u52a8\u68c0\u67e5 -NetworkTab.11=\u60a8\u5df2\u7ecf\u5b89\u88c5\u4e3a Windows \u670d\u52a1 \! \u8981\u4f7f\u7528\u5b83, \u60a8\u5fc5\u987b\u9000\u51fa\u8be5\u5e94\u7528\u7a0b\u5e8f,\n -NetworkTab.12=\u7136\u540e\u4ece windows \u7ba1\u7406\u9762\u677f\u4e2d\u542f\u52a8 (\u5e76\u914d\u7f6e) \u670d\u52a1.\n\n -NetworkTab.13=\u5c06\u91cd\u65b0\u521d\u59cb\u5316\u7f13\u5b58 \!\n -NetworkTab.14=\u5b89\u88c5\u4e3a Windows \u670d\u52a1\u65f6\u51fa\u9519!\n -NetworkTab.15=\u6d4f\u89c8/\u4f20\u9012\u8bbe\u5b9a -NetworkTab.16=\u7f29\u7565\u56fe\u5bfb\u627e\u4f4d\u7f6e (\u6309\u79d2\u8ba1\u7b97): -NetworkTab.17=\u542f\u7528\u7f13\u5b58 -NetworkTab.18=\u91cd\u7f6e\u7f13\u5b58 -NetworkTab.19=\u60a8\u786e\u5b9a\u5417? -NetworkTab.20=\u5f3a\u884c\u6307\u5b9a\u7f51\u7edc\u63a5\u53e3: -NetworkTab.22=\u7f51\u7edc\u8bbe\u5b9a (\u9ad8\u7ea7) -NetworkTab.23=\u5f3a\u884c\u6307\u5b9a\u670d\u52a1\u5668 IP: -NetworkTab.24=\u5f3a\u884c\u6307\u5b9a\u670d\u52a1\u5668\u7aef\u53e3 (\u9ed8\u8ba4\u4e3a 5001): -NetworkTab.25=PS3 \u8bbe\u5b9a -NetworkTab.26=\u60a8 PS3 \u6587\u4ef6\u540d\u7684\u5b57\u7b26\u96c6 (\u5728 XMB->\u4e3b\u673a\u8bbe\u5b9a->\u5b57\u7b26\u96c6): -NetworkTab.27=\u60a8\u4e0d\u8be5\u4f7f\u7528\u7684\u672a\u7528\u8bbe\u5b9a :p -NetworkTab.28=Turbo \u6a21\u5f0f (enable tcp_nodelay) / \u6ce8\u610f, \u4e0d\u786e\u5b9a\u662f\u5426\u53ef\u7528 -NetworkTab.29=\u5f53\u8f6c\u7801\u5f00\u59cb\u540e\u963b\u6b62\u6765\u81ea PS3 \u5bf9\u540c\u4e00\u6587\u4ef6\u7684\u8bf7\u6c42 -NetworkTab.30=\u4f7f\u7528 IP \u8fc7\u6ee4\u5668: -NetworkTab.31=\u9ad8\u7ea7 HTTP \u548c\u7cfb\u7edf\u8bbe\u5b9a -NetworkTab.32=HTTP \u5f15\u64ce V2 -NetworkTab.33=\u5728\u6d41\u5a92\u4f53\u65f6\u963b\u6b62\u64cd\u4f5c\u7cfb\u7edf\u4f11\u7720 -NetworkTab.34=\u63d2\u4ef6 -NetworkTab.35=\u4ee5 Mb/s \u4e3a\u5355\u4f4d\u6700\u5927\u5e26\u5bbd(0 \u4ee3\u8868\u4e0d\u9650\u5236): -NetworkTab.36=\u82e5\u81ea\u52a8\u68c0\u6d4b\u5931\u8d25\u7684\u9ed8\u8ba4\u6e32\u67d3\u5668: -NetworkTab.37=\u672a\u77e5\u6e32\u67d3\u5668 -NetworkTab.38=\u5f3a\u884c\u4f7f\u7528\u9ed8\u8ba4\u6e32\u67d3\u5668 (\u7981\u7528\u81ea\u52a8\u68c0\u6d4b) -PMS.0=\u672a\u53d1\u73b0\u6e32\u67d3\u5668 -PMS.1=\u97f3\u9891 -PMS.2=\#- Cache -\# -PMS.3=\u97f3\u89c6\u9891\u540c\u6b65\u53ef\u9009\u65b9\u6cd5 -PMS.4=\u9010\u884c\u626b\u63cf\u7b5b\u9009\u5668 -PMS.5=\u5df2\u8fde\u63a5\u81f3 PS3 -PMS.6=\u81ea\u52a8\u52a0\u8f7d .srt/.sub \u5b57\u5e55 -PMS.7=\u8df3\u8fc7 H.264 \u89e3\u7801\u73af\u5185\u53bb\u5757\u6ee4\u955c (\u4f1a\u964d\u4f4e\u8d28\u91cf) -PMS.8=\u5b57\u5e55 -PMS.9=\u5168\u90e8\u97f3\u9891\u64ad\u653e\u5217\u8868 -PMS.10=\u5b8c\u5168\u7981\u7528\u5b57\u5e55 -PMS.11=\u6240\u6709\u97f3\u9891\u8f68\u9053 -PMS.12=\u6309\u65e5\u671f -PMS.13=\u6309\u827a\u672f\u5bb6 -PMS.14=\u9ed8\u8ba4\u4f7f\u7528 MEncoder \u91cd\u5c01\u88c5 H.264 -PMS.16=\u6309\u4e13\u8f91 -PMS.17=\u672a\u77e5\u6e32\u67d3\u5668 -PMS.18=\u5df2\u8fde\u63a5 -PMS.19=\u6309\u98ce\u683c -PMS.21=\u6309\u76f8\u673a\u578b\u53f7 -PMS.22=\u6309\u827a\u672f\u5bb6/\u4e13\u8f91 -PMS.25=\u6309 ISO \u8bbe\u5b9a -PMS.26=\u6309\u98ce\u683c/\u827a\u672f\u5bb6/\u4e13\u8f91 -PMS.27=\u4fdd\u5b58\u914d\u7f6e -PMS.28=\u6309\u5b57\u6bcd/\u827a\u672f\u5bb6/\u4e13\u8f91 -PMS.31=\u7167\u7247 -PMS.32=\u6240\u6709\u7167\u7247 -PMS.34=\u89c6\u9891 -PMS.35=\u6240\u6709\u89c6\u9891 -PMS.36=\u9ad8\u6e05\u89c6\u9891 -PMS.37=\#- Video Settings -\# -PMS.39=\u6807\u6e05\u89c6\u9891 -PMS.40=DVD \u955c\u50cf -PMS.41=(\u91cd)\u5b89\u88c5 Win32 \u670d\u52a1 -PMS.130=\u641c\u7d22\u6e32\u67d3\u5668... -ProfileChooser.1=PS3 \u5a92\u4f53\u670d\u52a1\u5668\u914d\u7f6e\u6587\u4ef6\u9009\u62e9\u5668 -ProfileChooser.2=\u9009\u62e9 -ProfileChooser.3=\u914d\u7f6e\u6587\u4ef6 (.conf) \u6216\u76ee\u5f55 -StatusTab.2=\u72b6\u6001 -StatusTab.3=\u7b49\u5f85... -StatusTab.5=\u7a7a -StatusTab.6=\u8f6c\u7801\u7f13\u5b58\u72b6\u6001: -StatusTab.7=I/O \u7edf\u8ba1: -StatusTab.8=\u5f53\u524d\u6bd4\u7279\u7387: -StatusTab.9=\u76d1\u6d4b\u5230\u5a92\u4f53\u6e32\u67d3\u5668 -StatusTab.10=\u5cf0\u503c\u6bd4\u7279\u7387Peak bitrate: -StatusTab.11=Mb/s -StatusTab.12=MB -TSMuxerVideo.0=\u4f7f\u7528 MEncoder \u5206\u79bb\u5e76\u7f16\u7801\u6240\u6709\u97f3\u8f68\u4e3a AC-3 -TSMuxerVideo.1=\u4f7f\u7528 MEncoder \u5206\u79bb\u5e76\u7f16\u7801 DTS/FLAC \u97f3\u8f68\u4e3a LPCM [\u6ce8\u610f, \u8df3\u88c5\u5c1a\u4e0d\u53ef\u7528] -TSMuxerVideo.2=\u5728\u5143\u6570\u636e\u6587\u4ef6\u4e2d\u5f3a\u5236\u4f7f\u7528\u6765\u81ea FFmpeg \u7684 FPS \u5206\u6790\u7ed3\u679c -TSMuxerVideo.3=\u4ec5\u9002\u7528\u4e8e tsMuxeR \u5f15\u64ce\u7684\u89c6\u9891\u89e3\u7801\u8bbe\u5b9a -TSMuxerVideo.19=\u5c01\u88c5\u6240\u6709\u97f3\u8f68 -TrTab2.0=\u542f\u7528/\u7981\u7528\u4e00\u4e2a\u8f6c\u7801\u5f15\u64ce -TrTab2.1=\u73b0\u5728\u6ca1\u6709\u8bbe\u5b9a -TrTab2.2=\u9002\u7528\u4e8e\u4e0b\u5217\u5f15\u64ce\u7684\u89c6\u9891\u7f16\u7801\u5668\u8bbe\u5b9a: MEncoder/AviSynth/FFmpeg -TrTab2.3=\u5e94\u7528\u4e8e\u4e0b\u5217\u89e3\u7801\u5668\u7684\u97f3\u9891\u8bbe\u5b9a: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=\u89c6\u9891\u8d28\u91cf\u8bbe\u5b9a -TrTab2.5=\u5e38\u7528\u8f6c\u7801\u8bbe\u5b9a -TrTab2.6=\u6392\u5e8f\u8f6c\u7801\u5f15\u64ce\u5217\u8868. \u9996\u4e2a\u5c06\u51fa\u73b0\u5728\u539f\u59cb\u89c6\u9891\u6587\u4ef6\u5939 -TrTab2.7=\u6742\u9879 -TrTab2.8=\u8df3\u8fc7\u4ee5\u4e0b\u6269\u5c55\u540d\u7684\u8f6c\u7801 (\u9017\u53f7\u5206\u5272): -TrTab2.9=\u5f3a\u5236\u5bf9\u4ee5\u4e0b\u6269\u5c55\u540d\u7684\u8f6c\u7801 (\u9017\u53f7\u5206\u5272): -TrTab2.10=\u5141\u8bb8\u76f4\u63a5\u4f20\u8f93 DTS \u5230\u63a5\u6536\u5668\u4e0a.\n\u6ce8\u610f\u6709\u53ef\u80fd\u5f97\u5230\u9759\u6b62\u7684\u58f0\u97f3. \u5907\u6ce8:\n- \u60a8\u5fc5\u987b\u62e5\u6709 DTS \u517c\u5bb9\u7684\u63a5\u6536\u5668, \u4ee5\u5149\u7ea4\u6570\u5b57\u63a5\u53e3\u6216 HDMI \u8fde\u63a5\n- \u5728 XMB \u4e2d\u7684\u97f3\u91cf\u5fc5\u987b\u4e3a '\u6b63\u5e38'\n- \u5728 XMB \u4e2d\u7684\u58f0\u9053\u5fc5\u987b\u4e3a '\u5de6+\u53f3'\n -TrTab2.11=\u5f15\u64ce -TrTab2.12=\u5e38\u7528\u89e3\u7801\u5668\u8bbe\u5b9a -TrTab2.13=\u5e38\u7528\u7f16\u7801\u5668\u8bbe\u5b9a -TrTab2.14=\u89c6\u9891\u6587\u4ef6\u5f15\u64ce -TrTab2.15=\u97f3\u9891\u6587\u4ef6\u5f15\u64ce -TrTab2.16=\u7f51\u7edc\u89c6\u9891\u6d41\u5f15\u64ce -TrTab2.17=\u7f51\u7edc\u97f3\u9891\u6d41\u5f15\u64ce -TrTab2.18=\u6742\u9879\u5f15\u64ce -TrTab2.19=\u5f15\u64ce\u6309\u7167\u964d\u5e8f -TrTab2.20=\u6392\u5217; \u6700\u9ad8\u7684\u4e3a\u9996\u4e2a -TrTab2.21=(\u4e0d\u652f\u6301 AviSynth ) -TrTab2.22=\u97f3\u9891\u81ea\u52a8\u91cd\u91c7\u6837\u81f3 44.1 \u6216 48 kHz -TrTab2.27=\u4f7f\u7528 LPCM \u97f3\u9891(\u65e0\u9700\u91cd\u7f16\u7801) -TrTab2.28=\u4fdd\u6301 DTS \u97f3\u8f68 (\u65e0\u9700\u91cd\u7f16\u7801, \u517c\u5bb9\u5177\u5907\u5149\u7ea4\u6216 HDMI \u8f93\u51fa\u7684\u97f3\u89c6\u9891\u63a5\u6536\u5668) -TrTab2.29=AC-3 \u97f3\u9891\u91cd\u7f16\u7801\u6bd4\u7279\u7387 (in Kibit/s) (\u4f8b\u5982: 576, 640): -TrTab2.32=MPEG-2 \u9009\u9879: -TrTab2.39=\u89c6\u9891\u5c06\u4f1a\u88ab\u81ea\u52a8\u8f6c\u7801\u5e76\u5c01\u88c5\u6210 MPEG-PS / AC-3 (\u9ad8\u5ea6\u517c\u5bb9 PS3) -TrTab2.40=\n\u60a8\u53ef\u4ee5\u5c1d\u8bd5\u8c03\u6574 vqscale, vqmin \u548c keyint \u53c2\u6570\u6765\u5b9e\u73b0\u4f18\u79c0\u751a\u81f3\u51e0\u4e4e\u65e0\u635f\u7684\u8f6c\u7801\u8d28\u91cf. -TrTab2.41=\n\u5f0a\u7aef\u662f\u53ef\u53d8\u6bd4\u7279\u7387\u5bfc\u81f4\u6709\u65f6\u5cf0\u503c\u4f1a\u8d85\u8fc7\u60a8\u7684\u6700\u5927\u7f51\u7edc\u5e26\u5bbdy. -TrTab2.42=\n\u8fd9\u5c31\u662f\u4e3a\u4f55\u60a8\u8fd8\u53ef\u4ee5\u5728\u65e0\u7ebf\u548c CPL \u7b49\u6761\u4ef6\u4e0b\u8bbe\u5b9a\u5e26\u5bbd\u7684\u539f\u56e0. \u4f46\u662f, \u8f6c\u7801\u8d28\u91cf -TrTab2.43=\n\u662f\u7f51\u7edc\u901f\u5ea6\u548c CPU \u6027\u80fd\u4e4b\u95f4\u7684\u5e73\u8861: \u60a8\u8d8a\u589e\u52a0\u56fa\u5b9a\u6bd4\u7279\u7387\u4ee5\u63d0\u5347\u8d28\u91cf, -TrTab2.44=\n\u60a8\u7684 CPU \u8d1f\u8f7d\u8d8a\u5927\! \u4f46\u662f, \u4e0d\u8981\u671f\u671b\u80fd\u5728 15Mbps \u6761\u4ef6\u4e0b\u8ba9 1080p \u7684\u52a8\u4f5c\u7535\u5f71\u53d6\u5f97\u5b8c\u7f8e\u8d28\u91cf :p -TrTab2.50=\u9002\u7528\u4e8e AC-3 \u91cd\u7f16\u7801\u7684\u6700\u5927\u97f3\u9891\u58f0\u9053\u6570: -TrTab2.51=\u5b8c\u5168\u7981\u7528\u5b57\u5e55 -TrTab2.52=\u7ae0\u8282 \#Transcode\# \u6587\u4ef6\u5939\u652f\u6301 / \u95f4\u9694\uff0c\u5355\u4f4d\u4e3a\u5206\u949f: -TrTab2.55=2 \u58f0\u9053 (\u7acb\u4f53\u58f0) -TrTab2.56=6 \u58f0\u9053 (5.1) -TrTab2.60=\u4f18\u79c0 -TrTab2.61=\u65e0\u635f -TrTab2.62=\u826f\u597d -TrTab2.63=\u826f\u597d, \u9002\u7528\u4e8e\u9ad8\u6e05\u65e0\u7ebf\u7f51\u7edc\u8f6c\u7801 -TrTab2.64=\u4e2d\u7b49, \u9002\u7528\u4e8e\u9ad8\u6e05\u65e0\u7ebf\u7f51\u7edc\u8f6c\u7801 -TrTab2.65=\u4f4e\u8d28, \u4f4e\u7aef CPU \u6216\u9ad8\u6e05\u65e0\u7ebf\u7f51\u7edc\u8f6c\u7801 -TracesTab.3=\u6e05\u9664 -TreeNodeSettings.4=\u8be5\u5f15\u64ce\u672a\u8f7d\u5165\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_zht.properties ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_zht.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/messages_zht.properties 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/messages_zht.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,303 +0,0 @@ -DLNAMediaDatabase.0=\u9700\u8981\u91cd\u65b0\u5efa\u7acb\u66ab\u5b58\u8cc7\u6599\u5eab\u3002\n\u62b1\u6b49\u7d66\u60a8\u5e36\u4f86\u4e0d\u4fbf\! -DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z -DLNAMediaDatabase.2=\u6e05\u7406\u8cc7\u6599\u5eab... -DLNAMediaDatabase.3=\u58d3\u7e2e\u8cc7\u6599\u5eab... -DLNAMediaDatabase.4=\u6383\u7784\u8cc7\u6599\u593e\uff1a -FFMpegDVRMSRemux.0=\u53ef\u9078 FFmpeg \u8def\u5f91: -FFMpegDVRMSRemux.1=\u7528\u65bc DVR-MS \u91cd\u5c01\u88dd\u7684\u8a2d\u5b9a -FFMpegVideo.0=AviSynth/FFmpeg \u5f15\u64ce\u7684\u7de8\u78bc\u5668\u8a2d\u5b9a(\u5efa\u8b70\u4f7f\u7528 AviSynth/MEncoder) -FFMpegVideo.1=FFmpeg \u5f15\u64ce\u7684\u7de8\u78bc\u5668\u8a2d\u5b9a -FoldTab.0=<\u6240\u6709\u786c\u789f> -FoldTab.1=\u5171\u4eab\u9078\u9805 -FoldTab.2=\u6383\u7784\u6240\u6709\u5171\u4eab\u8cc7\u6599\u593e -FoldTab.3=\u6383\u7784\u5168\u90e8\u5171\u4eab\u8cc7\u6599\u593e\u9700\u8981\u5927\u91cf\u6642\u9593\!\n -FoldTab.4=\u60a8\u78ba\u5b9a\u8981\u555f\u52d5\u6383\u7784?\n\n -FoldTab.5=\u96b1\u85cf\u6a94\u6848\u526f\u6a94\u540d -FoldTab.6=\u96b1\u85cf \#Video Settings\# \u8cc7\u6599\u593e -FoldTab.7=\u5171\u4eab\u8cc7\u6599\u593e -FoldTab.8=\u96b1\u85cf\u8f49\u78bc\u5f15\u64ce\u540d\u7a31 -FoldTab.9=\u65b0\u589e\u8cc7\u6599\u593e -FoldTab.10=\u60a8\u60f3\u8981\u505c\u6b62\u6383\u7784\u55ce?\n\n -FoldTab.11=\u5411 PS3 \u50b3\u9001\u8f49\u78bc\u904e\u7684\u5f71\u50cf (\u6ce8\u610f, \u6a94\u6848\u6c92\u6709\u56fa\u5b9a\u7684\u5927\u5c0f!\uff09 -FoldTab.12=\u6392\u5e8f\u5171\u4eab\u8cc7\u6599\u593e -FoldTab.13=\u7e2e\u5716 -FoldTab.14=\u4f7f\u7528 MPlayer \u751f\u6210\u5f71\u7247\u7e2e\u5716 -FoldTab.15=\u5b57\u6bcd\u9806\u5e8f (A-Z) -FoldTab.16=\u6309\u7167\u65e5\u671f, \u65b0\u7684\u5728\u524d -FoldTab.17=\u6309\u7167\u65e5\u671f, \u820a\u7684\u5728\u524d -FoldTab.18=\u6a94\u6848\u9806\u5e8f: -FoldTab.19=DVD ISO \u7e2e\u5716 -FoldTab.20=ASCII \u9806\u5e8f -FoldTab.21=\u5716\u7247\u7e2e\u5716 -FoldTab.22=\u5b57\u6bcd\u6578\u5b57\u9806\u5e8f -FoldTab.23=\u5f9e amazon.com \u4e0b\u8f09 -FoldTab.24=\u5f9e discogs.com \u4e0b\u8f09 -FoldTab.26=\u97f3\u6a02\u7e2e\u5716\u5c0e\u5165: -FoldTab.27=\u5099\u7528\u5f71\u7247\u5c01\u9762\u5716\u8cc7\u6599\u593e -FoldTab.28=\u9078\u64c7\u4e00\u500b\u8cc7\u6599\u593e -FoldTab.29=\u986f\u793a iPhoto \u76f8\u7247\u5eab -FoldTab.30=\u986f\u793a iTunes \u5a92\u9ad4\u5eab -FoldTab.31=\u96b1\u85cf\u7a7a\u6216\u7121\u5a92\u9ad4\u8cc7\u6599\u593e (\u6ce8\u610f: \u700f\u89bd\u901f\u5ea6\u6703\u8b8a\u6162) -FoldTab.32=\u96b1\u85cf\u66ab\u5b58\u8cc7\u6599\u593e -FoldTab.33=\u96b1\u85cf \#Transcode\# \u8cc7\u6599\u593e -FoldTab.34=\u986f\u793a aperture \u8cc7\u6599\u5eab -FoldTab.35=\u7121 -FontFileFilter.3=TrueType \u5b57\u578b -LinksTab.5=\u5e6b\u52a9\u9023\u7d50: -LinksTab.6=\u69cb\u5efa: -LooksFrame.5=\u9000\u51fa -LooksFrame.6=\u4e3b\u9762\u677f -LooksFrame.9=\u5132\u5b58 -LooksFrame.12=\u91cd\u555f\u4f3a\u670d\u5668 -LooksFrame.13=\u7531\u65bc\u8a2d\u5b9a\u8b8a\u66f4\u5fc5\u9808\u91cd\u555f\u4f3a\u670d\u5668 -LooksFrame.18=\u72c0\u614b -LooksFrame.19=\u7d00\u9304\u6a94 -LooksFrame.20=\u4e00\u822c\u8a2d\u5b9a -LooksFrame.21=\u8f49\u78bc\u8a2d\u5b9a -LooksFrame.22=\u700f\u89bd/\u5171\u4eab\u8a2d\u5b9a -LooksFrame.24=\u5e6b\u52a9 -LooksFrame.25=\u95dc\u65bc -LooksFrame.26=\u50c5\u7528\u65bc\u6e2c\u8a66\uff0c\u53ef\u80fd\u4e0d\u7a69\u5b9a!! -MEncoderAviSynth.2=\u7528\u65bc AviSynth \u5f15\u64ce\u7684\u5f71\u50cf\u89e3\u78bc\u8a2d\u5b9a -MEncoderAviSynth.3=\u555f\u7528 AviSynth \u8f49\u63db\u8b8a\u52d5\u4f4d\u5143\u7387\u70ba\u56fa\u5b9a\u4f4d\u5143\u7387\u53c3\u6578 (convertfps=true) -MEncoderAviSynth.4=# AviSynth \u8173\u672c\u73fe\u5728\u53ef\u4ee5\u5b8c\u5168\u81ea\u8a02\n -MEncoderAviSynth.5=# \u4ee5\u4e0b\u662f\u53ef\u4f7f\u7528\u7684\u8b8a\u6578:\n -MEncoderAviSynth.6=# : DirectShowSource \u6307\u4ee4, \u4f8b. DirectShowSource(filename, convertfps)\n -MEncoderAviSynth.7=# : \u5047\u5982\u5075\u6e2c\u5230(SRT/SUB/IDX/ASS/SSA)\u7b49\u5b57\u5e55\u7684\u8a71\uff0c\u5b57\u5e55\u6307\u4ee4\n -MEncoderAviSynth.8=# : \u5f71\u7247\u6a94\u6848\u540d\uff0c\u5982\u679c\u60a8\u60f3\u81ea\u5df1\u4fee\u6539\u8a2d\u5b9a\u6642\u4f7f\u7528\n -MEncoderAviSynth.10=\n -MEncoderAviSynth.11=\n -MEncoderVideo.0=\u8df3\u904e H.264 \u74b0\u5167\u53bb\u584a\u6ffe\u93e1. \u53ef\u80fd\u6703\u964d\u4f4e\u54c1\u8cea. -MEncoderVideo.1=\u7528\u65bc MEncoder \u5f15\u64ce\u7684\u5f71\u50cf\u97f3\u6548\u89e3\u78bc\u8a2d\u5b9a -MEncoderVideo.2=\u4f7f\u7528\u5099\u7528\u8072\u97f3\u5f71\u50cf\u540c\u6b65\u65b9\u6cd5 -MEncoderVideo.3=\u4f7f\u7528\u7a0b\u5f0f\u9810\u8a2d\u7de8\u78bc\u5668\u53c3\u6578 (\u63a8\u85a6!) -MEncoderVideo.4=\u5f37\u5236\u4f7f\u7528\u5f9e FFmpeg \u50b3\u905e\u4f86\u7684\u5e40\u7387 -MEncoderVideo.5=\u60a8\u53ef\u4ee5\u5728\u9019\u88e1\u65b0\u589e\u7279\u5225\u9078\u9805, \u6bd4\u5982\u964d\u566a\u6ffe\u93e1: -vf hqdn3d -MEncoderVideo.6=\u81ea\u5b9a\u9078\u9805: -MEncoderVideo.7=\u97f3\u6548\u8a9e\u8a00\u512a\u5148\u7d1a: -MEncoderVideo.8=\u5b57\u5e55\u8a2d\u5b9a -MEncoderVideo.9=\u5b57\u5e55\u8a9e\u8a00\u512a\u5148\u7d1a: -MEncoderVideo.10=\u97f3\u6548\u6216\u5b57\u5e55\u8a9e\u8a00\u512a\u5148\u7d1a (\u8209\u4f8b: en,off;jpn,eng) -MEncoderVideo.11=\u5b57\u5e55\u5b57\u5143\u96c6: -MEncoderVideo.12=\u8986\u84cb\u6a23\u5f0f\u5b57\u5e55\u8a2d\u5b9a: \u5b57\u578b\u7e2e\u653e -MEncoderVideo.13=\u5b57\u578b\u5916\u5f62 -MEncoderVideo.14=\u5b57\u578b\u9670\u5f71 -MEncoderVideo.15=\u5b57\u5e55\u908a\u8ddd (px) -MEncoderVideo.16=\u7d14\u6587\u5b57\u5b57\u5e55\u8a2d\u5b9a: \u5b57\u578b\u7e2e\u653e -MEncoderVideo.17=\u5b57\u578b\u5916\u5f62 -MEncoderVideo.18=\u5b57\u578b\u6a21\u7cca -MEncoderVideo.19=\u5b57\u5e55\u908a\u8ddd (%) -MEncoderVideo.20=\u4f7f\u7528 ASS/SSA \u5b57\u5e55\u6a23\u5f0f -MEncoderVideo.21=Fontconfig/\u5d4c\u5165\u5f0f \u5b57\u578b -MEncoderVideo.22=\u81ea\u52d5\u8f09\u5165\u5177\u6709\u76f8\u540c\u6a94\u6848\u540d\u7684 *.srt/*.sub \u5b57\u5e55 -MEncoderVideo.23=FriBiDi \u6a21\u5f0f(\u7531\u53f3\u5411\u5de6\u8a9e\u8a00) -MEncoderVideo.24=\u6307\u5b9a TrueType \u5b57\u578b (\u7528\u65bc\u5b57\u5e55): -MEncoderVideo.25=\u9078\u64c7\u4e00\u6b3e TrueType \u5b57\u578b -MEncoderVideo.26=\u9010\u884c\u6383\u7784\u7be9\u9078\u5668 -MEncoderVideo.27=\u4f7f\u7528\u5f71\u50cf\u7e2e\u653e\u5668 -MEncoderVideo.28=\u5bec\u5ea6 -MEncoderVideo.29=\u5c08\u5bb6\u8a2d\u5b9a : \u7de8\u78bc\u5668\u7279\u5b9a\u53c3\u6578 -MEncoderVideo.30=\u9ad8\u5ea6 -MEncoderVideo.31=\u5b57\u5e55\u984f\u8272 -MEncoderVideo.32=\u4fdd\u7559 AC3 \u97f3\u8ecc (\u4e0d\u91cd\u65b0\u7de8\u78bc, \u53ef\u80fd\u5c0e\u81f4\u5c0d\u8a71\u7121\u8072\u6216\u8005\u8072\u97f3\u5f71\u50cf\u540c\u6b65\u554f\u984c) -MEncoderVideo.33=\u81ea\u5b9a\u7fa9\u53c3\u6578: -MEncoderVideo.34=\u7de8\u8f2f\u7de8\u78bc\u5668\u7279\u5b9a\u53c3\u6578 -MEncoderVideo.35=\u555f\u7528\u591a\u6838 CPU \u652f\u63f4 -MEncoderVideo.36=\u4f7f\u7528\u5d4c\u5165\u6a23\u5f0f -MEncoderVideo.37=\u5099\u7528\u5b57\u5e55\u8cc7\u6599\u593e -MEncoderVideo.38=\u5982\u679c\u53ef\u80fd\u4f7f\u7528 tsMuxeR \u91cd\u65b0\u5c01\u88dd\u5f71\u50cf\u800c\u4e0d\u8f49\u78bc -MEncoderVideo.39=\u91cd\u65b0\u5c01\u88dd DVD ISO \u5f71\u50cf\u8ecc (\u7121\u91cd\u7de8\u78bc) -MEncoderVideo.68=\#\u4f60\u53ef\u4ee5\u70ba\u5404\u7a2e\u7de8\u78bc\u6307\u5b9a\u7279\u5225\u7684\u53c3\u6578.\n -MEncoderVideo.69=\#\u9019\u4e3b\u8981\u662f\u70ba\u4e86\u89e3\u6c7a\u5f71\u97f3\u540c\u6b65\u554f\u984c\uff0c\u4f46\u4f60\u4e5f\u53ef\u4ee5\u4f7f\u7528\u65bc\u5176\u4ed6\u76ee\u7684\n -MEncoderVideo.70=\#\u56e0\u70ba\u9019\u662f\u6bd4\u8f03\u5c08\u696d\u7684\u8a2d\u5b9a\u6240\u4ee5\u5982\u679c\u4f60\u4e0d\u77e5\u9053\u4f60\u5728\u505a\u4ec0\u9ebc\u8a71\u8acb\u4e0d\u8981\u4f7f\u7528\n -MEncoderVideo.71=\#\u8a9e\u6cd5\u70ba {java \u689d\u4ef6} :: {MEncoder \u9078\u9805} ; \u4f60\u53ef\u4ee5\u4f7f\u7528\u591a\u500b\u9078\u9805\n -MEncoderVideo.72=\#\u5141\u8a31\u7684\u53c3\u6578: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n -MEncoderVideo.73=\#\u6ce8\u610f, \u4efb\u4f55\u932f\u8aa4\u7684\u884c\u6703\u88ab\u6e05\u9664\n -MEncoderVideo.75=\#\u7279\u5225\u53c3\u6578:\n -MEncoderVideo.76=\# -noass: \u5b8c\u5168\u505c\u7528 ASS/SSA \u5b57\u5e55\u56e0\u5f71\u97f3\u4e0d\u540c\u6b65\n -MEncoderVideo.77=\# -nosync: \u5b8c\u5168\u505c\u7528\u505c\u7528\u5099\u7528\u5f71\u97f3\u540c\u6b65\u65b9\u6cd5 (-mc \u6709\u540c\u6a23\u7684\u6548\u679c)\n -MEncoderVideo.78=\# -quality: \u8986\u84cb\u5f71\u7247\u54c1\u8cea\u8a2d\u5b9a\n -MEncoderVideo.79=\# -mt: \u5f37\u5236\u4f7f\u7528\u591a\u57f7\u884c\u5e8f MEncoder \u7248\u672c\n -MEncoderVideo.80=\#\u6b64\u6e05\u55ae\u6703\u56e0\u70ba\u6642\u9593\u800c\u8b8a\u52d5: t\u5c0d\u65bc\u7de8\u78bc\u5668\u6216\u6a94\u6848\u7684\u53c3\u6578\u6539\u9032\u8207\u610f\u898b\u662f\u59cb\u7d42\u6b61\u8fce\u7684\n -MEncoderVideo.87=\#\u5e95\u4e0b\u4f60\u53ef\u4ee5\u65b0\u589e\u4f60\u81ea\u5df1\u7684\u689d\u4ef6\u8207\u9078\u9805 ! \u9019\u88e1\u6709\u4e00\u4e9b\u4f8b\u5b50: for example, to enable the mt build of MEncoder\n -MEncoderVideo.88=\#\u5c0d\u65bc\u4efb\u4f55 H.264 HD \u5167\u5bb9 (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n -MEncoderVideo.89=\#to remove 24p judder on a 50hz TV:framerate == 23.976 :: -speed 1.042709376 -ofps 25\n -MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles:vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync -MEncoderVideo.92=DVD/VOBsub \u5b57\u5e55\u54c1\u8cea (0-4) (\u8d8a\u9ad8\u8d8a\u597d): -MEncoderVideo.93=\u70ba\u904e\u88dc\u511f\u589e\u52a0\u908a\u6846: -MEncoderVideo.94=\u5f37\u5236\u5b57\u5e55: -MEncoderVideo.95=\u5f37\u5236\u6a19\u7c64: -MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ -MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ -MEncoderVideo.98=cp1252 /* Windows - Western Europe */ -MEncoderVideo.99=cp1253 /* Windows - Greek */ -MEncoderVideo.100=cp1254 /* Windows - Turkish */ -MEncoderVideo.101=cp1255 /* Windows - Hebrew */ -MEncoderVideo.102=cp1256 /* Windows - Arabic */ -MEncoderVideo.103=cp1257 /* Windows - Baltic */ -MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ -MEncoderVideo.105=ISO-8859-1 /* Western Europe */ -MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ -MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ -MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ -MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ -MEncoderVideo.110=ISO-8859-6 /* Arabic */ -MEncoderVideo.111=ISO-8859-7 /* Greek */ -MEncoderVideo.112=ISO-8859-8 /* Hebrew */ -MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ -MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ -MEncoderVideo.115=ISO-8859-11 /* Thai */ -MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ -MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ -MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ -MEncoderVideo.119=ISO-8859-16 /* Central European languages */ -MEncoderVideo.120=cp932 /* \u65e5\u6587 */ -MEncoderVideo.121=cp936 /* \u7c21\u9ad4\u4e2d\u6587 */ -MEncoderVideo.122=cp949 /* \u97d3\u6587 */ -MEncoderVideo.123=cp950 /* Big5, \u6b63\u9ad4\u4e2d\u6587, \u7cb5\u8a9e */ -MEncoderVideo.124=UTF-8 /* Unicode */ -MEncoderVideo.125=\u9078\u64c7\u5b57\u5e55\u984f\u8272 -MEncoderVideo.126=cht,tw,chi,chs -MEncoderVideo.127=cht,tw,chi,chs -MEncoderVideo.128=*,cht;*,tw;*,chi;*,* -MEncoderVideo.129=/* \u81ea\u52d5 */ -MEncoderVideo.130=enca:ru:cp1251 /* Russian (auto) */ -MEncoderVideo.131=enca:pl:cp1250 /* Eastern Europe (auto) */ -MEncoderVideo.132=enca:zh:big5 /* Chinese (auto) */ -NetworkTab.0=\u8a9e\u8a00 [\u9700\u8981\u91cd\u555f\u7a0b\u5f0f]: -NetworkTab.1=\u700f\u89bd\u58d3\u7e2e\u6a94\u6848 (.rar/.zip/.cbr) -NetworkTab.2=\u751f\u6210\u7e2e\u5716 -NetworkTab.3=\u555f\u52d5\u5f8c\u6700\u5c0f\u5316 -NetworkTab.4=\u5b89\u88dd\u70ba Windows \u670d\u52d9 -NetworkTab.5=\u5e38\u7528\u8a2d\u5b9a -NetworkTab.6=\u8f49\u78bc\u66ab\u5b58\u6700\u5927\u5c3a\u5bf8, \u4ee5MB\u70ba\u55ae\u4f4d (\u6700\u5927\u503c: MAX_BUFFER_SIZE): -NetworkTab.7=\u7528\u65bc\u8f49\u78bc\u7684\u6838\u5fc3\u6578 (\u60a8\u4f3c\u4e4e\u6709 %d): -NetworkTab.8=\u6aa2\u67e5\u66f4\u65b0 -NetworkTab.9=\u81ea\u52d5\u6aa2\u67e5 -NetworkTab.11=\u60a8\u5df2\u7d93\u5b89\u88dd\u70ba Windows \u670d\u52d9 \! \u8981\u4f7f\u7528\u5b83, \u60a8\u5fc5\u9808\u9000\u51fa\u8a72\u61c9\u7528\u7a0b\u5f0f,\n -NetworkTab.12=\u7136\u5f8c\u5f9e windows \u7ba1\u7406\u9762\u677f\u4e2d\u555f\u52d5 (\u4e26\u8a2d\u5b9a) \u670d\u52d9.\n\n -NetworkTab.13=\u5c07\u91cd\u65b0\u521d\u59cb\u5316\u66ab\u5b58 \!\n -NetworkTab.14=\u5b89\u88dd\u70ba Windows \u670d\u52d9\u6642\u51fa\u932f!\n -NetworkTab.15=\u700f\u89bd/\u50b3\u905e\u8a2d\u5b9a -NetworkTab.16=\u7e2e\u5716\u5c0b\u627e\u4f4d\u7f6e (\u6309\u79d2\u8a08\u7b97): -NetworkTab.17=\u555f\u7528\u66ab\u5b58 -NetworkTab.18=\u91cd\u7f6e\u66ab\u5b58 -NetworkTab.19=\u60a8\u78ba\u5b9a\u55ce? -NetworkTab.20=\u5f37\u884c\u6307\u5b9a\u7db2\u8def\u63a5\u53e3: -NetworkTab.22=\u7db2\u8def\u8a2d\u5b9a (\u9ad8\u7d1a) -NetworkTab.23=\u5f37\u884c\u6307\u5b9a\u4f3a\u670d\u5668 IP: -NetworkTab.24=\u5f37\u884c\u6307\u5b9a\u4f3a\u670d\u5668\u7aef\u53e3 (\u9810\u8a2d\u70ba 5001): -NetworkTab.25=PS3 \u8a2d\u5b9a -NetworkTab.26=\u60a8 PS3 \u6a94\u6848\u540d\u7684\u5b57\u5143\u96c6 (\u5728 XMB->\u4e3b\u6a5f\u8a2d\u5b9a->\u5b57\u5143\u96c6): -NetworkTab.27=\u60a8\u4e0d\u8a72\u4f7f\u7528\u7684\u672a\u7528\u8a2d\u5b9a :p -NetworkTab.28=Turbo \u6a21\u5f0f (enable tcp_nodelay) / \u6ce8\u610f, \u4e0d\u78ba\u5b9a\u662f\u5426\u53ef\u7528 -NetworkTab.29=\u7576\u8f49\u78bc\u958b\u59cb\u5f8c\u963b\u6b62\u4f86\u81ea PS3 \u5c0d\u540c\u4e00\u6a94\u6848\u7684\u8acb\u6c42 -NetworkTab.30=\u4f7f\u7528 IP \u904e\u6ffe\u5668: -NetworkTab.31=\u9ad8\u7d1a HTTP \u548c\u7cfb\u7d71\u8a2d\u5b9a -NetworkTab.32=HTTP \u5f15\u64ce V2 -NetworkTab.33=\u5728\u4e32\u6d41\u5a92\u9ad4\u6642\u963b\u6b62\u64cd\u4f5c\u7cfb\u7d71\u4f11\u7720 -NetworkTab.34=\u63d2\u4ef6 -NetworkTab.35=\u4ee5 Mb/s \u70ba\u55ae\u4f4d\u6700\u5927\u983b\u5bec(0 \u4ee3\u8868\u4e0d\u9650\u5236): -NetworkTab.36=\u82e5\u81ea\u52d5\u6aa2\u6e2c\u5931\u6557\u7684\u9810\u8a2d\u6e32\u67d3\u5668: -NetworkTab.37=\u672a\u77e5\u6e32\u67d3\u5668 -NetworkTab.38=\u5f37\u5236\u4f7f\u7528\u9810\u8a2d\u6e32\u67d3\u5668 (\u505c\u7528\u81ea\u52d5\u6aa2\u6e2c) -PMS.0=\u672a\u767c\u73fe\u6e32\u67d3\u5668 -PMS.1=\u97f3\u6548 -PMS.2=\#- \u66ab\u5b58 -\# -PMS.3=\u8072\u97f3\u5f71\u50cf\u540c\u6b65\u53ef\u9078\u65b9\u6cd5 -PMS.4=\u9010\u884c\u6383\u7784\u7be9\u9078\u5668 -PMS.5=\u5df2\u9023\u63a5\u81f3 PS3 -PMS.6=\u81ea\u52d5\u8f09\u5165 .srt/.sub \u5b57\u5e55 -PMS.7=\u8df3\u904e H.264 \u89e3\u78bc\u74b0\u5167\u53bb\u584a\u6ffe\u93e1 (\u6703\u964d\u4f4e\u54c1\u8cea) -PMS.8=\u5b57\u5e55 -PMS.9=\u5168\u90e8\u97f3\u6548\u64ad\u653e\u6e05\u55ae -PMS.10=\u5b8c\u5168\u505c\u7528\u5b57\u5e55 -PMS.11=\u6240\u6709\u97f3\u6548\u8ecc\u9053 -PMS.12=\u6309\u65e5\u671f -PMS.13=\u6309\u85dd\u8853\u5bb6 -PMS.14=\u9810\u8a2d\u4f7f\u7528 MEncoder \u91cd\u5c01\u88dd H.264 -PMS.16=\u6309\u5c08\u8f2f -PMS.17=\u672a\u77e5\u6e32\u67d3\u5668 -PMS.18=\u5df2\u9023\u63a5 -PMS.19=\u6309\u98a8\u683c -PMS.21=\u6309\u76f8\u6a5f\u578b\u865f -PMS.22=\u6309\u85dd\u8853\u5bb6/\u5c08\u8f2f -PMS.25=\u6309 ISO \u8a2d\u5b9a -PMS.26=\u6309\u98a8\u683c/\u85dd\u8853\u5bb6/\u5c08\u8f2f -PMS.27=\u5132\u5b58\u8a2d\u5b9a -PMS.28=\u6309\u5b57\u6bcd/\u85dd\u8853\u5bb6/\u5c08\u8f2f -PMS.31=\u7167\u7247 -PMS.32=\u6240\u6709\u7167\u7247 -PMS.34=\u5f71\u50cf -PMS.35=\u6240\u6709\u5f71\u50cf -PMS.36=\u9ad8\u756b\u8cea\u5f71\u50cf -PMS.37=\#- \u5f71\u50cf\u8a2d\u5b9a -\# -PMS.39=\u666e\u901a\u756b\u8cea\u5f71\u50cf -PMS.40=DVD \u93e1\u50cf -PMS.41=(\u91cd)\u5b89\u88dd Win32 \u670d\u52d9 -PMS.130=\u641c\u5c0b\u6e32\u67d3\u5668... -ProfileChooser.1=PS3 \u5a92\u9ad4\u4f3a\u670d\u5668\u8a2d\u5b9a\u6a94\u6848\u9078\u64c7\u5668 -ProfileChooser.2=\u9078\u64c7 -ProfileChooser.3=\u8a2d\u5b9a\u6a94\u6848 (.conf) \u6216\u8cc7\u6599\u593e -StatusTab.2=\u72c0\u614b -StatusTab.3=\u7b49\u5f85... -StatusTab.5=\u7a7a -StatusTab.6=\u8f49\u78bc\u66ab\u5b58\u72c0\u614b: -StatusTab.7=I/O \u7d71\u8a08: -StatusTab.8=\u76ee\u524d\u4f4d\u5143\u7387: -StatusTab.9=\u76e3\u6e2c\u5230\u5a92\u9ad4\u6e32\u67d3\u5668 -StatusTab.10=\u5cf0\u503c\u4f4d\u5143\u7387: -StatusTab.11=Mb/s -StatusTab.12=MB -TSMuxerVideo.0=\u4f7f\u7528 MEncoder \u5206\u96e2\u4e26\u7de8\u78bc\u6240\u6709\u97f3\u8ecc\u70ba AC3 -TSMuxerVideo.1=\u4f7f\u7528 MEncoder \u5206\u96e2\u4e26\u7de8\u78bc DTS/FLAC \u97f3\u8ecc\u70ba LPCM [\u6ce8\u610f, \u8df3\u88dd\u5c1a\u4e0d\u53ef\u7528] -TSMuxerVideo.2=\u5728\u5143\u8cc7\u6599\u6a94\u6848\u4e2d\u5f37\u5236\u4f7f\u7528\u4f86\u81ea FFmpeg \u7684 FPS \u5206\u6790\u7d50\u679c -TSMuxerVideo.3=\u50c5\u9069\u7528\u65bc tsMuxeR \u5f15\u64ce\u7684\u5f71\u50cf\u89e3\u78bc\u8a2d\u5b9a -TSMuxerVideo.19=\u5c01\u88dd\u6240\u6709\u97f3\u8ecc -TrTab2.0=\u555f\u7528/\u505c\u7528\u4e00\u500b\u8f49\u78bc\u5f15\u64ce -TrTab2.1=\u73fe\u5728\u6c92\u6709\u8a2d\u5b9a -TrTab2.2=\u7528\u65bc\u4e0b\u5217\u5f15\u64ce\u7684\u5f71\u50cf\u7de8\u78bc\u5668\u8a2d\u5b9a: MEncoder/AviSynth/FFmpeg -TrTab2.3=\u7528\u65bc\u4e0b\u5217\u89e3\u78bc\u5668\u7684\u97f3\u6548\u8a2d\u5b9a: MEncoder/AviSynth/FFmpeg/tsMuxeR -TrTab2.4=\u5f71\u50cf\u54c1\u8cea\u8a2d\u5b9a -TrTab2.5=\u5e38\u7528\u8f49\u78bc\u8a2d\u5b9a -TrTab2.6=\u6392\u5e8f\u8f49\u78bc\u5f15\u64ce\u6e05\u55ae. \u9996\u500b\u5c07\u51fa\u73fe\u5728\u539f\u59cb\u5f71\u50cf\u8cc7\u6599\u593e -TrTab2.7=\u96dc\u9805 -TrTab2.8=\u8df3\u904e\u4ee5\u4e0b\u526f\u6a94\u540d\u7684\u8f49\u78bc (\u9017\u865f\u5206\u5272): -TrTab2.9=\u5f37\u5236\u5c0d\u4ee5\u4e0b\u526f\u6a94\u540d\u7684\u8f49\u78bc (\u9017\u865f\u5206\u5272): -TrTab2.10=\u5141\u8a31\u76f4\u63a5\u50b3\u8f38 DTS \u5230\u63a5\u6536\u5668\u4e0a.\n\u6ce8\u610f\u6709\u53ef\u80fd\u5f97\u5230\u975c\u6b62\u7684\u8072\u97f3. \u5099\u8a3b:\n- \u60a8\u5fc5\u9808\u64c1\u6709 DTS \u76f8\u5bb9\u7684\u63a5\u6536\u5668, \u4ee5\u5149\u7e96\u6578\u4f4d\u63a5\u53e3\u6216 HDMI \u9023\u63a5\n- \u5728 XMB \u4e2d\u7684\u97f3\u91cf\u5fc5\u9808\u70ba '\u6b63\u5e38'\n- \u5728 XMB \u4e2d\u7684\u8072\u9053\u5fc5\u9808\u70ba '\u5de6+\u53f3'\n -TrTab2.11=\u5f15\u64ce -TrTab2.12=\u5e38\u7528\u89e3\u78bc\u5668\u8a2d\u5b9a -TrTab2.13=\u5e38\u7528\u7de8\u78bc\u5668\u8a2d\u5b9a -TrTab2.14=\u5f71\u50cf\u6a94\u6848\u5f15\u64ce -TrTab2.15=\u97f3\u6548\u6a94\u6848\u5f15\u64ce -TrTab2.16=\u7db2\u8def\u5f71\u50cf\u6d41\u5f15\u64ce -TrTab2.17=\u7db2\u8def\u97f3\u6548\u6d41\u5f15\u64ce -TrTab2.18=\u96dc\u9805\u5f15\u64ce -TrTab2.19=\u5f15\u64ce\u6309\u7167\u964d\u5e8f -TrTab2.20=\u6392\u5217; \u6700\u9ad8\u7684\u70ba\u9996\u500b -TrTab2.21=(\u4e0d\u652f\u63f4 AviSynth ) -TrTab2.22=\u97f3\u6548\u81ea\u52d5\u91cd\u63a1\u6a23\u81f3 44.1 \u6216 48 kHz -TrTab2.27=\u4f7f\u7528 LPCM \u97f3\u6548(\u7121\u9700\u91cd\u7de8\u78bc) -TrTab2.28=\u4fdd\u6301 DTS \u97f3\u8ecc (\u7121\u9700\u91cd\u7de8\u78bc, \u76f8\u5bb9\u5177\u5099\u5149\u7e96\u6216 HDMI \u8f38\u51fa\u7684\u8072\u97f3\u5f71\u50cf\u63a5\u6536\u5668) -TrTab2.29=AC3 \u97f3\u6548\u91cd\u7de8\u78bc\u4f4d\u5143\u7387 (in Kibit/s) (\u4f8b\u5982: 576, 640): -TrTab2.32=MPEG-2 \u9078\u9805: -TrTab2.39=\u5f71\u50cf\u5c07\u6703\u88ab\u81ea\u52d5\u8f49\u78bc\u4e26\u5c01\u88dd\u6210 MPEG-PS / AC3 (\u9ad8\u5ea6\u76f8\u5bb9 PS3) -TrTab2.40=\n\u60a8\u53ef\u4ee5\u5617\u8a66\u8abf\u6574 vqscale, vqmin \u548c keyint \u53c3\u6578\u4f86\u5be6\u73fe\u512a\u79c0\u751a\u81f3\u5e7e\u4e4e\u7121\u640d\u7684\u8f49\u78bc\u54c1\u8cea. -TrTab2.41=\n\u5f0a\u7aef\u662f\u53ef\u8b8a\u4f4d\u5143\u7387\u5c0e\u81f4\u6709\u6642\u5cf0\u503c\u6703\u8d85\u904e\u60a8\u7684\u6700\u5927\u7db2\u8def\u983b\u5becy. -TrTab2.42=\n\u9019\u5c31\u662f\u70ba\u4f55\u60a8\u9084\u53ef\u4ee5\u5728\u7121\u7dda\u548c CPL \u7b49\u689d\u4ef6\u4e0b\u8a2d\u5b9a\u983b\u5bec\u7684\u539f\u56e0. \u4f46\u662f, \u8f49\u78bc\u54c1\u8cea -TrTab2.43=\n\u662f\u7db2\u8def\u901f\u5ea6\u548c CPU \u6027\u80fd\u4e4b\u9593\u7684\u5e73\u8861: \u60a8\u8d8a\u589e\u52a0\u56fa\u5b9a\u4f4d\u5143\u7387\u4ee5\u63d0\u5347\u54c1\u8cea, -TrTab2.44=\n\u60a8\u7684 CPU \u8ca0\u8f09\u8d8a\u5927\! \u4f46\u662f, \u4e0d\u8981\u671f\u671b\u80fd\u5728 15Mbps \u689d\u4ef6\u4e0b\u8b93 1080p \u7684\u52d5\u4f5c\u96fb\u5f71\u53d6\u5f97\u5b8c\u7f8e\u54c1\u8cea :p -TrTab2.50=\u9069\u7528\u65bc AC3 \u91cd\u7de8\u78bc\u7684\u6700\u5927\u97f3\u6548\u8072\u9053\u6578: -TrTab2.51=\u5b8c\u5168\u505c\u7528\u5b57\u5e55 -TrTab2.52=\u7ae0\u7bc0 \#Transcode\# \u8cc7\u6599\u593e\u652f\u63f4 / \u9593\u9694\uff0c\u55ae\u4f4d\u70ba\u5206\u9418: -TrTab2.55=2 \u8072\u9053 (\u7acb\u9ad4\u8072) -TrTab2.56=6 \u8072\u9053 (5.1) -TrTab2.60=\u512a\u79c0 -TrTab2.61=\u7121\u640d -TrTab2.62=\u826f\u597d -TrTab2.63=\u826f\u597d, \u9069\u7528\u65bc\u9ad8\u756b\u8cea\u7121\u7dda\u7db2\u8def\u8f49\u78bc -TrTab2.64=\u4e2d\u7b49, \u9069\u7528\u65bc\u9ad8\u756b\u8cea\u7121\u7dda\u7db2\u8def\u8f49\u78bc -TrTab2.65=\u4f4e\u8cea, \u4f4e\u7aef CPU \u6216\u9ad8\u756b\u8cea\u7121\u7dda\u7db2\u8def\u8f49\u78bc -TracesTab.3=\u6e05\u9664 -TreeNodeSettings.4=\u8a72\u5f15\u64ce\u672a\u8f09\u5165\! -TranscodeVirtualFolder.0=\#--\u8f49\u78bc--\# diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/HTTPResource.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/HTTPResource.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/HTTPResource.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/HTTPResource.java 2013-04-22 19:41:39.000000000 +0000 @@ -35,7 +35,7 @@ /** * Implements any item that can be transfered through the HTTP pipes. - * In the PMS case, this item represent media files. + * In the PMS case, this item represents media files. * @see DLNAResource */ public class HTTPResource { @@ -63,8 +63,8 @@ public static final String TIFF_TYPEMIME = "image/tiff"; public static final String GIF_TYPEMIME = "image/gif"; public static final String BMP_TYPEMIME = "image/bmp"; - public HTTPResource() { - } + + public HTTPResource() { } /** * Returns for a given item type the default MIME type associated. This is used in the HTTP transfers @@ -74,6 +74,7 @@ */ public static String getDefaultMimeType(int type) { String mimeType = HTTPResource.UNKNOWN_VIDEO_TYPEMIME; + if (type == Format.VIDEO) { mimeType = HTTPResource.UNKNOWN_VIDEO_TYPEMIME; } else if (type == Format.IMAGE) { @@ -81,22 +82,25 @@ } else if (type == Format.AUDIO) { mimeType = HTTPResource.UNKNOWN_AUDIO_TYPEMIME; } + return mimeType; } /** - * Returns a InputStream associated to the fileName. + * Returns a InputStream associated with the fileName. * @param fileName TODO Absolute or relative file path. - * @return If found, an InputStream associated to the fileName. null otherwise. + * @return If found, an InputStream associated with the fileName. null otherwise. */ protected InputStream getResourceInputStream(String fileName) { fileName = "/resources/" + fileName; ClassLoader cll = this.getClass().getClassLoader(); InputStream is = cll.getResourceAsStream(fileName.substring(1)); + while (is == null && cll.getParent() != null) { cll = cll.getParent(); is = cll.getResourceAsStream(fileName.substring(1)); } + return is; } @@ -104,8 +108,8 @@ * Creates an InputStream based on a URL. This is used while accessing external resources * like online radio stations. * @param u URL. - * @param saveOnDisk If true, the file is first downloaded in the harddisk in the temporary folder. - * @return InputStream that can be used for sending to the UPNP Media Renderer. + * @param saveOnDisk If true, the file is first downloaded to the temporary folder. + * @return InputStream that can be used for sending to the media renderer. * @throws IOException * @see #downloadAndSendBinary(String) */ @@ -133,12 +137,12 @@ } } - byte content[] = downloadAndSendBinary(u, saveOnDisk, f); + byte[] content = downloadAndSendBinary(u, saveOnDisk, f); return new ByteArrayInputStream(content); } /** - * Overloaded method for {@link #downloadAndSendBinary(String, boolean, File)}, without storing any file in the harddisk. + * Overloaded method for {@link #downloadAndSendBinary(String, boolean, File)}, without storing a file on the filesystem. * @param u URL to retrieve. * @return byte array. * @throws IOException @@ -148,10 +152,10 @@ } /** - * Returns a byte array representation of a file given by an URL. File is downloaded and optionally stored in the harddisk. + * Returns a byte array representation of the file given by the URL. The file is downloaded and optionally stored on the filesystem. * @param u URL to retrieve. - * @param saveOnDisk If true, store the file in the harddisk. - * @param f If saveOnDisk is true, then store the contents of the file represented by u into the associated File. f needs to be opened before + * @param saveOnDisk If true, store the file on the filesystem. + * @param f If saveOnDisk is true, then store the contents of the file represented by u in the associated File. f needs to be opened before * calling this function. * @return The byte array * @throws IOException @@ -170,34 +174,40 @@ conn.setRequestProperty("User-agent", PropertiesUtil.getProjectProperties().get("project.name") + " " + PMS.getVersion()); InputStream in = conn.getInputStream(); FileOutputStream fOUT = null; + if (saveOnDisk && f != null) { - //fileName = convertURLToFileName(fileName); + // fileName = convertURLToFileName(fileName); fOUT = new FileOutputStream(f); } - byte buf[] = new byte[4096]; + + byte[] buf = new byte[4096]; int n = -1; + while ((n = in.read(buf)) > -1) { bytes.write(buf, 0, n); + if (fOUT != null) { fOUT.write(buf, 0, n); } } + in.close(); + if (fOUT != null) { fOUT.close(); } + return bytes.toByteArray(); } - /** - * Returns an associated MIME type related to the Media Renderer. Some Media Renderer might need that the MIME type is not the correct one. - * @param mimetype MIME type to transform. - * @param mediarenderer Specific Media Renderer. + * Returns the supplied MIME type customized for the supplied media renderer according to the renderer's aliasing rules. + * @param mimetype MIME type to customize. + * @param renderer media renderer to customize the MIME type for. * @return The MIME type */ - public String getRendererMimeType(String mimetype, RendererConfiguration mediarenderer) { - return mediarenderer.getMimeType(mimetype); + public String getRendererMimeType(String mimetype, RendererConfiguration renderer) { + return renderer.getMimeType(mimetype); } public int getDLNALocalesCount() { @@ -208,6 +218,7 @@ if (index == 1 || index == 2) { return "MPEG_PS_NTSC"; } + return "MPEG_PS_PAL"; } @@ -215,9 +226,11 @@ if (index == 1) { return "MPEG_TS_SD_NA_ISO"; } + if (index == 2) { return "MPEG_TS_SD_JP_ISO"; } + return "MPEG_TS_SD_EU_ISO"; } @@ -225,9 +238,11 @@ if (index == 1) { return "MPEG_TS_SD_NA"; } + if (index == 2) { return "MPEG_TS_SD_JP"; } + return "MPEG_TS_SD_EU"; } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/NetworkConfiguration.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/NetworkConfiguration.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/NetworkConfiguration.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/NetworkConfiguration.java 2013-04-22 19:41:39.000000000 +0000 @@ -148,7 +148,9 @@ * {@link #getInstance()} to retrieve an instance. */ private NetworkConfiguration(Enumeration networkInterfaces) { - checkNetworkInterface(networkInterfaces, null); + System.setProperty("java.net.preferIPv4Stack", "true"); + + checkNetworkInterface(networkInterfaces, null); } /** diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/Request.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/Request.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/Request.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/Request.java 2013-04-22 19:41:39.000000000 +0000 @@ -197,9 +197,11 @@ String id = argument.substring(argument.indexOf("get/") + 4, argument.lastIndexOf("/")); id = id.replace("%24", "$"); // popcorn hour ? List files = PMS.get().getRootFolder(mediaRenderer).getDLNAResources(id, false, 0, 0, mediaRenderer); + if (transferMode != null) { output(output, "TransferMode.DLNA.ORG: " + transferMode); } + if (files.size() == 1) { // DNLAresource was found. dlna = files.get(0); @@ -211,9 +213,11 @@ output(output, "Accept-Ranges: bytes"); output(output, "Expires: " + getFUTUREDATE() + " GMT"); output(output, "Connection: keep-alive"); + if (mediaRenderer.isMediaParserV2()) { dlna.checkThumbnail(); } + inputStream = dlna.getThumbnailInputStream(); } else if (fileName.indexOf("subtitle0000") > -1) { // This is a request for a subtitle file @@ -224,7 +228,11 @@ if (subs != null && !subs.isEmpty()) { // TODO: maybe loop subs to get the requested subtitle type instead of using the first one DLNAMediaSubtitle sub = subs.get(0); - inputStream = new java.io.FileInputStream(sub.getExternalFile()); + // XXX external file is null if the first subtitle track is embedded: + // http://www.ps3mediaserver.org/forum/viewtopic.php?f=3&t=15805&p=75534#p75534 + if (sub.isExternal()) { + inputStream = new java.io.FileInputStream(sub.getExternalFile()); + } } } else { // This is a request for a regular file. @@ -267,10 +275,12 @@ if (StringUtils.isNotBlank(media.getContainer())) { name += " [container: " + media.getContainer() + "]"; } + if (StringUtils.isNotBlank(media.getCodecV())) { name += " [video: " + media.getCodecV() + "]"; } } + PMS.get().getFrame().setStatusLine("Serving " + name); // Response generation: @@ -339,6 +349,7 @@ } else { output(output, "Content-Type: image/jpeg"); } + output(output, "Accept-Ranges: bytes"); output(output, "Connection: keep-alive"); output(output, "Expires: " + getFUTUREDATE() + " GMT"); @@ -359,6 +370,7 @@ s = s.replace("[uuid]", PMS.get().usn());//.substring(0, PMS.get().usn().length()-2)); s = s.replace("[host]", PMS.get().getServer().getHost()); s = s.replace("[port]", "" + PMS.get().getServer().getPort()); + if (xbox) { LOGGER.debug("DLNA changes for Xbox 360"); s = s.replace("PS3 Media Server", "PS3 Media Server [" + profileName + "] : Windows Media Connect"); @@ -374,6 +386,7 @@ } else { s = s.replace("PS3 Media Server", "PS3 Media Server [" + profileName + "]"); } + inputStream = new ByteArrayInputStream(s.getBytes()); } } else if (method.equals("POST") && (argument.contains("MS_MediaReceiverRegistrar_control") || argument.contains("mrr/control"))) { @@ -382,6 +395,7 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); response.append(CRLF); + if (soapaction != null && soapaction.contains("IsAuthorized")) { response.append(HTTPXMLHelper.XBOX_2); response.append(CRLF); @@ -389,11 +403,13 @@ response.append(HTTPXMLHelper.XBOX_1); response.append(CRLF); } + response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); } else if (method.equals("POST") && argument.endsWith("upnp/control/connection_manager")) { output(output, CONTENT_TYPE_UTF8); - if (soapaction.indexOf("ConnectionManager:1#GetProtocolInfo") > -1) { + + if (soapaction != null && soapaction.indexOf("ConnectionManager:1#GetProtocolInfo") > -1) { response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -404,8 +420,11 @@ response.append(CRLF); } } else if (method.equals("SUBSCRIBE")) { - if(soapaction==null) //ignore this + if (soapaction == null) { + // ignore this return; + } + output(output, CONTENT_TYPE_UTF8); output(output,"Content-Length: 0"); output(output,"Connection: close"); @@ -414,7 +433,7 @@ output(output,"Timeout: Second-1800"); output(output,""); output.flush(); - //output.close(); + // output.close(); String cb = soapaction.replace("<", "").replace(">", ""); @@ -436,14 +455,13 @@ LOGGER.debug("Cannot parse address and port from soap action \"" + soapaction + "\"", ex); } - if(argument.contains("connection_manager")) { + if (argument.contains("connection_manager")) { response.append(HTTPXMLHelper.eventHeader("urn:schemas-upnp-org:service:ConnectionManager:1")); response.append(HTTPXMLHelper.eventProp("SinkProtocolInfo")); response.append(HTTPXMLHelper.eventProp("SourceProtocolInfo")); response.append(HTTPXMLHelper.eventProp("CurrentConnectionIDs")); response.append(HTTPXMLHelper.EVENT_FOOTER); - } - else if(argument.contains("content_directory")) { + } else if (argument.contains("content_directory")) { response.append(HTTPXMLHelper.eventHeader("urn:schemas-upnp-org:service:ContentDirectory:1")); response.append(HTTPXMLHelper.eventProp("TransferIDs")); response.append(HTTPXMLHelper.eventProp("ContainerUpdateIDs")); @@ -452,7 +470,8 @@ } } else if (method.equals("POST") && argument.endsWith("upnp/control/content_directory")) { output(output, CONTENT_TYPE_UTF8); - if (soapaction.indexOf("ContentDirectory:1#GetSystemUpdateID") > -1) { + + if (soapaction != null && soapaction.indexOf("ContentDirectory:1#GetSystemUpdateID") > -1) { response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -465,7 +484,7 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - } else if (soapaction.indexOf("ContentDirectory:1#GetSortCapabilities") > -1) { + } else if (soapaction != null && soapaction.indexOf("ContentDirectory:1#GetSortCapabilities") > -1) { response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -474,7 +493,7 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - } else if (soapaction.indexOf("ContentDirectory:1#X_GetFeatureList") > -1) { // Added for Samsung 2012 TVs + } else if (soapaction != null && soapaction.indexOf("ContentDirectory:1#X_GetFeatureList") > -1) { // Added for Samsung 2012 TVs response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -483,7 +502,7 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - } else if (soapaction.indexOf("ContentDirectory:1#GetSearchCapabilities") > -1) { + } else if (soapaction != null && soapaction.indexOf("ContentDirectory:1#GetSearchCapabilities") > -1) { response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -492,10 +511,11 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - } else if (soapaction.contains("ContentDirectory:1#Browse") || soapaction.contains("ContentDirectory:1#Search")) { - //LOGGER.trace(content); + } else if (soapaction != null && (soapaction.contains("ContentDirectory:1#Browse") + || soapaction.contains("ContentDirectory:1#Search"))) { objectID = getEnclosingValue(content, "", ""); String containerID = null; + if ((objectID == null || objectID.length() == 0) && xbox) { containerID = getEnclosingValue(content, "", ""); if (!containerID.contains("$")) { @@ -505,12 +525,15 @@ containerID = null; } } + Object sI = getEnclosingValue(content, "", ""); Object rC = getEnclosingValue(content, "", ""); browseFlag = getEnclosingValue(content, "", ""); + if (sI != null) { startingIndex = Integer.parseInt(sI.toString()); } + if (rC != null) { requestCount = Integer.parseInt(rC.toString()); } @@ -519,17 +542,19 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); response.append(CRLF); - if (soapaction.contains("ContentDirectory:1#Search")) { + + if (soapaction != null && soapaction.contains("ContentDirectory:1#Search")) { response.append(HTTPXMLHelper.SEARCHRESPONSE_HEADER); } else { response.append(HTTPXMLHelper.BROWSERESPONSE_HEADER); } + response.append(CRLF); response.append(HTTPXMLHelper.RESULT_HEADER); response.append(HTTPXMLHelper.DIDL_HEADER); - if (soapaction.contains("ContentDirectory:1#Search")) { + if (soapaction != null && soapaction.contains("ContentDirectory:1#Search")) { browseFlag = "BrowseDirectChildren"; } @@ -555,13 +580,21 @@ } } - List files = PMS.get().getRootFolder(mediaRenderer).getDLNAResources(objectID, browseFlag != null && browseFlag.equals("BrowseDirectChildren"), startingIndex, requestCount, mediaRenderer); + List files = PMS.get().getRootFolder(mediaRenderer).getDLNAResources( + objectID, + browseFlag != null && browseFlag.equals("BrowseDirectChildren"), + startingIndex, + requestCount, + mediaRenderer + ); + if (searchCriteria != null && files != null) { for (int i = files.size() - 1; i >= 0; i--) { if (!files.get(i).getName().equals(searchCriteria)) { files.remove(i); } } + if (files.size() > 0) { files = files.get(0).getChildren(); } @@ -573,6 +606,7 @@ if (xbox && containerID != null) { uf.setFakeParentId(containerID); } + if (uf.isCompatible(mediaRenderer) && (uf.getPlayer() == null || uf.getPlayer().isPlayerCompatible(mediaRenderer))) { response.append(uf.toString(mediaRenderer)); } else { @@ -580,20 +614,25 @@ } } } + response.append(HTTPXMLHelper.DIDL_FOOTER); response.append(HTTPXMLHelper.RESULT_FOOTER); response.append(CRLF); int filessize = 0; + if (files != null) { filessize = files.size(); } + response.append("").append(filessize - minus).append(""); response.append(CRLF); DLNAResource parentFolder = null; + if (files != null && filessize > 0) { parentFolder = files.get(0).getParent(); } + if (browseFlag != null && browseFlag.equals("BrowseDirectChildren") && mediaRenderer.isMediaParserV2() && mediaRenderer.isDLNATreeHack()) { // with the new parser, files are parsed and analyzed *before* // creating the DLNA tree, every 10 items (the ps3 asks 10 by 10), @@ -602,35 +641,40 @@ // invalidated and hidden if format is broken or encrypted, etc.). // let's send a fake total size to force the renderer to ask following items int totalCount = startingIndex + requestCount + 1; // returns 11 when 10 asked - if (filessize - minus <= 0) // if no more elements, send startingIndex - { + if (filessize - minus <= 0) { // if no more elements, send startingIndex totalCount = startingIndex; } + response.append("").append(totalCount).append(""); - } - else if(browseFlag!=null && browseFlag.equals("BrowseDirectChildren")) + } else if (browseFlag!=null && browseFlag.equals("BrowseDirectChildren")) { response.append("").append(((parentFolder != null) ? parentFolder.childrenNumber() : filessize) - minus).append(""); - else - //from upnp spec: If BrowseMetadata is specified in the BrowseFlags then TotalMatches = 1 + } else { + // from upnp spec: If BrowseMetadata is specified in the BrowseFlags then TotalMatches = 1 response.append("1"); + } + response.append(CRLF); response.append(""); + if (parentFolder != null) { response.append(parentFolder.getUpdateId()); } else { response.append("1"); } + response.append(""); response.append(CRLF); - if (soapaction.contains("ContentDirectory:1#Search")) { + + if (soapaction != null && soapaction.contains("ContentDirectory:1#Search")) { response.append(HTTPXMLHelper.SEARCHRESPONSE_FOOTER); } else { response.append(HTTPXMLHelper.BROWSERESPONSE_FOOTER); } + response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - //LOGGER.trace(response.toString()); + // LOGGER.trace(response.toString()); } } @@ -668,17 +712,20 @@ output(output, ""); int sendB = 0; + if (lowRange != DLNAMediaInfo.ENDFILE_POS && !method.equals("HEAD")) { sendB = sendBytes(inputStream); //, ((lowRange > 0 && highRange > 0)?(highRange-lowRange):-1) } + LOGGER.trace("Sending stream: " + sendB + " bytes of " + argument); PMS.get().getFrame().setStatusLine(null); - } else { + } else { // inputStream is null if (lowRange > 0 && highRange > 0) { output(output, "Content-Length: " + (highRange - lowRange + 1)); } else { output(output, "Content-Length: 0"); } + output(output, ""); } } @@ -698,6 +745,7 @@ byte[] buffer = new byte[32 * 1024]; int bytes = 0; int sendBytes = 0; + try { while ((bytes = fis.read(buffer)) != -1) { output.write(buffer, 0, bytes); @@ -708,6 +756,7 @@ } finally { fis.close(); } + return sendBytes; } @@ -715,9 +764,11 @@ String result = null; int leftTagPos = content.indexOf(leftTag); int rightTagPos = content.indexOf(rightTag, leftTagPos + 1); + if (leftTagPos > -1 && rightTagPos > leftTagPos) { result = content.substring(leftTagPos + leftTag.length(), rightTagPos); } + return result; } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/RequestHandler.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/RequestHandler.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/RequestHandler.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/RequestHandler.java 2013-04-22 19:41:39.000000000 +0000 @@ -214,7 +214,7 @@ // the renderer have failed. The only option left is to assume the // default renderer. request.setMediaRenderer(RendererConfiguration.getDefaultConf()); - LOGGER.trace("Using default media renderer " + request.getMediaRenderer().getRendererName()); + LOGGER.trace("Using default media renderer: " + request.getMediaRenderer().getRendererName()); if (userAgentString != null && !userAgentString.equals("FDSSDP")) { // We have found an unknown renderer @@ -226,7 +226,7 @@ if (userAgentString != null) { LOGGER.trace("HTTP User-Agent: " + userAgentString); } - LOGGER.trace("Recognized media renderer " + request.getMediaRenderer().getRendererName()); + LOGGER.trace("Recognized media renderer: " + request.getMediaRenderer().getRendererName()); } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/RequestHandlerV2.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/RequestHandlerV2.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/RequestHandlerV2.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/RequestHandlerV2.java 2013-04-22 19:41:39.000000000 +0000 @@ -225,7 +225,7 @@ // the renderer have failed. The only option left is to assume the // default renderer. request.setMediaRenderer(RendererConfiguration.getDefaultConf()); - LOGGER.trace("Using default media renderer " + request.getMediaRenderer().getRendererName()); + LOGGER.trace("Using default media renderer: " + request.getMediaRenderer().getRendererName()); if (userAgentString != null && !userAgentString.equals("FDSSDP")) { // We have found an unknown renderer @@ -237,7 +237,8 @@ if (userAgentString != null) { LOGGER.trace("HTTP User-Agent: " + userAgentString); } - LOGGER.trace("Recognized media renderer " + request.getMediaRenderer().getRendererName()); + + LOGGER.trace("Recognized media renderer: " + request.getMediaRenderer().getRendererName()); } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/RequestV2.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/RequestV2.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/RequestV2.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/RequestV2.java 2013-04-22 19:41:39.000000000 +0000 @@ -306,7 +306,11 @@ if (subs != null && !subs.isEmpty()) { // TODO: maybe loop subs to get the requested subtitle type instead of using the first one DLNAMediaSubtitle sub = subs.get(0); - inputStream = new java.io.FileInputStream(sub.getExternalFile()); + // XXX external file is null if the first subtitle track is embedded: + // http://www.ps3mediaserver.org/forum/viewtopic.php?f=3&t=15805&p=75534#p75534 + if (sub.isExternal()) { + inputStream = new java.io.FileInputStream(sub.getExternalFile()); + } } } else { // This is a request for a regular file. @@ -337,6 +341,7 @@ DLNAMediaSubtitle sub = subs.get(0); String subtitleUrl; String subExtension = sub.getType().getExtension(); + if (isNotBlank(subExtension)) { subtitleUrl = "http://" + PMS.get().getServer().getHost() + ':' + PMS.get().getServer().getPort() + "/get/" @@ -346,6 +351,7 @@ + ':' + PMS.get().getServer().getPort() + "/get/" + id + "/subtitle0000"; } + output.setHeader(subtitleHttpHeader, subtitleUrl); } } @@ -444,6 +450,7 @@ } else { output.setHeader(HttpHeaders.Names.CONTENT_TYPE, "image/jpeg"); } + output.setHeader(HttpHeaders.Names.ACCEPT_RANGES, "bytes"); output.setHeader(HttpHeaders.Names.CONNECTION, "keep-alive"); output.setHeader(HttpHeaders.Names.EXPIRES, getFUTUREDATE() + " GMT"); @@ -461,10 +468,12 @@ String s = new String(b); s = s.replace("[uuid]", PMS.get().usn());//.substring(0, PMS.get().usn().length()-2)); String profileName = PMS.getConfiguration().getProfileName(); + if (PMS.get().getServer().getHost() != null) { s = s.replace("[host]", PMS.get().getServer().getHost()); s = s.replace("[port]", "" + PMS.get().getServer().getPort()); } + if (xbox) { LOGGER.debug("DLNA changes for Xbox 360"); s = s.replace("PS3 Media Server", "PS3 Media Server [" + profileName + "] : Windows Media Connect"); @@ -495,6 +504,7 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); response.append(CRLF); + if (soapaction != null && soapaction.contains("IsAuthorized")) { response.append(HTTPXMLHelper.XBOX_2); response.append(CRLF); @@ -502,13 +512,14 @@ response.append(HTTPXMLHelper.XBOX_1); response.append(CRLF); } + response.append(HTTPXMLHelper.BROWSERESPONSE_FOOTER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); } else if (method.equals("POST") && argument.endsWith("upnp/control/connection_manager")) { output.setHeader(HttpHeaders.Names.CONTENT_TYPE, "text/xml; charset=\"utf-8\""); - if (soapaction.indexOf("ConnectionManager:1#GetProtocolInfo") > -1) { + if (soapaction != null && soapaction.indexOf("ConnectionManager:1#GetProtocolInfo") > -1) { response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -520,7 +531,7 @@ } } else if (method.equals("POST") && argument.endsWith("upnp/control/content_directory")) { output.setHeader(HttpHeaders.Names.CONTENT_TYPE, "text/xml; charset=\"utf-8\""); - if (soapaction.indexOf("ContentDirectory:1#GetSystemUpdateID") > -1) { + if (soapaction != null && soapaction.indexOf("ContentDirectory:1#GetSystemUpdateID") > -1) { response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -533,7 +544,7 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - } else if (soapaction.indexOf("ContentDirectory:1#X_GetFeatureList") > -1) { // Added for Samsung 2012 TVs + } else if (soapaction != null && soapaction.indexOf("ContentDirectory:1#X_GetFeatureList") > -1) { // Added for Samsung 2012 TVs response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -542,7 +553,7 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - } else if (soapaction.indexOf("ContentDirectory:1#GetSortCapabilities") > -1) { + } else if (soapaction != null && soapaction.indexOf("ContentDirectory:1#GetSortCapabilities") > -1) { response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -551,7 +562,7 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - } else if (soapaction.indexOf("ContentDirectory:1#GetSearchCapabilities") > -1) { + } else if (soapaction != null && soapaction.indexOf("ContentDirectory:1#GetSearchCapabilities") > -1) { response.append(HTTPXMLHelper.XML_HEADER); response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); @@ -560,9 +571,11 @@ response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); - } else if (soapaction.contains("ContentDirectory:1#Browse") || soapaction.contains("ContentDirectory:1#Search")) { + } else if (soapaction != null && (soapaction.contains("ContentDirectory:1#Browse") + || soapaction.contains("ContentDirectory:1#Search"))) { objectID = getEnclosingValue(content, "", ""); String containerID = null; + if ((objectID == null || objectID.length() == 0) && xbox) { containerID = getEnclosingValue(content, "", ""); if (!containerID.contains("$")) { @@ -572,6 +585,7 @@ containerID = null; } } + Object sI = getEnclosingValue(content, "", ""); Object rC = getEnclosingValue(content, "", ""); browseFlag = getEnclosingValue(content, "", ""); @@ -589,7 +603,7 @@ response.append(HTTPXMLHelper.SOAP_ENCODING_HEADER); response.append(CRLF); - if (soapaction.contains("ContentDirectory:1#Search")) { + if (soapaction != null && soapaction.contains("ContentDirectory:1#Search")) { response.append(HTTPXMLHelper.SEARCHRESPONSE_HEADER); } else { response.append(HTTPXMLHelper.BROWSERESPONSE_HEADER); @@ -599,7 +613,7 @@ response.append(HTTPXMLHelper.RESULT_HEADER); response.append(HTTPXMLHelper.DIDL_HEADER); - if (soapaction.contains("ContentDirectory:1#Search")) { + if (soapaction != null && soapaction.contains("ContentDirectory:1#Search")) { browseFlag = "BrowseDirectChildren"; } @@ -625,13 +639,21 @@ } } - List files = PMS.get().getRootFolder(mediaRenderer).getDLNAResources(objectID, browseFlag != null && browseFlag.equals("BrowseDirectChildren"), startingIndex, requestCount, mediaRenderer); + List files = PMS.get().getRootFolder(mediaRenderer).getDLNAResources( + objectID, + browseFlag != null && browseFlag.equals("BrowseDirectChildren"), + startingIndex, + requestCount, + mediaRenderer + ); + if (searchCriteria != null && files != null) { for (int i = files.size() - 1; i >= 0; i--) { if (!files.get(i).getName().equals(searchCriteria)) { files.remove(i); } } + if (files.size() > 0) { files = files.get(0).getChildren(); } @@ -643,6 +665,7 @@ if (xbox && containerID != null) { uf.setFakeParentId(containerID); } + if (uf.isCompatible(mediaRenderer) && (uf.getPlayer() == null || uf.getPlayer().isPlayerCompatible(mediaRenderer))) { response.append(uf.toString(mediaRenderer)); } else { @@ -655,15 +678,19 @@ response.append(HTTPXMLHelper.RESULT_FOOTER); response.append(CRLF); int filessize = 0; + if (files != null) { filessize = files.size(); } + response.append("").append(filessize - minus).append(""); response.append(CRLF); DLNAResource parentFolder = null; + if (files != null && filessize > 0) { parentFolder = files.get(0).getParent(); } + if (browseFlag != null && browseFlag.equals("BrowseDirectChildren") && mediaRenderer.isMediaParserV2() && mediaRenderer.isDLNATreeHack()) { // with the new parser, files are parsed and analyzed *before* creating the DLNA tree, // every 10 items (the ps3 asks 10 by 10), @@ -672,30 +699,34 @@ // invalidated and hidden if format is broken or encrypted, etc.). // let's send a fake total size to force the renderer to ask following items int totalCount = startingIndex + requestCount + 1; // returns 11 when 10 asked - if (filessize - minus <= 0) // if no more elements, send the startingIndex - { + if (filessize - minus <= 0) { // if no more elements, send the startingIndex totalCount = startingIndex; } response.append("").append(totalCount).append(""); } else if (browseFlag != null && browseFlag.equals("BrowseDirectChildren")) { response.append("").append(((parentFolder != null) ? parentFolder.childrenNumber() : filessize) - minus).append(""); - } else { //from upnp spec: If BrowseMetadata is specified in the BrowseFlags then TotalMatches = 1 + } else { // from upnp spec: If BrowseMetadata is specified in the BrowseFlags then TotalMatches = 1 response.append("1"); } + response.append(CRLF); response.append(""); + if (parentFolder != null) { response.append(parentFolder.getUpdateId()); } else { response.append("1"); } + response.append(""); response.append(CRLF); - if (soapaction.contains("ContentDirectory:1#Search")) { + + if (soapaction != null && soapaction.contains("ContentDirectory:1#Search")) { response.append(HTTPXMLHelper.SEARCHRESPONSE_FOOTER); } else { response.append(HTTPXMLHelper.BROWSERESPONSE_FOOTER); } + response.append(CRLF); response.append(HTTPXMLHelper.SOAP_ENCODING_FOOTER); response.append(CRLF); @@ -704,31 +735,36 @@ } else if (method.equals("SUBSCRIBE")) { output.setHeader("SID", PMS.get().usn()); output.setHeader("TIMEOUT", "Second-1800"); - String cb = soapaction.replace("<", "").replace(">", ""); + + if (soapaction != null) { + String cb = soapaction.replace("<", "").replace(">", ""); - try { - URL soapActionUrl = new URL(cb); - String addr = soapActionUrl.getHost(); - int port = soapActionUrl.getPort(); - Socket sock = new Socket(addr,port); - OutputStream out = sock.getOutputStream(); - - out.write(("NOTIFY /" + argument + " HTTP/1.1").getBytes()); - out.write(CRLF.getBytes()); - out.write(("SID: " + PMS.get().usn()).getBytes()); - out.write(CRLF.getBytes()); - out.write(("SEQ: " + 0).getBytes()); - out.write(CRLF.getBytes()); - out.write(("NT: upnp:event").getBytes()); - out.write(CRLF.getBytes()); - out.write(("NTS: upnp:propchange").getBytes()); - out.write(CRLF.getBytes()); - out.write(("HOST: " + addr + ":" + port).getBytes()); - out.write(CRLF.getBytes()); - out.flush(); - out.close(); - } catch (MalformedURLException ex) { - LOGGER.debug("Cannot parse address and port from soap action \"" + soapaction + "\"", ex); + try { + URL soapActionUrl = new URL(cb); + String addr = soapActionUrl.getHost(); + int port = soapActionUrl.getPort(); + Socket sock = new Socket(addr,port); + OutputStream out = sock.getOutputStream(); + + out.write(("NOTIFY /" + argument + " HTTP/1.1").getBytes()); + out.write(CRLF.getBytes()); + out.write(("SID: " + PMS.get().usn()).getBytes()); + out.write(CRLF.getBytes()); + out.write(("SEQ: " + 0).getBytes()); + out.write(CRLF.getBytes()); + out.write(("NT: upnp:event").getBytes()); + out.write(CRLF.getBytes()); + out.write(("NTS: upnp:propchange").getBytes()); + out.write(CRLF.getBytes()); + out.write(("HOST: " + addr + ":" + port).getBytes()); + out.write(CRLF.getBytes()); + out.flush(); + out.close(); + } catch (MalformedURLException ex) { + LOGGER.debug("Cannot parse address and port from soap action \"" + soapaction + "\"", ex); + } + } else { + LOGGER.debug("Expected soap action in request"); } if (argument.contains("connection_manager")) { diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/UPNPHelper.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/UPNPHelper.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/network/UPNPHelper.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/network/UPNPHelper.java 2013-04-22 19:41:39.000000000 +0000 @@ -14,53 +14,84 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA. */ package net.pms.network; +import java.io.IOException; +import java.net.BindException; +import java.net.DatagramPacket; +import java.net.DatagramSocket; +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.MulticastSocket; +import java.net.NetworkInterface; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.TimeZone; + import net.pms.PMS; + import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.net.*; -import java.text.SimpleDateFormat; -import java.util.*; - /** - * Helper class to handle the UPnP traffic that makes PMS discoverable by other clients. + * Helper class to handle the UPnP traffic that makes PMS discoverable by + * other clients. * See http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.0.pdf * and http://upnp.org/specs/arch/UPnP-arch-DeviceArchitecture-v1.1-AnnexA.pdf * for the specifications. */ public class UPNPHelper { - private static final Logger logger = LoggerFactory.getLogger(UPNPHelper.class); - private final static String CRLF = "\r\n"; - private final static String ALIVE = "ssdp:alive"; + /** Logger instance to write messages to the logs. */ + private static final Logger LOGGER = LoggerFactory.getLogger(UPNPHelper.class); + + /** Carriage return and line feed. */ + private static final String CRLF = "\r\n"; + + /** The Constant ALIVE. */ + private static final String ALIVE = "ssdp:alive"; + /** * IPv4 Multicast channel reserved for SSDP by Internet Assigned Numbers Authority (IANA). * MUST be 239.255.255.250. */ - private final static String IPV4_UPNP_HOST = "239.255.255.250"; + private static final String IPV4_UPNP_HOST = "239.255.255.250"; /** * IPv6 Multicast channel reserved for SSDP by Internet Assigned Numbers Authority (IANA). * MUST be [FF02::C]. */ - private final static String IPV6_UPNP_HOST = "[FF02::C]"; + private static final String IPV6_UPNP_HOST = "[FF02::C]"; /** * Multicast channel reserved for SSDP by Internet Assigned Numbers Authority (IANA). * MUST be 1900. */ - private final static int UPNP_PORT = 1900; + private static final int UPNP_PORT = 1900; - private final static String BYEBYE = "ssdp:byebye"; - private static Thread listener; + /** The Constant BYEBYE. */ + private static final String BYEBYE = "ssdp:byebye"; + + /** The listener. */ + private static Thread listenerThread; + + /** The alive thread. */ private static Thread aliveThread; - private static SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss", Locale.US); + + /** + * This utility class is not meant to be instantiated. + */ + private UPNPHelper() { + } /** * Send UPnP discovery search message to discover devices of interest on @@ -69,10 +100,14 @@ * @param host The multicast channel * @param port The multicast port * @param st The search target string - * @throws IOException + * @throws IOException Signals that an I/O exception has occurred. */ private static void sendDiscover(String host, int port, String st) throws IOException { String usn = PMS.get().usn(); + String serverHost = PMS.get().getServer().getHost(); + int serverPort = PMS.get().getServer().getPort(); + SimpleDateFormat sdf = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss", Locale.US); + sdf.setTimeZone(TimeZone.getTimeZone("GMT")); if (st.equals(usn)) { @@ -81,92 +116,166 @@ usn += "::"; } - String discovery = - "HTTP/1.1 200 OK" + CRLF - + "CACHE-CONTROL: max-age=1200" + CRLF - + "DATE: " + sdf.format(new Date(System.currentTimeMillis())) + " GMT" + CRLF - + "LOCATION: http://" + PMS.get().getServer().getHost() + ":" + PMS.get().getServer().getPort() + "/description/fetch" + CRLF - + "SERVER: " + PMS.get().getServerName() + CRLF - + "ST: " + st + CRLF - + "EXT: " + CRLF - + "USN: " + usn + st + CRLF - + "Content-Length: 0" + CRLF + CRLF; - sendReply(host, port, discovery); + StringBuilder discovery = new StringBuilder(); + + discovery.append("HTTP/1.1 200 OK").append(CRLF); + discovery.append("CACHE-CONTROL: max-age=1200").append(CRLF); + discovery.append("DATE: ").append(sdf.format(new Date(System.currentTimeMillis()))).append(" GMT").append(CRLF); + discovery.append("LOCATION: http://").append(serverHost).append(":").append(serverPort).append("/description/fetch").append(CRLF); + discovery.append("SERVER: ").append(PMS.get().getServerName()).append(CRLF); + discovery.append("ST: ").append(st).append(CRLF); + discovery.append("EXT: ").append(CRLF); + discovery.append("USN: ").append(usn).append(st).append(CRLF); + discovery.append("Content-Length: 0").append(CRLF).append(CRLF); + + sendReply(host, port, discovery.toString()); } - private static void sendReply(String host, int port, String msg) throws IOException { - try { - DatagramSocket ssdpUniSock = new DatagramSocket(); + /** + * Send reply. + * + * @param host the host + * @param port the port + * @param msg the msg + * @throws IOException Signals that an I/O exception has occurred. + */ + private static void sendReply(String host, int port, String msg) { + DatagramSocket datagramSocket = null; - logger.trace("Sending this reply [" + host + ":" + port + "]: " + StringUtils.replace(msg, CRLF, "")); + try { + datagramSocket = new DatagramSocket(); InetAddress inetAddr = InetAddress.getByName(host); DatagramPacket dgmPacket = new DatagramPacket(msg.getBytes(), msg.length(), inetAddr, port); - ssdpUniSock.send(dgmPacket); - ssdpUniSock.close(); - } catch (Exception ex) { - logger.info(ex.getMessage()); + LOGGER.trace("Sending this reply [" + host + ":" + port + "]: " + StringUtils.replace(msg, CRLF, "")); + + datagramSocket.send(dgmPacket); + } catch (Exception e) { + LOGGER.info(e.getMessage()); + LOGGER.debug("Error sending reply", e); + } finally { + if (datagramSocket != null) { + datagramSocket.close(); + } } } - public static void sendAlive() throws IOException { - logger.debug("Sending ALIVE..."); + /** + * Send alive. + */ + public static void sendAlive() { + LOGGER.debug("Sending ALIVE..."); + MulticastSocket multicastSocket = null; - MulticastSocket ssdpSocket = getNewMulticastSocket(); - sendMessage(ssdpSocket, "upnp:rootdevice", ALIVE); - sendMessage(ssdpSocket, PMS.get().usn(), ALIVE); - sendMessage(ssdpSocket, "urn:schemas-upnp-org:device:MediaServer:1", ALIVE); - sendMessage(ssdpSocket, "urn:schemas-upnp-org:service:ContentDirectory:1", ALIVE); - sendMessage(ssdpSocket, "urn:schemas-upnp-org:service:ConnectionManager:1", ALIVE); + try { + multicastSocket = getNewMulticastSocket(); + InetAddress upnpAddress = getUPNPAddress(); + multicastSocket.joinGroup(upnpAddress); + + sendMessage(multicastSocket, "upnp:rootdevice", ALIVE); + sendMessage(multicastSocket, PMS.get().usn(), ALIVE); + sendMessage(multicastSocket, "urn:schemas-upnp-org:device:MediaServer:1", ALIVE); + sendMessage(multicastSocket, "urn:schemas-upnp-org:service:ContentDirectory:1", ALIVE); + sendMessage(multicastSocket, "urn:schemas-upnp-org:service:ConnectionManager:1", ALIVE); + } catch (IOException e) { + LOGGER.debug("Error sending ALIVE message", e); + } finally { + if (multicastSocket != null) { + // Clean up the multicast socket nicely + try { + InetAddress upnpAddress = getUPNPAddress(); + multicastSocket.leaveGroup(upnpAddress); + } catch (IOException e) { + } - ssdpSocket.close(); - ssdpSocket = null; + multicastSocket.disconnect(); + multicastSocket.close(); + } + } } + /** + * Gets the new multicast socket. + * + * @return the new multicast socket + * @throws IOException Signals that an I/O exception has occurred. + */ private static MulticastSocket getNewMulticastSocket() throws IOException { - MulticastSocket ssdpSocket = new MulticastSocket(); - ssdpSocket.setReuseAddress(true); - NetworkInterface ni = NetworkConfiguration.getInstance().getNetworkInterfaceByServerName(); - if (ni != null) { - ssdpSocket.setNetworkInterface(ni); - - // force IPv4 address - Enumeration enm = ni.getInetAddresses(); - while (enm.hasMoreElements()) { - InetAddress ia = enm.nextElement(); - if (!(ia instanceof Inet6Address)) { - ssdpSocket.setInterface(ia); - break; - } + NetworkInterface networkInterface = NetworkConfiguration.getInstance().getNetworkInterfaceByServerName(); + + if (networkInterface == null) { + networkInterface = PMS.get().getServer().getNetworkInterface(); + } + + if (networkInterface == null) { + throw new IOException("No usable network interface found for UPnP multicast"); + } + + List usableAddresses = new ArrayList(); + List networkInterfaceAddresses = Collections.list(networkInterface.getInetAddresses()); + + for (InetAddress inetAddress : networkInterfaceAddresses) { + if (inetAddress != null && inetAddress instanceof Inet4Address && !inetAddress.isLoopbackAddress()) { + usableAddresses.add(inetAddress); } - } else if (PMS.get().getServer().getNetworkInterface() != null) { - logger.trace("Setting multicast network interface: " + PMS.get().getServer().getNetworkInterface()); - ssdpSocket.setNetworkInterface(PMS.get().getServer().getNetworkInterface()); } - logger.trace("Sending message from multicast socket on network interface: " + ssdpSocket.getNetworkInterface()); - logger.trace("Multicast socket is on interface: " + ssdpSocket.getInterface()); + + if (usableAddresses.size() == 0) { + throw new IOException("No usable addresses found for UPnP multicast"); + } + + InetSocketAddress localAddress = new InetSocketAddress(usableAddresses.get(0), 0); + MulticastSocket ssdpSocket = new MulticastSocket(localAddress); + ssdpSocket.setReuseAddress(true); + + LOGGER.trace("Sending message from multicast socket on network interface: " + ssdpSocket.getNetworkInterface()); + LOGGER.trace("Multicast socket is on interface: " + ssdpSocket.getInterface()); ssdpSocket.setTimeToLive(32); - ssdpSocket.joinGroup(getUPNPAddress()); - logger.trace("Socket Timeout: " + ssdpSocket.getSoTimeout()); - logger.trace("Socket TTL: " + ssdpSocket.getTimeToLive()); + LOGGER.trace("Socket Timeout: " + ssdpSocket.getSoTimeout()); + LOGGER.trace("Socket TTL: " + ssdpSocket.getTimeToLive()); return ssdpSocket; } - public static void sendByeBye() throws IOException { - logger.info("Sending BYEBYE..."); - MulticastSocket ssdpSocket = getNewMulticastSocket(); - - sendMessage(ssdpSocket, "upnp:rootdevice", BYEBYE); - sendMessage(ssdpSocket, "urn:schemas-upnp-org:device:MediaServer:1", BYEBYE); - sendMessage(ssdpSocket, "urn:schemas-upnp-org:service:ContentDirectory:1", BYEBYE); - sendMessage(ssdpSocket, "urn:schemas-upnp-org:service:ConnectionManager:1", BYEBYE); - - ssdpSocket.leaveGroup(getUPNPAddress()); - ssdpSocket.close(); - ssdpSocket = null; + /** + * Send the UPnP BYEBYE message. + */ + public static void sendByeBye() { + LOGGER.info("Sending BYEBYE..."); + + MulticastSocket multicastSocket = null; + try { + multicastSocket = getNewMulticastSocket(); + InetAddress upnpAddress = getUPNPAddress(); + multicastSocket.joinGroup(upnpAddress); + + sendMessage(multicastSocket, "upnp:rootdevice", BYEBYE); + sendMessage(multicastSocket, "urn:schemas-upnp-org:device:MediaServer:1", BYEBYE); + sendMessage(multicastSocket, "urn:schemas-upnp-org:service:ContentDirectory:1", BYEBYE); + sendMessage(multicastSocket, "urn:schemas-upnp-org:service:ConnectionManager:1", BYEBYE); + } catch (IOException e) { + LOGGER.debug("Error sending BYEBYE message", e); + } finally { + if (multicastSocket != null) { + // Clean up the multicast socket nicely + try { + InetAddress upnpAddress = getUPNPAddress(); + multicastSocket.leaveGroup(upnpAddress); + } catch (IOException e) { + } + + multicastSocket.disconnect(); + multicastSocket.close(); + } + } } + /** + * Utility method to call {@link Thread#sleep(long)} without having to + * catch the InterruptedException. + * + * @param delay the delay + */ private static void sleep(int delay) { try { Thread.sleep(delay); @@ -174,77 +283,103 @@ } } + /** + * Send the provided message to the socket. + * + * @param socket the socket + * @param nt the nt + * @param message the message + * @throws IOException Signals that an I/O exception has occurred. + */ private static void sendMessage(DatagramSocket socket, String nt, String message) throws IOException { String msg = buildMsg(nt, message); - Random rand = new Random(); - //logger.trace( "Sending this SSDP packet: " + CRLF + msg);// StringUtils.replace(msg, CRLF, "")); - DatagramPacket ssdpPacket = new DatagramPacket(msg.getBytes(), msg.length(), getUPNPAddress(), UPNP_PORT); - socket.send(ssdpPacket); - sleep(rand.nextInt(1800 / 2)); + //Random rand = new Random(); + + // LOGGER.trace( "Sending this SSDP packet: " + CRLF + StringUtils.replace(msg, CRLF, ""))); + InetAddress upnpAddress = getUPNPAddress(); + DatagramPacket ssdpPacket = new DatagramPacket(msg.getBytes(), msg.length(), upnpAddress, UPNP_PORT); socket.send(ssdpPacket); - sleep(rand.nextInt(1800 / 2)); + + // XXX Why is it necessary to sleep for this random time? What would happen when random equals 0? + //sleep(rand.nextInt(1800 / 2)); + + // XXX Why send the same packet twice? + //socket.send(ssdpPacket); + + // XXX Why is it necessary to sleep for this random time (again)? + //sleep(rand.nextInt(1800 / 2)); } - private static int delay = 10000; + + /** + * Starts up two threads: one to broadcast UPnP ALIVE messages and another + * to listen for responses. + * + * @throws IOException Signals that an I/O exception has occurred. + */ public static void listen() throws IOException { Runnable rAlive = new Runnable() { public void run() { + int delay = 10000; + while (true) { - try { - Thread.sleep(delay); - sendAlive(); - if (delay == 20000) // every 180s - { - delay = 180000; - } - if (delay == 10000) // after 10, and 30s - { - delay = 20000; - } - } catch (Exception e) { - logger.debug("Error while sending periodic alive message: " + e.getMessage()); + sleep(delay); + sendAlive(); + + // The first delay for sending an ALIVE message is 10 seconds, + // the second delay is for 20 seconds. From then on, all other + // delays are for 180 seconds. + switch (delay) { + case 10000: + delay = 20000; + break; + case 20000: + delay = 180000; + break; } } } }; + aliveThread = new Thread(rAlive, "UPNP-AliveMessageSender"); aliveThread.start(); Runnable r = new Runnable() { public void run() { boolean bindErrorReported = false; + while (true) { + MulticastSocket multicastSocket = null; + try { // Use configurable source port as per http://code.google.com/p/ps3mediaserver/issues/detail?id=1166 - MulticastSocket socket = new MulticastSocket(PMS.getConfiguration().getUpnpPort()); + multicastSocket = new MulticastSocket(PMS.getConfiguration().getUpnpPort()); + if (bindErrorReported) { - logger.warn("Finally, acquiring port " + PMS.getConfiguration().getUpnpPort() + " was successful!"); + LOGGER.warn("Finally, acquiring port " + PMS.getConfiguration().getUpnpPort() + " was successful!"); } - NetworkInterface ni = NetworkConfiguration.getInstance().getNetworkInterfaceByServerName(); - if (ni != null) { - socket.setNetworkInterface(ni); - } else if (PMS.get().getServer().getNetworkInterface() != null) { - logger.trace("Setting multicast network interface: " + PMS.get().getServer().getNetworkInterface()); - socket.setNetworkInterface(PMS.get().getServer().getNetworkInterface()); - } - socket.setTimeToLive(4); - socket.setReuseAddress(true); - socket.joinGroup(getUPNPAddress()); + + multicastSocket.setTimeToLive(4); + multicastSocket.setReuseAddress(true); + InetAddress upnpAddress = getUPNPAddress(); + multicastSocket.joinGroup(upnpAddress); + while (true) { byte[] buf = new byte[1024]; - DatagramPacket packet_r = new DatagramPacket(buf, buf.length); - socket.receive(packet_r); + DatagramPacket receivePacket = new DatagramPacket(buf, buf.length); + multicastSocket.receive(receivePacket); + + String s = new String(receivePacket.getData()); - String s = new String(packet_r.getData()); + InetAddress address = receivePacket.getAddress(); - InetAddress address = packet_r.getAddress(); if (s.startsWith("M-SEARCH")) { String remoteAddr = address.getHostAddress(); - int remotePort = packet_r.getPort(); + int remotePort = receivePacket.getPort(); if (PMS.getConfiguration().getIpFiltering().allowed(address)) { - logger.trace("Receiving a M-SEARCH from [" + remoteAddr + ":" + remotePort + "]"); + LOGGER.trace("Receiving a M-SEARCH from [" + remoteAddr + ":" + remotePort + "]"); if (StringUtils.indexOf(s, "urn:schemas-upnp-org:service:ContentDirectory:1") > 0) { sendDiscover(remoteAddr, remotePort, "urn:schemas-upnp-org:service:ContentDirectory:1"); @@ -258,62 +393,93 @@ sendDiscover(remoteAddr, remotePort, "urn:schemas-upnp-org:device:MediaServer:1"); } + if (StringUtils.indexOf(s, "ssdp:all") > 0) { + sendDiscover(remoteAddr, remotePort, "urn:schemas-upnp-org:device:MediaServer:1"); + } + if (StringUtils.indexOf(s, PMS.get().usn()) > 0) { sendDiscover(remoteAddr, remotePort, PMS.get().usn()); } } } else if (s.startsWith("NOTIFY")) { String remoteAddr = address.getHostAddress(); - int remotePort = packet_r.getPort(); + int remotePort = receivePacket.getPort(); - logger.trace("Receiving a NOTIFY from [" + remoteAddr + ":" + remotePort + "]"); + LOGGER.trace("Receiving a NOTIFY from [" + remoteAddr + ":" + remotePort + "]"); } } } catch (BindException e) { if (!bindErrorReported) { - logger.error("Unable to bind to " + PMS.getConfiguration().getUpnpPort() + LOGGER.error("Unable to bind to " + PMS.getConfiguration().getUpnpPort() + ", which means that PMS will not automatically appear on your renderer! " + "This usually means that another program occupies the port. Please " + "stop the other program and free up the port. " + "PMS will keep trying to bind to it...[" + e.getMessage() + "]"); } + bindErrorReported = true; sleep(5000); } catch (IOException e) { - logger.error("UPNP network exception", e); + LOGGER.error("UPNP network exception", e); sleep(1000); + } finally { + if (multicastSocket != null) { + // Clean up the multicast socket nicely + try { + InetAddress upnpAddress = getUPNPAddress(); + multicastSocket.leaveGroup(upnpAddress); + } catch (IOException e) { + } + + multicastSocket.disconnect(); + multicastSocket.close(); + } } } } }; - listener = new Thread(r, "UPNPHelper"); - listener.start(); + + listenerThread = new Thread(r, "UPNPHelper"); + listenerThread.start(); } + /** + * Shut down the threads that send ALIVE messages and listen to responses. + */ public static void shutDownListener() { - listener.interrupt(); + listenerThread.interrupt(); aliveThread.interrupt(); } + /** + * Builds a UPnP message string based on a message. + * + * @param nt the nt + * @param message the message + * @return the string + */ private static String buildMsg(String nt, String message) { StringBuilder sb = new StringBuilder(); - sb.append("NOTIFY * HTTP/1.1" + CRLF); - sb.append("HOST: " + IPV4_UPNP_HOST + ":").append(UPNP_PORT).append(CRLF); + sb.append("NOTIFY * HTTP/1.1").append(CRLF); + sb.append("HOST: ").append(IPV4_UPNP_HOST).append(":").append(UPNP_PORT).append(CRLF); sb.append("NT: ").append(nt).append(CRLF); sb.append("NTS: ").append(message).append(CRLF); if (message.equals(ALIVE)) { - sb.append("LOCATION: http://").append(PMS.get().getServer().getHost()).append(":").append(PMS.get().getServer().getPort()).append("/description/fetch" + CRLF); + sb.append("LOCATION: http://").append(PMS.get().getServer().getHost()).append(":").append(PMS.get().getServer().getPort()).append("/description/fetch").append(CRLF); } + sb.append("USN: ").append(PMS.get().usn()); + if (!nt.equals(PMS.get().usn())) { sb.append("::").append(nt); } + sb.append(CRLF); if (message.equals(ALIVE)) { - sb.append("CACHE-CONTROL: max-age=1800" + CRLF); + sb.append("CACHE-CONTROL: max-age=1800").append(CRLF); } if (message.equals(ALIVE)) { @@ -324,7 +490,13 @@ return sb.toString(); } + /** + * Gets the uPNP address. + * + * @return the uPNP address + * @throws IOException Signals that an I/O exception has occurred. + */ private static InetAddress getUPNPAddress() throws IOException { - return InetAddress.getByAddress(IPV4_UPNP_HOST, new byte[]{(byte) 239, (byte) 255, (byte) 255, (byte) 250}); + return InetAddress.getByName(IPV4_UPNP_HOST); } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/AboutTab.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/AboutTab.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/AboutTab.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/AboutTab.java 2013-04-22 19:41:39.000000000 +0000 @@ -102,11 +102,11 @@ lMplayerLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); lMplayerLink.addMouseListener(mplayerLink); - final LinkMouseListener mplayerSubJunkBuildsLink = new LinkMouseListener("SubJunk's MPlayer builds", - "http://www.spirton.com/mplayer-mencoder-subjunk-build/"); - JLabel lMplayerSubJunkBuildsLink = builder.addLabel(mplayerSubJunkBuildsLink.getLabel(), cc.xy(2, 13, "center, fill")); - lMplayerSubJunkBuildsLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - lMplayerSubJunkBuildsLink.addMouseListener(mplayerSubJunkBuildsLink); + final LinkMouseListener vlcLink = new LinkMouseListener("VLC media player", + "http://www.videolan.org/vlc/"); + JLabel lVlcLink = builder.addLabel(vlcLink.getLabel(), cc.xy(2, 13, "center, fill")); + lVlcLink.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + lVlcLink.addMouseListener(vlcLink); final LinkMouseListener mediaInfoLink = new LinkMouseListener("MediaInfo", "http://mediainfo.sourceforge.net/en"); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/GeneralTab.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/GeneralTab.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/GeneralTab.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/GeneralTab.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,11 +18,31 @@ */ package net.pms.newgui; -import com.jgoodies.forms.builder.PanelBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.FormLayout; -import com.sun.jna.Platform; +import java.awt.Component; +import java.awt.ComponentOrientation; +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextField; +import javax.swing.SwingUtilities; + import net.pms.Messages; import net.pms.PMS; import net.pms.configuration.Build; @@ -33,16 +53,16 @@ import net.pms.network.NetworkConfiguration; import net.pms.util.FormLayoutUtil; import net.pms.util.KeyedComboBoxModel; + import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; -import java.awt.*; -import java.awt.event.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; +import com.jgoodies.forms.builder.PanelBuilder; +import com.jgoodies.forms.factories.Borders; +import com.jgoodies.forms.layout.CellConstraints; +import com.jgoodies.forms.layout.FormLayout; +import com.sun.jna.Platform; public class GeneralTab { private static final Logger logger = LoggerFactory.getLogger(GeneralTab.class); @@ -198,15 +218,7 @@ } host = new JTextField(configuration.getServerHostname()); - host.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + host.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setHostname(host.getText()); @@ -214,15 +226,7 @@ }); port = new JTextField(configuration.getServerPort() != 5001 ? "" + configuration.getServerPort() : ""); - port.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + port.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { try { @@ -255,15 +259,7 @@ }); ip_filter = new JTextField(configuration.getIpFilter()); - ip_filter.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + ip_filter.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setIpFilter(ip_filter.getText()); @@ -271,15 +267,7 @@ }); maxbitrate = new JTextField(configuration.getMaximumBitrate()); - maxbitrate.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + maxbitrate.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { PMS.getConfiguration().setMaximumBitrate(maxbitrate.getText()); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/HelpTab.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/HelpTab.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/HelpTab.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/HelpTab.java 2013-04-22 19:41:39.000000000 +0000 @@ -21,6 +21,8 @@ import com.jgoodies.forms.builder.PanelBuilder; import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; + +import net.pms.PMS; import net.pms.util.PropertiesUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,18 +68,7 @@ editorPane.setContentType("text/html"); editorPane.setBackground(Color.WHITE); - try { - // Read the HTML help file - String documentationDir = PropertiesUtil.getProjectProperties().get("project.documentation.dir"); - File file = new File(documentationDir + "/index.html"); - - // Display the HTML help file in the editor - editorPane.setPage(file.toURI().toURL()); - } catch (MalformedURLException e) { - LOGGER.debug("Caught exception", e); - } catch (IOException e) { - LOGGER.debug("Caught exception", e); - } + updateContents(); // Enable internal anchor links editorPane.addHyperlinkListener(new HyperlinkListener() { @@ -112,4 +103,25 @@ return builder.getPanel(); } + + /** + * Load the current help page in the editor pane. + */ + public void updateContents() { + if (editorPane != null) { + try { + // Read the HTML help file + String documentationDir = PropertiesUtil.getProjectProperties().get("project.documentation.dir"); + String helpPage = PMS.getHelpPage(); + File file = new File(documentationDir + "/" + helpPage); + + // Display the HTML help file in the editor + editorPane.setPage(file.toURI().toURL()); + } catch (MalformedURLException e) { + LOGGER.debug("Caught exception", e); + } catch (IOException e) { + LOGGER.debug("Caught exception", e); + } + } + } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/LooksFrame.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/LooksFrame.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/LooksFrame.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/LooksFrame.java 2013-04-22 19:41:39.000000000 +0000 @@ -37,6 +37,8 @@ import javax.swing.border.CompoundBorder; import javax.swing.border.EmptyBorder; import javax.swing.border.EtchedBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import javax.swing.plaf.metal.DefaultMetalTheme; import javax.swing.plaf.metal.MetalLookAndFeel; import java.awt.*; @@ -54,16 +56,28 @@ private final PmsConfiguration configuration; public static final String START_SERVICE = "start.service"; private static final long serialVersionUID = 8723727186288427690L; + protected static final Dimension PREFERRED_SIZE = new Dimension(1000, 750); + // https://code.google.com/p/ps3mediaserver/issues/detail?id=949 + protected static final Dimension MINIMUM_SIZE = new Dimension(800, 480); + + /** + * List of context sensitive help pages URLs. These URLs should be relative + * to the documentation directory and in the same order as the tabs. The + * value null means "don't care", activating the tab will not + * change the help page. + */ + protected static final String[] HELP_PAGES = { "index.html", null, + "general_configuration.html", "navigation_share.html", + "transcoding.html", null, null }; + private NavigationShareTab ft; private StatusTab st; private TracesTab tt; private TranscodingTab tr; private GeneralTab nt; + private HelpTab ht; private AbstractButton reload; private JLabel status; - protected static final Dimension PREFERRED_SIZE = new Dimension(1000, 750); - // https://code.google.com/p/ps3mediaserver/issues/detail?id=949 - protected static final Dimension MINIMUM_SIZE = new Dimension(800, 480); private static boolean lookAndFeelInitialized = false; public TracesTab getTt() { @@ -345,21 +359,36 @@ } public JComponent buildMain() { - JTabbedPane tabbedPane = new JTabbedPane(SwingConstants.TOP); + final JTabbedPane tabbedPane = new JTabbedPane(SwingConstants.TOP); st = new StatusTab(configuration); tt = new TracesTab(configuration); tr = new TranscodingTab(configuration); nt = new GeneralTab(configuration); ft = new NavigationShareTab(configuration); + ht = new HelpTab(); + + tabbedPane.addTab(Messages.getString("LooksFrame.18"), st.build()); + tabbedPane.addTab(Messages.getString("LooksFrame.19"), tt.build()); + tabbedPane.addTab(Messages.getString("LooksFrame.20"), nt.build()); + tabbedPane.addTab(Messages.getString("LooksFrame.22"), ft.build()); + tabbedPane.addTab(Messages.getString("LooksFrame.21"), tr.build()); + tabbedPane.addTab(Messages.getString("LooksFrame.24"), ht.build()); + tabbedPane.addTab(Messages.getString("LooksFrame.25"), new AboutTab().build()); + + tabbedPane.addChangeListener(new ChangeListener() { + @Override + public void stateChanged(ChangeEvent e) { + int selectedIndex = tabbedPane.getSelectedIndex(); + + if (HELP_PAGES[selectedIndex] != null) { + PMS.setHelpPage(HELP_PAGES[selectedIndex]); - tabbedPane.addTab(Messages.getString("LooksFrame.18"),/* readImageIcon("server-16.png"),*/ st.build()); - tabbedPane.addTab(Messages.getString("LooksFrame.19"),/* readImageIcon("mail_new-16.png"),*/ tt.build()); - tabbedPane.addTab(Messages.getString("LooksFrame.20"),/* readImageIcon("advanced-16.png"),*/ nt.build()); - tabbedPane.addTab(Messages.getString("LooksFrame.22"), /*readImageIcon("bookmark-16.png"),*/ ft.build()); - tabbedPane.addTab(Messages.getString("LooksFrame.21"),/* readImageIcon("player_play-16.png"),*/ tr.build()); - tabbedPane.addTab(Messages.getString("LooksFrame.24"), /* readImageIcon("mail_new-16.png"), */ new HelpTab().build()); - tabbedPane.addTab(Messages.getString("LooksFrame.25"), /*readImageIcon("documentinfo-16.png"),*/ new AboutTab().build()); + // Update the contents of the help tab itself + ht.updateContents(); + } + } + }); tabbedPane.setBorder(new EmptyBorder(5, 5, 5, 5)); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/NavigationShareTab.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/NavigationShareTab.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/NavigationShareTab.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/NavigationShareTab.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,32 +18,52 @@ */ package net.pms.newgui; -import com.jgoodies.forms.builder.PanelBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.FormLayout; -import com.sun.jna.Platform; +import java.awt.Component; +import java.awt.ComponentOrientation; +import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.io.File; +import java.util.Locale; + +import javax.swing.DefaultListModel; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JFileChooser; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextField; + import net.pms.Messages; import net.pms.PMS; import net.pms.configuration.PmsConfiguration; import net.pms.dlna.DLNAMediaDatabase; import net.pms.util.FormLayoutUtil; import net.pms.util.KeyedComboBoxModel; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; -import java.awt.*; -import java.awt.event.*; -import java.io.File; -import java.util.Locale; +import com.jgoodies.forms.builder.PanelBuilder; +import com.jgoodies.forms.factories.Borders; +import com.jgoodies.forms.layout.CellConstraints; +import com.jgoodies.forms.layout.FormLayout; +import com.sun.jna.Platform; public class NavigationShareTab { private static final Logger LOGGER = LoggerFactory.getLogger(NavigationShareTab.class); public static final String ALL_DRIVES = Messages.getString("FoldTab.0"); private static final String PANEL_COL_SPEC = "left:pref, 50dlu, pref, 150dlu, pref, 25dlu, pref, 25dlu, pref, default:grow"; - private static final String PANEL_ROW_SPEC = "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 10dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 10dlu, fill:default:grow"; + private static final String PANEL_ROW_SPEC = "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 8dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 8dlu, fill:default:grow"; private static final String SHARED_FOLDER_COL_SPEC = "left:pref, left:pref, pref, pref, pref, 0:grow"; private static final String SHARED_FOLDER_ROW_SPEC = "p, 3dlu, p, 3dlu, fill:default:grow"; @@ -145,20 +165,20 @@ cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); builder.add(archive, FormLayoutUtil.flip(cc.xyw(1, 15, 3), colSpec, orientation)); - builder.add(hidevideosettings, FormLayoutUtil.flip(cc.xyw(4, 15, 3), colSpec, orientation)); - builder.add(hidetranscode, FormLayoutUtil.flip(cc.xyw(8, 15, 3), colSpec, orientation)); + builder.add(hidevideosettings, FormLayoutUtil.flip(cc.xyw(4, 15, 2), colSpec, orientation)); + builder.add(hidetranscode, FormLayoutUtil.flip(cc.xyw(7, 15, 4), colSpec, orientation)); builder.add(hideextensions, FormLayoutUtil.flip(cc.xyw(1, 17, 3), colSpec, orientation)); - builder.add(hideengines, FormLayoutUtil.flip(cc.xyw(4, 17, 3), colSpec, orientation)); - builder.add(hideemptyfolders, FormLayoutUtil.flip(cc.xyw(8, 17, 3), colSpec, orientation)); + builder.add(hideengines, FormLayoutUtil.flip(cc.xyw(4, 17, 2), colSpec, orientation)); + builder.add(hideemptyfolders, FormLayoutUtil.flip(cc.xyw(7, 17, 4), colSpec, orientation)); builder.add(itunes, FormLayoutUtil.flip(cc.xyw(1, 19, 3), colSpec, orientation)); - builder.add(iphoto, FormLayoutUtil.flip(cc.xyw(4, 19, 3), colSpec, orientation)); - builder.add(aperture, FormLayoutUtil.flip(cc.xyw(8, 19, 3), colSpec, orientation)); + builder.add(iphoto, FormLayoutUtil.flip(cc.xyw(4, 19, 2), colSpec, orientation)); + builder.add(aperture, FormLayoutUtil.flip(cc.xyw(7, 19, 4), colSpec, orientation)); builder.add(cacheenable, FormLayoutUtil.flip(cc.xy(1, 21), colSpec, orientation)); - builder.add(cachereset, FormLayoutUtil.flip(cc.xyw(4, 21, 3), colSpec, orientation)); - builder.add(hidemedialibraryfolder, FormLayoutUtil.flip(cc.xyw(8, 21, 3), colSpec, orientation)); + builder.add(cachereset, FormLayoutUtil.flip(cc.xyw(4, 21, 2), colSpec, orientation)); + builder.add(hidemedialibraryfolder, FormLayoutUtil.flip(cc.xyw(7, 21, 4), colSpec, orientation)); builder.addLabel(Messages.getString("FoldTab.18"), FormLayoutUtil.flip(cc.xyw(1, 23, 3), colSpec, orientation)); builder.add(sortmethod, FormLayoutUtil.flip(cc.xyw(4, 23, 3), colSpec, orientation)); @@ -192,15 +212,7 @@ //ThumbnailSeekPos seekpos = new JTextField("" + configuration.getThumbnailSeekPos()); - seekpos.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + seekpos.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { try { @@ -272,15 +284,7 @@ // AlternateThumbFolder defaultThumbFolder = new JTextField(configuration.getAlternateThumbFolder()); - defaultThumbFolder.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + defaultThumbFolder.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { configuration.setAlternateThumbFolder(defaultThumbFolder.getText()); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/TracesTab.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/TracesTab.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/TracesTab.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/TracesTab.java 2013-04-22 19:41:39.000000000 +0000 @@ -41,7 +41,7 @@ import javax.swing.text.DefaultCaret; public class TracesTab { - private static final Logger logger = LoggerFactory.getLogger(TracesTab.class); + private static final Logger LOGGER = LoggerFactory.getLogger(TracesTab.class); private PmsConfiguration configuration; class PopupTriggerMouseListener extends MouseAdapter { @@ -133,27 +133,32 @@ jListPane = new JScrollPane(jList, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); builder.add(jListPane, cc.xyw(1, 1, 2)); - // Add buttons opening log files - JPanel pLogFileButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - HashMap logFiles = LoggingConfigFileLoader.getLogFilePaths(); - for (String loggerName : logFiles.keySet()) { + // Add buttons to open logfiles (there may be more than one) + JPanel pLogfileButtons = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + HashMap logfiles = LoggingConfigFileLoader.getLogFilePaths(); + + for (String loggerName : logfiles.keySet()) { JButton b = new JButton(loggerName); - b.setToolTipText(logFiles.get(loggerName)); + b.setToolTipText(logfiles.get(loggerName)); + b.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { - File logFile = new File(((JButton) e.getSource()).getToolTipText()); + File logfile = new File(((JButton) e.getSource()).getToolTipText()); try { - java.awt.Desktop.getDesktop().open(logFile); - } catch (IOException e1) { - logger.error(String.format("Failed to open file %s in default editor", logFile), e1); + java.awt.Desktop.getDesktop().open(logfile); + } catch (IOException ioe) { + LOGGER.error(String.format("Failed to open file %s in default editor", logfile), ioe); + } catch (UnsupportedOperationException usoe) { + LOGGER.error(String.format("Failed to open file %s in default editor", logfile), usoe); } } }); - pLogFileButtons.add(b); + + pLogfileButtons.add(b); } - builder.add(pLogFileButtons, cc.xy(2, 2)); + builder.add(pLogfileButtons, cc.xy(2, 2)); return builder.getPanel(); } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/TranscodingTab.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/TranscodingTab.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/newgui/TranscodingTab.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/newgui/TranscodingTab.java 2013-04-22 19:41:39.000000000 +0000 @@ -18,36 +18,63 @@ */ package net.pms.newgui; -import com.jgoodies.forms.builder.PanelBuilder; -import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.FormLayout; -import com.sun.jna.Platform; +import java.awt.CardLayout; +import java.awt.Component; +import java.awt.ComponentOrientation; +import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.util.ArrayList; +import java.util.Locale; + +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JFileChooser; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTextField; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; + import net.pms.Messages; import net.pms.PMS; import net.pms.configuration.PmsConfiguration; import net.pms.encoders.Player; import net.pms.encoders.PlayerFactory; import net.pms.util.FormLayoutUtil; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreePath; -import javax.swing.tree.TreeSelectionModel; -import java.awt.*; -import java.awt.event.*; -import java.util.ArrayList; -import java.util.Locale; +import com.jgoodies.forms.builder.PanelBuilder; +import com.jgoodies.forms.factories.Borders; +import com.jgoodies.forms.layout.CellConstraints; +import com.jgoodies.forms.layout.FormLayout; +import com.sun.jna.Platform; public class TranscodingTab { private static final Logger LOGGER = LoggerFactory.getLogger(TranscodingTab.class); - private static final String COMMON_COL_SPEC = "left:pref, 2dlu, pref:grow"; - private static final String COMMON_ROW_SPEC = "p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 9dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 9dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 9dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p, 2dlu, p"; + private static final String COMMON_COL_SPEC = "$lcgap, left:pref, 2dlu, pref:grow, $lcgap"; + private static final String COMMON_ROW_SPEC = "5*(pref, 2dlu), pref, 18dlu, pref, 9dlu:grow, 2*(pref, 2dlu), default, 5*(pref, 2dlu), pref, 9dlu, 2*(pref, 2dlu), pref, 9dlu, 3*(pref, 2dlu), pref, $lgap, default"; private static final String EMPTY_COL_SPEC = "left:pref, 2dlu, pref:grow"; private static final String EMPTY_ROW_SPEC = "p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p , 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 3dlu, p, 20dlu, p, 3dlu, p, 3dlu, p"; private static final String LEFT_COL_SPEC = "left:pref, pref, pref, pref, 0:grow"; @@ -64,17 +91,14 @@ Locale locale = new Locale(configuration.getLanguage()); orientation = ComponentOrientation.getOrientation(locale); } + private JCheckBox disableSubs; - - public JCheckBox getDisableSubs() { - return disableSubs; - } private JTextField forcetranscode; private JTextField notranscode; private JTextField maxbuffer; private JComboBox nbcores; private DefaultMutableTreeNode parent[]; - private JPanel tabbedPane; + private JPanel tabbedPanel; private CardLayout cl; private JTextField abitrate; private JTree tree; @@ -86,6 +110,14 @@ private JCheckBox mpeg2remux; private JCheckBox chapter_support; private JTextField chapter_interval; + private JCheckBox videoHWacceleration; + private JTextField langs; + private JTextField defaultsubs; + private JTextField forcedsub; + private JTextField forcedtags; + private JTextField alternateSubFolder; + private JButton folderSelectButton; + private JCheckBox subs; private static final int MAX_CORES = 32; private void updateEngineModel() { @@ -109,10 +141,10 @@ } private void handleCardComponentChange(Component component) { - tabbedPane.setPreferredSize(component.getPreferredSize()); - tabbedPane.getParent().invalidate(); - tabbedPane.getParent().validate(); - tabbedPane.getParent().repaint(); + tabbedPanel.setPreferredSize(component.getPreferredSize()); + tabbedPanel.getParent().invalidate(); + tabbedPanel.getParent().validate(); + tabbedPanel.getParent().repaint(); } public JComponent build() { @@ -124,7 +156,7 @@ builder.setOpaque(true); CellConstraints cc = new CellConstraints(); - builder.add(buildRightTabbedPane(), FormLayoutUtil.flip(cc.xyw(4, 1, 3), colSpec, orientation)); + builder.add(buildRightTabbedPanel(), FormLayoutUtil.flip(cc.xyw(4, 1, 3), colSpec, orientation)); builder.add(buildLeft(), FormLayoutUtil.flip(cc.xy(2, 1), colSpec, orientation)); JPanel panel = builder.getPanel(); @@ -135,11 +167,11 @@ return panel; } - public JComponent buildRightTabbedPane() { + private JComponent buildRightTabbedPanel() { cl = new CardLayout(); - tabbedPane = new JPanel(cl); - tabbedPane.setBorder(BorderFactory.createEmptyBorder()); - JScrollPane scrollPane = new JScrollPane(tabbedPane); + tabbedPanel = new JPanel(cl); + tabbedPanel.setBorder(BorderFactory.createEmptyBorder()); + JScrollPane scrollPane = new JScrollPane(tabbedPanel); scrollPane.setBorder(BorderFactory.createEmptyBorder()); return scrollPane; } @@ -229,7 +261,7 @@ handleCardComponentChange(e.getComponent()); } }); - tabbedPane.add(commonEnc.id(), commonEnc.getConfigPanel()); + tabbedPanel.add(commonEnc.id(), commonEnc.getConfigPanel()); root.add(commonEnc); parent = new DefaultMutableTreeNode[5]; @@ -254,7 +286,7 @@ public void valueChanged(TreeSelectionEvent e) { if (e.getNewLeadSelectionPath() != null && e.getNewLeadSelectionPath().getLastPathComponent() instanceof TreeNodeSettings) { TreeNodeSettings tns = (TreeNodeSettings) e.getNewLeadSelectionPath().getLastPathComponent(); - cl.show(tabbedPane, tns.id()); + cl.show(tabbedPanel, tns.id()); } } }); @@ -285,6 +317,10 @@ for (Player p : PlayerFactory.getAllPlayers()) { if (p.id().equals(id)) { ordPlayers.add(p); + if (p.isVideoHardwareAccelerationReady()) { + videoHWacceleration.setEnabled(true); + videoHWacceleration.setSelected(configuration.isVideoHardwareAcceleration()); + } //matched = true; } } @@ -312,7 +348,7 @@ handleCardComponentChange(e.getComponent()); } }); - tabbedPane.add(en.id(), jc); + tabbedPanel.add(en.id(), jc); parent[p.purpose()].add(en); } @@ -352,16 +388,13 @@ CellConstraints cc = new CellConstraints(); + JComponent cmp = builder.addSeparator(Messages.getString("NetworkTab.5"), FormLayoutUtil.flip(cc.xyw(2, 1, 3), colSpec, orientation)); + cmp = (JComponent) cmp.getComponent(0); + cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); + + builder.addLabel(Messages.getString("NetworkTab.6").replaceAll("MAX_BUFFER_SIZE", configuration.getMaxMemoryBufferSizeStr()), FormLayoutUtil.flip(cc.xy(2, 3), colSpec, orientation)); maxbuffer = new JTextField("" + configuration.getMaxMemoryBufferSize()); - maxbuffer.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + maxbuffer.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { try { @@ -373,15 +406,9 @@ } }); - JComponent cmp = builder.addSeparator(Messages.getString("NetworkTab.5"), FormLayoutUtil.flip(cc.xyw(1, 1, 3), colSpec, orientation)); - cmp = (JComponent) cmp.getComponent(0); - cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); - - builder.addLabel(Messages.getString("NetworkTab.6").replaceAll("MAX_BUFFER_SIZE", configuration.getMaxMemoryBufferSizeStr()), FormLayoutUtil.flip(cc.xy(1, 3), colSpec, orientation)); - builder.add(maxbuffer, FormLayoutUtil.flip(cc.xy(3, 3), colSpec, orientation)); - - String nCpusLabel = String.format(Messages.getString("NetworkTab.7"), Runtime.getRuntime().availableProcessors()); - builder.addLabel(nCpusLabel, FormLayoutUtil.flip(cc.xy(1, 5), colSpec, orientation)); + builder.add(maxbuffer, FormLayoutUtil.flip(cc.xy(4, 3), colSpec, orientation)); + + builder.addLabel(Messages.getString("NetworkTab.7").replaceAll("%d", "" + Runtime.getRuntime().availableProcessors()), FormLayoutUtil.flip(cc.xy(2, 5), colSpec, orientation)); String[] guiCores = new String[MAX_CORES]; for (int i = 0; i < MAX_CORES; i++) { @@ -401,19 +428,21 @@ configuration.setNumberOfCpuCores(Integer.parseInt(e.getItem().toString())); } }); - builder.add(nbcores, FormLayoutUtil.flip(cc.xy(3, 5), colSpec, orientation)); + builder.add(nbcores, FormLayoutUtil.flip(cc.xy(4, 5), colSpec, orientation)); + chapter_support = new JCheckBox(Messages.getString("TrTab2.52"), configuration.isChapterSupport()); + chapter_support.setContentAreaFilled(false); + chapter_support.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + configuration.setChapterSupport((e.getStateChange() == ItemEvent.SELECTED)); + chapter_interval.setEnabled(configuration.isChapterSupport()); + } + }); + builder.add(chapter_support, FormLayoutUtil.flip(cc.xy(2, 7), colSpec, orientation)); + chapter_interval = new JTextField("" + configuration.getChapterInterval()); chapter_interval.setEnabled(configuration.isChapterSupport()); - chapter_interval.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - + chapter_interval.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { try { @@ -424,136 +453,65 @@ } } }); + builder.add(chapter_interval, FormLayoutUtil.flip(cc.xy(4, 7), colSpec, orientation)); - chapter_support = new JCheckBox(Messages.getString("TrTab2.52")); - chapter_support.setContentAreaFilled(false); - chapter_support.setSelected(configuration.isChapterSupport()); - - chapter_support.addItemListener(new ItemListener() { + disableSubs = new JCheckBox(Messages.getString("TrTab2.51"),configuration.isDisableSubtitles()); + disableSubs.setContentAreaFilled(false); + disableSubs.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { - configuration.setChapterSupport((e.getStateChange() == ItemEvent.SELECTED)); - chapter_interval.setEnabled(configuration.isChapterSupport()); + configuration.setDisableSubtitles((e.getStateChange() == ItemEvent.SELECTED)); } }); + builder.add(disableSubs, FormLayoutUtil.flip(cc.xy(2, 11), colSpec, orientation)); - builder.add(chapter_support, FormLayoutUtil.flip(cc.xy(1, 7), colSpec, orientation)); + JTabbedPane setupTabbedPanel = new JTabbedPane(); + setupTabbedPanel.addTab(Messages.getString("TrTab2.66"), buildVideoSetupPanel()); + setupTabbedPanel.addTab(Messages.getString("TrTab2.67"), buildAudioSetupPanel()); + setupTabbedPanel.addTab(Messages.getString("MEncoderVideo.8"), buildSubtitlesSetupPanel()); + + builder.add(setupTabbedPanel, FormLayoutUtil.flip(cc.xywh(1, 14, 5, 31), colSpec, orientation)); - builder.add(chapter_interval, FormLayoutUtil.flip(cc.xy(3, 7), colSpec, orientation)); + JPanel panel = builder.getPanel(); + panel.applyComponentOrientation(orientation); - cmp = builder.addSeparator(Messages.getString("TrTab2.3"), FormLayoutUtil.flip(cc.xyw(1, 11, 3), colSpec, orientation)); - cmp = (JComponent) cmp.getComponent(0); - cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); + return panel; + } + + private JComponent buildVideoSetupPanel() { + String colSpec = FormLayoutUtil.getColSpec("left:pref, 2dlu, pref:grow", orientation); + FormLayout layout = new FormLayout(colSpec, "$lgap, 2*(pref, 2dlu), 10dlu, 10dlu, 3*(pref, 5dlu), pref"); + PanelBuilder builder = new PanelBuilder(layout); + builder.setBorder(Borders.DLU4_BORDER); + CellConstraints cc = new CellConstraints(); - channels = new JComboBox(new Object[]{Messages.getString("TrTab2.55"), Messages.getString("TrTab2.56") /*, "8 channels 7.1" */}); // 7.1 not supported by Mplayer :\ - channels.setEditable(false); - if (configuration.getAudioChannelCount() == 2) { - channels.setSelectedIndex(0); - } else { - channels.setSelectedIndex(1); - } - channels.addItemListener(new ItemListener() { + videoHWacceleration = new JCheckBox(Messages.getString("TrTab2.69"), configuration.isVideoHardwareAcceleration()); + videoHWacceleration.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { - configuration.setAudioChannelCount(Integer.parseInt(e.getItem().toString().substring(0, 1))); + configuration.setVideoHardwareAcceleration((e.getStateChange() == ItemEvent.SELECTED)); } }); + builder.add(videoHWacceleration, FormLayoutUtil.flip(cc.xy(1, 2), colSpec, orientation)); + videoHWacceleration.setEnabled(false); - builder.addLabel(Messages.getString("TrTab2.50"), FormLayoutUtil.flip(cc.xy(1, 13), colSpec, orientation)); - builder.add(channels, FormLayoutUtil.flip(cc.xy(3, 13), colSpec, orientation)); - - forcePCM = new JCheckBox(Messages.getString("TrTab2.27")); - forcePCM.setContentAreaFilled(false); - if (configuration.isMencoderUsePcm()) { - forcePCM.setSelected(true); - } - forcePCM.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - configuration.setMencoderUsePcm(e.getStateChange() == ItemEvent.SELECTED); - } - }); - - builder.add(forcePCM, FormLayoutUtil.flip(cc.xyw(1, 15, 3), colSpec, orientation)); - - ac3remux = new JCheckBox(Messages.getString("MEncoderVideo.32") + (Platform.isWindows() ? Messages.getString("TrTab2.21") : "")); - ac3remux.setContentAreaFilled(false); - if (configuration.isRemuxAC3()) { - ac3remux.setSelected(true); - } - ac3remux.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - configuration.setRemuxAC3((e.getStateChange() == ItemEvent.SELECTED)); - } - }); - - builder.add(ac3remux, FormLayoutUtil.flip(cc.xyw(1, 17, 3), colSpec, orientation)); - - forceDTSinPCM = new JCheckBox(Messages.getString("TrTab2.28") + (Platform.isWindows() ? Messages.getString("TrTab2.21") : "")); - forceDTSinPCM.setContentAreaFilled(false); - if (configuration.isDTSEmbedInPCM()) { - forceDTSinPCM.setSelected(true); - } - forceDTSinPCM.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - configuration.setDTSEmbedInPCM(forceDTSinPCM.isSelected()); - if (configuration.isDTSEmbedInPCM()) { - JOptionPane.showMessageDialog( - (JFrame) (SwingUtilities.getWindowAncestor((Component) PMS.get().getFrame())), - Messages.getString("TrTab2.10"), - Messages.getString("Dialog.Information"), - JOptionPane.INFORMATION_MESSAGE); - } - } - }); - - builder.add(forceDTSinPCM, FormLayoutUtil.flip(cc.xyw(1, 19, 3), colSpec, orientation)); - - abitrate = new JTextField("" + configuration.getAudioBitrate()); - abitrate.addKeyListener(new KeyListener() { - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - try { - int ab = Integer.parseInt(abitrate.getText()); - configuration.setAudioBitrate(ab); - } catch (NumberFormatException nfe) { - LOGGER.debug("Could not parse audio bitrate from \"" + abitrate.getText() + "\""); - } - } - }); - - builder.addLabel(Messages.getString("TrTab2.29"), FormLayoutUtil.flip(cc.xy(1, 21), colSpec, orientation)); - builder.add(abitrate, FormLayoutUtil.flip(cc.xy(3, 21), colSpec, orientation)); - - mpeg2remux = new JCheckBox(Messages.getString("MEncoderVideo.39") + (Platform.isWindows() ? Messages.getString("TrTab2.21") : "")); + mpeg2remux = new JCheckBox(Messages.getString("MEncoderVideo.39") + (Platform.isWindows() + ? Messages.getString("TrTab2.21") : ""), configuration.isMencoderRemuxMPEG2()); mpeg2remux.setContentAreaFilled(false); - if (configuration.isMencoderRemuxMPEG2()) { - mpeg2remux.setSelected(true); - } mpeg2remux.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { configuration.setMencoderRemuxMPEG2((e.getStateChange() == ItemEvent.SELECTED)); } }); - - builder.add(mpeg2remux, FormLayoutUtil.flip(cc.xyw(1, 23, 3), colSpec, orientation)); - - cmp = builder.addSeparator(Messages.getString("TrTab2.4"), FormLayoutUtil.flip(cc.xyw(1, 25, 3), colSpec, orientation)); + builder.add(mpeg2remux, FormLayoutUtil.flip(cc.xyw(1, 6, 3), colSpec, orientation)); + + JComponent cmp = builder.addSeparator(Messages.getString("TrTab2.7"), FormLayoutUtil.flip(cc.xyw(1, 8, 3), colSpec, orientation)); cmp = (JComponent) cmp.getComponent(0); cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); - - builder.addLabel(Messages.getString("TrTab2.32"), FormLayoutUtil.flip(cc.xyw(1, 29, 3), colSpec, orientation)); - + + builder.add(new JLabel(Messages.getString("TrTab2.32")), FormLayoutUtil.flip(cc.xy(1, 10), colSpec, orientation)); Object data[] = new Object[] { configuration.getMencoderMainSettings(), /* default */ - String.format("keyint=5:vqscale=1:vqmin=2 /* %s */", Messages.getString("TrTab2.60")), /* great */ String.format("keyint=5:vqscale=1:vqmin=1 /* %s */", Messages.getString("TrTab2.61")), /* lossless */ + String.format("keyint=5:vqscale=1:vqmin=2 /* %s */", Messages.getString("TrTab2.60")), /* great */ String.format("keyint=5:vqscale=2:vqmin=3 /* %s */", Messages.getString("TrTab2.62")), /* good (wired) */ String.format("keyint=25:vqmax=5:vqmin=2 /* %s */", Messages.getString("TrTab2.63")), /* good (wireless) */ String.format("keyint=25:vqmax=7:vqmin=2 /* %s */", Messages.getString("TrTab2.64")), /* medium (wireless) */ @@ -561,7 +519,6 @@ }; MyComboBoxModel cbm = new MyComboBoxModel(data); - vq = new JComboBox(cbm); vq.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { @@ -574,86 +531,229 @@ } } }); - vq.getEditor().getEditorComponent().addKeyListener(new KeyListener() { + vq.getEditor().getEditorComponent().addKeyListener(new KeyAdapter() { @Override - public void keyPressed(KeyEvent e) { + public void keyReleased(KeyEvent e) { + vq.getItemListeners()[0].itemStateChanged(new ItemEvent(vq, 0, vq.getEditor().getItem(), ItemEvent.SELECTED)); } + }); + vq.setEditable(true); + builder.add(vq, FormLayoutUtil.flip(cc.xy(3, 10), colSpec, orientation)); + builder.add(new JLabel(Messages.getString("TrTab2.8")), FormLayoutUtil.flip(cc.xy(1, 12), colSpec, orientation)); + notranscode = new JTextField(configuration.getNoTranscode()); + notranscode.addKeyListener(new KeyAdapter() { @Override - public void keyTyped(KeyEvent e) { + public void keyReleased(KeyEvent e) { + configuration.setNoTranscode(notranscode.getText()); } + }); + builder.add(notranscode, FormLayoutUtil.flip(cc.xy(3, 12), colSpec, orientation)); + builder.addLabel(Messages.getString("TrTab2.9"), FormLayoutUtil.flip(cc.xy(1, 14), colSpec, orientation)); + forcetranscode = new JTextField(configuration.getForceTranscode()); + forcetranscode.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - vq.getItemListeners()[0].itemStateChanged(new ItemEvent(vq, 0, vq.getEditor().getItem(), ItemEvent.SELECTED)); + configuration.setForceTranscode(forcetranscode.getText()); } }); - vq.setEditable(true); - builder.add(vq, FormLayoutUtil.flip(cc.xyw(1, 31, 3), colSpec, orientation)); - - String help1 = Messages.getString("TrTab2.39"); - help1 += Messages.getString("TrTab2.40"); - help1 += Messages.getString("TrTab2.41"); - help1 += Messages.getString("TrTab2.42"); - help1 += Messages.getString("TrTab2.43"); - help1 += Messages.getString("TrTab2.44"); - - JTextArea decodeTips = new JTextArea(help1); - decodeTips.setEditable(false); - decodeTips.setBorder(BorderFactory.createEtchedBorder()); - decodeTips.setBackground(new Color(255, 255, 192)); - builder.add(decodeTips, FormLayoutUtil.flip(cc.xyw(1, 41, 3), colSpec, orientation)); + builder.add(forcetranscode, FormLayoutUtil.flip(cc.xy(3, 14), colSpec, orientation)); - disableSubs = new JCheckBox(Messages.getString("TrTab2.51")); - disableSubs.setContentAreaFilled(false); + JPanel panel = builder.getPanel(); + panel.applyComponentOrientation(orientation); - cmp = builder.addSeparator(Messages.getString("TrTab2.7"), FormLayoutUtil.flip(cc.xyw(1, 33, 3), colSpec, orientation)); + return panel; + } + + private JComponent buildAudioSetupPanel() { + String colSpec = FormLayoutUtil.getColSpec("left:pref, 2dlu, pref:grow", orientation); + FormLayout layout = new FormLayout(colSpec, "$lgap, pref, 9dlu, 4*(pref, 2dlu), pref, 12dlu, 3*(pref, 2dlu), pref:grow"); + PanelBuilder builder = new PanelBuilder(layout); + builder.setBorder(Borders.DLU4_BORDER); + CellConstraints cc = new CellConstraints(); + + JComponent cmp = builder.addSeparator(Messages.getString("TrTab2.3"), FormLayoutUtil.flip(cc.xyw(1, 2, 3), colSpec, orientation)); cmp = (JComponent) cmp.getComponent(0); cmp.setFont(cmp.getFont().deriveFont(Font.BOLD)); + + builder.addLabel(Messages.getString("TrTab2.50"), FormLayoutUtil.flip(cc.xy(1, 4), colSpec, orientation)); - builder.add(disableSubs, FormLayoutUtil.flip(cc.xy(1, 35), colSpec, orientation)); + channels = new JComboBox(new Object[]{Messages.getString("TrTab2.55"), Messages.getString("TrTab2.56") /*, "8 channels 7.1" */}); // 7.1 not supported by Mplayer :\ + channels.setEditable(false); + if (configuration.getAudioChannelCount() == 2) { + channels.setSelectedIndex(0); + } else { + channels.setSelectedIndex(1); + } + channels.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + configuration.setAudioChannelCount(Integer.parseInt(e.getItem().toString().substring(0, 1))); + } + }); + builder.add(channels, FormLayoutUtil.flip(cc.xy(3, 4), colSpec, orientation)); - builder.addLabel(Messages.getString("TrTab2.8"), FormLayoutUtil.flip(cc.xy(1, 37), colSpec, orientation)); + forcePCM = new JCheckBox(Messages.getString("TrTab2.27"), configuration.isMencoderUsePcm()); + forcePCM.setContentAreaFilled(false); + forcePCM.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + configuration.setMencoderUsePcm(e.getStateChange() == ItemEvent.SELECTED); + } + }); + builder.add(forcePCM, FormLayoutUtil.flip(cc.xy(1, 6), colSpec, orientation)); - notranscode = new JTextField(configuration.getNoTranscode()); - notranscode.addKeyListener(new KeyListener() { + ac3remux = new JCheckBox(Messages.getString("MEncoderVideo.32") + (Platform.isWindows() + ? Messages.getString("TrTab2.21") : ""), configuration.isRemuxAC3()); + ac3remux.setContentAreaFilled(false); + ac3remux.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + configuration.setRemuxAC3((e.getStateChange() == ItemEvent.SELECTED)); + } + }); + builder.add(ac3remux, FormLayoutUtil.flip(cc.xyw(1, 8, 3), colSpec, orientation)); + + forceDTSinPCM = new JCheckBox(Messages.getString("TrTab2.28") + (Platform.isWindows() + ? Messages.getString("TrTab2.21") : ""), configuration.isDTSEmbedInPCM()); + forceDTSinPCM.setContentAreaFilled(false); + forceDTSinPCM.addActionListener(new ActionListener() { @Override - public void keyPressed(KeyEvent e) { + public void actionPerformed(ActionEvent e) { + configuration.setDTSEmbedInPCM(forceDTSinPCM.isSelected()); + if (configuration.isDTSEmbedInPCM()) { + JOptionPane.showMessageDialog( + (JFrame) (SwingUtilities.getWindowAncestor((Component) PMS.get().getFrame())), + Messages.getString("TrTab2.10"), + "Information", + JOptionPane.INFORMATION_MESSAGE); + } } + }); + builder.add(forceDTSinPCM, FormLayoutUtil.flip(cc.xyw(1, 10, 3), colSpec, orientation)); + builder.addLabel(Messages.getString("TrTab2.29"), FormLayoutUtil.flip(cc.xy(1, 12), colSpec, orientation)); + abitrate = new JTextField("" + configuration.getAudioBitrate()); + abitrate.addKeyListener(new KeyAdapter() { @Override - public void keyTyped(KeyEvent e) { + public void keyReleased(KeyEvent e) { + try { + int ab = Integer.parseInt(abitrate.getText()); + configuration.setAudioBitrate(ab); + } catch (NumberFormatException nfe) { + LOGGER.debug("Could not parse audio bitrate from \"" + abitrate.getText() + "\""); + } } + }); + builder.add(abitrate, FormLayoutUtil.flip(cc.xy(3, 12), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.7"), FormLayoutUtil.flip(cc.xy(1, 14), colSpec, orientation)); + langs = new JTextField(configuration.getAudioLanguages()); + langs.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - configuration.setNoTranscode(notranscode.getText()); + configuration.setAudioLanguages(langs.getText()); } }); - builder.add(notranscode, FormLayoutUtil.flip(cc.xy(3, 37), colSpec, orientation)); + builder.add(langs, FormLayoutUtil.flip(cc.xy(3, 14), colSpec, orientation)); - builder.addLabel(Messages.getString("TrTab2.9"), FormLayoutUtil.flip(cc.xy(1, 39), colSpec, orientation)); + JPanel panel = builder.getPanel(); + panel.applyComponentOrientation(orientation); - forcetranscode = new JTextField(configuration.getForceTranscode()); - forcetranscode.addKeyListener(new KeyListener() { + return panel; +} + + private JComponent buildSubtitlesSetupPanel() { + String colSpec = FormLayoutUtil.getColSpec("left:pref, 3dlu, pref:grow, 3dlu, right:pref:grow, 3dlu, pref:grow, 3dlu, right:pref:grow, 3dlu, pref:grow, 3dlu, right:pref:grow, 3dlu, pref:grow", orientation); + FormLayout layout = new FormLayout(colSpec, "$lgap, 17*(pref, 2dlu), pref"); + final PanelBuilder builder = new PanelBuilder(layout); + builder.setBorder(Borders.DLU4_BORDER); + CellConstraints cc = new CellConstraints(); + + builder.addLabel(Messages.getString("MEncoderVideo.9"), FormLayoutUtil.flip(cc.xy(1, 2), colSpec, orientation)); + defaultsubs = new JTextField(configuration.getSubtitlesLanguages()); + defaultsubs.addKeyListener(new KeyAdapter() { @Override - public void keyPressed(KeyEvent e) { + public void keyReleased(KeyEvent e) { + configuration.setSubtitlesLanguages(defaultsubs.getText()); } + }); + builder.add(defaultsubs, FormLayoutUtil.flip(cc.xyw(3, 2, 2), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.94"), FormLayoutUtil.flip(cc.xy(5, 2), colSpec, orientation)); + forcedsub = new JTextField(configuration.getForcedSubtitleLanguage()); + forcedsub.addKeyListener(new KeyAdapter() { @Override - public void keyTyped(KeyEvent e) { + public void keyReleased(KeyEvent e) { + configuration.setForcedSubtitleLanguage(forcedsub.getText()); } + }); + builder.add(forcedsub, FormLayoutUtil.flip(cc.xy(7, 2), colSpec, orientation)); + builder.addLabel(Messages.getString("MEncoderVideo.95"), FormLayoutUtil.flip(cc.xy(9, 2), colSpec, orientation)); + forcedtags = new JTextField(configuration.getForcedSubtitleTags()); + forcedtags.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - configuration.setForceTranscode(forcetranscode.getText()); + configuration.setForcedSubtitleTags(forcedtags.getText()); } }); - builder.add(forcetranscode, FormLayoutUtil.flip(cc.xy(3, 39), colSpec, orientation)); + builder.add(forcedtags, FormLayoutUtil.flip(cc.xyw(11, 2, 5), colSpec, orientation)); - JPanel panel = builder.getPanel(); + builder.addLabel(Messages.getString("MEncoderVideo.37"), FormLayoutUtil.flip(cc.xy(1, 6), colSpec, orientation)); + alternateSubFolder = new JTextField(configuration.getAlternateSubsFolder()); + alternateSubFolder.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + configuration.setAlternateSubsFolder(alternateSubFolder.getText()); + } + }); + builder.add(alternateSubFolder, FormLayoutUtil.flip(cc.xyw(3, 6, 8), colSpec, orientation)); - // Apply the orientation to the panel and all components in it + folderSelectButton = new JButton("..."); + folderSelectButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + JFileChooser chooser = null; + try { + chooser = new JFileChooser(); + } catch (Exception ee) { + chooser = new JFileChooser(new RestrictedFileSystemView()); + } + chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + int returnVal = chooser.showDialog((Component) e.getSource(), Messages.getString("FoldTab.28")); + if (returnVal == JFileChooser.APPROVE_OPTION) { + alternateSubFolder.setText(chooser.getSelectedFile().getAbsolutePath()); + configuration.setAlternateSubsFolder(chooser.getSelectedFile().getAbsolutePath()); + } + } + }); + builder.add(folderSelectButton, FormLayoutUtil.flip(cc.xy(11, 6), colSpec, orientation)); + + subs = new JCheckBox(Messages.getString("MEncoderVideo.22"), configuration.isAutoloadSubtitles()); + subs.setContentAreaFilled(false); + subs.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + configuration.setAutoloadSubtitles((e.getStateChange() == ItemEvent.SELECTED)); + } + }); + builder.add(subs, FormLayoutUtil.flip(cc.xyw(1, 8, 15), colSpec, orientation)); + + final JPanel panel = builder.getPanel(); + + boolean enable = !configuration.isDisableSubtitles(); + for (Component component : panel.getComponents()) { + component.setEnabled(enable); + } + + disableSubs.addItemListener(new ItemListener() { + public void itemStateChanged(ItemEvent e) { + // if Disable Subtitles is not selected, subtitles are enabled + boolean enabled = e.getStateChange() != ItemEvent.SELECTED; + for (Component component : panel.getComponents()) { + component.setEnabled(enabled); + } + } + }); + panel.applyComponentOrientation(orientation); return panel; diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/util/FileUtil.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/util/FileUtil.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/util/FileUtil.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/util/FileUtil.java 2013-04-22 19:41:39.000000000 +0000 @@ -85,11 +85,13 @@ } File lowerCasedFilename = new File(f.getParentFile(), f.getName().substring(0, point) + "." + ext.toLowerCase()); + if (lowerCasedFilename.exists()) { return lowerCasedFilename; } File upperCasedFilename = new File(f.getParentFile(), f.getName().substring(0, point) + "." + ext.toUpperCase()); + if (upperCasedFilename.exists()) { return upperCasedFilename; } @@ -97,13 +99,13 @@ return null; } - // FIXME needs to be renamed e.g. doSubtitlesExist or doesSubtitleExist + // FIXME rename e.g. isSubtitleExists, isSubtitlesExist... @Deprecated public static boolean doesSubtitlesExists(File file, DLNAMediaInfo media) { return doesSubtitlesExists(file, media, true); } - // FIXME needs to be renamed e.g. doSubtitlesExist or doesSubtitleExist + // FIXME rename e.g. isSubtitleExists... @Deprecated public static boolean doesSubtitlesExists(File file, DLNAMediaInfo media, boolean usecache) { boolean found = browseFolderForSubtitles(file.getParentFile(), file, media, usecache); @@ -111,8 +113,10 @@ if (isNotBlank(alternate)) { // https://code.google.com/p/ps3mediaserver/issues/detail?id=737#c5 File subFolder = new File(alternate); + if (!subFolder.isAbsolute()) { subFolder = new File(file.getParent() + "/" + alternate); + try { subFolder = subFolder.getCanonicalFile(); } catch (IOException e) { @@ -130,6 +134,7 @@ private synchronized static boolean browseFolderForSubtitles(File subFolder, File file, DLNAMediaInfo media, boolean usecache) { boolean found = false; + if (!usecache) { cache = null; } @@ -138,24 +143,29 @@ cache = new HashMap(); } - File allSubs[] = cache.get(subFolder); + File[] allSubs = cache.get(subFolder); + if (allSubs == null) { allSubs = subFolder.listFiles(); + if (allSubs != null) { cache.put(subFolder, allSubs); } } String fileName = getFileNameWithoutExtension(file.getName()).toLowerCase(); + if (allSubs != null) { for (File f : allSubs) { if (f.isFile() && !f.isHidden()) { String fName = f.getName().toLowerCase(); + for (String ext : SubtitleType.getSupportedFileExtensions()) { if (fName.length() > ext.length() && fName.startsWith(fileName) && endsWithIgnoreCase(fName, "." + ext)) { int a = fileName.length(); int b = fName.length() - ext.length() - 1; String code = ""; + if (a <= b) { // handling case with several dots:

* Note: since this method accesses the filesystem, it should not be used in contexts in which performance is critical. * Note: this method changes the file access time. @@ -383,7 +395,7 @@ /** * Determine whether a file is writable by trying to write it. This works around JDK bugs which - * return the wrong results for {@link java.io.File.canWrite()} on Windows and, in some cases, on Unix. + * return the wrong results for {@link java.io.File#canWrite()} on Windows and, in some cases, on Unix. *

* Note: since this method accesses the filesystem, it should not be used in contexts in which performance is critical. * Note: this method changes the file access time and may change the file modification time. @@ -428,7 +440,7 @@ /** * Determines whether the supplied directory is readable by trying to read its contents. - * This works around JDK bugs which return the wrong results for {@link java.io.File.canRead()} + * This works around JDK bugs which return the wrong results for {@link java.io.File#canRead()} * on Windows and possibly on Unix. *

* Note: since this method accesses the filesystem, it should not be used in contexts in which performance is critical. @@ -461,7 +473,7 @@ /** * Determines whether the supplied directory is writable by trying to write a file to it. - * This works around JDK bugs which return the wrong results for {@link java.io.File.canWrite()} + * This works around JDK bugs which return the wrong results for {@link java.io.File#canWrite()} * on Windows and possibly on Unix. *

* Note: since this method accesses the filesystem, it should not be used in contexts in which performance is critical. diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/util/NaturalComparator.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/util/NaturalComparator.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/util/NaturalComparator.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/util/NaturalComparator.java 2013-04-22 19:41:39.000000000 +0000 @@ -83,7 +83,7 @@ * @see #getNaturalComparator() */ public static Comparator getNaturalComparator(final Collator collator) { - if(collator == null) { + if (collator == null) { // it's important to explicitly handle this here - else the bug will manifest anytime later in possibly // unrelated code that tries to use the comparator throw new NullPointerException("collator must not be null"); @@ -202,13 +202,13 @@ // both character indices are after a subword (or at zero) // Check if one string is at end - if(sIndex == sLength && tIndex == tLength) { + if (sIndex == sLength && tIndex == tLength) { return 0; } - if(sIndex == sLength) { + if (sIndex == sLength) { return -1; } - if(tIndex == tLength) { + if (tIndex == tLength) { return 1; } @@ -219,7 +219,7 @@ boolean sCharIsDigit = Character.isDigit(sChar); boolean tCharIsDigit = Character.isDigit(tChar); - if(sCharIsDigit && tCharIsDigit) { + if (sCharIsDigit && tCharIsDigit) { // Compare numbers // skip leading 0s @@ -227,7 +227,7 @@ while(sChar == '0') { ++sLeadingZeroCount; ++sIndex; - if(sIndex == sLength) { + if (sIndex == sLength) { break; } sChar = s.charAt(sIndex); @@ -236,41 +236,41 @@ while(tChar == '0') { ++tLeadingZeroCount; ++tIndex; - if(tIndex == tLength) { + if (tIndex == tLength) { break; } tChar = t.charAt(tIndex); } boolean sAllZero = sIndex == sLength || !Character.isDigit(sChar); boolean tAllZero = tIndex == tLength || !Character.isDigit(tChar); - if(sAllZero && tAllZero) { + if (sAllZero && tAllZero) { continue; } - if(sAllZero && !tAllZero) { + if (sAllZero && !tAllZero) { return -1; } - if(tAllZero) { + if (tAllZero) { return 1; } int diff = 0; do { - if(diff == 0) { + if (diff == 0) { diff = sChar - tChar; } ++sIndex; ++tIndex; - if(sIndex == sLength && tIndex == tLength) { + if (sIndex == sLength && tIndex == tLength) { return diff != 0 ? diff : sLeadingZeroCount - tLeadingZeroCount; } - if(sIndex == sLength) { - if(diff == 0) { + if (sIndex == sLength) { + if (diff == 0) { return -1; } return Character.isDigit(t.charAt(tIndex)) ? -1 : diff; } - if(tIndex == tLength) { - if(diff == 0) { + if (tIndex == tLength) { + if (diff == 0) { return 1; } return Character.isDigit(s.charAt(sIndex)) ? 1 : diff; @@ -279,24 +279,24 @@ tChar = t.charAt(tIndex); sCharIsDigit = Character.isDigit(sChar); tCharIsDigit = Character.isDigit(tChar); - if(!sCharIsDigit && !tCharIsDigit) { + if (!sCharIsDigit && !tCharIsDigit) { // both number sub words have the same length - if(diff != 0) { + if (diff != 0) { return diff; } break; } - if(!sCharIsDigit) { + if (!sCharIsDigit) { return -1; } - if(!tCharIsDigit) { + if (!tCharIsDigit) { return 1; } } while(true); } else { // Compare words - if(collator != null) { + if (collator != null) { // To use the collator the whole subwords have to be compared - character-by-character comparision // is not possible. So find the two subwords first int aw = sIndex; @@ -311,36 +311,36 @@ String as = s.substring(aw, sIndex); String bs = t.substring(bw, tIndex); int subwordResult = collator.compare(as, bs); - if(subwordResult != 0) { + if (subwordResult != 0) { return subwordResult; } } else { // No collator specified. All characters should be ascii only. Compare character-by-character. do { - if(sChar != tChar) { - if(caseSensitive) { + if (sChar != tChar) { + if (caseSensitive) { return sChar - tChar; } sChar = Character.toUpperCase(sChar); tChar = Character.toUpperCase(tChar); - if(sChar != tChar) { + if (sChar != tChar) { sChar = Character.toLowerCase(sChar); tChar = Character.toLowerCase(tChar); - if(sChar != tChar) { + if (sChar != tChar) { return sChar - tChar; } } } ++sIndex; ++tIndex; - if(sIndex == sLength && tIndex == tLength) { + if (sIndex == sLength && tIndex == tLength) { return 0; } - if(sIndex == sLength) { + if (sIndex == sLength) { return -1; } - if(tIndex == tLength) { + if (tIndex == tLength) { return 1; } sChar = s.charAt(sIndex); diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/util/StringUtil.java ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/util/StringUtil.java --- ps3mediaserver-1.71.0+mencoder35005/src/main/java/net/pms/util/StringUtil.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/java/net/pms/util/StringUtil.java 2013-04-22 19:41:39.000000000 +0000 @@ -81,7 +81,7 @@ /** * Returns an abbreviated version of the supplied string. * - * @param The String to abbreviate. + * @param str The String to abbreviate. * @return The abbreviated String. */ public static String abbreviate(String str) { diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,331 @@ +Dialog.Confirm=Confirm +Dialog.Error=Error +Dialog.Information=Information +Dialog.Options=Options +Dialog.Question=Question +DLNAMediaDatabase.0=The cache database needs to be reinitialized.\nSorry for the inconvenience \! +DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z +DLNAMediaDatabase.2=Cleanup database... +DLNAMediaDatabase.3=Compacting database... +DLNAMediaDatabase.4=Scanning Folder: +DLNAMediaDatabase.5=Damaged cache has to be deleted but the program couldn't do it.\nStop the program and delete the folder %s manually. +DLNAResource.0=External Subtitles +DLNAResource.1=No Encoding +DLNAResource.2=No Enc. +DLNAResource.3=[%E] {Audio: %c/%A (%b)} {Sub: %t/%S (%u)} +DLNAResource.4=%F - %d [%E] {%x} {Sub: %t/%S (%u)} +FFMpegDVRMSRemux.0=Alternative FFmpeg Path: +FFMpegDVRMSRemux.1=Settings for DVR-MS remuxing +FFMpegVideo.0=Encoder settings for AviSynth/FFmpeg engine only (Prefer AviSynth/MEncoder) +FFMpegVideo.1=Custom options (advanced) +FoldTab.0= +FoldTab.1=Sharing options +FoldTab.2=Scan all shared folders +FoldTab.3=Scanning all the shared folders can take a lot of time \!\n +FoldTab.4=Are you sure to launch the scan?\n\n +FoldTab.5=Hide file extensions +FoldTab.6=Hide \#Video Settings\# Folder +FoldTab.7=Shared folders +FoldTab.8=Hide transcoding engine names +FoldTab.9=Add Directory +FoldTab.10=Do you want to stop the scan?\n\n +FoldTab.11=Enable transcoded video copy on PS3 (Careful, files have no fixed size !) +FoldTab.12=Sort the shared folders +FoldTab.13=Thumbnails +FoldTab.14=Use MPlayer for video thumbnails +FoldTab.15=Alphabetical (A-Z) +FoldTab.16=By date, newest first +FoldTab.17=By date, oldest first +FoldTab.18=File order: +FoldTab.19=DVD ISO thumbnails +FoldTab.20=ASCIIbetical +FoldTab.21=Image thumbnails +FoldTab.22=Alphanumeric +FoldTab.23=Download from amazon.com +FoldTab.24=Download from discogs.com +FoldTab.26=Audio thumbnails import: +FoldTab.27=Alternate video cover art folder +FoldTab.28=Choose a folder +FoldTab.29=Show iPhoto library +FoldTab.30=Show iTunes library +FoldTab.31=Hide empty/non-media folders (slower) +FoldTab.32=Hide cache folder +FoldTab.33=Hide \#--TRANSCODE--\# Folder +FoldTab.34=Show aperture library +FoldTab.35=None +FontFileFilter.3=TrueType Fonts +LinksTab.5=Helpful links: +LinksTab.6=Build: +LooksFrame.5=Quit +LooksFrame.6=Main Panel +LooksFrame.9=Save +LooksFrame.12=Restart Server +LooksFrame.13=The server has to be restarted due to a configuration change +LooksFrame.18=Status +LooksFrame.19=Traces +LooksFrame.20=General Configuration +LooksFrame.21=Transcoding Settings +LooksFrame.22=Navigation/Share Settings +LooksFrame.24=Help +LooksFrame.25=About +LooksFrame.26=FOR TESTING ONLY, POSSIBLY UNSTABLE +MEncoderAviSynth.2=Video decoder settings for AviSynth engine only +MEncoderAviSynth.3=Enable AviSynth variable framerate change into a constant framerate (convertfps=true) +MEncoderAviSynth.4=# AviSynth script is now fully customisable\n +MEncoderAviSynth.5=# The following variables are available:\n +MEncoderAviSynth.6=# : The complete DirectShowSource instruction, e.g. DirectShowSource(filename, convertfps)\n +MEncoderAviSynth.7=# : The complete subtitle instruction if there's any detected (SRT/SUB/IDX/ASS/SSA)\n +MEncoderAviSynth.8=# : The video filename for if you want to do all this by yourself\n +MEncoderAviSynth.10=\n +MEncoderAviSynth.11=\n +MEncoderVideo.0=Skip loop filter deblocking for H.264. Can degrade quality. +MEncoderVideo.1=Video/Audio decoder settings for MEncoder engine only +MEncoderVideo.2=A/V sync alternative method +MEncoderVideo.3=Use application default codec parameters (Recommended!) +MEncoderVideo.4=Force framerate parsed from FFmpeg +MEncoderVideo.5=You can add specific options here, such as a denoise filter for example: -vf hqdn3d +MEncoderVideo.6=Custom options: +MEncoderVideo.7=Audio language priority: +MEncoderVideo.8=Subtitles settings +MEncoderVideo.9=Subtitles language priority: +MEncoderVideo.10=Audio/subtitles language priority +MEncoderVideo.11=Codepage for non-Unicode subtitles: +MEncoderVideo.12=Override styled subtitles settings: Font scale +MEncoderVideo.13=Font outline +MEncoderVideo.14=Font shadow +MEncoderVideo.15=Sub margin (px) +MEncoderVideo.16=Plaintext subtitles settings: Font scale +MEncoderVideo.17=Font outline +MEncoderVideo.18=Font blur +MEncoderVideo.19=Sub margin (%) +MEncoderVideo.20=Use ASS/SSA subtitle styling +MEncoderVideo.21=Fontconfig/Embedded fonts +MEncoderVideo.22=Automatically load *.srt/*.sub subtitles with the same file name +MEncoderVideo.23=FriBiDi +MEncoderVideo.24=Specify TrueType font (for subtitles): +MEncoderVideo.25=Select a TrueType font +MEncoderVideo.26=Deinterlace filter +MEncoderVideo.27=Use Video Scaler +MEncoderVideo.28=Width +MEncoderVideo.29=Expert Settings: Codec-specific parameters +MEncoderVideo.30=Height +MEncoderVideo.31=Subs color +MEncoderVideo.32=Keep AC-3 track (no re-encode, may cause inaudible dialog and A/V sync issues) +MEncoderVideo.33=Custom parameters: +MEncoderVideo.34=Edit codecs specific parameters +MEncoderVideo.35=Use multiple CPU cores +MEncoderVideo.36=Use embedded style +MEncoderVideo.37=Alternate Subtitles Folder +MEncoderVideo.39=Remux DVD ISO video track (no re-encode) +MEncoderVideo.68=\#Here you can put specific parameters for some codec combinations.\n +MEncoderVideo.69=\#It's mostly for A/V synchronization issues, but it can be used for anything else as well\n +MEncoderVideo.70=\#Consider it like expert settings as this shouldn't be used if you don't know exactly what you're doing\n +MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n +MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Careful, any malformed line will be wiped out\n +MEncoderVideo.75=\#Special options:\n +MEncoderVideo.76=\# -noass: definitely disable ASS/SSA subtitles as they can mess up A/V sync\n +MEncoderVideo.77=\# -nosync: definitely disable A/V sync alternative method for this condition (-mc will do the same)\n +MEncoderVideo.78=\# -quality: override video quality settings\n +MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n +MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n +MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n +MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=DVD/VOBsub subtitle quality (0-4): +MEncoderVideo.93=Add borders for overscan compensation: +MEncoderVideo.94=Forced sub: +MEncoderVideo.95=Forced tags: +MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ +MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ +MEncoderVideo.98=cp1252 /* Windows - Western Europe */ +MEncoderVideo.99=cp1253 /* Windows - Greek */ +MEncoderVideo.100=cp1254 /* Windows - Turkish */ +MEncoderVideo.101=cp1255 /* Windows - Hebrew */ +MEncoderVideo.102=cp1256 /* Windows - Arabic */ +MEncoderVideo.103=cp1257 /* Windows - Baltic */ +MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ +MEncoderVideo.105=ISO-8859-1 /* Western Europe */ +MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ +MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ +MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ +MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ +MEncoderVideo.110=ISO-8859-6 /* Arabic */ +MEncoderVideo.111=ISO-8859-7 /* Greek */ +MEncoderVideo.112=ISO-8859-8 /* Hebrew */ +MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ +MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ +MEncoderVideo.115=ISO-8859-11 /* Thai */ +MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ +MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ +MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ +MEncoderVideo.119=ISO-8859-16 /* Central European languages */ +MEncoderVideo.120=cp932 /* Japanese */ +MEncoderVideo.121=cp936 /* Chinese */ +MEncoderVideo.122=cp949 /* Korean */ +MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */ +MEncoderVideo.124=UTF-8 /* Unicode */ +MEncoderVideo.125=Choose Subtitles Color +MEncoderVideo.126=eng,fre,jpn,ger,und +MEncoderVideo.127=eng,fre,jpn,ger,und +MEncoderVideo.128=*,* +MEncoderVideo.129=/* Auto */ +MEncoderVideo.130=enca:ru:cp1251 /* Russian (auto) */ +MEncoderVideo.131=enca:pl:cp1250 /* Eastern Europe (auto) */ +MEncoderVideo.132=enca:zh:big5 /* Chinese (auto) */ +NetworkTab.0=Language [needs application restart]: +NetworkTab.1=Browse compressed archives (.rar/.zip/.cbr) +NetworkTab.2=Generate thumbnails +NetworkTab.3=Start minimized +NetworkTab.4=Install as a Windows Service +NetworkTab.5=General settings +NetworkTab.6=Transcode buffer maximum size, in megabytes (maximum: MAX_BUFFER_SIZE): +NetworkTab.7=Number of cores used for transcoding (it seems you have %d): +NetworkTab.8=Check for updates +NetworkTab.9=Check automatically +NetworkTab.11=You have installed the Windows service \! For using it, you must quit this application,\n +NetworkTab.12=then start (and configure) the service from the windows administration panel.\n\n +NetworkTab.13=The cache will be reinitialized \!\n +NetworkTab.14=Error in the installation of the Windows service!\n +NetworkTab.15=Navigation/Parsing settings +NetworkTab.16=Thumbnail seeking position (in seconds): +NetworkTab.17=Enable the cache +NetworkTab.18=Reset cache +NetworkTab.19=Are you sure? +NetworkTab.20=Force networking on interface: +NetworkTab.22=Network settings (advanced) +NetworkTab.23=Force IP of the server: +NetworkTab.24=Force port of the server (5001 by default): +NetworkTab.25=PS3 Settings +NetworkTab.26=Character encoding of your PS3 file names (see XMB->System settings->Charset): +NetworkTab.27=Unused settings you shouldn't use :p +NetworkTab.28=Turbo mode (enable tcp_nodelay) / be careful, not sure if that's ok to do this +NetworkTab.29=Block incoming request for the same file from PS3 when transcode has started +NetworkTab.30=Use an IP filter (whitelist): +NetworkTab.31=Advanced HTTP and system settings +NetworkTab.32=HTTP Engine V2 +NetworkTab.33=Prevent OS from sleeping while streaming +NetworkTab.34=Plugins +NetworkTab.35=Maximum bandwidth in Mb/s (0 means no limit): +NetworkTab.36=Default renderer when automatic detection fails: +NetworkTab.37=Unknown renderer +NetworkTab.38=Force default renderer (disable automatic detection) +PMS.0=No renderers were found +PMS.1=Audio +PMS.2=\#- Cache -\# +PMS.3=A/V sync alternative method +PMS.4=Deinterlace Filter +PMS.5=Connected to PS3 +PMS.6=Auto load .srt/.sub subtitles +PMS.7=SkipLoopFilter for H.264 Decoding (Could degrade quality) +PMS.8=Subtitles +PMS.9=All Audio Playlists +PMS.10=Definitely disable subtitles +PMS.11=All Audio Tracks +PMS.12=By Date +PMS.13=By Artist +PMS.16=By Album +PMS.17=Unknown renderer +PMS.18=Connected +PMS.19=By Genre +PMS.21=By camera model +PMS.22=By Artist/Album +PMS.25=By ISO settings +PMS.26=By Genre/Artist/Album +PMS.27=Save configuration +PMS.28=By Letter/Artist/Album +PMS.31=Photo +PMS.32=All Photos +PMS.34=Video +PMS.35=All Videos +PMS.36=HD Videos +PMS.37=\#- Video Settings -\# +PMS.39=SD Videos +PMS.40=DVD Images +PMS.41=(Re)installing Win32 service +PMS.42=Error initalizing PMS! +PMS.130=Searching for renderers... +ProfileChooser.1=PS3 Media Server Profile Chooser +ProfileChooser.2=Select +ProfileChooser.3=Profile file (.conf) or directory +StatusTab.2=Status +StatusTab.3=Waiting... +StatusTab.5=Empty +StatusTab.6=Transcoding buffer status: +StatusTab.7=I/O statistics: +StatusTab.8=Current bitrate: +StatusTab.9=Detected media renderers +StatusTab.10=Peak bitrate: +StatusTab.11=Mb/s +StatusTab.12=MB +TracesTab.3=Clear +TranscodeVirtualFolder.0=\#--TRANSCODE--\# +TreeNodeSettings.4=This engine is not loaded\! +TrTab2.0=Enable/disable a transcoding engine +TrTab2.1=No settings for now +TrTab2.2=Video encoder settings with following engines: MEncoder/AviSynth/FFmpeg +TrTab2.3=Audio settings, apply to following decoders: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Video quality settings +TrTab2.5=Common transcode settings +TrTab2.6=Sort the transcoding engines list. First one will appears in the original video folder +TrTab2.7=Misc options +TrTab2.8=Skip transcode for the following
extensions (comma separated): +TrTab2.9=Force transcode for the following
extensions (comma separated): +TrTab2.10=Allows you to stream DTS directly to your receiver.\nBe careful, it's possible to have a static sound. Notes:\n- You must have a DTS compatible receiver, connected on TOSLINK or HDMI\n- The volume icon on XMB must be on 'Normal'\n- The channels icon on XMB must be on 'Left+Right'\n +TrTab2.11=Engines +TrTab2.12=Common decoder settings +TrTab2.13=Common encoder settings +TrTab2.14=Video Files Engines +TrTab2.15=Audio Files Engines +TrTab2.16=Web Video Streaming Engines +TrTab2.17=Web Audio Streaming Engines +TrTab2.18=Misc Engines +TrTab2.19=Engines are in descending +TrTab2.20=order; the highest is first +TrTab2.21=(AviSynth not supported) +TrTab2.22=Automatic audio resampling to 44.1 or 48 kHz +TrTab2.27=Use LPCM for audio (no re-encode) +TrTab2.28=Keep DTS track (no re-encode, compatible with AV receiver through optical or HDMI output) +TrTab2.29=AC-3 re-encoding audio bitrate (in kibit/s) (e.g.: 576, 640): +TrTab2.32=MPEG-2 options: +TrTab2.39=The video is automatically transcoded and muxed to a MPEG-PS / AC-3 audio (highly compatible on PS3) +TrTab2.40=\nYou can play with the vqscale, vqmin and keyint parameters to achieve good, even almost lossless transcoding quality. +TrTab2.41=\nThe drawback to this is the VBR bitrate, which can sometimes peak above your max network capacity. +TrTab2.42=\nThat's why you can also set the bandwidth if you're on WiFi, CPL, etc. However, the transcoding quality +TrTab2.43=\nis a balance between network speed and CPU power: the more quality you put into a constrained bitrate, +TrTab2.44=\nthe more your CPU will suffer\! Also, don't expect to fit a 1080p action movie in the purest quality in 15Mbps :p +TrTab2.50=Maximum number of audio channels to output for AC-3 re-encoding: +TrTab2.51=Definitely disable subtitles +TrTab2.52=\#--TRANSCODE--\# folder chapter support (interval in minutes): +TrTab2.55=2 channels (Stereo) +TrTab2.56=6 channels (5.1) +TrTab2.60=Great quality +TrTab2.61=Lossless quality +TrTab2.62=Good quality +TrTab2.63=Good quality for HD Wifi +TrTab2.64=Medium quality for HD Wifi +TrTab2.65=Low quality for low-end CPU +TrTab2.66=Video settings +TrTab2.67=Audio settings +TrTab2.68=Subtitle settings +TrTab2.69=Hardware acceleration +TSMuxerVideo.0=Demux with MEncoder and encode all audio tracks to AC-3 +TSMuxerVideo.1=Demux with MEncoder and encode DTS/FLAC audio tracks to LPCM [Careful, seeking don't work yet] +TSMuxerVideo.2=Force FPS parsed from FFmpeg in the meta file +TSMuxerVideo.3=Video decoder settings for tsMuxeR engine only +TSMuxerVideo.19=Mux all audio tracks +VlcTrans.1=VLC Transcoder Settings +VlcTrans.2=Use hardware acceleration +VlcTrans.3=Enable experimental codecs +VlcTrans.4=Enable audio sync +VlcTrans.6=Audio Language Priority +VlcTrans.7=jpn,eng +VlcTrans.8=Subtitle Language Priority +VlcTrans.9=eng,jpn +VlcTrans.10=Advanced Settings +VlcTrans.11=Video scale: +VlcTrans.17=Override auto-detection +VlcTrans.18=Audio Sample Rate +VlcTrans.19=Audio sample rate
Potential Values: 44100 (unstable) +VlcTrans.20=Custom Options: diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ar.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ar.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ar.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ar.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,293 @@ +# +# This file was automatically translated with Google Translate (http://translate.google.com/#en|ar) +# as a proof of concept for right-to-left oriented language support in PMS. +# +# A proper translation still needs to be done. +# +DLNAMediaDatabase.0=\u0642\u0627\u0639\u062F\u0629 \u0628\u064A\u0627\u0646\u0627\u062A \u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062A\u062E\u0632\u064A\u0646 \u0627\u0644\u0645\u0624\u0642\u062A \u064A\u062D\u062A\u0627\u062C \u0625\u0644\u0649 \u064A\u0643\u0648\u0646 reinitialized.\n \u0646 \u0646\u0623\u0633\u0641 \u0644\u0644\ \u0625\u0632\u0639\u0627\u062C! +DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z +DLNAMediaDatabase.2=\u062A\u0646\u0638\u064A\u0641 \u0642\u0627\u0639\u062F\u0629 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A ... +DLNAMediaDatabase.3=\u0636\u063A\u0637 \u0642\u0627\u0639\u062F\u0629 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A ... +DLNAMediaDatabase.4=\u0645\u0633\u062D \u0627\u0644\u0645\u062C\u0644\u062F: +FFMpegDVRMSRemux.0=\u0627\u0644\u0628\u062F\u064A\u0644 FFmpeg \u0645\u0633\u0627\u0631: +FFMpegDVRMSRemux.1=\u0636\u0628\u0637 DVR-MS remuxing +FFMpegVideo.0=\u0636\u0628\u0637 \u062A\u0631\u0645\u064A\u0632 \u0644\u0627\u0641\u064A\u0633\u064A\u0646\u062B / FFMPEG \u0645\u062D\u0631\u0643 \u0641\u0642\u0637 (\u064A\u0641\u0636\u0644 \u0627\u0641\u064A\u0633\u064A\u0646\u062B / \u0645\u064A\u0646\u0643\u0648\u062F\u0631) +FoldTab.0=<\u0643\u0644 \u0627\u0644\u0645\u0634\u063A\u0644\u0627\u062A> +FoldTab.1=\u062E\u064A\u0627\u0631\u0627\u062A \u0627\u0644\u0645\u0634\u0627\u0631\u0643\u0629 +FoldTab.2=\u062A\u0641\u062D\u0635 \u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0627\u0644\u0645\u0634\u062A\u0631\u0643\u0629 +FoldTab.3=\u0648\u064A\u0645\u0643\u0646 \u0645\u0633\u062D \u0643\u0644 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0627\u0644\u0645\u0634\u062A\u0631\u0643\u0629 \u062A\u0623\u062E\u0630 \u0627\u0644\u0643\u062B\u064A\u0631 \u0645\u0646 \u0627\u0644\u0648\u0642\u062A\!\n +FoldTab.4=\u0647\u0644 \u0623\u0646\u062A \u0645\u062A\u0623\u0643\u062F \u0644\u0625\u0637\u0644\u0627\u0642 \u0627\u0644\u0645\u0633\u062D\u061F\n\n +FoldTab.5=\u0625\u062E\u0641\u0627\u0621 \u0645\u0644\u062D\u0642\u0627\u062A \u0627\u0644\u0645\u0644\u0641\u0627\u062A +FoldTab.6=\u0627\u062E\u0641\u0627\u0621 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0645\u062C\u0644\u062F +FoldTab.7=\u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0627\u0644\u0645\u0634\u062A\u0631\u0643\u0629 +FoldTab.8=\u0625\u062E\u0641\u0627\u0621 \u0623\u0633\u0645\u0627\u0621 \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A \u0645\u062D\u0631\u0643 +FoldTab.9=\u0625\u0636\u0627\u0641\u0629 \u062F\u0644\u064A\u0644 +FoldTab.10=\u0647\u0644 \u062A\u0631\u063A\u0628 \u0641\u064A \u0627\u0644\u062A\u0648\u0642\u0641 \u0639\u0646 \u0627\u0644\u0641\u062D\u0635\u061F\n\n +FoldTab.11=\u062A\u0645\u0643\u064A\u0646 \u0627\u0644\u0645\u062D\u0648\u0644\u0629 \u0646\u0633\u062E\u0629 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0639\u0644\u0649 PS3 (\u0627\u0644\u062F\u0642\u064A\u0642\u060C \u0648\u0645\u0644\u0641\u0627\u062A \u0644\u064A\u0633 \u0644\u0647\u0627 \u062D\u062C\u0645 \u062B\u0627\u0628\u062A!) +FoldTab.12=\u0641\u0631\u0632 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0627\u0644\u0645\u0634\u062A\u0631\u0643\u0629 +FoldTab.13=\u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 +FoldTab.14=\u0627\u0633\u062A\u062E\u062F\u0645 \u0625\u0645\u0628\u0644\u0627\u064A\u0631 \u0644\u0644\u0645\u0635\u063A\u0631\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 +FoldTab.15=\u0627\u0644\u0623\u0628\u062C\u062F\u064A (A-Z) +FoldTab.16=\u062D\u0633\u0628 \u0627\u0644\u062A\u0627\u0631\u064A\u062E\u060C \u0627\u0644\u0623\u062D\u062F\u062B \u0623\u0648\u0644\u0627 +FoldTab.17=\u062D\u0633\u0628 \u0627\u0644\u062A\u0627\u0631\u064A\u062E\u060C \u0627\u0644\u0623\u0642\u062F\u0645 \u0623\u0648\u0644\u0627 +FoldTab.18=\u0645\u0644\u0641 \u0627\u0644\u0646\u0638\u0627\u0645: +FoldTab.19=\u062F\u064A \u0641\u064A \u062F\u064A \u0627\u064A\u0632\u0648 \u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 +FoldTab.20=ASCIIbetical +FoldTab.21=\u0635\u0648\u0631\u0629 \u0645\u0635\u063A\u0631\u0629 +FoldTab.22=\u0623\u0628\u062C\u062F\u064A\u0629 +FoldTab.23=\u062A\u062D\u0645\u064A\u0644 \u0645\u0646 amazon.com +FoldTab.24=\u062A\u062D\u0645\u064A\u0644 \u0645\u0646 discogs.com +FoldTab.26=\u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 \u0639\u0631\u0636 \u0627\u0644\u0635\u0648\u062A: +FoldTab.27=\u0627\u0644\u0628\u062F\u064A\u0644 \u062A\u063A\u0637\u064A\u0629 \u0627\u0644\u0641\u0646 \u0641\u064A\u062F\u064A\u0648 \u0627\u0644\u0645\u062C\u0644\u062F +FoldTab.28=\u0627\u062E\u062A\u064A\u0627\u0631 \u0645\u062C\u0644\u062F +FoldTab.29=\u0625\u0638\u0647\u0627\u0631 \u0645\u0643\u062A\u0628\u0629 iPhoto +FoldTab.30=\u0639\u0631\u0636 \u0627\u064A \u062A\u064A\u0648\u0646\u0632 \u0645\u0643\u062A\u0628\u0629 +FoldTab.31=\u0625\u062E\u0641\u0627\u0621 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0641\u0627\u0631\u063A\u0629 / \u063A\u064A\u0631 \u0633\u0627\u0626\u0644 \u0627\u0644\u0625\u0639\u0644\u0627\u0645 (\u062D\u0630\u0631\u0627: \u0627\u0644\u062A\u0635\u0641\u062D \u0628\u0637\u064A\u0621) +FoldTab.32=\u0625\u062E\u0641\u0627\u0621 \u0627\u0644\u0645\u062C\u0644\u062F \u0627\u0644\u0645\u0624\u0642\u062A +FoldTab.33=\u0625\u062E\u0641\u0627\u0621 \u0627\u0644\u0645\u062C\u0644\u062F\u0627\u062A \u0641\u064A\u0631\u062A +FoldTab.34=\u062A\u0638\u0647\u0631 \u0641\u062A\u062D\u0629 \u0645\u0643\u062A\u0628\u0629 +FontFileFilter.3=\u062E\u0637\u0648\u0637 \u062A\u0631\u0648\u062A\u0627\u064A\u0628 +LinksTab.5=\u0631\u0648\u0627\u0628\u0637 \u0645\u0641\u064A\u062F\u0629: +LinksTab.6=\u0628\u0646\u0627\u0621: +LooksFrame.5=\u0627\u0633\u062A\u0642\u0627\u0644 +LooksFrame.6=\u0627\u0644\u0631\u0626\u064A\u0633\u064A\u0629 \u0644\u0648\u062D\u0629 +LooksFrame.9=\u062D\u0641\u0638 +LooksFrame.12=\u0625\u0639\u0627\u062F\u0629 \u062A\u0634\u063A\u064A\u0644 \u0627\u0644\u062E\u0627\u062F\u0645 +LooksFrame.13=\u0627\u0644\u062E\u0627\u062F\u0645 \u0644\u0627\u0628\u062F \u0645\u0646 \u0625\u0639\u0627\u062F\u0629 \u062A\u0634\u063A\u064A\u0644 \u0628\u0633\u0628\u0628 \u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u062A\u0643\u0648\u064A\u0646 +LooksFrame.18=\u062D\u0627\u0644\u0629 +LooksFrame.19=\u0622\u062B\u0627\u0631 +LooksFrame.20=\u062A\u0643\u0648\u064A\u0646 \u0639\u0627\u0645 +LooksFrame.21=\u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A \u0625\u0639\u062F\u0627\u062F\u0627\u062A +LooksFrame.22=\u0627\u0644\u0645\u0644\u0627\u062D\u0629 / \u062D\u0635\u0629 \u0625\u0639\u062F\u0627\u062F\u0627\u062A +LooksFrame.24=\u0645\u0633\u0627\u0639\u062F\u0629 +LooksFrame.25=\u062D\u0648\u0644 +LooksFrame.26=\u0627\u0644\u0627\u062E\u062A\u0628\u0627\u0631 \u0641\u0642\u0637\u060C \u0645\u0646 \u0627\u0644\u0645\u062D\u062A\u0645\u0644 \u063A\u064A\u0631 \u0645\u0633\u062A\u0642\u0631\u0629 +MEncoderAviSynth.2=\u0636\u0628\u0637 \u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0644\u0645\u062D\u0631\u0643 \u0627\u0641\u064A\u0633\u064A\u0646\u062B \u0641\u0642\u0637 +MEncoderAviSynth.3=\u062A\u0645\u0643\u064A\u0646 \u0627\u0641\u064A\u0633\u064A\u0646\u062B \u062A\u063A\u064A\u064A\u0631 \u0641\u0631\u0627\u0645\u064A\u0631\u0627\u062A\u064A \u0627\u0644\u0645\u062A\u063A\u064A\u0631 \u0641\u064A \u0641\u0631\u0627\u0645\u064A\u0631\u0627\u062A\u064A \u062B\u0627\u0628\u062A (convertfps = \u0635\u062D\u064A\u062D) +MEncoderAviSynth.4=#AviSynth script is now fully customisable !\n +MEncoderAviSynth.5=#You must use the following variables (\"clip\" being the avisynth variable of the movie):\n +MEncoderAviSynth.6=#: insert the complete DirectShowSource instruction [ clip=DirectShowSource(movie, convertfps) ]\n +MEncoderAviSynth.7=#: insert the complete TextSub/VobSub instruction if there's any detected srt/sub/idx/ass subtitle file\n +MEncoderAviSynth.8=#: variable of the movie filename, if you want to do all this by yourself\n +MEncoderAviSynth.9=#Be careful, the custom script MUST return the clip object\n +MEncoderAviSynth.10=<\u0641\u064A\u0644\u0645>\n +MEncoderAviSynth.11=<\u0639\u0646\u0648\u0627\u0646 \u0641\u0631\u0639\u064A>\n +MEncoderAviSynth.12=\u0639\u0648\u062F\u0629 \u0643\u0644\u064A\u0628 +MEncoderVideo.0=\u062A\u062E\u0637\u064A \u0641\u0644\u062A\u0631 \u0644\u0625\u0632\u0627\u0644\u0629 \u0643\u062A\u0644 \u062D\u0644\u0642\u0629 H.264. \u064A\u0645\u0643\u0646 \u0623\u0646 \u062A\u062A\u062D\u0644\u0644 \u062C\u0648\u062F\u0629. +MEncoderVideo.1=\u0627\u0644\u0641\u064A\u062F\u064A\u0648 / \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0635\u0648\u062A \u0644\u0641\u0643 \u0645\u062D\u0631\u0643 \u0645\u064A\u0646\u0643\u0648\u062F\u0631 \u0641\u0642\u0637 +MEncoderVideo.2=A / V \u0637\u0631\u064A\u0642\u0629 \u0628\u062F\u064A\u0644\u0629 \u0645\u062A\u0632\u0627\u0645\u0646\u0629 +MEncoderVideo.3=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A \u062A\u0637\u0628\u064A\u0642 \u0627\u0644\u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0627\u0641\u062A\u0631\u0627\u0636\u064A (\u0645\u0633\u062A\u062D\u0633\u0646!) +MEncoderVideo.4=\u0641\u0631\u0636 \u0641\u0631\u0627\u0645\u064A\u0631\u0627\u062A\u064A \u062A\u062D\u0644\u064A\u0644 \u0645\u0646 FFMPEG +MEncoderVideo.5=\u064A\u0645\u0643\u0646\u0643 \u0625\u0636\u0627\u0641\u0629 \u0647\u0646\u0627 \u062E\u064A\u0627\u0631\u0627\u062A \u0645\u062D\u062F\u062F\u0629\u060C \u0645\u062B\u0644 \u0645\u0631\u0634\u062D denoise \u0639\u0644\u0649 \u0633\u0628\u064A\u0644 \u0627\u0644\u0645\u062B\u0627\u0644: -vf hqdn3d +MEncoderVideo.6=\u0639\u0631\u0641 \u062E\u064A\u0627\u0631\u0627\u062A: +MEncoderVideo.7=\u0627\u0644\u0635\u0648\u062A \u0644\u063A\u0629 \u0630\u0627\u062A \u0627\u0644\u0623\u0648\u0644\u0648\u064A\u0629: +MEncoderVideo.8=\u062A\u0631\u062C\u0645\u0629 \u0625\u0639\u062F\u0627\u062F\u0627\u062A +MEncoderVideo.9=\u062A\u0631\u062C\u0645\u0629 \u0644\u063A\u0629 \u0630\u0627\u062A \u0627\u0644\u0623\u0648\u0644\u0648\u064A\u0629: +MEncoderVideo.10=\u0627\u0644\u0635\u0648\u062A \u0644\u063A\u0629 \u0627\u0644\u062A\u0631\u062C\u0645\u0629 / \u0627\u0644\u0623\u0648\u0644\u0648\u064A\u0629 (\u0639\u0644\u0649 \u0633\u0628\u064A\u0644 \u0627\u0644\u0645\u062B\u0627\u0644: \u0627\u0646\u060C \u062D\u0627\u0644\u0627\u060C \u0627\u0644\u064A\u0627\u0628\u0627\u0646\u060C \u0627\u0646\u0643\u0644\u062A\u0631\u0627) +MEncoderVideo.11=\u062A\u0631\u062C\u0645\u0629 \u0645\u062E\u0637\u0637 \u0627\u0644\u0634\u0641\u0631\u0629: +MEncoderVideo.12=\u062A\u062C\u0627\u0648\u0632 \u0639\u0644\u0649 \u063A\u0631\u0627\u0631 \u062A\u0631\u062C\u0645\u0629: \u0636\u0628\u0637 \u062D\u062C\u0645 \u0627\u0644\u062E\u0637 +MEncoderVideo.13=\u0627\u0644\u062E\u0637 \u0627\u0644\u0645\u062E\u0637\u0637 \u0627\u0644\u062A\u0641\u0635\u064A\u0644\u064A +MEncoderVideo.14=\u0627\u0644\u062E\u0637 \u0627\u0644\u0638\u0644 +MEncoderVideo.15=\u0634\u0628\u0647 \u0647\u0627\u0645\u0634 (\u0645\u0642\u0635\u0641) +MEncoderVideo.16=\u0645\u0634\u0641\u0631 \u062A\u0631\u062C\u0645\u0629: \u0636\u0628\u0637 \u062D\u062C\u0645 \u0627\u0644\u062E\u0637 +MEncoderVideo.17=\u0627\u0644\u062E\u0637 \u0627\u0644\u0645\u062E\u0637\u0637 \u0627\u0644\u062A\u0641\u0635\u064A\u0644\u064A +MEncoderVideo.18=\u0627\u0644\u062E\u0637 \u0637\u0645\u0633 +MEncoderVideo.19=\u0634\u0628\u0647 \u0647\u0627\u0645\u0634 (\u066A) +MEncoderVideo.20=\u0627\u0633\u062A\u062E\u062F\u0645 ASS / SSA \u0627\u0644\u062A\u0635\u0645\u064A\u0645 \u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0641\u0631\u0639\u064A +MEncoderVideo.21=Fontconfig / \u062C\u0632\u0621\u0627 \u0644\u0627 \u064A\u062A\u062C\u0632\u0623 \u0645\u0646 \u0627\u0644\u062E\u0637\u0648\u0637 +MEncoderVideo.22=* \u062A\u062D\u0645\u064A\u0644 \u062A\u0644\u0642\u0627\u0626\u064A\u0627. SRT / *. \u062A\u0631\u062C\u0645\u0629 \u0627\u0644\u0641\u0631\u0639\u064A\u0629 \u0645\u0639 \u0646\u0641\u0633 \u0627\u0633\u0645 \u0627\u0644\u0645\u0644\u0641 +MEncoderVideo.23=FriBiDi \u0648\u0636\u0639 +MEncoderVideo.24=\u062A\u062D\u062F\u064A\u062F \u062E\u0637 \u062A\u0631\u0648\u062A\u0627\u064A\u0628 (\u0644\u062A\u0631\u062C\u0645\u0629): +MEncoderVideo.25=\u062A\u062D\u062F\u064A\u062F \u062E\u0637 \u062A\u0631\u0648\u062A\u0627\u064A\u0628 +MEncoderVideo.26=\u062A\u0634\u0627\u0628\u0643 \u0641\u0644\u062A\u0631 +MEncoderVideo.27=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0627\u0644\u0645\u062A\u0633\u0644\u0642 +MEncoderVideo.28=\u0639\u0631\u0636 +MEncoderVideo.29=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u062E\u0628\u0631\u0627\u0621: \u062A\u0631\u0645\u064A\u0632 \u0645\u062D\u062F\u062F\u0629 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A +MEncoderVideo.30=\u0627\u0631\u062A\u0641\u0627\u0639 +MEncoderVideo.31=\u0627\u0644\u063A\u0648\u0627\u0635\u0627\u062A \u0627\u0644\u0644\u0648\u0646 +MEncoderVideo.32=Remux \u0639\u0646\u062F\u0645\u0627 \u0627\u0644\u0635\u0648\u062A \u0647\u0648 AC-3 (\u0623\u064A \u0625\u0639\u0627\u062F\u0629 \u062A\u0631\u0645\u064A\u0632) +MEncoderVideo.33=\u0639\u0631\u0641 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A: +MEncoderVideo.34=\u062A\u0639\u062F\u064A\u0644 \u0627\u0644\u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A \u0645\u062D\u062F\u062F\u0629 +MEncoderVideo.35=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062C\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064A\u0629 \u0645\u062A\u0639\u062F\u062F\u0629 \u0627\u0644\u0646\u0648\u0649 +MEncoderVideo.36=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0623\u0633\u0644\u0648\u0628 \u062C\u0632\u0621\u0627 \u0644\u0627 \u064A\u062A\u062C\u0632\u0623 \u0645\u0646 +MEncoderVideo.37=\u0627\u0644\u0628\u062F\u064A\u0644 \u062A\u0631\u062C\u0645\u0627\u062A \u0645\u062C\u0644\u062F +MEncoderVideo.39=Remux \u0641\u064A\u062F\u064A\u0648 \u062F\u064A \u0641\u064A \u062F\u064A \u0627\u064A\u0632\u0648 \u0627\u0644\u0645\u0633\u0627\u0631 (\u0623\u064A \u0625\u0639\u0627\u062F\u0629 \u062A\u0631\u0645\u064A\u0632) +MEncoderVideo.68=\#Here you can put specific parameters for some codec combinations.\n +MEncoderVideo.69=\#It's mostly for A/V synchronization issues, but it can be used for anything else as well\n +MEncoderVideo.70=\#Consider it like expert settings as this shouldn't be used if you don't know exactly what you're doing\n +MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n +MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Careful, any malformed line will be wiped out\n +MEncoderVideo.75=\#Special options:\n +MEncoderVideo.76=\# -noass: definitely disable ASS/SSA subtitles as they can mess up A/V sync\n +MEncoderVideo.77=\# -nosync: definitely disable A/V sync alternative method for this condition (-mc will do the same)\n +MEncoderVideo.78=\# -quality: override video quality settings\n +MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n +MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n +MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n +MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=\u062F\u064A \u0641\u064A \u062F\u064A / VOBsub \u062C\u0648\u062F\u0629 \u0627\u0644\u062A\u0631\u062C\u0645\u0629 (0-4) (\u0623\u0639\u0644\u0649 \u0647\u064A \u0623\u062D\u0633\u0646): +MEncoderVideo.93=\u0625\u0636\u0627\u0641\u0629 \u062D\u062F\u0648\u062F \u0644\u0644\u062D\u0635\u0648\u0644 \u0639\u0644\u0649 \u062A\u0639\u0648\u064A\u0636 overscan: +MEncoderVideo.94=\u0627\u0636\u0637\u0631 \u0641\u0631\u0639\u064A\u0629 \u0647\u064A: +MEncoderVideo.95=\u0623\u062C\u0628\u0631 \u0628\u0647: +MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ +MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ +MEncoderVideo.98=cp1252 /* Windows - Western Europe */ +MEncoderVideo.99=cp1253 /* Windows - Greek */ +MEncoderVideo.100=cp1254 /* Windows - Turkish */ +MEncoderVideo.101=cp1255 /* Windows - Hebrew */ +MEncoderVideo.102=cp1256 /* Windows - Arabic */ +MEncoderVideo.103=cp1257 /* Windows - Baltic */ +MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ +MEncoderVideo.105=ISO-8859-1 /* Western Europe */ +MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ +MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ +MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ +MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ +MEncoderVideo.110=ISO-8859-6 /* Arabic */ +MEncoderVideo.111=ISO-8859-7 /* Greek */ +MEncoderVideo.112=ISO-8859-8 /* Hebrew */ +MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ +MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ +MEncoderVideo.115=ISO-8859-11 /* Thai */ +MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ +MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ +MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ +MEncoderVideo.119=ISO-8859-16 /* Central European languages */ +MEncoderVideo.120=cp932 /* Japanese */ +MEncoderVideo.121=cp936 /* Chinese */ +MEncoderVideo.122=cp949 /* Korean */ +MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */ +MEncoderVideo.124=UTF-8 /* Unicode */ +MEncoderVideo.125=Choose Subtitles Color +NetworkTab.0=\u0644\u063A\u0629 [\u064A\u062C\u0628 \u062A\u0637\u0628\u064A\u0642 \u0625\u0639\u0627\u062F\u0629 \u062A\u0634\u063A\u064A\u0644]: +NetworkTab.1=\u062A\u0635\u0641\u062D \u0627\u0644\u0645\u062D\u0641\u0648\u0638\u0627\u062A \u0627\u0644\u0645\u0636\u063A\u0648\u0637\u0629 (.rar / .zip / .cbr) +NetworkTab.2=\u062A\u0648\u0644\u064A\u062F \u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 +NetworkTab.3=\u0628\u062F\u0621 \u0645\u0635\u063A\u0631 +NetworkTab.4=\u062A\u062B\u0628\u064A\u062A \u0628\u0627\u0639\u062A\u0628\u0627\u0631\u0647\u0627 \u062E\u062F\u0645\u0629 \u0648\u064A\u0646\u062F\u0648\u0632 +NetworkTab.5=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0639\u0627\u0645\u0629 +NetworkTab.6=\u0641\u064A\u0631\u062A \u062D\u062C\u0645 \u0627\u0644\u0645\u062E\u0632\u0646 \u0627\u0644\u0645\u0624\u0642\u062A \u0627\u0644\u0623\u0642\u0635\u0649\u060C \u0641\u064A \u0645\u064A\u063A\u0627 \u0628\u0627\u064A\u062A (\u0627\u0644\u062D\u062F \u0627\u0644\u0623\u0642\u0635\u0649: MAX_BUFFER_SIZE): +NetworkTab.7=\u0639\u062F\u062F \u0627\u0644\u0646\u0648\u0649 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645\u0629 \u0644\u0646\u0642\u0644 \u0627\u0644\u062A\u0631\u0645\u064A\u0632 (\u064A\u0628\u062F\u0648 \u0623\u0646 \u0644\u062F\u064A\u0643 %d): +NetworkTab.8=\u0627\u0644\u062A\u062D\u0642\u0642 \u0645\u0646 \u0627\u0644\u062A\u062D\u062F\u064A\u062B\u0627\u062A +NetworkTab.9=\u062A\u062D\u0642\u0642 \u062A\u0644\u0642\u0627\u0626\u064A\u0627 +NetworkTab.11=\u0643\u0646\u062A \u0642\u062F \u0642\u0645\u062A \u0628\u062A\u062B\u0628\u064A\u062A \u062E\u062F\u0645\u0629 Windows \! \u0644\u0627\u0633\u062A\u062E\u062F\u0627\u0645\u0647\u060C \u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0647\u0630\u0627 \u0627\u0644\u062A\u0637\u0628\u064A\u0642\u060C \u0627\u0633\u062A\u0642\u0627\u0644\u060C \ \u0646 +NetworkTab.12=\u062B\u0645 \u062A\u0628\u062F\u0623 (\u0648\u062A\u0643\u0648\u064A\u0646) \u0644\u062E\u062F\u0645\u0629 \u0648\u064A\u0646\u062F\u0648\u0632 \u0645\u0646 \u0644\u0648\u062D\u0629 \u0627\u0644\u0625\u062F\u0627\u0631\u0629. \ \u0646 \ \u0646 +NetworkTab.13=\u0648\u0633\u0648\u0641 \u064A\u0643\u0648\u0646 reinitialized \u0639\u0644\u0649 \u0645\u062E\u0628\u0623 \! \n +NetworkTab.14=\u062E\u0637\u0623 \u0641\u064A \u062A\u0631\u0643\u064A\u0628 \u062E\u062F\u0645\u0629 Windows \u0646 \! +NetworkTab.15=\u0627\u0644\u0645\u0644\u0627\u062D\u0629 / \u062A\u0648\u0632\u064A\u0639 \u0625\u0639\u062F\u0627\u062F\u0627\u062A +NetworkTab.16=\u0645\u0648\u0642\u0641 \u0627\u0644\u0645\u0635\u063A\u0631\u0629 \u0627\u0644\u062A\u064A \u062A\u0633\u0639\u0649 (\u062B\u0627\u0646\u064A\u0629): +NetworkTab.17=\u062A\u0645\u0643\u064A\u0646 \u0630\u0627\u0643\u0631\u0629 \u0627\u0644\u062A\u062E\u0632\u064A\u0646 \u0627\u0644\u0645\u0624\u0642\u062A +NetworkTab.18=\u0625\u0639\u0627\u062F\u0629 \u0636\u0628\u0637 \u0645\u062E\u0628\u0623 +NetworkTab.19=\u0647\u0644 \u0623\u0646\u062A \u0645\u062A\u0623\u0643\u062F\u061F +NetworkTab.20=\u0634\u0628\u0643\u0629 \u0627\u0644\u0646\u0641\u0627\u0630 \u0641\u064A \u0627\u0644\u0648\u0627\u062C\u0647\u0629: +NetworkTab.22=\u0636\u0628\u0637 \u0634\u0628\u0643\u0629 (\u0645\u062A\u0642\u062F\u0645) +NetworkTab.23=\u0641\u0631\u0636 IP \u0644\u0645\u0644\u0642\u0645: +NetworkTab.24=\u0642\u0648\u0629 \u0627\u0644\u0645\u0646\u0641\u0630 \u0644\u0645\u0644\u0642\u0645 (5001 \u0627\u0641\u062A\u0631\u0627\u0636\u064A\u0627): +NetworkTab.25=PS3 \u0644\u0648\u062D\u0629 \u0627\u0644\u062A\u062D\u0643\u0645 +NetworkTab.26=\u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u062D\u0631\u0648\u0641 \u0645\u0646 \u0623\u0633\u0645\u0627\u0626\u0643\u0645 \u0645\u0644\u0641 PS3 (\u0627\u0646\u0638\u0631 XMB - \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0646\u0638\u0627\u0645> -> \u0645\u062D\u0627\u0631\u0641): +NetworkTab.27=\u063A\u064A\u0631 \u0627\u0644\u0645\u0633\u062A\u062E\u062F\u0645\u0629 \u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u062A\u064A \u064A\u062C\u0628 \u0639\u062F\u0645 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 :P +NetworkTab.28=\u0648\u0636\u0639 \u062A\u0648\u0631\u0628\u0648 (\u062A\u0645\u0643\u064A\u0646 tcp_nodelay) / \u062A\u0648\u062E\u064A \u0627\u0644\u062D\u0630\u0631\u060C \u0648\u0644\u0633\u062A \u0645\u062A\u0623\u0643\u062F\u0627 \u0625\u0630\u0627 \u0643\u0627\u0646 \u0647\u0630\u0627 \u0647\u0648 \u0645\u0648\u0627\u0641\u0642 \u0644\u0644\u0642\u064A\u0627\u0645 \u0628\u0630\u0644\u0643 +NetworkTab.29=\u0645\u0646\u0639 \u0637\u0644\u0628 \u0648\u0627\u0631\u062F \u0644\u0646\u0641\u0633 \u0627\u0644\u0645\u0644\u0641 \u0645\u0646 PS3 \u0639\u0646\u062F\u0645\u0627 \u0628\u062F\u0623\u062A \u0641\u064A\u0631\u062A +NetworkTab.30=\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0641\u0644\u062A\u0631 IP: +NetworkTab.31=HTTP \u0627\u0644\u0645\u062A\u0642\u062F\u0645\u0629 \u0648\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0646\u0638\u0627\u0645 +NetworkTab.32=HTTP \u0627\u0644\u0645\u062D\u0631\u0643 V2 +NetworkTab.33=\u0645\u0646\u0639 \u0646\u0638\u0627\u0645 \u0627\u0644\u062A\u0634\u063A\u064A\u0644 \u0645\u0646 \u0627\u0644\u0646\u0648\u0645 \u0641\u064A \u062D\u064A\u0646 \u062A\u062F\u0641\u0642 +NetworkTab.34=\u0627\u0644\u0625\u0636\u0627\u0641\u0627\u062A +NetworkTab.35=\u0623\u0642\u0635\u0649 \u0639\u0631\u0636 \u0627\u0644\u0646\u0637\u0627\u0642 \u0627\u0644\u062A\u0631\u062F\u062F\u064A \u0641\u064A \u0645\u064A\u062C\u0627 \u0628\u062A / \u062B\u0627\u0646\u064A\u0629 (0 \u064A\u0639\u0646\u064A \u0639\u062F\u0645 \u0648\u062C\u0648\u062F \u062D\u062F\u0648\u062F): +PMS.0=\u0644\u0645 \u064A\u062A\u0645 \u0627\u0644\u0639\u062B\u0648\u0631 \u0639\u0644\u0649 \u0639\u0627\u0631\u0636\u064A\u0646 +PMS.1=\u0627\u0644\u0635\u0648\u062A +PMS.2=\#- \u0645\u062E\u0628\u0623 -\# +PMS.3=A / V \u0637\u0631\u064A\u0642\u0629 \u0628\u062F\u064A\u0644\u0629 \u0645\u062A\u0632\u0627\u0645\u0646\u0629 +PMS.4=\u062A\u0634\u0627\u0628\u0643 \u062A\u0635\u0641\u064A\u0629 +PMS.5=\u0628\u062C\u0647\u0627\u0632 PS3 +PMS.6=\u0627\u0644\u0633\u064A\u0627\u0631\u0627\u062A \u062A\u062D\u0645\u064A\u0644 .srt / .sub \u062A\u0631\u062C\u0645\u0627\u062A +PMS.7=SkipLoopFilter \u0644\u0644\u062D\u0635\u0648\u0644 \u0639\u0644\u0649 \u0641\u0643 H.264 (\u062A\u062E\u0641\u0641 \u062C\u0648\u062F\u0629) +PMS.8=\u062A\u0631\u062C\u0645\u0629 +PMS.9=\u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0635\u0646\u0641\u0627\u062A \u0627\u0644\u0633\u0645\u0639\u064A\u0629 +PMS.10=\u062A\u0639\u0637\u064A\u0644 \u0628\u0627\u0644\u062A\u0623\u0643\u064A\u062F \u062A\u0631\u062C\u0645\u0627\u062A +PMS.11=\u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0633\u0627\u0631\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 +PMS.12=\u062D\u0633\u0628 \u0627\u0644\u062A\u0627\u0631\u064A\u062E +PMS.13=\u0628\u0648\u0627\u0633\u0637\u0629 \u0627\u0644\u0641\u0646\u0627\u0646 +PMS.16=\u0645\u0646 \u0627\u0644\u0623\u0644\u0628\u0648\u0645 +PMS.17=\u063A\u064A\u0631 \u0645\u0639\u0631\u0648\u0641 \u0627\u0644\u0639\u0627\u0631\u0636 +PMS.18=\u0645\u062A\u0635\u0644 +PMS.19=\u062D\u0633\u0628 \u0627\u0644\u0646\u0648\u0639 +PMS.21=\u0645\u0646 \u0637\u0631\u0627\u0632 \u0627\u0644\u0643\u0627\u0645\u064A\u0631\u0627 +PMS.22=\u0645\u0646 \u0642\u0628\u0644 \u0627\u0644\u0641\u0646\u0627\u0646 / \u0627\u0644\u0623\u0644\u0628\u0648\u0645 +PMS.25=\u0628\u0648\u0627\u0633\u0637\u0629 \u0625\u0639\u062F\u0627\u062F\u0627\u062A ISO +PMS.26=\u0628\u0648\u0627\u0633\u0637\u0629 \u0646\u0648\u0639 / \u0627\u0644\u0641\u0646\u0627\u0646 / \u0627\u0644\u0623\u0644\u0628\u0648\u0645 +PMS.27=\u062D\u0641\u0638 \u0627\u0644\u062A\u0643\u0648\u064A\u0646 +PMS.31=\u0635\u0648\u0631 +PMS.32=\u0643\u0644 \u0627\u0644\u0635\u0648\u0631 +PMS.34=\u0641\u064A\u062F\u064A\u0648 +PMS.35=\u0643\u0644 \u0644\u0642\u0637\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 +PMS.36=\u0623\u0641\u0644\u0627\u0645 HD +PMS.37=\#- \u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 -\# +PMS.39=\u0623\u0641\u0644\u0627\u0645 SD +PMS.41=(\u0625\u0639\u0627\u062F\u0629) \u062A\u062B\u0628\u064A\u062A Win32 \u0648\u062E\u062F\u0645\u0629 +PMS.130=\u0627\u0644\u0628\u062D\u062B \u0639\u0646 \u0639\u0627\u0631\u0636\u064A\u0646 ... +ProfileChooser.1=PS3 \u0645\u064A\u062F\u064A\u0627 \u200B\u200B\u0633\u064A\u0631\u0641\u0631 \u0627\u0644\u0634\u062E\u0635\u064A \u0645\u0646\u062A\u0642\u064A +ProfileChooser.2=\u062D\u062F\u062F +ProfileChooser.3=\u0645\u0644\u0641 \u0627\u0644\u0645\u0644\u0641 (. \u0623\u0633\u064A\u0648\u0637) \u0623\u0648 \u062F\u0644\u064A\u0644 +StatusTab.2=\u062D\u0627\u0644\u0629 +StatusTab.3=\u0627\u0646\u062A\u0638\u0627\u0631 ... +StatusTab.5=\u0641\u0627\u0631\u063A +StatusTab.6=\u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A \u062D\u0627\u0644\u0629 \u0627\u0644\u0639\u0627\u0632\u0644\u0629: +StatusTab.7=I / O \u0625\u062D\u0635\u0627\u0626\u064A\u0627\u062A: +StatusTab.8=\u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A \u0627\u0644\u062D\u0627\u0644\u064A: +StatusTab.9=\u0627\u0644\u0643\u0634\u0641 \u0639\u0646 \u0648\u0633\u0627\u0626\u0644 \u0627\u0644\u0625\u0639\u0644\u0627\u0645 \u0639\u0627\u0631\u0636\u064A\u0646 +StatusTab.10=\u0630\u0631\u0648\u0629 \u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A: +StatusTab.11=\u0645\u064A\u063A\u0627\u0628\u062A \u0641\u064A \u0627\u0644\u062B\u0627\u0646\u064A\u0629 +TSMuxerVideo.0=Demux \u0645\u0639 \u0645\u064A\u0646\u0643\u0648\u062F\u0631 \u0648\u062A\u0631\u0645\u064A\u0632 \u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0633\u0627\u0631\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 \u0625\u0644\u0649 AC-3 +TSMuxerVideo.1=Demux \u0645\u0639 \u0645\u064A\u0646\u0643\u0648\u062F\u0631 \u0648\u062A\u0631\u0645\u064A\u0632 DTS / FLAC \u0627\u0644\u0645\u0633\u0627\u0631\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 \u0625\u0644\u0649 LPCM [\u0627\u0644\u062F\u0642\u064A\u0642\u060C \u0648\u0627\u0644\u0633\u0639\u064A \u0644\u0627 \u062A\u0639\u0645\u0644 \u062D\u062A\u0649 \u0627\u0644\u0622\u0646] +TSMuxerVideo.2=FPS \u0642\u0648\u0629 \u062A\u062D\u0644\u064A\u0644 \u0645\u0646 FFMPEG \u0641\u064A \u0645\u0644\u0641 \u0627\u0644\u062A\u0639\u0631\u064A\u0641 +TSMuxerVideo.3=\u0636\u0628\u0637 \u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0644\u0645\u062D\u0631\u0643 tsMuxeR \u0641\u0642\u0637 +TSMuxerVideo.19=MUX \u062C\u0645\u064A\u0639 \u0627\u0644\u0645\u0633\u0627\u0631\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 +TrTab2.0=\u062A\u0645\u0643\u064A\u0646 / \u062A\u0639\u0637\u064A\u0644 \u0645\u062D\u0631\u0643 \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A +TrTab2.1=\u0623\u064A \u0636\u0628\u0637 \u0641\u064A \u0627\u0644\u0648\u0642\u062A \u0627\u0644\u0631\u0627\u0647\u0646 +TrTab2.2=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u062A\u0631\u0645\u064A\u0632 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0645\u0639 \u0645\u062D\u0631\u0643\u0627\u062A \u0627\u0644\u062A\u0627\u0644\u064A\u0629: \u0645\u064A\u0646\u0643\u0648\u062F\u0631 / \u0627\u0641\u064A\u0633\u064A\u0646\u062B / FFMPEG +TrTab2.3=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u060C \u062A\u0646\u0637\u0628\u0642 \u0639\u0644\u0649 \u0641\u0643 \u0627\u0644\u0631\u0645\u0648\u0632 \u0627\u0644\u062A\u0627\u0644\u064A\u0629: \u0645\u064A\u0646\u0643\u0648\u062F\u0631 / \u0627\u0641\u064A\u0633\u064A\u0646\u062B / FFMPEG tsMuxeR / +TrTab2.4=\u0636\u0628\u0637 \u062C\u0648\u062F\u0629 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 +TrTab2.5=\u0645\u0634\u062A\u0631\u0643 \u0641\u064A\u0631\u062A \u0625\u0639\u062F\u0627\u062F\u0627\u062A +TrTab2.6=\u0641\u0631\u0632 \u0642\u0627\u0626\u0645\u0629 \u0645\u062D\u0631\u0643\u0627\u062A \u0627\u0644\u062A\u062D\u0648\u064A\u0644. \u0623\u0648\u0644 \u0648\u0638\u0647\u0631 \u0641\u064A \u0645\u062C\u0644\u062F \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0627\u0644\u0623\u0635\u0644\u064A +TrTab2.7=\u0645\u062A\u0641\u0631\u0642\u0627\u062A \u062E\u064A\u0627\u0631\u0627\u062A +TrTab2.8=\u0641\u064A\u0631\u062A \u0644\u062A\u062E\u0637\u064A \u0627\u0644\u0645\u0644\u062D\u0642\u0627\u062A \u0627\u0644\u062A\u0627\u0644\u064A\u0629 (\u0645\u0641\u0635\u0648\u0644\u0629 \u0628\u0641\u0648\u0627\u0635\u0644): +TrTab2.9=\u0641\u064A\u0631\u062A \u0644\u0625\u062C\u0628\u0627\u0631 \u0627\u0644\u0645\u0644\u062D\u0642\u0627\u062A \u0627\u0644\u062A\u0627\u0644\u064A\u0629 (\u0645\u0641\u0635\u0648\u0644\u0629 \u0628\u0641\u0648\u0627\u0635\u0644): +TrTab2.10=\u064A\u0633\u0645\u062D \u0644\u0643 \u0644\u062A\u064A\u0627\u0631 DTS \u0645\u0628\u0627\u0634\u0631\u0629 \u0625\u0644\u0649 \u062C\u0647\u0627\u0632 \u0627\u0644\u0627\u0633\u062A\u0642\u0628\u0627\u0644 \u0627\u0644\u062E\u0627\u0635 \u0628\u0643. \ \u0627\u0644\u0628\u0646\u0643 \u0627\u0644\u0623\u0647\u0644\u064A \u062F\u0642\u064A\u0642\u060C \u0641\u0645\u0646 \u0627\u0644\u0645\u0645\u0643\u0646 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0644\u0647\u0627 \u0635\u0648\u062A \u062B\u0627\u0628\u062A. \u0645\u0644\u0627\u062D\u0638\u0627\u062A: \ \u0646 \u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u062C\u0647\u0627\u0632 \u0627\u0633\u062A\u0642\u0628\u0627\u0644 \u0645\u062A\u0648\u0627\u0641\u0642 DTS\u060C \u0645\u062A\u0635\u0644\u0629 \u0641\u064A \u0643\u064A\u0628\u0644\u0627\u062A \u0623\u0648 HDMI \ \u0646 \u0648\u0631\u0645\u0632 \u0648\u062D\u062F\u0629 \u0627\u0644\u062A\u062E\u0632\u064A\u0646 \u0639\u0644\u0649 XMB \u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0639\u0644\u0649 "\u0637\u0628\u064A\u0639\u064A" \ N-\u0631\u0645\u0632 \u0627\u0644\u0642\u0646\u0648\u0627\u062A \u0639\u0644\u0649 XMB \u064A\u062C\u0628 \u0623\u0646 \u064A\u0643\u0648\u0646 \u0639\u0644\u0649 '+ \u064A\u0645\u064A\u0646 \u064A\u0633\u0627\u0631' \u0646 \n +TrTab2.11=\u0645\u062D\u0631\u0643\u0627\u062A +TrTab2.12=\u0636\u0628\u0637 \u0641\u0643 \u0645\u0634\u062A\u0631\u0643 +TrTab2.13=\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u062A\u0634\u0641\u064A\u0631 \u0645\u0634\u062A\u0631\u0643 +TrTab2.14=\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0645\u062D\u0631\u0643\u0627\u062A +TrTab2.15=\u0627\u0644\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u0635\u0648\u062A\u064A\u0629 \u0648\u0645\u062D\u0631\u0643\u0627\u062A +TrTab2.16=\u0645\u062D\u0631\u0643\u0627\u062A \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0639\u0644\u0649 \u0634\u0628\u0643\u0629 \u0627\u0644\u0625\u0646\u062A\u0631\u0646\u062A \u0627\u0644\u062C\u0631\u064A +TrTab2.17=\u0634\u0628\u0643\u0629 \u0635\u0648\u062A \u0645\u062D\u0631\u0643\u0627\u062A \u0627\u0644\u062C\u0631\u064A +TrTab2.18=\u0645\u062D\u0631\u0643\u0627\u062A \u0645\u062A\u0641\u0631\u0642\u0627\u062A +TrTab2.19=\u0627\u0644\u0645\u062D\u0631\u0643\u0627\u062A \u0641\u064A \u062A\u0646\u0627\u0632\u0644\u064A +TrTab2.20=\u0623\u062C\u0644\u060C \u0648\u0623\u0639\u0644\u0649 \u0647\u0648 \u0623\u0648\u0644\u0627 +TrTab2.21=(\u0627\u0641\u064A\u0633\u064A\u0646\u062B \u063A\u064A\u0631 \u0645\u0639\u062A\u0645\u062F\u0629) +TrTab2.22=\u0627\u0644\u0635\u0648\u062A \u0627\u0644\u062A\u0644\u0642\u0627\u0626\u064A \u0627\u062E\u062A\u0632\u0627\u0644 \u0625\u0644\u0649 44.1 \u0623\u0648 48 \u0643\u064A\u0644\u0648\u0647\u0631\u062A\u0632 +TrTab2.27=DTS / FLAC \u0644\u062A\u062D\u0648\u064A\u0644 LPCM (\u062A\u062D\u062A\u0627\u062C \u0625\u0644\u0649 \u062C\u0647\u0627\u0632 \u0627\u0633\u062A\u0642\u0628\u0627\u0644 \u0644\u062A\u062F\u0641\u0642 HDMI LPCM 5.1) +TrTab2.28=\u0627\u0644\u062D\u0641\u0627\u0638 \u0639\u0644\u0649 \u0627\u0644\u0635\u0648\u062A DTS \u0641\u064A \u062A\u064A\u0627\u0631 (\u0645\u062A\u0648\u0627\u0641\u0642 \u0645\u0639 \u0627\u0644\u0627\u0646\u062A\u0627\u062C \u0627\u0644\u0628\u0635\u0631\u064A\u0629) +TrTab2.29=\u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A \u0627\u0644\u0635\u0648\u062A AC-3 (\u0641\u064A \u0643\u064A\u0644\u0648 \u0628\u0627\u064A\u062A / \u062B\u0627\u0646\u064A\u0629) (\u0645\u062B\u0644\u0627: 384\u060C 576\u060C 640): +TrTab2.32=MPEG-2 \u062E\u064A\u0627\u0631\u0627\u062A: +TrTab2.39=\u0648\u0627\u0644\u0645\u062D\u0648\u0644\u0629 \u062A\u0644\u0642\u0627\u0626\u064A\u0627 \u0627\u0644\u0641\u064A\u062F\u064A\u0648 \u0648\u0645\u0648\u0643\u0633\u064A\u062F \u0625\u0644\u0649 \u0627\u0644\u0635\u0648\u062A MPEG-PS / AC-3 (\u0645\u062A\u0648\u0627\u0641\u0642\u0629 \u0625\u0644\u0649 \u062D\u062F \u0643\u0628\u064A\u0631 \u0639\u0644\u0649 PS3) +TrTab2.40=\n\u064A\u0645\u0643\u0646\u0643 \u0623\u0646 \u062A\u0644\u0639\u0628 \u0645\u0639 \u0627\u0644\u0645\u0639\u0644\u0645\u0627\u062A vqscale\u060C vqmin \u0648keyint \u0625\u0644\u0649 \u062A\u062D\u0642\u064A\u0642 \u0627\u0644\u062E\u064A\u0631\u060C \u0648\u062D\u062A\u0649 \u0628\u0644\u0627 \u062E\u0633\u0627\u0626\u0631 \u062A\u0642\u0631\u064A\u0628\u0627 \u0627\u0644\u062A\u062D\u0648\u064A\u0644 \u062C\u0648\u062F\u0629. +TrTab2.41=\n\u0627\u0644\u0639\u064A\u0628 \u0641\u064A \u0647\u0630\u0627 \u0647\u0648 \u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A VBR\u060C \u0648\u0627\u0644\u062A\u064A \u064A\u0645\u0643\u0646 \u0623\u0646 \u064A\u0635\u0644 \u0625\u0644\u0649 \u0630\u0631\u0648\u062A\u0647 \u0641\u064A \u0628\u0639\u0636 \u0627\u0644\u0623\u062D\u064A\u0627\u0646 \u0641\u0648\u0642 \u0642\u062F\u0631\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0643\u062D\u062F \u0623\u0642\u0635\u0649. +TrTab2.42=\n\u0648\u0647\u0630\u0627 \u0647\u0648 \u0627\u0644\u0633\u0628\u0628 \u064A\u0645\u0643\u0646\u0643 \u0623\u064A\u0636\u0627 \u062A\u0639\u064A\u064A\u0646 \u0639\u0631\u0636 \u0627\u0644\u0646\u0637\u0627\u0642 \u0627\u0644\u062A\u0631\u062F\u062F\u064A \u0625\u0630\u0627 \u0643\u0646\u062A \u0639\u0644\u0649 \u0648\u0627\u064A \u0641\u0627\u064A\u060C \u0648\u0642\u0627\u0646\u0648\u0646 \u0627\u0644\u0625\u062C\u0631\u0627\u0621\u0627\u062A \u0627\u0644\u062C\u0646\u0627\u0626\u064A\u0629\u060C \u0648\u0645\u0627 \u0625\u0644\u0649 \u0630\u0644\u0643\u060C \u0641\u0625\u0646 \u0646\u0648\u0639\u064A\u0629 \u0627\u0644\u0634\u0641\u0631\u0629 +TrTab2.43=\n\u062A\u0648\u0627\u0632\u0646 \u0628\u064A\u0646 \u0633\u0631\u0639\u0629 \u0627\u0644\u0634\u0628\u0643\u0629 \u0648\u0642\u0648\u0629 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062C\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064A\u0629: \u0648\u0627\u0644\u0645\u0632\u064A\u062F \u0645\u0646 \u0627\u0644\u062C\u0648\u062F\u0629 \u0627\u0644\u062A\u064A \u0648\u0636\u0639\u062A \u0641\u064A \u0645\u0639\u062F\u0644 \u0627\u0644\u0628\u062A \u0645\u0642\u064A\u062F\u0629\u060C +TrTab2.44=\n\u0643\u0644\u0645\u0627 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062C\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064A\u0629 \u0627\u0644\u062E\u0627\u0635\u0629 \u0628\u0643 \u062A\u0639\u0627\u0646\u064A \! \u0623\u064A\u0636\u0627\u060C \u0644\u0627 \u0646\u062A\u0648\u0642\u0639 \u0644\u062A\u062A\u0646\u0627\u0633\u0628 \u0645\u0639 \u0641\u064A\u0644\u0645 \u0627\u0644\u062D\u0631\u0643\u0629 \u0648\u0627\u0644\u0627\u062B\u0627\u0631\u0629 1080P \u0641\u064A \u0623\u0646\u0642\u0649 \u0646\u0648\u0639\u064A\u0629 \u0641\u064A 15Mbps: P +TrTab2.50=\u0627\u0644\u062D\u062F \u0627\u0644\u0623\u0642\u0635\u0649 \u0644\u0639\u062F\u062F \u0645\u0646 \u0627\u0644\u0642\u0646\u0648\u0627\u062A \u0627\u0644\u0633\u0645\u0639\u064A\u0629 \u0625\u0644\u0649 \u0627\u0644\u0625\u062E\u0631\u0627\u062C: +TrTab2.51=\u062A\u0639\u0637\u064A\u0644 \u0628\u0627\u0644\u062A\u0623\u0643\u064A\u062F \u062A\u0631\u062C\u0645\u0627\u062A +TrTab2.52=\u0641\u0635\u0648\u0644 \u0641\u064A\u0631\u062A \u0627\u0644\u062F\u0639\u0645 \u0645\u062C\u0644\u062F / \u0627\u0644\u0641\u0627\u0635\u0644 \u0627\u0644\u0632\u0645\u0646\u064A \u0641\u064A \u062F\u0642\u0627\u0626\u0642: +TrTab2.55=2 \u0642\u0646\u0648\u0627\u062A (\u0633\u062A\u064A\u0631\u064A\u0648) +TrTab2.56=6 \u0642\u0646\u0648\u0627\u062A (5.1) +TrTab2.60=\u0639\u0638\u064A\u0645 \u062C\u0648\u062F\u0629 +TrTab2.61=\u0636\u064A\u0627\u0639 \u062C\u0648\u062F\u0629 +TrTab2.62=\u0630\u0627\u062A \u0646\u0648\u0639\u064A\u0629 \u062C\u064A\u062F\u0629 +TrTab2.63=\u0630\u0627\u062A \u0646\u0648\u0639\u064A\u0629 \u062C\u064A\u062F\u0629 \u0644HD \u0648\u0627\u064A \u0641\u0627\u064A \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A +TrTab2.64=\u0645\u062A\u0648\u0633\u0637\u0629 \u0627\u0644\u062C\u0648\u062F\u0629 \u0644HD \u0648\u0627\u064A \u0641\u0627\u064A \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A +TrTab2.65=\u062C\u0648\u062F\u0629\u060C \u0648\u0627\u0646\u062E\u0641\u0627\u0636 \u0641\u064A \u0646\u0647\u0627\u064A\u0629 \u0648\u062D\u062F\u0629 \u0627\u0644\u0645\u0639\u0627\u0644\u062C\u0629 \u0627\u0644\u0645\u0631\u0643\u0632\u064A\u0629 \u0623\u0648 HD \u062A\u0631\u0627\u0646\u0633\u0643\u0648\u062F\u064A\u0646\u063A \u0648\u0627\u064A \u0641\u0627\u064A +TracesTab.3=\u0645\u0633\u062D +TreeNodeSettings.4=\u0644\u0645 \u064A\u062A\u0645 \u062A\u062D\u0645\u064A\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u062D\u0631\u0643 \! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_bg.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_bg.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_bg.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_bg.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,301 @@ +DLNAMediaDatabase.0=\u0421 \u0446\u0435\u043B \u043F\u043E\u0434\u043E\u0431\u0440\u044F\u0432\u0430\u043D\u0435 \u0440\u0430\u0431\u043E\u0442\u0430\u0442\u0430 \u043D\u0430 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0430\u0442\u0430,\n\u0444\u0430\u0439\u043B\u043E\u0432\u0430\u0442\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 \u0441\u0435 \u043D\u0443\u0436\u0434\u0430\u0435 \u043E\u0442 \u043E\u0431\u043D\u043E\u0432\u044F\u0432\u0430\u043D\u0435.\n\u0421\u044A\u0436\u0430\u043B\u044F\u0432\u0430\u043C\u0435 \u0437\u0430 \u043D\u0435\u0443\u0434\u043E\u0431\u0441\u0442\u0432\u043E\u0442\u043E \! +DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z +DLNAMediaDatabase.2=\u041F\u043E\u0447\u0438\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043D\u043D\u0438... +DLNAMediaDatabase.3=\u0423\u043F\u043B\u044A\u0442\u043D\u044F\u0432\u0430\u043D\u0435 \u0431\u0430\u0437\u0430\u0442\u0430 \u0434\u0430\u043D\u043D\u0438... +DLNAMediaDatabase.4=\u0421\u043A\u0430\u0442\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043F\u0430\u043F\u043A\u0430: +FFMpegDVRMSRemux.0=\u0410\u043B\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u0435\u043D FFmpeg \u043F\u044A\u0442: +FFMpegDVRMSRemux.1=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 DVR-MS \u0440\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u0430\u043D\u0435 +FFMpegVideo.0=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0430\u043C\u043E \u0437\u0430 \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u0430 AviSynth/FFmpeg (\u041F\u0420\u0415\u0414\u041F\u041E\u0427\u0418\u0422\u0410\u041D AVISYNTH/MENCODER) +FFMpegVideo.1=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u0430 FFmpeg +FoldTab.0=<\u0412\u0441\u0438\u0447\u043A\u0438 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430> +FoldTab.1=\u041E\u043F\u0446\u0438\u0438 \u0437\u0430 \u0441\u043F\u043E\u0434\u0435\u043B\u044F\u043D\u0435 +FoldTab.2=\u0421\u043A\u0430\u043D\u0438\u0440\u0430\u0439 \u0432\u0441\u0438\u0447\u043A\u0438 \u0441\u043F\u043E\u0434\u0435\u043B\u0435\u043D\u0438 \u043F\u0430\u043F\u043A\u0438 +FoldTab.3=\u0421\u043A\u0430\u043D\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0432\u0441\u0438\u0447\u043A\u0438 \u0441\u043F\u043E\u0434\u0435\u043B\u0435\u043D\u0438 \u043F\u0430\u043F\u043A\u0438. \u041C\u043E\u0436\u0435 \u0434\u0430 \u043E\u0442\u043D\u0435\u043C\u0435 \u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E \u0432\u0440\u0435\u043C\u0435 \!\n +FoldTab.4=\u0421\u0438\u0433\u0443\u0440\u043D\u0438 \u043B\u0438 \u0441\u0442\u0435, \u0447\u0435 \u0438\u0441\u043A\u0430\u0442\u0435 \u0434\u0430 \u0437\u0430\u043F\u043E\u0447\u043D\u0435\u0442\u0435 \u0441\u043A\u0430\u043D\u0438\u0440\u0430\u043D\u0435\u0442\u043E?\n\n +FoldTab.5=\u0421\u043A\u0440\u0438\u0439 \u0444\u0430\u0439\u043B\u043E\u0432\u0438\u0442\u0435 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438\u044F +FoldTab.6=\u0421\u043A\u0440\u0438\u0439 \u043F\u0430\u043F\u043A\u0438 \ \u0412\u0438\u0434\u0435\u043E \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \ +FoldTab.7=\u0421\u043F\u043E\u0434\u0435\u043B\u0435\u043D\u0438 \u043F\u0430\u043F\u043A\u0438 +FoldTab.8=\u0421\u043A\u0440\u0438\u0439 \u0438\u043C\u0435\u043D\u0430\u0442\u0430 \u043D\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u0449\u0438\u0442\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 +FoldTab.9=\u0414\u043E\u0431\u0430\u0432\u0438 \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044F +FoldTab.10=\u0418\u0441\u043A\u0430\u0442\u0435 \u043B\u0438 \u0434\u0430 \u0441\u043F\u0440\u0435\u0442\u0435 \u0441\u043A\u0430\u043D\u0438\u0440\u0430\u043D\u0435\u0442\u043E?\n\n +FoldTab.11=\u0420\u0430\u0437\u0440\u0435\u0448\u0438 \u043A\u043E\u043F\u0438\u0435 \u043E\u0442 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u043E\u0442\u043E \u0432\u0438\u0434\u0435\u043E \u043D\u0430 PS3 (\u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435, \u0444\u0430\u0439\u043B\u043E\u0432\u0435\u0442\u0435 \u043D\u044F\u043C\u0430\u0442 \u0444\u0438\u043A\u0441\u0438\u0440\u0430\u043D\u0430 \u0433\u043E\u043B\u0435\u043C\u0438\u043D\u0430 ) +FoldTab.12=\u041F\u043E\u0434\u0440\u0435\u0436\u0434\u0430\u043D\u0435 \u043D\u0430 \u0441\u043F\u043E\u0434\u0435\u043B\u0435\u043D\u0438\u0442\u0435 \u043F\u0430\u043F\u043A\u0438 +FoldTab.13=\u041C\u0438\u043D\u0438 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 +FoldTab.14=\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439 MPlayer \u0437\u0430 \u0432\u0438\u0434\u0435\u043E \u043C\u0438\u043D\u0438 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438\u0442\u0435 +FoldTab.15=\u041F\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043D\u0435 +FoldTab.16=\u041D\u0430\u0439-\u043D\u043E\u0432\u0438\u0442\u0435 \u043E\u0442\u043F\u0440\u0435\u0434 +FoldTab.17=\u041F\u043E \u0434\u0430\u0442\u0430, \u043D\u0430\u0439-\u0441\u0442\u0430\u0440\u0438\u0442\u0435 \u043E\u0442\u043F\u0440\u0435\u0434 +FoldTab.18=\u041C\u0435\u0442\u043E\u0434 \u043D\u0430 \u043F\u043E\u0434\u0440\u0435\u0436\u0434\u0430\u043D\u0435: +FoldTab.19=DVD ISO \u043C\u0438\u043D\u0438 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 +FoldTab.20=ASCII \u0430\u0437\u0431\u0443\u0447\u043D\u043E +FoldTab.21=\u041C\u0438\u043D\u0438 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 +FoldTab.22=\u0411\u0443\u043A\u0432\u0435\u043D\u043E \u043F\u043E\u0434\u0440\u0435\u0436\u0434\u0430\u043D\u0435 +FoldTab.23=\u0421\u0432\u0430\u043B\u0438 \u043E\u0442 amazon.com +FoldTab.24=\u0421\u0432\u0430\u043B\u0438 \u043E\u0442 discogs.com +FoldTab.26=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0430\u0443\u0434\u0438\u043E \u043C\u0438\u043D\u0438 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438: +FoldTab.27=\u0410\u043B\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0430 \u043F\u0430\u043F\u043A\u0430 \u0437\u0430 \u0432\u0438\u0434\u0435\u043E \u043E\u0431\u043B\u043E\u0436\u043A\u0438\u0442\u0435 +FoldTab.28=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043F\u0430\u043F\u043A\u0430 +FoldTab.29=\u041F\u043E\u043A\u0430\u0436\u0438 iPhoto \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 +FoldTab.30=\u041F\u043E\u043A\u0430\u0436\u0438 iTunes \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 +FoldTab.31=\u0421\u043A\u0440\u0438\u0439 \u043F\u0440\u0430\u0437\u043D\u0438/\u043D\u0435 \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u0449\u0438 \u043C\u0435\u0434\u0438\u044F \u043F\u0430\u043F\u043A\u0438 (\u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435: \u0437\u0430\u0431\u0430\u0432\u044F \u0442\u044A\u0440\u0441\u0435\u043D\u0435\u0442\u043E) +FoldTab.32=\u0421\u043A\u0440\u0438\u0439 \u043F\u0430\u043F\u043A\u0438\u0442\u0435 \u0441 \u043C\u0435\u0434\u0438\u0439\u043D\u0438 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 +FoldTab.33=\u0421\u043A\u0440\u0438\u0439 \u043F\u0430\u043F\u043A\u0438 \ \u041F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 \ +FoldTab.34=\u041F\u043E\u043A\u0430\u0436\u0438 \u043E\u0442\u0432\u043E\u0440\u0435\u043D\u0430\u0442\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 +FoldTab.35=\u041D\u0438\u043A\u043E\u0439 +FontFileFilter.3=Truetype \u0448\u0440\u0438\u0444\u0442\u043E\u0432\u0435 +LinksTab.5=\u041F\u043E\u043C\u043E\u0449\u043D\u0438 \u043B\u0438\u043D\u043A\u043E\u0432\u0435: +LinksTab.6=\u0418\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043D\u0435: +LooksFrame.5=\u0418\u0437\u0445\u043E\u0434 +LooksFrame.6=\u041F\u043E\u043A\u0430\u0436\u0438 \u043C\u043E\u044F \u043F\u0430\u043D\u0435\u043B +LooksFrame.9=\u0417\u0430\u043F\u0438\u0448\u0438 +LooksFrame.12=\u0420\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 HTTP \u0441\u044A\u0440\u0432\u044A\u0440\u0430 +LooksFrame.13=\u0421\u044A\u0440\u0432\u044A\u0440\u044A\u0442 \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0431\u044A\u0434\u0435 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043D, \u043F\u043E\u0440\u0430\u0434\u0438 \u043F\u0440\u043E\u043C\u044F\u043D\u0430 \u043D\u0430 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F\u0442\u0430 +LooksFrame.18=\u0421\u044A\u0441\u0442\u043E\u044F\u043D\u0438\u0435 +LooksFrame.19=\u041F\u0440\u043E\u0441\u043B\u0435\u0434\u044F\u0432\u0430\u043D\u0438\u044F +LooksFrame.20=\u0413\u043B\u0430\u0432\u043D\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +LooksFrame.21=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 +LooksFrame.22=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F \u0438 \u0441\u043F\u043E\u0434\u0435\u043B\u0435\u043D\u0438 +LooksFrame.24=\u0412\u044A\u043F\u0440\u043E\u0441\u0438 / \u041F\u043E\u043C\u043E\u0449 +LooksFrame.25=\u0417\u0430 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0430\u0442\u0430 +LooksFrame.26=\u0417\u0410 \u0422\u0415\u0421\u0422\u0412\u0410\u041D\u0415 \u0421\u0410\u041C\u041E, \u0412\u042A\u0417\u041C\u041E\u0416\u041D\u041E \u0415 \u0414\u0410 \u0418\u041C\u0410 \u041D\u0415\u0421\u0422\u0410\u0411\u0418\u041B\u041D\u041E\u0421\u0422 +MEncoderAviSynth.2=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\u0442\u0435 \u043D\u0430 \u0432\u0438\u0434\u0435\u043E \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u0430 \u0441\u0430\u043C\u043E \u0437\u0430 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0430 AviSynth +MEncoderAviSynth.3=\u0420\u0430\u0437\u0440\u0435\u0448\u0438 AviSynth \u0434\u0430 \u0437\u0430\u043C\u0435\u043D\u044F \u043D\u0435\u043F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u0430\u0442\u0430 \u043A\u0430\u0434\u0440\u043E\u0432\u0430 \u0447\u0435\u0441\u0442\u043E\u0442\u0430 \u0441 \u043F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u0430 \u0442\u0430\u043A\u0430\u0432\u0430 (convertfps=true) +MEncoderAviSynth.4=\# \u0421\u043A\u0440\u0438\u043F\u0442\u0430 AviSynth \u0441\u0435\u0433\u0430 \u0435 \u043D\u0430\u043F\u044A\u043B\u043D\u043E \u043F\u0440\u0438\u0441\u043F\u043E\u0441\u043E\u0431\u0438\u043C\n +MEncoderAviSynth.5=\# \u0421\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u0438 \u0441\u0430 \u043D\u0430\u043B\u0438\u0447\u043D\u0438:\n +MEncoderAviSynth.6=\# : \u041F\u044A\u043B\u043D\u0438\u0442\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u0438 \u0437\u0430 DirectShowSource , \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 DirectShowSource(\u0438\u043C\u0435 \u043D\u0430 \u0444\u0430\u0439\u043B, \u0447\u0435\u0441\u0442\u043E\u0442\u0430 \u043D\u0430 \u043A\u043E\u043D\u0432\u0435\u0440\u0442\u0438\u0440\u0430\u043D\u0435)\n +MEncoderAviSynth.7=\# : \u041F\u044A\u043B\u043D\u0438\u0442\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\u043A\u0446\u0438\u0438 \u0437\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438, \u0430\u043A\u043E \u0438\u043C\u0430 \u0442\u0430\u043A\u0438\u0432\u0430 \u0437\u0430\u0441\u0435\u0447\u0435\u043D\u0438 (SRT/SUB/IDX/ASS/SSA)\n +MEncoderAviSynth.8=\# : \u0418\u043C\u0435 \u043D\u0430 \u0432\u0438\u0434\u0435\u043E \u0444\u0430\u0439\u043B\u0430, \u0430\u043A\u043E \u0438\u0441\u043A\u0430\u0442\u0435 \u0434\u0430 \u043F\u0440\u0430\u0432\u0438\u0442\u0435 \u0442\u043E\u0432\u0430 \u0441\u0430\u043C\u0438\n +MEncoderAviSynth.10=<\u0444\u0438\u043B\u043C>\n +MEncoderAviSynth.11=<\u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438>\n +MEncoderVideo.0=\u041F\u0440\u043E\u043F\u0443\u0441\u043D\u0438 loop filter \u0434\u0435\u0431\u043B\u043E\u043A\u0438\u0440\u0430\u043D\u0435 \u0437\u0430 H.264. \u041C\u043E\u0436\u0435 \u0434\u0430 \u0432\u043B\u043E\u0448\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E\u0442\u043E. +MEncoderVideo.1=\u0412\u0438\u0434\u0435\u043E/\u0410\u0443\u0434\u0438\u043E \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 \u0441\u043C\u043E \u0437\u0430 MEncoder \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442. +MEncoderVideo.2=A/V sync \u0430\u043B\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u0435\u043D \u043C\u0435\u0442\u043E\u0434 +MEncoderVideo.3=\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\u0442\u0435 \u043F\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043A\u043E\u0434\u0435\u0446\u0438\u0442\u0435 \u043D\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u0442\u043E (\u041F\u0440\u0435\u043F\u043E\u0440\u044A\u0447\u0438\u0442\u0435\u043B\u043D\u043E) +MEncoderVideo.4=\u0424\u043E\u0440\u0441\u0438\u0440\u0430\u0439 \u043A\u0430\u0434\u0440\u043E\u0432\u0430\u0442\u0430 \u0447\u0435\u0441\u0442\u043E\u0442\u0430 \u043E\u0442 FFMpeg +MEncoderVideo.5=\u0412\u0438\u0435 \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043F\u0440\u0438\u0431\u0430\u0432\u0438\u0442\u0435 \u0442\u0443\u043A \u0441\u043F\u0435\u0446\u0438\u0444\u0438\u0447\u043D\u0438 \u043E\u043F\u0446\u0438\u0438, \u043A\u0430\u0442\u043E denoise \u0444\u0438\u043B\u0442\u044A\u0440 \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: -vf hqdn3d +MEncoderVideo.6=\u041F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0441\u043A\u0438 \u043E\u043F\u0446\u0438\u0438: +MEncoderVideo.7=\u041F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 \u043D\u0430 \u0435\u0437\u0438\u043A\u0430 \u043D\u0430 \u0430\u0443\u0434\u0438\u043E\u0442\u043E: +MEncoderVideo.8=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 +MEncoderVideo.9=\u041F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 \u043D\u0430 \u0435\u0437\u0438\u043A\u0430 \u043D\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438: +MEncoderVideo.10=\u0410\u0443\u0434\u0438\u043E/\u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 \u0435\u0437\u0438\u043A\u043E\u0432 \u043F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: en,off;eng,off ) +MEncoderVideo.11=\u041A\u043E\u0434\u043E\u0432\u0430 \u0442\u0430\u0431\u043B\u0438\u0446\u0430 \u0437\u0430 \u043D\u0435-Unicode \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438: +MEncoderVideo.12=\u0417\u0430\u043C\u044F\u043D\u0430 \u043D\u0430 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u0441\u0442\u0438\u043B \u043D\u0430 \u0448\u0440\u0438\u0444\u0442\u0430: \u0440\u0430\u0437\u043C\u0435\u0440 \u043D\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 +MEncoderVideo.13=\u041A\u043E\u043D\u0442\u0443\u0440 \u043D\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 +MEncoderVideo.14=\u0421\u044F\u043D\u043A\u0430 \u043D\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 +MEncoderVideo.15=\u0413\u043E\u043B\u0435\u043C\u0438\u043D\u0430 \u043D\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 (px) +MEncoderVideo.16=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438\u0442\u0435 \u0432 \u043E\u0431\u0438\u043A\u043D\u043E\u0432\u0435\u043D \u0442\u0435\u043A\u0441: \u0413\u043E\u043B\u0435\u043C\u0438\u043D\u0430 \u043D\u0430 \u0448\u0440\u0438\u0444\u0442 +MEncoderVideo.17=\u041A\u043E\u043D\u0442\u0443\u0440 \u043D\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 +MEncoderVideo.18=\u041F\u0440\u043E\u0437\u0440\u0430\u0447\u043D\u043E\u0441\u0442 \u043D\u0430 \u0448\u0440\u0438\u0444\u0442\u0430 +MEncoderVideo.19=\u0413\u043E\u043B\u0435\u043C\u0438\u043D\u0430 \u043D\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 (%) +MEncoderVideo.20=ASS/SSA \u0421\u0443\u0431\u0442\u0438\u0442\u0440\u0438 +MEncoderVideo.21=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u043D \u0448\u0440\u0438\u0444\u0442 / \u0412\u0433\u0440\u0430\u0434\u0435\u043D\u0438 \u0448\u0440\u0438\u0444\u0442\u043E\u0432\u0435 +MEncoderVideo.22=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043D\u0435 \u043D\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 *.srt/*.sub \u0441 \u0438\u0434\u0435\u043D\u0442\u0438\u0447\u043D\u043E \u043D\u0430 \u0444\u0430\u0439\u043B\u0430 \u0437\u0430\u0433\u043B\u0430\u0432\u0438\u0435 +MEncoderVideo.23=FriBiDi \u0440\u0435\u0436\u0438\u043C +MEncoderVideo.24=\u0421\u043F\u0435\u0446\u0438\u0444\u0438\u0447\u0435\u043D \u0448\u0440\u0438\u0444\u0442 TrueType (\u0437\u0430 \u0430\u0437\u0438\u0430\u0442\u0441\u043A\u0438 \u0435\u0437\u0438\u0446\u0438): +MEncoderVideo.25=\u0418\u0437\u0431\u0435\u0440\u0438 True \u0422ype \u0448\u0440\u0438\u0444\u0442 +MEncoderVideo.26=Deinterlace \u0444\u0438\u043B\u0442\u044A\u0440 +MEncoderVideo.27=\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439 \u0432\u0438\u0434\u0435\u043E \u0431\u0440\u043E\u044F\u0447 +MEncoderVideo.28=\u0428\u0438\u0440\u0438\u043D\u0430 +MEncoderVideo.29=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 \u0435\u043A\u0441\u043F\u0435\u0440\u0442\u0438 : \u0421\u043F\u0435\u0446\u0438\u0444\u0438\u0447\u043D\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u043D\u0430 \u043A\u043E\u0434\u0435\u0446\u0438\u0442\u0435 +MEncoderVideo.30=\u0412\u0438\u0441\u043E\u0447\u0438\u043D\u0430 +MEncoderVideo.31=\u0422\u0430\u0437\u0438 \u043E\u043F\u0446\u0438\u044F \u0435 \u0435\u043A\u0441\u043F\u0435\u0440\u0438\u043C\u0435\u043D\u0442\u0430\u043B\u043D\u0430 \u0432\u0435\u0440\u0441\u0438\u044F \u043D\u0430 MEncoder, \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0438\u0440\u0430\u043D\u0430 \u0437\u0430 \u043C\u043D\u043E\u0433\u043E\u044F\u0434\u0440\u0435\u043D\u0438 \u043F\u0440\u043E\u0446\u0435\u0441\u043E\u0440\u0438 \u0438 H264 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435.\n\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439\u0442\u0435 \u0442\u043E\u0432\u0430, \u0441\u0430\u043C\u043E \u0430\u043A\u043E \u043D\u0430\u0438\u0441\u0442\u0438\u043D\u0430 \u0418\u041C\u0410\u0422\u0415 \u043C\u043D\u043E\u0433\u043E\u044F\u0434\u0440\u0435\u043D \u043F\u0440\u043E\u0446\u0435\u0441\u043E\u0440 \u0438 \u0441\u0442\u0435 \u0437\u0430\u0434\u0430\u043B\u0438 2 \u044F\u0434\u0440\u0430 \u0438 \u043F\u043E\u0432\u0435\u0447\u0435 \u0432 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\u0442\u0435 \u0437\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 \!\n\u0421\u044A\u0449\u043E \u0442\u0430\u043A\u0430, \u0442\u043E\u0432\u0430 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0431\u044A\u0434\u0435 \u043D\u0435\u0441\u0442\u0430\u0431\u0438\u043B\u043D\u043E, \u0442\u0430\u043A\u0430 \u0447\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0432\u044A\u0440\u043D\u0435\u0442\u0435 \u043A\u044A\u043C \u0441\u0442\u0430\u0440\u0438\u044F \u043F\u043E \u0432\u0441\u044F\u043A\u043E \u0432\u0440\u0435\u043C\u0435 ... +MEncoderVideo.32=\u0420\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u0430\u0439 , \u043A\u043E\u0433\u0430\u0442\u043E \u0430\u0443\u0434\u0438\u043E \u0444\u0430\u0439\u043B\u0430 \u0435 AC-3 (\u043D\u0435 \u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430) +MEncoderVideo.33=\u041F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0441\u043A\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438: +MEncoderVideo.34=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u0439 \u0441\u043F\u0435\u0446\u0438\u0444\u0438\u0447\u043D\u0438\u0442\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u043D\u0430 \u043A\u043E\u0434\u0435\u0446\u0438\u0442\u0435 +MEncoderVideo.35=\u0417\u0430\u0441\u0438\u043B\u0438 \u043C\u043D\u043E\u0433\u043E\u044F\u0434\u0440\u0435\u043D\u0430 \u043F\u043E\u0434\u0434\u0440\u044A\u0436\u043A\u0430 \u0437\u0430 H264 HD \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 +MEncoderVideo.36=\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439 ASS \u0441\u0442\u0438\u043B \u043F\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043D\u0435 +MEncoderVideo.37=\u0410\u043B\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0430 \u043F\u0430\u043F\u043A\u0430 \u0437\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 +MEncoderVideo.39=\u0420\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u0430\u0439 DVD ISO \u0432\u0438\u0434\u0435\u043E \u0444\u0430\u0439\u043B\u043E\u0432\u0435 (\u043D\u0435 \u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430) +MEncoderVideo.68=\\u0422\u0443\u043A \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043F\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u0435 \u0441\u043F\u0435\u0446\u0438\u0444\u0438\u0447\u043D\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u0437\u0430 \u043D\u044F\u043A\u043E\u0438 \u043A\u043E\u043C\u0431\u0438\u043D\u0430\u0446\u0438\u0438 \u043A\u043E\u0434\u0435\u0446\u0438.\n +MEncoderVideo.69=\\u0422\u043E\u0432\u0430 \u0435 \u043F\u043E\u0432\u0435\u0447\u0435 \u0437\u0430 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0438 \u043F\u0440\u0438 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u044F \u043D\u0430 A\u0443\u0434\u0438\u043E/\u0412\u0438\u0434\u0435\u043E, \u043D\u043E \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430 \u0434\u043E\u0431\u0440\u0435 \u0438 \u0437\u0430 \u0434\u0440\u0443\u0433\u0438 \u0446\u0435\u043B\u0438 \n +MEncoderVideo.70=\\u0421\u0447\u0438\u0442\u0430\u0439\u0442\u0435 \u0442\u043E\u0432\u0430 \u0437\u0430 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 \u0435\u043A\u0441\u043F\u0435\u0440\u0442\u0438, \u0438 \u043D\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439\u0442\u0435, \u0430\u043A\u043E \u043D\u0435 \u0437\u043D\u0430\u0435\u0442\u0435 \u043A\u0430\u043A\u0432\u043E \u043F\u0440\u0430\u0432\u0438\u0442\u0435 \n +MEncoderVideo.71=\\u0421\u0438\u043D\u0442\u0430\u043A\u0441\u0438\u0441\u0430 \u0435 {java condition} :: {mencoder options} ; \u041C\u043E\u0436\u0435 \u0434\u0430 \u0441\u044A\u0432\u043C\u0435\u0441\u0442\u0438\u0442\u0435 \u043D\u044F\u043A\u043E\u043B\u043A\u043E \u043E\u043F\u0446\u0438\u0438\n +MEncoderVideo.72=\\u0420\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438 \u0441\u0438\u043C\u0432\u043E\u043B\u0438 (\u0437\u043D\u0430\u0446\u0438): file-name srt-file container v-codec a-codec sample-rate framerate width height channels duration\n +MEncoderVideo.73=\\u0412\u043D\u0438\u043C\u0430\u0432\u0430\u0439\u0442\u0435, \u0432\u0441\u0435\u043A\u0438 \u0438\u0437\u043A\u0440\u0438\u0432\u0435\u043D (\u0434\u0435\u0444\u043E\u0440\u043C\u0438\u0440\u0430\u043D) \u0440\u0435\u0434, \u0449\u0435 \u0431\u044A\u0434\u0435 \u0443\u043D\u0438\u0449\u043E\u0436\u0435\u043D\n +MEncoderVideo.75=\\u0421\u043F\u0435\u0446\u0438\u0430\u043B\u043D\u0438 \u043E\u043F\u0446\u0438\u0438:\n +MEncoderVideo.76=\ -noass: \u043D\u0430\u043F\u044A\u043B\u043D\u043E \u0438\u0437\u043A\u043B\u044E\u0447\u0438 ASS/SSA \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 \u0430\u043A\u043E \u043C\u043E\u0433\u0430\u0442 \u0434\u0430 \u043F\u043E\u043F\u0440\u0435\u0447\u0430\u0442 \u043D\u0430 A\u0443\u0434\u0438\u043E/\u0412\u0438\u0434\u0435\u043E \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u044F\n +MEncoderVideo.77=\ -nosync: \u043D\u0430\u043F\u044A\u043B\u043D\u043E \u0438\u0437\u043A\u043B\u044E\u0447\u0438 A\u0443\u0434\u0438\u043E/\u0412\u0438\u0434\u0435\u043E \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u044F \u0447\u0440\u0435\u0437 \u0430\u043B\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u0435\u043D \u043C\u0435\u0442\u043E\u0434 \u0437\u0430 \u0442\u043E\u0432\u0430 \u0441\u044A\u0441\u0442\u043E\u044F\u043D\u0438\u0435 (-mc \u0449\u0435 \u043D\u0430\u043F\u0440\u0430\u0432\u0438 \u0441\u044A\u0449\u043E\u0442\u043E)\n +MEncoderVideo.78=\ -quality: \u043E\u0442\u043C\u044F\u043D\u0430 \u0432\u0438\u0434\u0435\u043E \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\u0442\u0435 \u0437\u0430 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E\n +MEncoderVideo.79=\ -mt: \u0424\u043E\u0440\u0441\u0438\u0440\u0430\u0439 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043C\u043D\u043E\u0433\u043E\u0432\u0430\u0440\u0438\u0430\u043D\u0442\u043D\u0430 \u0432\u0435\u0440\u0441\u0438\u044F \u043D\u0430 \u041Cencoder (\u0435\u043A\u0441\u043F\u0435\u0440\u0438\u043C\u0435\u043D\u0442\u0430\u043B\u043D\u043E, \u043C\u043E\u0436\u0435 \u0434\u0430 \u043D\u0435 \u0435 \u0441\u0442\u0430\u0431\u0438\u043B\u043D\u043E)\n +MEncoderVideo.80=\\u0422\u043E\u0437\u0438 \u0441\u043F\u0438\u0441\u044A\u043A \u0449\u0435 \u0441\u0435 \u043F\u043E\u0434\u043E\u0431\u0440\u044F\u0432\u0430 \u0441 \u0432\u0440\u0435\u043C\u0435\u0442\u043E: \u041C\u043D\u0435\u043D\u0438\u044F \u0438 \u043E\u0431\u0440\u0430\u0442\u043D\u0430 \u0432\u0440\u044A\u0437\u043A\u0430 \u0437\u0430 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u043D\u0430 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u0438 \u043A\u043E\u0434\u0435\u0446\u0438/\u0444\u0430\u0439\u043B\u043E\u0432\u0435 \u0441\u0430 \u0432\u0438\u043D\u0430\u0433\u0438 \u0434\u043E\u0431\u0440\u0435 \u0434\u043E\u0448\u043B\u0438 \n +MEncoderVideo.87=\\u0421\u0435\u0433\u0430 \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043F\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u0435 \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u0438 \u0443\u0441\u043B\u043E\u0432\u0438\u044F/\u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u0438. \u0415\u0442\u043E \u043D\u044F\u043A\u043E\u0438 \u043F\u0440\u0438\u043C\u0435\u0440\u0438: \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0434\u0430 \u0441\u0435 \u0434\u0430\u0434\u0435 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442 \u0437\u0430 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043D\u0435 mt \u0432\u0435\u0440\u0441\u0438\u044F \u043D\u0430 mencoder\n +MEncoderVideo.88=\\u0437\u0430 \u0432\u0441\u044F\u043A\u043E H264 HD \u0441\u044A\u0434\u044A\u0440\u0436\u0430\u043D\u0438\u0435 (\u0441\u044A\u0432\u043F\u0430\u0434\u0430\u0449\u043E \u0441 \u0433\u043B\u0430\u0432\u043D\u0438\u0442\u0435 \u043E\u043F\u0446\u0438\u0438): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\\u0417\u0430 \u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0440\u0435\u043F\u0442\u0435\u043D\u0435\u0442\u043E \u043D\u0430 24 \u043A\u0430\u0434\u044A\u0440\u0430 \u043D\u0430 50hz \u0442\u0435\u043B\u0435\u0432\u0438\u0437\u043E\u0440\u0438: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\\u0417\u0430 \u0440\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u0430\u043D\u0435 , \u043A\u043E\u0433\u0430\u0442\u043E \u0432\u0438\u0434\u0435\u043E\u0442\u043E \u0435 mpeg2 \u043D\u044F\u043C\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=DVD/VOB \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E (0-4) (\u043F\u043E-\u0433\u043E\u043B\u044F\u043C\u043E \u0447\u0438\u0441\u043B\u043E \u0435 \u043F\u043E-\u0434\u043E\u0431\u0440\u043E\u0442\u043E): +MEncoderVideo.93=\u0421\u043B\u043E\u0436\u0438 \u0433\u0440\u0430\u043D\u0438\u0446\u0438 \u0437\u0430 \u043A\u043E\u043C\u043F\u0435\u043D\u0441\u0438\u0440\u0430\u043D (overscan) \u0440\u0435\u0436\u0438\u043C \u043D\u0430 \u0435\u043A\u0440\u0430\u043D\u0430: +MEncoderVideo.94=\u0424\u043E\u0440\u0441\u0438\u0440\u0430\u043D\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 : +MEncoderVideo.95=\u0424\u043E\u0440\u0441\u0438\u0440\u0430\u043D\u0438 \u0442\u0430\u0433\u043E\u0432\u0435 : +MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ +MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ +MEncoderVideo.98=cp1252 /* Windows - Western Europe */ +MEncoderVideo.99=cp1253 /* Windows - Greek */ +MEncoderVideo.100=cp1254 /* Windows - Turkish */ +MEncoderVideo.101=cp1255 /* Windows - Hebrew */ +MEncoderVideo.102=cp1256 /* Windows - Arabic */ +MEncoderVideo.103=cp1257 /* Windows - Baltic */ +MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ +MEncoderVideo.105=ISO-8859-1 /* Western Europe */ +MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ +MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ +MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ +MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ +MEncoderVideo.110=ISO-8859-6 /* Arabic */ +MEncoderVideo.111=ISO-8859-7 /* Greek */ +MEncoderVideo.112=ISO-8859-8 /* Hebrew */ +MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ +MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ +MEncoderVideo.115=ISO-8859-11 /* Thai */ +MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ +MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ +MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ +MEncoderVideo.119=ISO-8859-16 /* Central European languages */ +MEncoderVideo.120=cp932 /* Japanese */ +MEncoderVideo.121=cp936 /* Chinese */ +MEncoderVideo.122=cp949 /* Korean */ +MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */ +MEncoderVideo.124=UTF-8 /* Unicode */ +MEncoderVideo.125=\u0418\u0437\u0431\u0435\u0440\u0438 \u0446\u0432\u044F\u0442 \u043D\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438\u0442\u0435 +MEncoderVideo.126=bul,eng,fre,jpn,ger,und +MEncoderVideo.127=bul,eng,fre,jpn,ger,und +MEncoderVideo.128=*,* +MEncoderVideo.129=/* \u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E */ +MEncoderVideo.130=enca:ru:cp1251 /* \u0420\u0443\u0441\u043A\u0438 (\u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E) */ +MEncoderVideo.131=enca:pl:cp1250 /* \u0418\u0437\u0442\u043E\u0447\u043D\u0430 \u0415\u0432\u0440\u043E\u043F\u0430 (\u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E) */ +MEncoderVideo.132=enca:zh:big5 /* \u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0438 (\u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E) */ +NetworkTab.0=\u0415\u0437\u0438\u043A [\u0438\u0437\u0438\u0441\u043A\u0432\u0430 \u0440\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u0442\u043E]: +NetworkTab.1=\u041F\u0440\u0435\u0433\u043B\u0435\u0434\u0430\u0439 .RAR/.ZIP/.CBR \u0430\u0440\u0445\u0438\u0432\u0438 +NetworkTab.2=\u0413\u0435\u043D\u0435\u0440\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043C\u0438\u043D\u0438 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 +NetworkTab.3=\u0421\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u0432 \u043C\u0438\u043D\u0438\u043C\u0430\u043B\u0438\u0437\u0438\u0440\u0430\u043D \u0440\u0435\u0436\u0438\u043C +NetworkTab.4=\u0418\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u0439 \u043A\u0430\u0442\u043E Windows \u0443\u0441\u043B\u0443\u0433\u0430 +NetworkTab.5=\u0413\u043B\u0430\u0432\u043D\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +NetworkTab.6=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u043D\u0430 \u0433\u043E\u043B\u0435\u043C\u0438\u043D\u0430 \u043D\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0437\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435, \u0432 megabytes (\u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C: MAX_BUFFER_SIZE): +NetworkTab.7=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043D\u0430 \u044F\u0434\u0440\u0430\u0442\u0430 \u0437\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 (\u0432 \u043C\u043E\u043C\u0435\u043D\u0442\u0430 \u0432\u0438\u0435 \u0438\u043C\u0430\u0442\u0435 %d) +NetworkTab.8=\u041F\u0440\u043E\u0432\u0435\u0440\u0438 \u0437\u0430 \u043E\u0431\u043D\u043E\u0432\u0435\u043D\u0430 \u0432\u0435\u0440\u0441\u0438\u044F +NetworkTab.9=\u041F\u0440\u043E\u0432\u0435\u0440\u0438 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E +NetworkTab.11=\u0412\u0438\u0435 \u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u0445\u0442\u0435 \u0443\u0441\u043B\u0443\u0433\u0430 \u0437\u0430 WINDOWS \u0444\u0443\u043D\u043A\u0446\u0438\u044F\! \u0417\u0430 \u0434\u0430 \u044F \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0442\u0435, \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0437\u0430\u0442\u0432\u043E\u0440\u0438\u0442\u0435 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u0442\u043E,\n +NetworkTab.12=\u043F\u043E\u0441\u043B\u0435 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439\u0442\u0435 (\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u0442\u0435) \u0443\u0441\u043B\u0443\u0433\u0430\u0442\u0430 \u043E\u0442 \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043D\u0438\u044F \u043F\u0430\u043D\u0435\u043B \u043D\u0430 Windows .\n\n +NetworkTab.13=\u041C\u0435\u0434\u0438\u0439\u043D\u0430\u0442\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 \u0449\u0435 \u0441\u0435 \u043E\u0431\u043D\u043E\u0432\u0438 \!\n +NetworkTab.14=\u0413\u0440\u0435\u0448\u043A\u0430 \u043F\u0440\u0438 \u0438\u043D\u0441\u0442\u0430\u043B\u0430\u0446\u0438\u044F\u0442\u0430 \u043D\u0430 \u0443\u0441\u043B\u0443\u0433\u0430\u0442\u0430 \u0437\u0430 WINDOWS \u0444\u0443\u043D\u043A\u0446\u0438\u044F \n +NetworkTab.15=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F/\u043E\u0431\u0449 \u0434\u043E\u0441\u0442\u044A\u043F +NetworkTab.16=\u041F\u043E\u0437\u0438\u0446\u0438\u044F \u043D\u0430 \u0442\u044A\u0440\u0441\u0435\u043D\u0435 \u043D\u0430 \u043C\u0438\u043D\u0438 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438 (\u0432 \u0441\u0435\u043A\u0443\u043D\u0434\u0438): +NetworkTab.17=\u0420\u0430\u0437\u0440\u0435\u0448\u0438 \u043C\u0435\u0434\u0438\u0439\u043D\u0430\u0442\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 / \u043A\u0435\u0448 +NetworkTab.18=\u0420\u0435\u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u0439 \u043C\u0435\u0434\u0438\u0439\u043D\u0430\u0442\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 +NetworkTab.19=\u0421\u0438\u0433\u0443\u0440\u043D\u0438 \u043B\u0438 \u0441\u0442\u0435? +NetworkTab.20=\u0417\u0430\u0441\u0438\u043B\u0438 \u043C\u0440\u0435\u0436\u043E\u0432\u0430 \u0432\u0440\u044A\u0437\u043A\u0430 \u0432 \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430: +NetworkTab.22=\u041C\u0440\u0435\u0436\u043E\u0432\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438, \u043F\u0440\u043E\u043C\u0435\u043D\u0435\u0442\u0435 \u0441\u0430\u043C\u043E \u043F\u0440\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0438 +NetworkTab.23=\u0424\u043E\u0440\u0441\u0438\u0440\u0430\u0439 IP \u0430\u0434\u0440\u0435\u0441 \u043D\u0430 \u0441\u044A\u0440\u0432\u044A\u0440\u0430: +NetworkTab.24=\u0424\u043E\u0440\u0441\u0438\u0440\u0430\u0439 \u043F\u043E\u0440\u0442 \u043D\u0430 \u0441\u044A\u0440\u0432\u044A\u0440\u0430 (5001 \u043F\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043D\u0435): +NetworkTab.25=PS3 \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +NetworkTab.26=\u041A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0441\u0438\u043C\u0432\u043E\u043B\u0438\u0442\u0435 \u043D\u0430 \u0438\u043C\u0435\u043D\u0430\u0442\u0430 \u043D\u0430 \u0444\u0430\u0439\u043B\u043E\u0432\u0435 \u043D\u0430 PS3 (\u0432\u0438\u0436 XMB->\u0421\u0438\u0441\u0442\u0435\u043C\u043D\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438->\u0421\u0438\u043C\u0432\u043E\u043B\u0438 (\u0437\u043D\u0430\u0446\u0438)): +NetworkTab.27=\u041D\u0435\u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438, \u043D\u0435 \u043F\u043E\u043B\u0437\u0432\u0430\u0439\u0442\u0435 :p +NetworkTab.28=\u0422\u0443\u0440\u0431\u043E \u0440\u0435\u0436\u0438\u043C (\u0440\u0430\u0437\u0440\u0435\u0448\u0438 tcp_nodelay) / \u0431\u044A\u0434\u0435\u0442\u0435 \u0432\u043D\u0438\u043C\u0430\u0442\u0435\u043B\u043D\u0438, \u043D\u0435 \u0435 \u0441\u0438\u0433\u0443\u0440\u043D\u043E \u0434\u0430\u043B\u0438 \u0440\u0430\u0431\u043E\u0442\u0438 \u0434\u043E\u0431\u0440\u0435 +NetworkTab.29=\u0411\u043B\u043E\u043A\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0432\u0445\u043E\u0434\u044F\u0449\u0438 \u0437\u0430\u044F\u0432\u043A\u0438 \u0438\u0434\u0435\u043D\u0442\u0438\u0447\u043D\u0438 \u0441 \u0444\u0430\u0439\u043B\u0430 \u043E\u0442 PS3, \u043A\u043E\u0433\u0430\u0442\u043E \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435\u0442\u043E \u0435 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043B\u043E +NetworkTab.30=\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439 IP \u0444\u0438\u043B\u0442\u044A\u0440: +NetworkTab.31=\u0420\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438 HTTP \u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +NetworkTab.32=HTTP \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442 V2 +NetworkTab.33=\u0417\u0430\u0431\u0440\u0430\u043D\u0438 \u0437\u0430\u0441\u043F\u0438\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0442\u0430, \u0434\u043E\u043A\u0430\u0442\u043E \u0442\u0435\u0447\u0435 \u0441\u0442\u0440\u0438\u0439\u043C\u0438\u043D\u0433 +NetworkTab.34=\u0421\u0438\u0441\u0442\u0435\u043C\u043D\u0438 \u0434\u043E\u0431\u0430\u0432\u043A\u0438 +NetworkTab.35=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u0435\u043D \u0442\u0440\u0430\u0444\u0438\u043A \u0432 Mb/s (0 \u043E\u0437\u043D\u0430\u0447\u0430\u0432\u0430, \u0431\u0435\u0437 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u0435): +NetworkTab.36=\u0420\u0435\u043D\u0434\u0435\u0440\u0438\u0440\u0430\u043D\u0435 \u043F\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043D\u0435, \u043A\u043E\u0433\u0430\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E\u0442\u043E \u043E\u0442\u043A\u0440\u0438\u0432\u0430\u043D\u0435 \u043D\u0435 \u0434\u0430\u0434\u0435 \u0440\u0435\u0437\u0443\u043B\u0442\u0430\u0442: +NetworkTab.37=\u041D\u0435\u043F\u043E\u0437\u043D\u0430\u0442\u043E \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E \u0437\u0430 \u0440\u0435\u043D\u0434\u0435\u0440\u0438\u0440\u0430\u043D\u0435 +NetworkTab.38=\u0424\u043E\u0440\u0441\u0438\u0440\u0430\u0439 \u0440\u0435\u043D\u0434\u0435\u0440\u0438\u0440\u0430\u043D\u0435 \u043F\u043E \u043F\u043E\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043D\u0435 (\u0438\u0437\u043A\u043B\u044E\u0447\u0432\u0430 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E\u0442\u043E \u043E\u0442\u043A\u0440\u0438\u0432\u0430\u043D\u0435) +PMS.0=PS3 \u043D\u0435 \u0435 \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0430. \u0412\u043A\u043B\u044E\u0447\u0435\u043D\u0430 \u043B\u0438 \u0435 \u043A\u043E\u043D\u0437\u043E\u043B\u0430\u0442\u0430? \u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u0435 \u0442\u0440\u0430\u0441\u0435\u0442\u0430\u0442\u0430 \u0438/\u0438\u043B\u0438 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F\u0442\u0430, \u0430 \u0441\u044A\u0449\u043E \u0442\u0430\u043A\u0430 \u0438 \u0444\u0430\u0439\u043B\u0430 debug.log +PMS.1=\u0410\u0443\u0434\u0438\u043E +PMS.2=\- \u041C\u0435\u0434\u0438\u0439\u043D\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 -\ +PMS.3=\u0410\u0443\u0434\u0438\u043E/\u0432\u0438\u0434\u0435\u043E \u0430\u043B\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0430 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u044F +PMS.4=Deinterlace \u0444\u0438\u043B\u0442\u044A\u0440 +PMS.5=PS3 \u043A\u043E\u043D\u0437\u043E\u043B\u0430\u0442\u0430 \u0435 \u043D\u0430\u043C\u0435\u0440\u0435\u043D\u0430 \! +PMS.6=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0437\u0430\u0440\u0435\u0434\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 .srt/.sub +PMS.7=\u041F\u0440\u043E\u043F\u0443\u0441\u043D\u0438 Loop \u0444\u0438\u043B\u0442\u044A\u0440 \u0437\u0430 H264 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 [\u041C\u041E\u0416\u0415 \u0414\u0410 \u0412\u041B\u041E\u0428\u0418 \u041A\u0410\u0427\u0415\u0421\u0422\u0412\u041E\u0422\u041E] +PMS.8=\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u0438 +PMS.9=\u0412\u0441\u0438\u0447\u043A\u0438 \u0430\u0443\u0434\u0438\u043E \u043F\u043B\u0435\u0439\u043B\u0438\u0441\u0442\u0438 +PMS.10=\u041F\u0440\u0435\u0446\u0438\u0437\u043D\u043E \u0437\u0430\u0431\u0440\u0430\u043D\u044F\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 +PMS.11=\u0412\u0441\u0438\u0447\u043A\u0438 \u0430\u0443\u0434\u0438\u043E \u043F\u043E\u0442\u043E\u0446\u0438 +PMS.12=\u041F\u043E \u0434\u0430\u0442\u0430 +PMS.13=\u041F\u043E \u0430\u0440\u0442\u0438\u0441\u0442 +PMS.130=\u0421\u0432\u044A\u0440\u0437\u0432\u0430\u043D\u0435 \u0441 PS3 \u043A\u043E\u043D\u0437\u043E\u043B\u0430\u0442\u0430... +PMS.16=\u041F\u043E \u0430\u043B\u0431\u0443\u043C +PMS.17=\u041D\u0435\u043F\u043E\u0437\u043D\u0430\u0442\u043E \u043C\u0435\u0434\u0438\u0439\u043D\u043E \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E +PMS.18=\u0421\u0432\u044A\u0440\u0437\u0430\u043D +PMS.19=\u041F\u043E \u0436\u0430\u043D\u0440 +PMS.21=\u041F\u043E \u043C\u043E\u0434\u0435\u043B \u043D\u0430 \u0444\u043E\u0442\u043E\u0430\u043F\u0430\u0440\u0430\u0442\u0430/\u043A\u0430\u043C\u0435\u0440\u0430\u0442\u0430 +PMS.22=\u041F\u043E \u0438\u0437\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B/\u0430\u043B\u0431\u0443\u043C +PMS.25=\u041F\u043E ISO \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +PMS.26=\u041F\u043E \u0416\u0430\u043D\u0440/\u0438\u0437\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B/\u0430\u043B\u0431\u0443\u043C +PMS.27=\u0417\u0430\u043F\u0430\u0437\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438\u0442\u0435 +PMS.28=\u041F\u043E \u0430\u0437\u0431\u0443\u0447\u0435\u043D \u0440\u0435\u0434/\u0418\u0437\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B/\u0410\u043B\u0431\u0443\u043C +PMS.31=\u0421\u043D\u0438\u043C\u043A\u0438 +PMS.32=\u0412\u0441\u0438\u0447\u043A\u0438 \u0441\u043D\u0438\u043C\u043A\u0438 +PMS.34=\u0412\u0438\u0434\u0435\u043E +PMS.35=\u0412\u0441\u0438\u0447\u043A\u043E\u0442\u043E \u0432\u0438\u0434\u0435\u043E +PMS.36=HD \u0432\u0438\u0434\u0435\u043E +PMS.37=\- \u0412\u0438\u0434\u0435\u043E \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 -\ +PMS.39=SD \u0412\u0438\u0434\u0435\u043E +PMS.40=DVD \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F +PMS.41=(\u041F\u0440\u0435)\u0438\u043D\u0441\u0442\u0430\u043B\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0443\u0441\u043B\u0443\u0433\u0430\u0442\u0430 Win32 +ProfileChooser.1=PS3 Media Server \u0438\u0437\u0431\u043E\u0440 \u043D\u0430 \u043F\u0440\u043E\u0444\u0438\u043B +ProfileChooser.2=\u0418\u0437\u0431\u0435\u0440\u0438 +ProfileChooser.3=\u041F\u0440\u043E\u0444\u0438\u043B \u0444\u0430\u0439\u043B (.conf) \u0438\u043B\u0438 \u0434\u0438\u0440\u0435\u043A\u0442\u043E\u0440\u0438\u044F +StatusTab.2=\u0421\u0442\u0430\u0442\u0443\u0441 +StatusTab.3=\u0418\u0437\u0447\u0430\u043A\u0432\u0430\u043D\u0435... +StatusTab.5=\u041F\u0440\u0430\u0437\u043D\u043E +StatusTab.6=\u0421\u0442\u0430\u0442\u0443\u0441 \u043D\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0437\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435: +StatusTab.7=I/O \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430: +StatusTab.8=\u0422\u0435\u043A\u0443\u0449 \u0431\u0438\u0442\u0440\u0435\u0439\u0442: +StatusTab.9=\u041D\u0430\u043C\u0435\u0440\u0435\u043D\u0438 \u043C\u0435\u0434\u0438\u0439\u043D\u0438 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430: +StatusTab.10=\ kb/s | \u0412\u044A\u0440\u0445\u043E\u0432 \u0431\u0438\u0442\u0440\u0435\u0439\u0442: +StatusTab.11=\ kb/\u0441 +StatusTab.12=MB +TracesTab.3=\u0418\u0437\u0447\u0438\u0441\u0442\u0438 +TreeNodeSettings.4=\u0422\u043E\u0437\u0438 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442 \u043D\u0435 \u0435 \u0437\u0430\u0440\u0435\u0434\u0435\u043D\! +TrTab2.0=\u0420\u0430\u0437\u0440\u0435\u0448\u0438/\u0437\u0430\u0431\u0440\u0430\u043D\u0438 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442 \u0437\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 +TrTab2.1=\u041D\u044F\u043C\u0430 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 \u043C\u043E\u043C\u0435\u043D\u0442\u0430 +TrTab2.2=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 \u0432\u0438\u0434\u0435\u043E \u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 \u0441\u044A\u0441 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438: MEncoder/AviSynth/FFmpeg +TrTab2.3=\u0418\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0439 \u0430\u0443\u0434\u0438\u043E \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438, \u0437\u0430 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u0438: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u0432\u0438\u0434\u0435\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E\u0442\u043E +TrTab2.5=\u041E\u0431\u0449\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 +TrTab2.6=\u041F\u043E\u0434\u0440\u0435\u0436\u0434\u0430\u043D\u0435 \u043D\u0430 \u043B\u0438\u0441\u0442\u0430 \u0441 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 \u0437\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435. \u041F\u044A\u0440\u0432\u0438\u044F \u0449\u0435 \u0441\u0435 \u043F\u043E\u044F\u0432\u0438 \u0432 \u043E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u043D\u0430\u0442\u0430 \u0432\u0438\u0434\u0435\u043E \u043F\u0430\u043F\u043A\u0430 +TrTab2.7=\u0414\u0440\u0443\u0433\u0438 \u043E\u043F\u0446\u0438\u0438 +TrTab2.8=\u041F\u0440\u043E\u043F\u0443\u0441\u043D\u0438 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438\u044F (\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438 \u0441\u044A\u0441 \u0437\u0430\u043F\u0435\u0442\u0430\u0439\u043A\u0430): +TrTab2.9=\u0424\u043E\u0440\u0441\u0438\u0440\u0430\u0439 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 \u0437\u0430 \u0441\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u0440\u0430\u0437\u0448\u0438\u0440\u0435\u043D\u0438\u044F (\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438 \u0441\u044A\u0441 \u0437\u0430\u043F\u0435\u0442\u0430\u0439\u043A\u0430): +TrTab2.10=\u041F\u043E\u0437\u0432\u043E\u043B\u0438 \u0437\u0430\u043F\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 DTS \u043F\u043E\u0442\u043E\u043A\u0430 \u0434\u0438\u0440\u0435\u043A\u0442\u043D\u043E \u0432 \u043F\u0440\u0438\u0435\u043C\u043D\u0438\u043A\u0430 \u0432\u0438.\n\u0411\u044A\u0434\u0435\u0442\u0435 \u0432\u043D\u0438\u043C\u0430\u0442\u0435\u043B\u043D\u0438,\u0442\u043E\u0432\u0430 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0434\u043E\u0432\u0435\u0434\u0435 \u0434\u043E \u0441\u0442\u0440\u0430\u043D\u0438\u0447\u0435\u043D \u0448\u0443\u043C. \u0422\u0443\u043A \u0441\u0430 \u043D\u044F\u043A\u043E\u0438 \u0441\u044A\u0432\u0435\u0442\u0438:\n- \u0422\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0438\u043C\u0430\u0442\u0435 DTS \u0441\u044A\u0432\u043C\u0435\u0441\u0442\u0438\u043C \u043F\u0440\u0438\u0435\u043C\u043D\u0438\u043A, \u0441\u0432\u044A\u0440\u0437\u0430\u043D \u0447\u0440\u0435\u0437 TOSLINK \u0438\u043B\u0438 HDMI\n- \u0418\u043A\u043E\u043D\u0430\u0442\u0430 \u0437\u0430 \u0437\u0432\u0443\u043A\u0430 \u043D\u0430 XMB \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0435 \u0432 \u0440\u0435\u0436\u0438\u043C 'Normal'\n- \u0418\u043A\u043E\u043D\u0430\u0442\u0430 \u0437\u0430 \u043A\u0430\u043D\u0430\u043B\u0438\u0442\u0435 \u043D\u0430 XMB \u0442\u0440\u044F\u0431\u0432\u0430 \u0434\u0430 \u0435 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430 \u043D\u0430 'Left+Right'\n +TrTab2.11=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 +TrTab2.12=\u041E\u0431\u0449\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u0430 +TrTab2.13=\u041E\u0431\u0449\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 \u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 +TrTab2.14=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 \u0437\u0430 \u0432\u0438\u0434\u0435\u043E \u0444\u0430\u0439\u043B\u043E\u0432\u0435 +TrTab2.15=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 \u0437\u0430 \u0430\u0443\u0434\u0438\u043E \u0444\u0430\u0439\u043B\u043E\u0432\u0435 +TrTab2.16=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 \u0437\u0430 \u0441\u0442\u0440\u0438\u0439\u043C\u0432\u0430\u043D\u0435 \u043D\u0430 \u0432\u0438\u0434\u0435\u043E \u043E\u0442 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442 +TrTab2.17=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 \u0437\u0430 \u0441\u0442\u0440\u0438\u0439\u043C\u0432\u0430\u043D\u0435 \u043D\u0430 \u0430\u0443\u0434\u0438\u043E \u043E\u0442 \u0438\u043D\u0442\u0435\u0440\u043D\u0435\u0442 +TrTab2.18=\u0414\u0440\u0443\u0433\u0438 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 +TrTab2.19=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438 \u0441 \u0443\u0434\u0435\u0431\u0435\u043B\u044F\u0432\u0430\u043D\u0435 \u0449\u0435 \u0431\u044A\u0434\u0430\u0442 \u0441 \u043F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 +TrTab2.20=\u0438 \u0449\u0435 \u0437\u0430\u043C\u0435\u043D\u0438 \u043E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u043D\u043E\u0442\u043E \u0432\u0438\u0434\u0435\u043E +TrTab2.21=[Avisynth \u043D\u0435 \u0441\u0435 \u043F\u043E\u0434\u0434\u044A\u0440\u0436\u0430] +TrTab2.22=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u043F\u0440\u043E\u0431\u0432\u0430\u0439 \u0430\u0443\u0434\u0438\u043E\u0442\u043E \u043D\u0430 44.1 \u0438\u043B\u0438 48 kHz +TrTab2.27=\u0420\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u0430\u0439 DTS/FLAC -> LPCM (\u041D\u0443\u0436\u0434\u0430\u0435\u0442\u0435 \u0441\u0435 \u043E\u0442 HDMI \u043F\u0440\u0438\u0435\u043C\u043D\u0438\u043A \u0437\u0430 \u0441\u0442\u0440\u0438\u0439\u043C\u0432\u0430\u043D\u0435 \u043D\u0430 LPCM 5.1 \! \u0421\u0440\u0435\u0434\u0435\u043D \u0431\u0438\u0442\u0440\u0435\u0439\u0442 = 4.6Mbps) +TrTab2.28=\u0417\u0430\u043F\u0430\u0437\u0438 DTS \u0430\u0443\u0434\u0438\u043E \u043F\u0440\u0438 \u0441\u0442\u0440\u0438\u0439\u043C\u0432\u0430\u043D\u0435 (\u0421\u044A\u0432\u043C\u0435\u0441\u0442\u0438\u043C \u0441 \u043E\u043F\u0442\u0438\u0447\u0435\u043D \u0438\u0437\u0445\u043E\u0434) -> \u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435, \u0441\u043B\u0430\u0431 \u0431\u0438\u0442\u0440\u0435\u0439\u0442 \u043E\u0442\u0433\u043E\u0440\u0435 +TrTab2.29=AC-3 \u0410\u0443\u0434\u0438\u043E \u0431\u0438\u0442\u0440\u0435\u0439\u0442 (in Kbits/s) (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: 384, 576, 640): +TrTab2.32=Mpeg2 \u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u0432\u0438\u0434\u0435\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E\u0442\u043E(\u041D\u044F\u043A\u043E\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0430 \u0434\u043E\u0441\u0442\u044A\u043F\u043D\u0438 \u0432 \u043F\u0430\u0434\u0430\u0449\u043E\u0442\u043E \u043C\u0435\u043D\u044E , \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u043F\u0440\u043E\u043C\u0435\u043D\u044F\u0442\u0435 \u0441\u0442\u043E\u0439\u043D\u043E\u0441\u0442\u0438, \u043D\u043E \u0431\u044A\u0434\u0435\u0442\u0435 \u0432\u043D\u0438\u043C\u0430\u0442\u0435\u043B\u043D\u0438): +TrTab2.39=\u0421\u044A\u0432\u0435\u0442\u0438 \u0437\u0430 \u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435:\n\n\u0412\u0438\u0434\u0435\u043E\u0442\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u0441\u0435 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430 \u0438 \u0440\u0435\u043C\u0443\u043A\u0441\u0432\u0430 \u0432 MPEG-PS / AC-3 \u0430\u0443\u0434\u0438\u043E (\u0432\u0438\u0441\u043E\u043A\u043E \u0441\u044A\u0432\u043C\u0435\u0441\u0442\u0438\u043C \u0441 PS3 \u043A\u043E\u043D\u0437\u043E\u043B\u0430) +TrTab2.40=\n\u041C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0432\u044A\u0437\u043F\u0440\u043E\u0438\u0437\u0432\u0435\u0436\u0434\u0430\u0442\u0435 \u0441 vqscale, vqmin \u0438 keyint \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0438 \u0437\u0430 \u043F\u043E\u0441\u0442\u0438\u0433\u0430\u043D\u0435 \u043D\u0430 \u0434\u043E\u0431\u0440\u043E, \u0434\u043E\u0440\u0438 \u0438 \u043F\u043E\u0447\u0442\u0438 \u0431\u0435\u0437 \u0437\u0430\u0433\u0443\u0431\u0430 \u043D\u0430 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435. +TrTab2.41=\n\u041D\u0435\u0434\u043E\u0441\u0442\u0430\u0442\u044A\u043A \u043D\u0430 \u0442\u043E\u0432\u0430 \u0435,\u0447\u0435 VBR-\u0431\u0438\u0442\u0440\u0435\u0439\u0442\u0430 \u043C\u043E\u0436\u0435 \u0434\u0430 \u043D\u0430\u0434\u0445\u0432\u044A\u0440\u043B\u0438 \u043A\u0430\u043F\u0430\u0446\u0438\u0442\u0435\u0442\u0430 \u043D\u0430 \u043C\u0440\u0435\u0436\u0430\u0442\u0430 \u0432\u0438. +TrTab2.42=\n\u0417\u0430\u0442\u043E\u0432\u0430 \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u0430 \u0437\u0430\u0434\u0430\u0434\u0435\u0442\u0435 \u0448\u0438\u0440\u0438\u043D\u0430 \u043D\u0430 \u043B\u0435\u043D\u0442\u0430\u0442\u0430 \u0430\u043A\u043E \u0441\u0442\u0435 \u043D\u0430 WiFi, CPL \u0438 \u0442.\u043D. \u0412\u044A\u043F\u0440\u0435\u043A\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E\u0442\u043E \u043D\u0430 \u043F\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 +TrTab2.43=\ \u0441\u0435 \u044F\u0432\u044F\u0432\u0430 \u0431\u0430\u043B\u0430\u043D\u0441 \u043C\u0435\u0436\u0434\u0443 \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u0442\u0430 \u043D\u0430 \u043C\u0440\u0435\u0436\u0430\u0442\u0430 \u0438 \u0441\u0438\u043B\u0430\u0442\u0430 \u043D\u0430 \u043F\u0440\u043E\u0446\u0435\u0441\u043E\u0440\u0430: \u0417\u0430 \u043F\u043E-\u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435\u043D\u043E \u043E\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0430 \u0441\u043A\u043E\u0440\u043E\u0441\u0442 \u043D\u0430 \u0431\u0438\u0442\u0440\u0435\u0439\u0442\u0430, +TrTab2.44=\n\u043F\u043E-\u0432\u0438\u0441\u043E\u043A \u0431\u0438\u0442\u0440\u0435\u0439\u0442 \u0449\u0435 \u0437\u0430\u0442\u043E\u0440\u043C\u043E\u0437\u044F\u0432\u0430 \u043F\u0440\u043E\u0446\u0435\u0441\u043E\u0440\u0430 \u0432\u0438\! \u0421\u044A\u0449\u043E \u0442\u0430\u043A\u0430, \u043D\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u0432\u0430\u0439\u0442\u0435 1080p \u0444\u0438\u043B\u043C\u0438 \u043D\u0430 \u043D\u0430\u0439-\u0432\u0438\u0441\u043E\u043A\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u043F\u0440\u0438 15Mbps \u0441\u043A\u043E\u0440\u043E\u0441\u0442 \u043D\u0430 \u043C\u0440\u0435\u0436\u0430\u0442\u0430 :p +TrTab2.50=\u0411\u0440\u043E\u0439 \u043D\u0430 \u0430\u0443\u0434\u0438\u043E \u043A\u0430\u043D\u0430\u043B\u0438\u0442\u0435: +TrTab2.51=\u041F\u0440\u0435\u0446\u0438\u0437\u043D\u043E \u0437\u0430\u0431\u0440\u0430\u043D\u044F\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u0438 +TrTab2.52=\u041F\u043E\u0434\u0434\u0440\u044A\u0436\u043A\u0430 \u043D\u0430 \u0437\u0430\u0433\u043B\u0430\u0432\u0438\u044F \u043E\u0442 \ \u041F\u0420\u0415\u041A\u041E\u0414\u0418\u0420\u0410\u041D\u0415 \ \u043F\u0430\u043F\u043A\u0430\u0442\u0430 / \u0418\u043D\u0442\u0435\u0440\u0432\u0430\u043B \u0432 \u043C\u0438\u043D\u0443\u0442\u0438: +TrTab2.55=2 \u043A\u0430\u043D\u0430\u043B\u0430 (Stereo) +TrTab2.56=6 \u043A\u0430\u043D\u0430\u043B\u0430 (5.1) +TrTab2.60=\u041E\u0442\u043B\u0438\u0447\u043D\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E +TrTab2.61=\u0411\u0435\u0437 \u0437\u0430\u0433\u0443\u0431\u0430 \u043D\u0430 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E +TrTab2.62=\u0414\u043E\u0431\u0440\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E +TrTab2.63=\u0414\u043E\u0431\u0440\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u0437\u0430 HD WiFi \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 +TrTab2.64=\u0421\u0440\u0435\u0434\u043D\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u0437\u0430 HD WiFi \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 +TrTab2.65=\u041D\u0438\u0441\u043A\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E, \u043D\u0438\u0441\u043A\u043E \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0438\u0442\u0435\u043B\u0435\u043D \u043F\u0440\u043E\u0446\u0435\u0441\u043E\u0440 \u0438\u043B\u0438 \u0441\u043B\u0430\u0431\u043E HD WiFi \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 +TSMuxerVideo.0=\u0414\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u0430\u0439 \u0441 MEncoder \u0438 \u043A\u043E\u0434\u0438\u0440\u0430\u0439 \u0432\u0441\u0438\u0447\u043A\u0438 \u0430\u0443\u0434\u0438\u043E \u043F\u043E\u0442\u043E\u0446\u0438 \u0432 AC-3 +TSMuxerVideo.1=\u0414\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u0430\u0439 \u0441 MEncoder \u0438 \u043A\u043E\u0434\u0438\u0440\u0430\u0439 DTS/FLAC \u0430\u0443\u0434\u0438\u043E \u043F\u043E\u0442\u043E\u0446\u0438\u0442\u0435 \u0432 LPCM [\u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435, \u0442\u044A\u0440\u0441\u0435\u043D\u0435\u0442\u043E \u043D\u044F\u043C\u0430 \u0434\u0430 \u0440\u0430\u0431\u043E\u0442\u0438] +TSMuxerVideo.19=\u041C\u0443\u043A\u0441\u0438\u0440\u0430\u0439 \u0432\u0441\u0438\u0447\u043A\u0438 \u0430\u0443\u0434\u0438\u043E \u043F\u043E\u0442\u043E\u0446\u0438 +TSMuxerVideo.2=\u0424\u043E\u0440\u0441\u0438\u0440\u0430\u0439 FPS (\u0447\u0435\u0441\u0442\u043E\u0442\u0430\u0442\u0430 \u043D\u0430 \u043A\u0430\u0434\u0440\u0438\u0442\u0435) \u0430\u043D\u0430\u043B\u0438\u0437\u0438\u0440\u0430\u043D\u0438 \u043E\u0442 FFmpeg \u0432 \u043C\u0435\u0442\u0430 \u0444\u0430\u0439\u043B +TSMuxerVideo.3=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0437\u0430 \u0432\u0438\u0434\u0435\u043E \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u0430\u043D\u0435 \u0441\u0430\u043C\u043E \u0437\u0430 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0430 TsMuxer +TranscodeVirtualFolder.0=\#--\u0414\u0415\u041A\u041E\u0414\u0418\u0420\u0410\u041D\u0415--\# diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_br.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_br.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_br.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_br.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,223 @@ +DLNAMediaDatabase.0=Para melhorar o suporte e a qualidade da aplica\u00E7\u00E3o,\na base de dados da biblioteca de m\u00EDdia tem de ser reiniciada.\nPedimos desculpa pelo fato \! +FFMpegDVRMSRemux.0=Caminho FFmpeg Alternativo: +FFMpegDVRMSRemux.1=Defini\u00E7\u00F5es para DVR-MS remuxing +FFMpegVideo.0=Defini\u00E7\u00F5es do codificador s\u00F3 para o engine AviSynth/FFmpeg (PREFERIR AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Op\u00E7\u00F5es de Compartilhamento +FoldTab.2=Pesquisar todas as pastas compartilhadas +FoldTab.3=Pesquisar todas as pastas compartilhadas poder\u00E1 demorar muito tempo \!\n +FoldTab.4=Tem a certeza que quer iniciar a pesquisa?\n\n +FoldTab.5=Ocultar extens\u00E3o dos arquivos +FoldTab.6=Ocultar Pasta \#Defini\u00E7\u00F5es de V\u00EDdeo\# +FoldTab.7=Pastas Compartilhadas +FoldTab.8=Ocultar nomes dos engines de transcodifica\u00E7\u00E3o +FoldTab.9=Adicionar Pasta +FoldTab.10=Deseja terminar a pesquisa?\n\n +FoldTab.11=Ativar c\u00F3pia de v\u00EDdeo no PS3 / Aten\u00E7\u00E3o, a navega\u00E7\u00E3o poder\u00E1 tornar-se lenta +FoldTab.12=Ordenar as pastas compartilhadas +FoldTab.13=Miniaturas +FoldTab.14=Usar o Mplayer para miniaturas de V\u00EDdeo +FoldTab.15=Padr\u00E3o +FoldTab.16=Mais recentes primeiro +FoldTab.18=M\u00E9todo de ordena\u00E7\u00E3o de arquivos: +FoldTab.19=Miniaturas DVD ISO +FoldTab.22=Alfanum\u00E9rico +FoldTab.23=Download de amazon.com +FoldTab.24=Download de discogs.com +FoldTab.26=Miniaturas de \u00C1udio: +FoldTab.27=Pasta de capas de v\u00EDdeo alternativa +FoldTab.28=Escolha uma pasta +FoldTab.29=Mostrar biblioteca iPhoto +FoldTab.30=Mostrar biblioteca iTunes +FoldTab.31=Ocultar pastas vazias/sem m\u00EDdia (Cuidado: navega\u00E7\u00E3o lenta) +FoldTab.32=Ocultar pasta de biblioteca de m\u00EDdia +FoldTab.33=Ocultar Pasta de \#Transcode\# +FoldTab.34=Mostrar biblioteca aperture +FoldTab.35=Nenhum +FontFileFilter.3=Fontes Truetype +LinksTab.5=Links \u00FAteis: +LooksFrame.5=Sair +LooksFrame.6=Painel Principal +LooksFrame.9=Salvar +LooksFrame.12=Reiniciar Servidor +LooksFrame.18=Estado +LooksFrame.19=Registro +LooksFrame.20=Configura\u00E7\u00E3o Geral +LooksFrame.21=Defini\u00E7\u00F5es de Transcodifica\u00E7\u00E3o +LooksFrame.22=Navega\u00E7\u00E3oo/Defini\u00E7\u00F5es de Compartilhamento +LooksFrame.24=FAQ / Ajuda +LooksFrame.25=Sobre +LooksFrame.26=PARA TESTE APENAS, POSSIVELMENTE INST\u00C1VEL +MEncoderAviSynth.2=Defini\u00E7\u00F5es do Descodificador de V\u00EDdeo apenas para o engin AviSynth +MEncoderAviSynth.3=Ativar a mudan\u00E7a do AviSynth para framerate constante (convertfps=true) +MEncoderVideo.0=N\u00E3o usar loop filter deblocking para H.264: PODE DEGRADAR A QUALIDADE, desative se o processador for suficientemente r\u00E1pido\!\! +MEncoderVideo.1=Defini\u00E7\u00F5es do Descodificador apenas para o engine V\u00EDdeo/\u00C1udio MEncoder +MEncoderVideo.2=M\u00E9todo alternativo de sincroniza\u00E7\u00E3o A/V +MEncoderVideo.3=Usar par\u00E2metros padr\u00E3o dos codecs (Recomendado\!) +MEncoderVideo.4=For\u00E7ar framerate analizado pelo FFmpeg +MEncoderVideo.5=Aqui pode adicionar op\u00E7\u00E3es espec\u00EDficas, tais como um filtro de denoise, por exemplo: -vf hqdn3d +MEncoderVideo.6=Op\u00E7\u00F5es personalizadas: +MEncoderVideo.7=Prioridade da linguagem \u00E1udio: +MEncoderVideo.8=Defini\u00E7\u00F5es de Legendas +MEncoderVideo.9=Prioridade de idioma para Legendas: +MEncoderVideo.10=Prioridade de Linguagem \u00E1udio/Legendas (exemplo: en,off;eng,off ) +MEncoderVideo.11=P\u00E1gina de C\u00F3digo das Legendas: +MEncoderVideo.12=Defini\u00E7\u00F5es de fonte ASS: Escala de Fonte +MEncoderVideo.13=Contorno da Fonte +MEncoderVideo.14=Sombra da Fonte +MEncoderVideo.15=Margem da Fonte +MEncoderVideo.16=Defini\u00E7\u00F5es padr\u00E3o de fontes: Escala de Fonte +MEncoderVideo.17=Contorno da Fonte +MEncoderVideo.18=Borr\u00E3o da Fonte +MEncoderVideo.19=Margem da Fonte +MEncoderVideo.20=Legendas ASS/SSA +MEncoderVideo.21=Fontconfig / Fontes incorporadas +MEncoderVideo.22=Carregar automaticamente legendas *.srt/*.sub com o mesmo nome do arquivo +MEncoderVideo.24=Fonte TrueType espec\u00EDfica (para l\u00EDnguas asi\u00E1ticas): +MEncoderVideo.25=Selecionar Fonte Truetype +MEncoderVideo.26=Filtro Deinterlace +MEncoderVideo.27=Usar v\u00EDdeo scaler +MEncoderVideo.28=Largura +MEncoderVideo.29=Configura\u00E7\u00F5es avan\u00E7adas: Par\u00E2metros espe\u00EDficos de Codecs +MEncoderVideo.30=Altura +MEncoderVideo.32=Remux quando a faixa de \u00E1udio for AC-3 (sem recodifica\u00E7\u00E3o) +MEncoderVideo.33=Par\u00E2metros personalizados: +MEncoderVideo.34=Editar par\u00E2metros personalizados de codecs +MEncoderVideo.35=Suporte multicore melhorado para conte\u00FAdo H.264 HD +MEncoderVideo.36=Usar estilo ASS original +MEncoderVideo.37=Pasta alternativa para legendas +MEncoderVideo.39=Remux faixa de v\u00EDdeo DVD ISO (sem recodificar) +MEncoderVideo.68=\#Aqui pode usar par\u00E2metros espec\u00EDficos para algumas combina\u00E7\u00F5es de codecs.\n +MEncoderVideo.69=\#\\u00c9 usado principalmente para problemas de sincroniza\u00E7\u00E3o A/V, mas pode ser usado para qualquer outro fim, tamb\u00E9m\n +MEncoderVideo.70=\#Considerar como defini\u00E7\u00F5es avan\u00E7adas, n\u00E3o devendo ser usado se n\u00E3o souber exatamente como\n +MEncoderVideo.71=\#A sintaxe \u00E9 {java condition} :: {mencoder options} ; Pode acumular diversas op\u00E7\u00F5es\n +MEncoderVideo.72=\#Tokens autorizados: nome_do_arquivo arquivo_srt container vcodec acodec samplerate framerate largura altura canais dura\u00E7\u00E3o\n +MEncoderVideo.73=\#Cuidado, qualquer linha mal composta ser\uFFFD eliminada\n +MEncoderVideo.75=\#Op\u00E7\u00F5es especiais:\n +MEncoderVideo.76=\# -noass: desativa definitivamente legendas ASS/SSA j\u00E1 que podem interferir com a sincroniza\u00E7\u00E3o A/V\n +MEncoderVideo.77=\# -nosync: desativa definitivamente o m\u00E9todo alternativo de sincroniza\u00E7\u00E3o A/V para esta condi\u00E7\u00E3o (-mc far\u00E1 o mesmo)\n +MEncoderVideo.78=\# -quality: sobrepor defini\u00E7\u00F5es de quailidade de v\u00EDdeo\n +MEncoderVideo.79=\# -mt: for\u00E7ar utiliza\u00E7\u00E3o do build mencoder multithreaded (experimental, poder\u00E1 ser inst\u00E1vel)\n +MEncoderVideo.80=\#Esta lista ser\u00E1 melhorada com o tempo: ajustes/feedbacks em v\u00E1rios arquivos/codecs ser\u00E3o sempre bem-vindos\n +MEncoderVideo.87=\#Pode usar aqui as suas pr\u00F3prias condi\u00E7\u00F5es/op\u00E7\u00F5es \! Alguns exemplos: para ativar o build mt do mencoder\n +MEncoderVideo.88=\#para qualquer conte\u00FAdo HD H.264(redundante com a op\u00E7\u00E3o principal): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#para remover 24p judder numa TV de 50hz: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#para remux quando o v\u00EDdeo for MPEG-2 e n\u00E3o houver legendas: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=L\u00EDngua [tem de reiniciar a aplica\u00E7\u00E3o]: +NetworkTab.1=Navegar nos arquivos .RAR/.ZIP/.CBR +NetworkTab.2=Gerar miniaturas +NetworkTab.3=Iniciar minimizado +NetworkTab.4=Instalar como Servi\u00E7o do Windows +NetworkTab.5=Configura\u00E7\u00F5es Gerais +NetworkTab.6=Tamanho m\u00E1ximo do buffer de transcode, em megabytes (m\u00E1ximo: MAX_BUFFER_SIZE): +NetworkTab.7=N\u00FAmero de n\u00FAcleos usados para transcodifica\u00E7\u00E3o (parece que tem %d): +NetworkTab.8=Verificar se h\u00E1 atualiza\u00E7\u00F5es +NetworkTab.9=Verificar automaticamente +NetworkTab.11=Instalou o servi\u00E7o no Windows \! Para usar, tem de sair da aplica\u00E7\u00E3o,\n +NetworkTab.12=depois iniciar (e configurar) o servi\u00E7o pelo painel de administr\u00E7a\u00E3o do Windows.\n\n +NetworkTab.13=A biblioteca de m\u00EDdia ser\u00E1 reiniciada \!\n +NetworkTab.14=Erro na instala\u00E7\u00E3o do servi\u00E7o do Windows\!\n +NetworkTab.15=Defini\u00E7\u00F5es de Navega\u00E7\u00E3o/An\u00E1lize +NetworkTab.16=Posi\u00E7\u00E3o de procura de miniatura (em segundos): +NetworkTab.17=Ativar biblioteca de m\u00EDdia +NetworkTab.18=Repor biblioteca de m\u00EDdia +NetworkTab.19=Tem a certeza? +NetworkTab.20=For\u00E7ar rede na interface: +NetworkTab.22=Defini\u00E7\u00F5es de Rede, mude apenas se tiver problemas +NetworkTab.23=For\u00E7ar IP do servidor: +NetworkTab.24=For\u00E7ar porta do servidor (5001 por padr\u00E3o): +NetworkTab.25=Configura\u00E7\u00F5es do PS3 +NetworkTab.26=Codifica\u00E7\u00E3o de caracteres dos nomes dos arquivos do PS3 (ver XMB->Defini\u00E7\u00F5es de sistema->Charset): +NetworkTab.27=Configura\u00E7\u00F5es n\u00E3o utilizadas que n\u00E3o deve usar :p +NetworkTab.28=Modo Turbo (ativa tcp_nodelay) / use com cuidado, poder\u00E1 n\u00E3o ser bom usar isso +NetworkTab.29=Bloquear pedidos para o mesmo arquivo a partir do PS3 assim que o transcode iniciar +NetworkTab.30=Usar filtro IP: +NetworkTab.31=HTTP avan\u00E7ado e configura\u00E7\u00F5es do sistema +NetworkTab.32=HTTP Engine V2 +NetworkTab.33=Previnir o Sistema Operacional de dormir enquanto estiver transmitindo +NetworkTab.34=Plugins +NetworkTab.35=Largura de banda m\u00E1xima em Mb/s (0 significa sem limite): +NetworkTab.36=Renderer padr\u00E3o quando a detec\u00E7\u00E3o autom\u00E1tica falhar: +NetworkTab.37=Renderer desconhecido +NetworkTab.38=For\u00E7ar renderer padr\u00E3o (desabilitar detec\u00E7\u00E3o autom\u00E1tica) +PMS.0=O PS3 n\u00E3o foi encontrada. Estar\u00E1 ligada? Verifique o registo e/ou configura\u00E7\u00E3o, ou ent\u00E3o no arquivo debug.log +PMS.1=\u00C1udio +PMS.2=\#- Biblioteca de M\u00EDdia -\# +PMS.3=M\u00E9todo alternativo para sincroniza\u00E7\u00E3o A/V +PMS.4=Filtro de Deinterlace +PMS.5=PS3 encontrado \! +PMS.6=Carregar legendas .srt/.sub automaticamente +PMS.7=SkipLoopFilter para Decodifica\u00E7\u00E3o H.264 [PODER\u00C1 DEGRADAR A QUALIDADE] +PMS.8=Legendas +PMS.9=Todas as Playlists de \u00E1udio +PMS.10=Desativar legendas definitivamente +PMS.11=Todas as faixas de \u00E1udio +PMS.12=Por Data +PMS.13=Por Artista +PMS.16=Por Album +PMS.18=Conectado +PMS.19=Por G\u00E9nero +PMS.21=Por modelo de c\u00E2mera +PMS.22=Por Artista/Album +PMS.25=Por defini\u00E7\u00F5es ISO +PMS.26=Por G\u00E9nero/Artista/Album +PMS.27=Salvar configura\u00E7\u00F5es +PMS.31=Foto +PMS.32=Todas as Fotos +PMS.34=V\u00EDdeo +PMS.35=Todos os V\u00EDdeos +PMS.36=V\u00EDdeos HD +PMS.37=\#- Configura\u00E7\u00F5es de V\u00EDdeo -\# +PMS.39=V\u00EDdeos SD +PMS.41=(Re)instalar servi\u00E7o Win32 +PMS.130=Contatando o PS3... +StatusTab.2=Status +StatusTab.3=Aguardando... +StatusTab.5=Vazio +StatusTab.6=Status do buffer de Transcodifica\u00E7\u00E3o: +StatusTab.7=Estat\u00EDstica de E/S: +StatusTab.8=Bitrate atual: +StatusTab.9=M\u00EDdiamedia renderers detectados +StatusTab.10=Pico de bitrate: +TSMuxerVideo.0=For\u00E7ar AC-3 remuxing com todos os arquivos +TSMuxerVideo.1=For\u00E7ar PCM remuxing com \u00E1udio DTS/FLAC +TSMuxerVideo.2=For\u00E7ar FPS analizado pelo FFmpeg no meta-arquivo +TSMuxerVideo.3=Configura\u00E7\u00F5es do Decodificador de V\u00EDdeo apenas para o engine TsMuxer +TSMuxerVideo.19=Muxar todas a faixas de audio +TrTab2.0=Ativar/desativar um engine de transcodifica\u00E7\u00E3o +TrTab2.1=Sem configura\u00E7\u00F5es para configurar por agora +TrTab2.2=Configura\u00E7\u00F5es do codificador de v\u00EDdeo com os seguintes engines: MEncoder/AviSynth/FFmpeg +TrTab2.3=Configura\u00E7\u00F5es \u00E1udio, a aplicar aos seguintes decodificadores: MEncoder/AviSynth/FFmpeg +TrTab2.4=Configura\u00E7\u00F5es de qualidade de V\u00EDdeo +TrTab2.5=Configura\u00E7\u00F5es comuns de transcode +TrTab2.6=Ordenar a lista de engines de transcodifica\u00E7\u00E3o. O primeiro ir\u00E1 aparecer na pasta original de v\u00EDdeo +TrTab2.7=V\u00E1rias op\u00E7\u00F5es +TrTab2.8=Saltar transcode para as seguintes extens\u00F5es (separadas por v\u00EDrgulas): +TrTab2.9=For\u00E7ar transcode para as seguintes extens\u00F5es (separadas por v\u00EDrgulas): +TrTab2.10=Permite fazer stream de DTS diretamente para o receptor.\nAten\u00E7\u00E3o, \u00E9 poss\u00EDvel que se ou\u00E7a um som de est\u00E1tica. Conselhos:\n- Tem de ter um receptor compat\u00EDvel com DTS, ligado atrav\u00E9s de TOSLINK ou HDMI\n- O \u00EDcone de volume no XMB tem de estar em 'Normal'\n- O \u00EDcone dos canais no XMB tem de estar 'Left+Right'\n +TrTab2.11=Engines +TrTab2.12=Configura\u00E7\u00F5es comuns do decodificador +TrTab2.13=Configura\u00E7\u00F5es comuns do codificador +TrTab2.14=Engines de arquivos de v\u00EDdeo +TrTab2.15=Engines de arquivos de \u00E1udio +TrTab2.16=Engines de streaming de v\u00EDdeo web +TrTab2.17=Engines de streaming de \u00E1udio Web +TrTab2.18=Engines v\u00E1rios +TrTab2.19=Engine em negrito ser\u00E1 o priorit\u00E1rio +TrTab2.20=e ir\u00E1 substituir o v\u00EDdeo original +TrTab2.21=[AviSynth n\u00E3o suportado] +TrTab2.27=DTS/FLAC -> LPCM remux (Necessita um receptor HDMI para streaming de PCM 5.1 \! Bitrate m\u00E9dio = 4.6Mbps) +TrTab2.28=Manter o \u00E1udio DTS no stream (Compat\u00EDvel com sa\u00EDda \u00F3ptica) -> Aten\u00E7\u00E3o, ligeiro aumento no bitrate \! +TrTab2.29=Bitrate de \u00E1udio AC-3 (em Kbits/s) (ex: 384, 576, 640): +TrTab2.32=Configura\u00E7\u00F5es MPEG-2: +TrTab2.39=Dicas do codificador:\n\nO v\u00EDdeo \u00E9 automaticamente codificado e muxado em MPEG-PS / AC-3 \u00E1udio (altamenta compat\u00EDvel na PS3) +TrTab2.40=\nPode tentar mudar o par\u00E2metro vqscale, vqmin e keyint para atingir uma boa, quase sem perda, qualidade de transcodifica\u00E7\u00E3o. +TrTab2.41=\nO inconveniente \u00E9 que o bitrate VBR poder\u00E1 atingir picos acima da capacidade m\u00E1xima da rede. +TrTab2.42=\nPor essa raz\u00E3o deve ajustar a largura de banda se usar WiFi, CPL, etc. Contudo, a qualidade de transcodifica\u00E7\u00E3o +TrTab2.43=\n\u00E9 um equil\u00EDbrio entre velocidade da rede e capacidade do processador: quanto maior for a qualidade num bitrate reduzido, +TrTab2.44=\nmais o processador ser\u00E1 afetado\! Al\u00E9m disso, n\u00E3o espere que um filme de a\u00E7\u00E3o a 1080p fique com a melhor qualidade a 15Mbps :p +TrTab2.50=N\u00FAmero de canais de \u00E1udio: +TrTab2.51=Desativar definitivamente as legendas +TrTab2.52=Chapters \#Transcode\# folder support / Intervalos em minutos: +TracesTab.3=Limpar +TreeNodeSettings.4=Este engine n\u00E3o est\u00E1 carregado\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ca.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ca.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ca.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ca.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,234 @@ +DLNAMediaDatabase.0=La memoria de la base de dades s'ha de reinicialitzar.\nPerdoneu les mol\u00E8sties\! +FFMpegDVRMSRemux.0=Ruta Alternativa de FFmpeg: +FFMpegDVRMSRemux.1=Propietats per remuxing DVR-MS +FFMpegVideo.0=Propietats del motor AviSynth/FFmpeg i prou (Preferir AviSynth/MEncoder) +FoldTab.0= +FoldTab.1=Opcions de compartici\u00F3 +FoldTab.2=Escanejar totes les carpetes compartides +FoldTab.3=Escanejar totes les carpetes compartides Pot tardar molt\!\n +FoldTab.4=Esteu segur de voler comen\u00E7ar l'escaneig?\n\n +FoldTab.5=Ocultar les extensions dels arxius +FoldTab.6=Ocultar la Carpeta \#Ajustaments de Video\# +FoldTab.7=Carpetes compartides +FoldTab.8=Ocultar els noms dels motors de transcodificaci\u00F3 +FoldTab.9=Afegir Directori +FoldTab.10=Voleu parar l'escaneig?\n\n +FoldTab.11=Activar la copia de video transcodificat a la PSA3 (Atenci\u00F3, els fitxers no tenen mida fixa \!) +FoldTab.12=Ordenar les carpetes compartides +FoldTab.13=Miniatures +FoldTab.14=Fer servir Mplayer per les Miniatures de Video +FoldTab.15=Alfab\u00E8ticament (A-Z) +FoldTab.16=Per data, els m\u00E9s nous primer +FoldTab.17=Per data, el mes vells primer +FoldTab.18=Ordre dels fitxers: +FoldTab.19=Miniatures dels DVD ISO +FoldTab.20=ASCIIb\u00E8ticament +FoldTab.21=Miniatures de imatge +FoldTab.22=Alfanum\u00E8ric +FoldTab.23=Descarrega d'amazon.com +FoldTab.24=Descarrega de discogs.com +FoldTab.26=Mostra miniatures de so: +FoldTab.27=Carpeta alternativa de cobertes de videos +FoldTab.28=Tria una carpeta +FoldTab.29=Veure la biblioteca de iPhoto +FoldTab.30=Veure la biblioteca de iTunes +FoldTab.31=Hide empty/non-media folders (Careful: slower browsing) +FoldTab.32=Hide cache folder +FoldTab.33=Hide \#Transcode\# Folder +FoldTab.34=Show aperture library +FontFileFilter.3=Fonts Truetype +LinksTab.5=Enlla\u00E7os d'utilitat: +LooksFrame.5=Sortir +LooksFrame.6=Panell Principal +LooksFrame.9=Guardar +LooksFrame.12=Rearrancar el Servidor +LooksFrame.13=El servidor s'ha de reiniciar a causa de un canvi de configuraci\u00F3 +LooksFrame.18=Estat +LooksFrame.19=Rastreig +LooksFrame.20=Configuraci\u00F3 General +LooksFrame.21=Ajustaments de transcodificaci\u00F3 +LooksFrame.22=Ajustaments Navegar/Compartir +LooksFrame.24=Ajuda +LooksFrame.25=Quant a +MEncoderAviSynth.2=Ajustaments de decoder per AviSynth +MEncoderAviSynth.3=Permetre el canvi de n\u02D9mero de fotogrames de variable a constant amb AviSynth (convertfps\=true) +MEncoderVideo.0=Saltar el desbloqueig de filtre de loop per H.264. Pot degradar la qualitat +MEncoderVideo.1=Ajustaments del decoder de Video/Audio per MEncoder solamente +MEncoderVideo.2=M\u00E8tode alternatiu de sincronia A/V +MEncoderVideo.3=Fer servir els par\u00E0metres per defecte dels codecs de l'aplicaci\u00F3 (Recomanat\!) +MEncoderVideo.4=For\u00E7ar n\u02D9mero de fotogrames rebuts del FFmpeg +MEncoderVideo.5=Pot incloure aqu\u00ED opci\u00F3ns espec\u00EDfiques, tals como un filtre de soroll per exemple: -vf hqdn3d +MEncoderVideo.6=Opcions personalitzades: +MEncoderVideo.7=Prioritat d'idioma d'\u00E0udio: +MEncoderVideo.8=Configuraci\u00F3 de Subt\u00EDtols +MEncoderVideo.9=Prioritat d'idioma de Subt\u00EDtols: +MEncoderVideo.10=Prioritat de idioma de \u00E0udio/subt\u00EDtols (ex: en,off;eng,off) +MEncoderVideo.11=Codi de p\u00E0gina per subtitols: +MEncoderVideo.12=Ajustaments de font ASS: Escala de font +MEncoderVideo.13=Vora de la font +MEncoderVideo.14=Ombra de font +MEncoderVideo.15=Marge inferior de font +MEncoderVideo.16=Propietats de font por defecte: Escala de font +MEncoderVideo.17=Vora de font +MEncoderVideo.18=Desenfoc de la font +MEncoderVideo.19=Marge inferior de la font +MEncoderVideo.20=Subt\u00EDtols ASS/SSA +MEncoderVideo.21=Fontconfig/Fonts incrustades +MEncoderVideo.22=Autocarregar subt\u00EDtols *.srt/*.sub amb el mateix nom de fitxer +MEncoderVideo.23=Mode FriBiDi +MEncoderVideo.24=Especificar la Font TrueType (per idiomes asi\u00E0tics): +MEncoderVideo.25=Escollir una font Truetype +MEncoderVideo.26=Filtre de Desentralla\u00E7at +MEncoderVideo.27=Fer servir Escalador de Video +MEncoderVideo.28=Ample +MEncoderVideo.29=Ajustaments per experts : Parametres especifics de Codecs +MEncoderVideo.30=Al\u00E7ada +MEncoderVideo.31=Color dels subtitols +MEncoderVideo.32=Remescla quan cuando la pista de so sigui AC-3 (no recodificar) +MEncoderVideo.33=Par\u00E0metres personalitzats: +MEncoderVideo.34=Editar par\u00E0metres espec\u00EDfics de codecs +MEncoderVideo.35=Suport multinucli millorat +MEncoderVideo.36=Estil per defecte ASS +MEncoderVideo.37=Carpeta de subtitols alternativa +MEncoderVideo.39=Fer Remux del video dels DVD ISO (no recodificar) +MEncoderVideo.68=\#Aqui aqu\u00ED es por posar par\u00E0metres espec\u00EDfics per combinacions de codecs.\n +MEncoderVideo.69=\#Utilitza-ho sobretot si hi ha problemes amb la sincronitzaci\u00F3 A/V, per\u00DA tamb\u00C8 es pot utilitzar per qualsevol altra cosa\n +MEncoderVideo.70=\#Es un ajust per experts, no ho utilitzis si no saps ben b\u00C8 el que est\u00E0s fent\n +MEncoderVideo.71=\#La sintaxis es {condici\u00F3 java} :: {opcions MEncoder} ; Podeu acumular varies opcions\n +MEncoderVideo.72=\#Tokens permesos: filename srtfile ambtainer vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Compte, qualsevol l\u00EDnia mal formada ser\u00E0 esborrada\n +MEncoderVideo.75=\#Opcions especials:\n +MEncoderVideo.76=\# -noass: deshabilitar totalment els Subt\u00EDtols ASS/SSA ja que pot afectar a la sincronia A/V\n +MEncoderVideo.77=\# -nosync: deshabilitar totalment els M\u00E8tode alternatiu de sincronia A/V per Aquesta ambdicion (-mc hace lo mismo)\n +MEncoderVideo.78=\# -quality: ignorar la configuraci\u00F3 de cualitat de video\n +MEncoderVideo.79=\# -mt: for\u00E7ar l'\u02D9s del MEncoder multifil (experimental, pot resultar inestable)\n +MEncoderVideo.80=\#Aquesta llista millorar\u00E0 amb el temos: ajustaments i comentaris sobre codecs/fitxers sempre s\u00F3n benvinguts\n\n +MEncoderVideo.87=\#Pot especificar sus propias ambdiciones y opci\u00F3es\! Por ejemplo, per usar el MEncoder multihilo\n +MEncoderVideo.88=\#per qualsevol contingut H.264 en HD (redundant amb la opci\u00F3 principal): vcodec \=\= h264 && width >\= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#per treure judder de 24p en una televisi\u00F3 de 50hz TV: framerate \=\= 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#per fer remux quan el video \u00C8s MPEG-2 sense subt\u00EDtols: vcodec \=\= mpeg2 && srtfile \=\= null :: -ovc copy -nosync +MEncoderVideo.92=Qualitat dels subtitols per DVD/VOBsub (0-4) (m\u00C8s alt \u00C8s millor) +MEncoderVideo.93=Afegir marges per compensar overscan: +MEncoderVideo.94=Subtitols for\u00E7ats: +MEncoderVideo.95=Etiquetes for\u00E7ades: +NetworkTab.0=Idioma [necesita rearrancar la aplicacion]: +NetworkTab.1=Examinar arxius comprimits .RAR/.ZIP/.CBR +NetworkTab.2=Genraci\u00F3 de miniatures +NetworkTab.3=Iniciar minimitzat +NetworkTab.4=Instalar como a Servei de Windows +NetworkTab.5=Configuraci\u00F3 General +NetworkTab.6=Mida m\u00e0axim del buffer de transcodificaci\u00f3, en Megabytes (m\u00e0axim MAX_BUFFER_SIZE): +NetworkTab.7=N\u02D9mero de nuclis usats per transcodificar (sembla que teniu %d): +NetworkTab.8=Buscar actualitzacions +NetworkTab.9=Verificar autom\u00E0ticament +NetworkTab.11=Heu instal\u00B7lat el servei de Windows \! Per fer-lo servir heu de tancar aquesta aplicaci\u00F3\n +NetworkTab.12=llavors iniciar (i configurar) el servei des del panell d'administraci\u00F3 de Windows.\n\n +NetworkTab.13=La cache es reinicialitzar\u00E0 \!\n +NetworkTab.14=Error en la instalaci\u00F3 del servei de Windows\!\n +NetworkTab.15=Propietats de Navegaci\u00F3/Lectura +NetworkTab.16=Cerca de la posici\u00F3 de les miniatures (en segons): +NetworkTab.17=Habilitar la libreria de medios +NetworkTab.18=Reiniciar la memoria +NetworkTab.19=Esteu segur? +NetworkTab.20=For\u00E7ar funcionament de xarxa a l'interf\u00EDcie: +NetworkTab.22=Configuraci\u00F3 de xarxa (avan\u00E7at) +NetworkTab.23=For\u00E7ar IP del servidor: +NetworkTab.24=For\u00E7ar el port del servidor (5001 per defecte): +NetworkTab.25=Caracter\u00EDstiques de la PS3 +NetworkTab.26=Juego de caracteres per archivos de su PS3 (see XMB->Ajustaments del sistema->Juego de caracteres): +NetworkTab.27=Caracteristicas no usadas que no deberia usar :p +NetworkTab.28=Modo Turbo (habilita tcp_nodelay) / cuidado, noestoy seguro si se debe hacer +NetworkTab.29=Bloquear peticiones entrantes per el mismo archivo desde la PS3 cuando haya empezado la transcodificaci\u00F3 +NetworkTab.30=Posar un filtre de IP: +NetworkTab.31=Configuracions HTTP i de sistema avan\u00E7ades +NetworkTab.32=Motor HTTP v2 +NetworkTab.33=Impedir que el sistema hiberni mentre estem fent sreaming +NetworkTab.34=Plugins +NetworkTab.35=Ample de banda maxim en Mb/s (0 significa ilimitado): +PMS.0=La PS3 no s'ha trobat. \u2026s encesa? Pot tamb\u00C8 mirar en Rastreig, Configuraci\u00F3 o l'arxiu debug.log +PMS.1=\u00C0udio +PMS.2=\#- Llibreria de Medios -\# +PMS.3=M\u00E8tode alternatiu de sincronia A/V +PMS.4=Filtre de Desentrella\u00E7at +PMS.5=PS3 trobada \! +PMS.6=Autocarregar Subt\u00EDtols .srt/.sub +PMS.7=Saltar filtre de bucle per la descodificaci\u00F3 H.264 [Pot DEGRADAR LA qualitat] +PMS.8=Subtitols +PMS.9=Todas las listas de reproduccion de Audio +PMS.10=Desactivar definitivament els subtitols +PMS.11=Totes las Pistas de Audio +PMS.12=Per Data +PMS.13=Per Artista +PMS.16=Per Album +PMS.17=Renderitzador desconegut +PMS.18=Connectat +PMS.19=Per G\u00E8nere +PMS.21=Per model de c\u00E0mara +PMS.22=Per Artista/Album +PMS.25=Per ajustes ISO +PMS.26=Per G\u00E8nere/Artista/\u00C0lbum +PMS.27=Guardar configuraci\u00F3 +PMS.31=Foto +PMS.32=Totes les Fotos +PMS.34=Video +PMS.35=Tots els Videos +PMS.36=Videos HD +PMS.37=\#- Ajustaments de Video -\# +PMS.39=Videos SD +PMS.41=(Re)instalando el servicio Win32 +PMS.130=Contactant amb la PS3... +ProfileChooser.1=Triar del perfil de PS3 Media Server +ProfileChooser.2=Triar +ProfileChooser.3=Fitxer (.conf) o directori amb el perfils +StatusTab.2=Estat +StatusTab.3=Esperant... +StatusTab.5=Buit +StatusTab.6=Estat del bufer de transcodificaci\u00F3: +StatusTab.7=Estad\u00EDstiques de E/S: +StatusTab.8=Bitrate actual: +StatusTab.9=Renderitzadors de media detectats +StatusTab.10=Bitrate m\u00E0xim: +StatusTab.11=Mb/s +TSMuxerVideo.0=For\u00E7ar remescla AC-3 amb tots els arxius +TSMuxerVideo.1=For\u00E7ar remescla PCM amb audio DTS/FLAC +TSMuxerVideo.2=For\u00E7ar FPS de FFmpeg en l'arxiu meta +TSMuxerVideo.3=Ajustaments de decodificador de video nom\u00C8s per al motor TsMuxer +TSMuxerVideo.19=Mesclar totes les pistes de so +TrTab2.0=Habilitar/deshabilitar un motor de transcodificaci\u00F3 +TrTab2.1=Sense ajusts de moment +TrTab2.2=Ajustaments de codificador amb els seg\u00B8ents Motors: MEncoder/AviSynth/FFmpeg +TrTab2.3=Ajustaments de Audio, aplicables als decodificadores seg\u00B8ents: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Ajustaments de cualitat de video +TrTab2.5=Ajustaments de transcodificaci\u00F3 +TrTab2.6=Ordenar amb els Motors de transcodificaci\u00F3 primer. El primer apareixer\u00E0 a la carpeta del video original +TrTab2.7=Opcions v\u00E0ries +TrTab2.8=Saltar la transcodificaci\u00F3 per les extensions seg\u00B8ents (separades per comes): +TrTab2.9=For\u00E7ar la transcodificaci\u00F3 per les extensions seg\u00B8ents (separades por comes): +TrTab2.10=Permet fer stream de DTS directament al receptro.\nAlerta, \u00C8s possible que tingueu un so est\u00E0tic. Notes:\n- Cal que tingueu un receptor compatible DTS, connectat amb TOSLINK o HDMI\n- La icona del volum a XMB ha d'estar en 'Normal'\n- La icona dels canala a XMB ha d'estar a 'Esquerra+Dreta'\n +TrTab2.11=Motors +TrTab2.12=Ajustaments comuns del decodificador +TrTab2.13=Ajustaments comuns del codificador +TrTab2.14=Motors de Archivos de Video +TrTab2.15=Motors de Archivos de Audio +TrTab2.16=Motors de Video Web +TrTab2.17=Motors de Audio Web +TrTab2.18=Motors varis +TrTab2.19=El motor en negreta t\u00C8 prioritat +TrTab2.20=i sustituir\u00E0 al video original +TrTab2.21=(AviSynth no suportat) +TrTab2.22=Remostreig autom\u00E0tic del so a 44.1 o 48 kHz +TrTab2.27=Remux DTS/FLAC -> LPCM (Necesita un receptor A/V amb HDMI per enviar PCM 5.1 \! Bitrate mig \= 4.6Mbps) +TrTab2.28=Mantenir el so DTS en l'stream (Compatible amb la sortida optica) +TrTab2.29=Bitrate de Audio AC-3 (en Kbits/s) (ej: 384, 576, 640): +TrTab2.32=Ajustaments MPEG-2: +TrTab2.39=El video es codifica i mescla automaticament com MPEG-PS amb audio AC-3 (molt compatible amb PS3) +TrTab2.40=\nPodeu modificar els par\u00E0metres vqscale, vqmin i keyint per obtenir una bona cualitat de transcodificaci\u00F3, gaireb\u00E9 sense p\u00E8rdues. +TrTab2.41=\n L'inconvenient es que el bitrate de VBR Pot a vegades superar la capacidat de la vostra xarxa. +TrTab2.42=\nPer aix\u00F2 pot tamb\u00E9 modificar l'Ample de banda si aneu per WiFi, CPL, etc. Tanmateix, la qualitat de transcodificaci\u00F3 +TrTab2.43=\n\u00E9s un equilibri entre velocitat de xarxa i potencia de cpu: contra m\u00E9s qualitat vulgui amb un ample de banda ajustat, +TrTab2.44=\nm\u00E9s patir\u00E0 la vostra cpu\! A m\u00E9s, no pretingui reproduir una pelicula d'acci\u00F3 a 1080p amb la millor qualitat en 15Mbps :p +TrTab2.50=N\u00FAmero de canals de audio: +TrTab2.51=Deshabilitar Subt\u00EDtols definitivament +TrTab2.52=Suport de \#Transcodificaci\u00F2\# de carpetes de cap\u00EDtols / Interval en minuts: +TracesTab.3=Netejar +TreeNodeSettings.4=Aquest motor no est\u00E0 carregat\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_cz.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_cz.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_cz.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_cz.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,307 @@ +Dialog.Confirm=Potvrdit +Dialog.Error=Chyba +Dialog.Information=Informace +Dialog.Options=Mo\u017Enosti +Dialog.Question=Dotaz +DLNAMediaDatabase.0=Pro lep\u0161\u00ED podporu a zdokonalen\u00ED aplikace,\ndatab\u00E1zi knihovny m\u00E9di\u00ED je t\u0159eba znovu inicializovat.\nOmlouv\u00E1me se za nep\u0159\u00EDjemnosti \! +DLNAMediaDatabase.1=A,\u00C1,B,C,\u010C,D,\u010E,E,\u00C9,F,G,H,I,\u00CD,J,K,L,M,N,O,\u00D3,P,Q,R,\u0158,S,\u0160,T,\u0164,U,\u00DA,V,W,X,Y,Z,\u017D +DLNAMediaDatabase.2=\u010Ci\u0161t\u011Bn\u00ED datab\u00E1ze... +DLNAMediaDatabase.3=Zhu\u0161t\u011Bn\u00ED datab\u00E1ze... +DLNAMediaDatabase.4=Hled\u00E1n\u00ED v adres\u00E1\u0159i: +DLNAMediaDatabase.5=Po\u0161kozen\u00E1 cache mus\u00ED b\u00FDt smaz\u00E1na, ale program to nemohl ud\u011Blat.\nUkon\u010Dete program a sma\u017Ete adres\u00E1\u0159 %s ru\u010Dn\u011B. +FFMpegDVRMSRemux.0=Alternativn\u00ED cesta k FFmpeg: +FFMpegDVRMSRemux.1=Nastaven\u00ED pro DVR-MS remuxing +FFMpegVideo.0=Nastaven\u00ED enkod\u00E9ru pouze pro AviSynth/FFmpeg (preferuj pou\u017Eit\u00ED AviSynth/MEncoder) +FFMpegVideo.1=Nastaven\u00ED enkod\u00E9ru pro FFmpeg +FoldTab.0= +FoldTab.1=Nastaven\u00ED sd\u00EDlen\u00ED +FoldTab.2=Skenovat v\u0161echny sd\u00EDlen\u00E9 adres\u00E1\u0159e +FoldTab.3=Skenov\u00E1n\u00ED v\u0161ech sd\u00EDlen\u00FDch slo\u017Eek m\u016F\u017Ee zabrat hodn\u011B \u010Dasu \!\n +FoldTab.4=Opravdu chcete spustit skenov\u00E1n\u00ED?\n\n +FoldTab.5=Skr\u00FDt p\u0159\u00EDpony soubor\u016F +FoldTab.6=Skr\u00FDt adres\u00E1\u0159 \#Nastaven\u00ED videa\# +FoldTab.7=Sd\u00EDlen\u00E9 adres\u00E1\u0159e +FoldTab.8=Skr\u00FDt jm\u00E9na transk\u00F3dovac\u00EDch n\u00E1stroj\u016F +FoldTab.9=P\u0159idat adres\u00E1\u0159 +FoldTab.10=Chcete zastavit skenov\u00E1n\u00ED?\n\n +FoldTab.11=Povolit transk\u00F3dov\u00E1n\u00EDkopie videa na PS3 (Pozor, soubory nemaj\u00ED pevnou velikost !) +FoldTab.12=\u0158adit sd\u00EDlen\u00E9 slo\u017Eky +FoldTab.13=Miniatury +FoldTab.14=Pou\u017E\u00EDt Mplayer pro miniatury videa +FoldTab.15=Z\u00E1kladn\u00ED +FoldTab.16=Nejd\u0159\u00EDve naposledy p\u0159idan\u00E9 +FoldTab.17=Nejd\u0159\u00EDve nejstar\u0161\u00ED +FoldTab.18=Metoda \u0159azen\u00ED soubor\u016F: +FoldTab.19=DVD ISO n\u00E1hledy +FoldTab.20=ASCII +FoldTab.21=N\u00E1hledy obr\u00E1zk\u016F +FoldTab.22=Alfanumericky +FoldTab.23=Stahovat z amazon.com +FoldTab.24=Stahovat z discogs.com +FoldTab.26=Stahov\u00E1n\u00ED miniatur audia: +FoldTab.27=Alternativn\u00ED adres\u00E1\u0159 s obaly videa +FoldTab.28=Zvolte adres\u00E1\u0159 +FoldTab.29=Zobraz knihovnu iPhoto +FoldTab.30=Zabraz knihovnu iTunes +FoldTab.31=Skr\u00FDt pr\u00E1zdn\u00E9/ne-media adres\u00E1\u0159e (Pozor: pomalej\u0161\u00ED proch\u00E1zen\u00ED) +FoldTab.32=Skr\u00FDt slo\u017Eku cache +FoldTab.33=Skr\u00FDt slo\u017Eku \#Transcode\# +FoldTab.34=Zobrazit knihovnu Apple Aperture +FoldTab.35=\u017D\u00E1dn\u00E9 +FontFileFilter.3=P\u00EDsmo TrueType +LinksTab.5=U\u017Eite\u010Dn\u00E9 odkazy: +LinksTab.6=Verze: +LooksFrame.5=Konec +LooksFrame.6=Hlavn\u00ED panel +LooksFrame.9=Ulo\u017Eit +LooksFrame.12=Restart Serveru +LooksFrame.13=Server mus\u00ED b\u00FDt restarov\u00E1n z d\u016Fvodu zm\u011Bn nastaven\u00ED +LooksFrame.18=Stav +LooksFrame.19=Logov\u00E1n\u00ED +LooksFrame.20=Z\u00E1kladn\u00ED nastaven\u00ED +LooksFrame.21=Nastaven\u00ED transk\u00F3dov\u00E1n\u00ED +LooksFrame.22=Navigace/Nastaven\u00ED sd\u00EDlen\u00ED +LooksFrame.24=N\u00E1pov\u011Bda +LooksFrame.25=O programu +LooksFrame.26=POUZE PRO TESTOV\u00C1N\u00CD, MO\u017DN\u00C1 NESTABILN\u00CD +MEncoderAviSynth.2=Nastaven\u00ED video dekod\u00E9ru jen pro n\u00E1stroj AviSynth +MEncoderAviSynth.3=Povolte v AviSynth zm\u011Bnu variabiln\u00EDho datov\u00E9ho toku na konstantn\u00ED datov\u00FD tok (convertfps=true) +MEncoderAviSynth.4=# Script pro AviSynth je nyn\u00ED pln\u011B ukonfigurovateln\u00FD.\n +MEncoderAviSynth.5=# K dispozici jsou n\u00E1sleduj\u00EDc\u00ED prom\u011Bnn\u00E9:\n +MEncoderAviSynth.6=# : kompletn\u00ED instrukce DirectShowSource, nap\u0159. DirectShowSource(filename, convertfps)\n +MEncoderAviSynth.7=# : kompletn\u00ED instrukce pro titulky, pokud jsou n\u011Bjak\u00E9 detekovan\u00E9 (SRT/SUB/IDX/ASS/SSA)\n +MEncoderAviSynth.8=# : n\u00E1zev filmu, pokud chcete v\u0161e nastavit sami\n +MEncoderAviSynth.10=\n +MEncoderAviSynth.11=\n +MEncoderVideo.0=P\u0159esko\u010D\u00ED smy\u010Dku deblocking filtru pro H.264. M\u016F\u017Ee degradovat jakost +MEncoderVideo.1=Nastaven\u00ED video/audio dekod\u00E9ru jen pro MEncoder +MEncoderVideo.2=Alternativn\u00ED metoda A/V synchronizace +MEncoderVideo.3=Pou\u017E\u00EDt pro kodeky z\u00E1kladn\u00ED paramatry aplikace (Doporu\u010Deno!) +MEncoderVideo.4=Vynutit rychlost sn\u00EDmk\u016F analyzovanou FFmpeg +MEncoderVideo.5=Zde m\u016F\u017Eete p\u0159idat konkr\u00E9tn\u00ED mo\u017Enosti, jako je nap\u0159\u00EDklad filtr denoise: -vf hqdn3d +MEncoderVideo.6=U\u017Eivatelsk\u00E9 nastaven\u00ED: +MEncoderVideo.7=Priorita jazyka zvuku: +MEncoderVideo.8=Nastaven\u00ED titulk\u016F +MEncoderVideo.9=Priorita jazyka titulk\u016F: +MEncoderVideo.10=Priorita jazyka audia/titulk\u016F (nap\u0159: cz,vyp;cze,vyp) +MEncoderVideo.11=K\u00F3dov\u00E1n\u00ED titulk\u016F: +MEncoderVideo.12=ASS nastaven\u00ED p\u00EDsma: Rozsah p\u00EDsma +MEncoderVideo.13=P\u00EDsmo obrysov\u00E9 +MEncoderVideo.14=P\u00EDsmo st\u00EDnovan\u00E9 +MEncoderVideo.15=P\u00EDsmo pod okrajem +MEncoderVideo.16=Default font settings: Rozsah p\u00EDsma +MEncoderVideo.17=P\u00EDsmo obrysov\u00E9 +MEncoderVideo.18=P\u00EDsmo rozmazan\u00E9 +MEncoderVideo.19=P\u00EDsmo pod okrajem +MEncoderVideo.20=ASS/SSA titulky +MEncoderVideo.21=Fontconfig/Vlo\u017Een\u00E1 p\u00EDsma +MEncoderVideo.22=Automatick\u00E9 na\u010Dten\u00ED *.srt/*.sub titulk\u016F se stejn\u00FDm n\u00E1zvem jako n\u00E1zev souboru +MEncoderVideo.23=FriBiDi m\u00F3d +MEncoderVideo.24=Specifick\u00E9 p\u00EDsmo TrueType font (pro asijsk\u00E9 jazyky): +MEncoderVideo.25=Vyberte p\u00EDsmo Truetype +MEncoderVideo.26=Filtr prokl\u00E1d\u00E1n\u00ED +MEncoderVideo.27=Pou\u017E\u00EDt Video scaler +MEncoderVideo.28=\u0160\u00ED\u0159ka +MEncoderVideo.29=Pro experty : specifick\u00E9 parametry kodek\u016F +MEncoderVideo.30=V\u00FD\u0161ka +MEncoderVideo.31=Barva titulk\u016F +MEncoderVideo.32=Ponechat AC-3 stopu (bez reenk\u00F3dov\u00E1n\u00ED, m\u016F\u017Ee zp\u016Fsobit v\u00FDpadky zvuku a probl\u00E9my s A/V synchronizac\u00ED) +MEncoderVideo.33=U\u017Eivatelsk\u00E9 parametry: +MEncoderVideo.34=Upravit specifick\u00E9 parametry kodek\u016F +MEncoderVideo.35=Roz\u0161\u00ED\u0159en\u00E1 v\u00EDcej\u00E1drov\u00E1 podpora +MEncoderVideo.36=Pou\u017E\u00EDt z\u00E1kladn\u00ED ASS styl +MEncoderVideo.37=Alternativn\u00ED adres\u00E1\u0159 s titulky +MEncoderVideo.39=Remux DVD ISO video stopy (ne p\u0159ek\u00F3dov\u00E1n\u00ED) +MEncoderVideo.68=\# Zde m\u016F\u017Eete vlo\u017Eit konkr\u00E9tn\u00ED parametry pro kombinace n\u011Bkter\u00FDch kodek\u016F.\n +MEncoderVideo.69=\# Jde p\u0159edev\u0161\u00EDm o probl\u00E9my s A/V synchronizac\u00ED, ale lze jej pou\u017E\u00EDt i pro cokoliv jin\u00E9ho\n +MEncoderVideo.70=\# Jde o expertn\u00ED nastaven\u00ED, proto\u017Ee by nem\u011Blo b\u00FDt pou\u017E\u00EDv\u00E1no pokud nev\u00EDte p\u0159esn\u011B co d\u011Bl\u00E1te\n +MEncoderVideo.71=\# Syntaxe je {java condition} :: {MEncoder options} ; M\u016F\u017Eete slou\u010Dit v\u00EDce mo\u017Enost\u00ED\n +MEncoderVideo.72=\# Povolen\u00E9 v\u00FDrazy: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\# Pozor, v\u0161echny chybn\u011B zapsan\u00E9 \u0159\u00E1dky budou odstran\u011Bny\n +MEncoderVideo.75=\# Speci\u00E1ln\u00ED nastaven\u00ED:\n +MEncoderVideo.76=\# -noass: definitivn\u011B zak\u00E1zat ASS/SSA titulky, jak se mohou obr\u00E1tit vzh\u016Fru nohama A/V sync\n +MEncoderVideo.77=\# -nosync: definitivn\u011B zak\u00E1zat A/V sync alternativn\u00ED metodu pro tuto podm\u00EDnku (-mc will do the same)\n +MEncoderVideo.78=\# -quality: p\u0159epsat nastaven\u00ED video kvality\n +MEncoderVideo.79=\# -mt: vynutit pou\u017Eit\u00ED v\u00EDcevl\u00E1knov\u00E9 verze MEncoderu (experiment\u00E1ln\u00ED, mo\u017En\u00E1 nestabiln\u00ED)\n +MEncoderVideo.80=\# Tento seznam se bude \u010Dasem zlep\u0161ovat: odkazy na r\u016Fzn\u00E9 kodeky/soubory jsou v\u017Edy v\u00EDt\u00E1ny\n +MEncoderVideo.87=\# Nyn\u00ED m\u016F\u017Eete vlo\u017Eit vlastn\u00ED podm\u00EDnky/volby ! Zde n\u011Bkter\u00E9 p\u0159\u00EDklady: nap\u0159. povolit mt build MEncod\u00E9ru\n +MEncoderVideo.88=\# pro jak\u00FDkoliv obsah H.264 HD (zbyte\u010Dn\u00FD p\u0159i hlavn\u00EDm nastaven\u00ED): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\# Odstran\u011Bn\u00ED kmit\u00E1n\u00ED p\u0159i 24 sn\u00EDmc\u00EDch/s na 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\# Remux kdy\u017E video je MPEG-2 a neobsahuje titulky: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=DVD/VOBsub kvalita titulk\u016F (0-4) (v\u011Bt\u0161\u00ED je lep\u0161\u00ED): +MEncoderVideo.93=P\u0159idat okraje pro kompenzaci overscan: +MEncoderVideo.94=Vynucen\u00ED titulk\u016F: +MEncoderVideo.95=Vynucen\u00ED tag\u016F: +MEncoderVideo.96=cp1250 /* Windows - v\u00FDchodoevropsk\u00E9 */ +MEncoderVideo.97=cp1251 /* Windows - cyrilice */ +MEncoderVideo.98=cp1252 /* Windows - z\u00E1padoevropsk\u00E9 */ +MEncoderVideo.99=cp1253 /* Windows - \u0159eck\u00E9 */ +MEncoderVideo.100=cp1254 /* Windows - tureck\u00E9 */ +MEncoderVideo.101=cp1255 /* Windows - hebrejsk\u00E9 */ +MEncoderVideo.102=cp1256 /* Windows - arabsk\u00E9 */ +MEncoderVideo.103=cp1257 /* Windows - baltick\u00E9 */ +MEncoderVideo.104=cp1258 /* Windows - vietnamsk\u00E9 */ +MEncoderVideo.105=ISO-8859-1 /* z\u00E1padoevropsk\u00E9 */ +MEncoderVideo.106=ISO-8859-2 /* z\u00E1pado a st\u0159edoevropsk\u00E9 */ +MEncoderVideo.107=ISO-8859-3 /* z\u00E1padoevropsk\u00E9 a jihoevropsk\u00E9 */ +MEncoderVideo.108=ISO-8859-4 /* z\u00E1padoevropsk\u00E9 a baltsk\u00E9 zem\u011B */ +MEncoderVideo.109=ISO-8859-5 /* abeceda cyrilice */ +MEncoderVideo.110=ISO-8859-6 /* arabsk\u00E9 */ +MEncoderVideo.111=ISO-8859-7 /* \u0159eck\u00E9 */ +MEncoderVideo.112=ISO-8859-8 /* hebrejsk\u00E9 */ +MEncoderVideo.113=ISO-8859-9 /* z\u00E1padoevropsk\u00E9 s p\u0159idanou ture\u010Dtinou */ +MEncoderVideo.114=ISO-8859-10 /* z\u00E1padoevropsk\u00E9 se seversk\u00FDmi jazyky */ +MEncoderVideo.115=ISO-8859-11 /* thajsk\u00E9 */ +MEncoderVideo.116=ISO-8859-13 /* baltick\u00E9 a polsk\u00E9 */ +MEncoderVideo.117=ISO-8859-14 /* keltsk\u00E9 */ +MEncoderVideo.118=ISO-8859-15 /* p\u0159idan\u00FD znak Euro */ +MEncoderVideo.119=ISO-8859-16 /* st\u0159edoevropsk\u00E9 jazyky */ +MEncoderVideo.120=cp932 /* japonsk\u00E9 */ +MEncoderVideo.121=cp936 /* \u010D\u00EDnsk\u00E9 */ +MEncoderVideo.122=cp949 /* korejsk\u00E9 */ +MEncoderVideo.123=cp950 /* Big5, tajvansk\u00E9, kantonsk\u00E9 */ +MEncoderVideo.124=UTF-8 /* Unicode */ +MEncoderVideo.125=Vyberte barvu titulk\u016F +MEncoderVideo.126=cze,eng,fre,ger,und +MEncoderVideo.127=cze,eng,fre,ger,und +MEncoderVideo.128=*,* +NetworkTab.0=Jazyk [nutn\u00FD restart aplikace]: +NetworkTab.1=Proch\u00E1zet .RAR/.ZIP/.CBR archivy +NetworkTab.2=Generov\u00E1n\u00ED miniatur +NetworkTab.3=Minimalizovat po startu +NetworkTab.4=Instalovat jako slu\u017Ebu Windows +NetworkTab.5=Z\u00E1kladn\u00ED nastaven\u00ED +NetworkTab.6=Transk\u00F3dovac\u00ED vyrovn\u00E1vac\u00ED pam\u011B\u0165 - max. velikost v megabytech (maximum: MAX_BUFFER_SIZE): +NetworkTab.7=Po\u010Det jader pou\u017Eit\u00FDch pro transk\u00F3dov\u00E1n\u00ED (zd\u00E1 se, \u017Ee m\u00E1te %d): +NetworkTab.8=Kontrola updatu +NetworkTab.9=Automatick\u00E1 kontrola +NetworkTab.11=M\u00E1te ninstalovanou slu\u017Ebu Windows \! Pro jej\u00ED pou\u017Eit\u00ED mus\u00EDte ukon\u010Dit aplikaci,\n +NetworkTab.12=potom spustit (a nastavit) slu\u017Ebu z administrativn\u00EDho panelu windows.\n\n +NetworkTab.13=Knihovna m\u00E9di\u00ED bude reinicializov\u00E1na \!\n +NetworkTab.14=Chyba v instalaci slu\u017Eby Windows!\n +NetworkTab.15=Nastaven\u00ED navigace/parsingu +NetworkTab.16=Pozice vyhled\u00E1v\u00E1n\u00ED miniatur (v sekund\u00E1ch): +NetworkTab.17=Povolit knihovnu m\u00E9di\u00ED +NetworkTab.18=Resetovat knihovnu m\u00E9di\u00ED +NetworkTab.19=Opravdu? +NetworkTab.20=Vynutit s\u00ED\u0165 na rozhran\u00ED: +NetworkTab.22=Nastaven\u00ED s\u00EDt\u011B, m\u011Bnit pouze p\u0159i probl\u00E9mech! +NetworkTab.23=Platn\u00E9 IP serveru: +NetworkTab.24=Platn\u00FD port serveru (5001 p\u0159ednastaven\u00FD): +NetworkTab.25=PS3 nastaven\u00ED +NetworkTab.26=K\u00F3dov\u00E1n\u00ED n\u00E1zvu soubor\u016F va\u0161eho PS3 (pod\u00EDvejte se na XMB->Syst\u00E9mov\u00E9 nastaven\u00ED->K\u00F3dov\u00E1n\u00ED): +NetworkTab.27=Nezn\u00E1m\u00E1 nastaven\u00ED byste nem\u011Bli pou\u017E\u00EDvat :p +NetworkTab.28=Turbo m\u00F3d (zapnuto tcp_nodelay) / bu\u010Fte opatrn\u00ED, kdy\u017E si nejste jist\u00ED, \u017Ee je to v po\u0159\u00E1dku +NetworkTab.29=P\u0159\u00EDchoz\u00ED po\u017Eadavek na stejn\u00FD soubor z PS3 na za\u010D\u00E1tek trank\u00F3dov\u00E1n\u00ED +NetworkTab.30=Pou\u017E\u00EDt IP filtr: +NetworkTab.31=Roz\u0161\u00ED\u0159en\u00E9 HTTP a syst\u00E9mov\u00E9 nastaven\u00ED +NetworkTab.32=HTTP Engine V2 +NetworkTab.33=Zabr\u00E1nit uspan\u00ED OS po dobu streamingu +NetworkTab.34=Pluginy +NetworkTab.35=Maxim\u00E1ln\u00ED \u0161\u00ED\u0159ka p\u00E1sma v Mb/s (0 znamen\u00E1 bez limitu): +NetworkTab.36=Z\u00E1kladn\u00ED p\u0159ehr\u00E1va\u010D kdy\u017E sel\u017Ee automatick\u00E1 detekce: +NetworkTab.37=Nezn\u00E1m\u00FD p\u0159ehr\u00E1va\u010D +NetworkTab.38=Vynutit z\u00E1kladn\u00ED p\u0159ehr\u00E1va\u010D (Zak\u00E1zat automatickou detekci) +PMS.0=PS3 nebyla nalezena. Je zapnut\u00E1? M\u016F\u017Eete tak\u00E9 zkontrolovat logy a/nebo konfiguraci, nebo tak\u00E9 debug.log soubor +PMS.1=Zvuk +PMS.2=\#- Knihovna m\u00E9di\u00ED -\# +PMS.3=A/V sync alternativn\u00ED metoda +PMS.4=Filtr prokl\u00E1d\u00E1n\u00ED +PMS.5=PS3 byla nalezena \! +PMS.6=Auto load .srt/.sub titulk\u016F +PMS.7=SkipLoop Filtr pro dek\u00F3dov\u00E1n\u00ED H.264 [MO\u017DN\u00C9 SN\u00CD\u017DEN\u00CD KVALITY] +PMS.8=Titulky +PMS.9=V\u0161echny hudebn\u00ED playlisty +PMS.10=Definitivn\u011B zak\u00E1zat titulky +PMS.11=V\u0161echny zvukov\u00E9 stopy +PMS.12=Podle data +PMS.13=Podle um\u011Blce +PMS.16=Podle alba +PMS.17=Nezn\u00E1m\u00FD p\u0159ehr\u00E1va\u010D +PMS.18=P\u0159ipojeno +PMS.19=Podle \u017E\u00E1nru +PMS.21=Podle modelu fotoapar\u00E1tu +PMS.22=Podle um\u011Blce/alba +PMS.25=Podle nastaven\u00ED ISO +PMS.26=Podle \u017E\u00E1nru/um\u011Blce/alba +PMS.27=Ulo\u017Eit konfiguraci +PMS.28=Podle n\u00E1zvu/um\u011Blce/alba +PMS.31=Fotografie +PMS.32=V\u0161echny fotografie +PMS.34=Video +PMS.35=V\u0161echna videa +PMS.36=HD videa +PMS.37=\#- Nastaven\u00ED videa -\# +PMS.39=SD videa +PMS.40=DVD obrazy +PMS.41=(Re)instalace slu\u017Eby win32 +PMS.42=Chyba p\u0159i inicalizaci PMS! +PMS.130=P\u0159ipojuji se k PS3... +ProfileChooser.1=V\u00FDb\u011Br profilu PS3 Media Server +ProfileChooser.2=Vybrat +ProfileChooser.3=Soubor profilu(.conf)nebo adres\u00E1\u0159 +StatusTab.2=Stav +StatusTab.3=\u010Cek\u00E1m... +StatusTab.5=Pr\u00E1zdn\u00FD +StatusTab.6=Stav transk\u00F3dovac\u00ED vyrovn\u00E1vac\u00ED pam\u011Bti: +StatusTab.7=I/O statistiky: +StatusTab.8=Moment\u00E1ln\u00ED bitrate: +StatusTab.9=Detekovan\u00FD p\u0159ehr\u00E1va\u010D m\u00E9di\u00ED +StatusTab.10=Nejvy\u0161\u0161\u00ED bitrate: +StatusTab.11=Mb/s +StatusTab.12=MB +TracesTab.3=Smazat +TreeNodeSettings.4=Tento n\u00E1stroj nen\u00ED nahr\u00E1n\! +TrTab2.0=Povolit/zak\u00E1zat a transk\u00F3dovac\u00ED n\u00E1stroj +TrTab2.1=V sou\u010Dastnosti \u017E\u00E1dn\u00E9 nastaven\u00ED +TrTab2.2=Nastaven\u00ED video enkod\u00E9ru s n\u00E1sleduj\u00EDc\u00EDmi n\u00E1stroji: MEncoder/AviSynth/FFmpeg +TrTab2.3=Nastaven\u00ED audia, pou\u017Eiteln\u00E9 pro n\u00E1sleduj\u00EDc\u00ED dekod\u00E9ry: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Nastaven\u00ED kvality videa +TrTab2.5=Obecn\u00E9 nastaven\u00ED transk\u00F3dov\u00E1n\u00ED +TrTab2.6=T\u0159\u00EDd\u011Bn\u00ED seznamu transk\u00F3dovac\u00EDch n\u00E1stroj\u016F. Prvn\u00ED z nich se objevuje v p\u016Fvodn\u00ED video slo\u017Ece +TrTab2.7=Dal\u0161\u00ED nastaven\u00ED +TrTab2.8=P\u0159esko\u010Dit transk\u00F3dov\u00E1n\u00ED pro n\u00E1sleduj\u00EDc\u00ED p\u0159\u00EDpony (odd\u011Blen\u00E9 \u010D\u00E1rkou): +TrTab2.9=Vynutit transk\u00F3dov\u00E1n\u00ED pro n\u00E1sledujic\u00ED p\u0159\u00EDpony (odd\u011Blen\u00E9 \u010D\u00E1rkou): +TrTab2.10=Umo\u017E\u0148uje pos\u00EDlat DTS stream p\u0159\u00EDmo na v\u00E1\u0161 p\u0159ehr\u00E1va\u010D.\nBu\u010Fte opatrn\u00ED, m\u016F\u017Ee se objevit \u0161um ve zvuku. Zde je n\u011Bkolik rad:\n- Mus\u00EDte m\u00EDt DTS kompatibiln\u00ED p\u0159ij\u00EDma\u010D, p\u0159ipojen\u00FD p\u0159es TOSLINK nebo HDMI\n- Ikona hlasitosti na XMB mus\u00ED b\u00FDt nastavena na 'Normal'\n- Ikona kan\u00E1lu na XMB mus\u00ED b\u00FDt nastavena na 'Left+Right'\n +TrTab2.11=N\u00E1stroje +TrTab2.12=Obecn\u00E9 nastaven\u00ED dekod\u00E9ru +TrTab2.13=Obecn\u00E9 nastaven\u00ED enkod\u00E9ru +TrTab2.14=N\u00E1stroje Video soubor\u016F +TrTab2.15=N\u00E1stroje Audio soubor\u016F +TrTab2.16=N\u00E1stroje Video Web Streamingu +TrTab2.17=N\u00E1stroje Audio Web Streamingu +TrTab2.18=Dal\u0161\u00ED n\u00E1stroje +TrTab2.19=N\u00E1stroje jsou \u0159azeny sestupn\u011B, +TrTab2.20=tu\u010Dn\u011B zv\u00FDrazn\u011Bn\u00FD je pou\u017Eit prioritn\u011B +TrTab2.21=[AviSynth nen\u00ED podporov\u00E1n] +TrTab2.22=Automatick\u00FD audio resampling na 44.1 nebo 48 kHz +TrTab2.27=DTS/FLAC -> LPCM remux (Pot\u0159ebujete HDMI receiver pro streaming LPCM 5.1 \! Pr\u016Fm\u011Brn\u00FD Bitrate = 4.6Mbps) +TrTab2.28=Zachovat DTS audio ve streamu (Kompatibiln\u00ED s optick\u00FDm v\u00FDstupem) -> Opatrn\u011B, m\u00EDrn\u00E1 zm\u011Bna bitrate ! +TrTab2.29=AC-3 Audio datov\u00FD tok (v kbit/s) (volba: 576, 640): +TrTab2.32=MPEG-2 nastaven\u00ED: +TrTab2.39=Video je automaticky transk\u00F3dov\u00E1no a muxov\u00E1no do MPEG-PS/AC-3 audio (vysoce kompatibiln\u00ED s PS3) +TrTab2.40=\nM\u016F\u017Eete pou\u017E\u00EDt vqscale, vqmin a keyint parametry pro dosa\u017Een\u00ED dobr\u00E9, dokonce t\u00E9m\u011B\u0159 bezestr\u00E1tov\u00E9 kvality p\u0159evodu. +TrTab2.41=\nNev\u00FDhodou je to, \u017Ee VBR datov\u00FD tok m\u016F\u017Ee n\u011Bkdy p\u0159esahovat maxim\u00E1ln\u00ED kapacitu va\u0161\u00ED s\u00EDt\u011B. +TrTab2.42=\nTo je d\u016Fvod, pro\u010D si m\u016F\u017Eete tak\u00E9 nastavit \u0161\u00ED\u0159ku p\u00E1sma, pokud jste na WiFi, CPL, atd. Nicm\u00E9n\u011B, kvalita p\u0159evodu +TrTab2.43=\nje rovnov\u00E1ha mezi rychlost\u00ED s\u00EDt\u011B a v\u00FDkonem cpu: pro vy\u0161\u0161\u00ED kvalitu budete omezeni rychlost\u00ED datov\u00E9ho toku, +TrTab2.44=\nbez v\u00EDce procesor\u016F budete trp\u011Bt\! Tak\u017Ee budete pot\u0159ebovat pro ak\u010Dn\u00ED film v 1080p a v nejvy\u0161\u0161\u00ED kvalit\u011B 15Mbps :p +TrTab2.50=Maxim\u00E1ln\u00ED po\u010Det v\u00FDstupn\u00EDch zvukov\u00FDch kan\u00E1l\u016F pro AC-3 re-encoding: +TrTab2.51=Definitivn\u011B zak\u00E1zat titulky +TrTab2.52=Tvorba kapitol ve slo\u017Ece \#Transcode\# / interval v minut\u00E1ch: +TrTab2.55=2 kan\u00E1ly (Stereo) +TrTab2.56=6 kan\u00E1l\u016F (5.1) +TrTab2.60=Vysok\u00E1 kvalita +TrTab2.61=Bezestr\u00E1tov\u00E1 kvalita +TrTab2.62=Dobr\u00E1 kvalita +TrTab2.63=Dobr\u00E1 kvalita pro HD Wifi transk\u00F3dov\u00E1n\u00ED +TrTab2.64=St\u0159edn\u00ED kvalita pro HD Wifi transk\u00F3dov\u00E1n\u00ED +TrTab2.65=N\u00EDzk\u00E1 kvalita, low-end CPU nebo HD Wifi transk\u00F3dov\u00E1n\u00ED +TrTab2.66=Nastaven\u00ed videa +TrTab2.67=Nastaven\u00ed audia +TrTab2.68=Nastaven\u00ed titulk\u016f +TrTab2.69=Hardwerov\u00e1 akcelerace +TSMuxerVideo.0=Demux s MEncoderem a enk\u00F3dov\u00E1n\u00ED v\u0161ech zvukov\u00FDch stop do AC-3 +TSMuxerVideo.1=Demux s MEncoderem a enk\u00F3dov\u00E1n\u00ED DTS/FLAC zvukov\u00FDch stop do LPCM [Pozor, hled\u00E1n\u00ED zat\u00EDm nefunguje] +TSMuxerVideo.2=Vynutit sn\u00EDmkovou frekvenci analyzovanou FFmpeg +TSMuxerVideo.3=Nastaven\u00ED video dekod\u00E9ru pouze pro TsMuxer +TSMuxerVideo.19=Mux v\u0161ech zvukov\u00FDch stop diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_da.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_da.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_da.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_da.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,202 @@ +DLNAMediaDatabase.0=For bedre support og forbedring af programmet, \nmedia bilioteket bliver n\u00F8d til at geninitialisere. \n Beklager ulejligheden \! +DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,\u00C6,\u00D8,\u00C5 +FFMpegDVRMSRemux.0=Alternativ FFmpeg Vej: +FFMpegDVRMSRemux.1=Indstillinger for DVR-MS remuxing +FFMpegVideo.0=Encoder indstillinger kun for AviSynth/FFmpeg motor (ANBEFALER AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Delings indstillinger +FoldTab.2=Skan alle delte mapper +FoldTab.3=Skanning af alle delte mapper kan tage meget lang tid \!\n +FoldTab.4=Er du sikker p\u00E5 at du vil skanne?\n\n +FoldTab.5=Skjul filtyper +FoldTab.6=Skjul \#Video indstillinger\# mappe +FoldTab.7=Delte mapper +FoldTab.8=Skjul kodnings motor navne +FoldTab.9=Tilf\u00F8g destination +FoldTab.10=Vil du stoppe med at skanne?\n\n +FoldTab.11=Aktivere kodet video kopiering p\u00E5 PS3 (BEM\u00C6RK, filer har ingen fast st\u00F8rrelse !) +FoldTab.12=Sortere de delte mapper +FoldTab.13=Miniaturer +FoldTab.14=Brug Mplayer for Video miniaturere +FoldTab.15=Standard +FoldTab.16=De senere f\u00F8rst +FoldTab.18=Fil sorteringsmetode: +FoldTab.23=Download fra amazon.com +FoldTab.24=Download fra discogs.com +FoldTab.26=Lyd miniature vis: +FoldTab.27=Alternative videocover art mapper +FoldTab.28=V\u00E6lg en mappe +FoldTab.29=Vis iPhoto bibliotek +FoldTab.30=Vis iTunes bibliotek +FontFileFilter.3=TrueType-skrifttyper +LinksTab.5=Hj\u00E6lpsomme links: +LooksFrame.5=Afslut +LooksFrame.6=Hovedpanel +LooksFrame.9=Gem +LooksFrame.12=Genstart Server +LooksFrame.18=Status +LooksFrame.19=Spor +LooksFrame.20=General Konfiguration +LooksFrame.21=Kodnings indstillinger +LooksFrame.22=Navigation/Dele indstillinger +LooksFrame.24=Hj\u00E6lp +LooksFrame.25=Om +MEncoderAviSynth.2=Video decoder indstillinger kun for AviSynth motor +MEncoderAviSynth.3=Aktiver AviSynth variabel framerate \u00E6ndring til en konstant framerate (convertfps=true) +MEncoderVideo.0=Skip loop filteret afblokering for H.264. Kan formindske kvalitet +MEncoderVideo.1=Video/Lyd afkodningsindstillinger kun for MEncoder motor +MEncoderVideo.2=A/V sync alternativ metode +MEncoderVideo.3=Brug standard codec parametre (Anbefalet!) +MEncoderVideo.4=Tving framerate parses fra FFmpeg +MEncoderVideo.5=Her kan du tilf\u00F8je tilpasset indstillinger, som for eksempel denoise filtert: -vf hqdn3d +MEncoderVideo.6=Tilpasset options: +MEncoderVideo.7=Lydsprog prioritet: +MEncoderVideo.8=Undertekstindstillinger +MEncoderVideo.9=Undertekstssprog prioritet: +MEncoderVideo.10=Lyd/undertekster sprog prioritet (eks: en,off;eng,off) +MEncoderVideo.11=Underteksters kodnings-side: +MEncoderVideo.12=ASS skrifttype indstillinger: Skrifttype skala +MEncoderVideo.13=skrifttype skitse +MEncoderVideo.14=skrifttype skykke +MEncoderVideo.15=skrifttype sub margin +MEncoderVideo.16=Standard skrifttype indstillinger: Skrifttype skala +MEncoderVideo.17=Skrifttype skitse +MEncoderVideo.18=Skrifttype sl\u00F8ring +MEncoderVideo.19=Skrifttype sub margin +MEncoderVideo.20=ASS/SSA Undertekster +MEncoderVideo.21=Fontconfig/Integrerede skrifttyper +MEncoderVideo.22=Autoload *.srt/*.sub undertekster med samme navn +MEncoderVideo.24=Specifik TrueType-Skrifttype (for asian sprog): +MEncoderVideo.25=V\u00E6lg en TrueType-Skrifttype +MEncoderVideo.26=Deinterlace filter +MEncoderVideo.27=Brug Video skala +MEncoderVideo.28=Bredte +MEncoderVideo.29=Expert indstillinger : Codec specifikke parametre +MEncoderVideo.30=H\u00F8jde +MEncoderVideo.32=Remux n\u00E5r lydsporet er AC-3 (ingen reencode) +MEncoderVideo.33=Tilpasset parametre: +MEncoderVideo.34=\u00C6ndre codec specifikke parametre +MEncoderVideo.35=Udvidet flerkernet support +MEncoderVideo.36=Brug ASS Standard stil +MEncoderVideo.37=Alternativ undertekst mappe +MEncoderVideo.68=\#Her kan du s\u00E6tte specifikke parametre for nogle codec kombinationer.\n +MEncoderVideo.69=\#Det er prim\u00E6rt for A/V-synkronisering problemer, men det kan stadig bruges til alt andet\n +MEncoderVideo.70=\#Betragt det ligsom ekspert indstillingerne da denne ikke b\u00F8r anvendes, hvis du ikke ved pr\u00E6cis, hvad du laver\n +MEncoderVideo.71=\#Syntaksen er {java condition} :: {MEncoder options} ; Du kan kumulere flere muligheder\n +MEncoderVideo.72=\#M\u00F8ntefterligninger tilladt: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Forsigtige, enhver malformed linje vil blive udslettet\n +MEncoderVideo.75=\#Special indstillinger:\n +MEncoderVideo.76=\# -noass: Sl\u00E5 ASS/SSA undertekster fra da de kan \u00F8del\u00E6gge A/V-synkronisationen\n +MEncoderVideo.77=\# -nosync: Sl\u00E5 A/V-synkronisationen alternativ metode fra (-mc Vil g\u00F8re det samme)\n +MEncoderVideo.78=\# -quality: overg\u00E5 video kvalitets indstillingerne\n +MEncoderVideo.79=\# -mt: Tving brugen af flertr\u00E5dede MEncoder (eksperimental, kan v\u00E6re ustabil)\n +MEncoderVideo.80=\#Denne liste vil blive bedre med tiden: tweaks/feedbacks p\u00E5 forskellige codecs/filer er altid velkommen\n +MEncoderVideo.87=\#Nu kan du l\u00E6gge dine egne betingelser/indstillinger ind! Her er nogle eksempler: For eksempel, for aktivere mt versionen af mencorder\n +MEncoderVideo.88=\#For alt H.264 HD indhold (redondant med hovedindstillingerne): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#Til at fjerne 24p st\u00F8j p\u00E5 et 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#For at fjerne remux n\u00E5r videoformat er MPEG-2 og der ikke findes undertekster: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=Sprog [Kr\u00E6ver genstart af programmet]: +NetworkTab.1=Browse .RAR/.ZIP/.CBR archives +NetworkTab.2=Miniature generering +NetworkTab.3=Start minimeret +NetworkTab.4=Installer som Windows Tjeneste +NetworkTab.5=Generelle indstillinger +NetworkTab.6=kodnings buffer maks st\u00F8rrelse, i megabytes (maks: MAX_BUFFER_SIZE): +NetworkTab.7=Antal af kerne brugt for kodningen (det ser ud til at du har %d): +NetworkTab.11=Du har installeret Windows tjenesten \! For at bruge det, skal du lukke programmet ned,\n +NetworkTab.12=og s\u00E5 starte tjenesten fra Windows administrationspanelet.\n\n +NetworkTab.13=Media biblioteket bliver geninitialiseret \!\n +NetworkTab.14=Fejl i installationen af Windows tjenesten!\n +NetworkTab.15=Navigation/Parses indstillinger +NetworkTab.16=Miniature s\u00F8gnings position (in seconds): +NetworkTab.17=Aktivere media biblioteket +NetworkTab.18=Nulstil media biblioteket +NetworkTab.19=Er du sikker? +NetworkTab.20=Tving netv\u00E6rk p\u00E5 interface: +NetworkTab.22=Netv\u00E6rksindstillinger, \u00E6ndre kun, hvis problemer +NetworkTab.23=Tving IP af serveren: +NetworkTab.24=Tving port af serveren (5001 by default): +NetworkTab.25=PS3 indstillinger +NetworkTab.26=Tegnkodning af din PS3's filnavne(se XMB->System settings->Charset): +NetworkTab.27=Ubrugte indstillinger du ikke b\u00F8r bruge :p +NetworkTab.28=Turbo mode (aktivere tcp_nodelay) / V\u00E6r forsigtig, er ikke sikker p\u00E5 at det er i orden at g\u00F8re +NetworkTab.29=Blokere indkomne foresp\u00F8rgelse for den samme fil fra PS3 n\u00E5r kodningen er startet +NetworkTab.30=Brug et IP filter: +NetworkTab.35=Maksimum b\u00E5ndbredde i Mb/s (0 betyder ingen begr\u00E6nsning): +PMS.0=PS3 blev ikke fundet. Er den t\u00E6ndt? Du kan ogs\u00E5 tjekke spor og/eller konfiguration, eller ogs\u00E5 debug.log filen +PMS.1=Lyd +PMS.2=\#- Media bibliotek -\# +PMS.3=A/V-synkroniserings alternativ metode +PMS.4=Deinterlace Filter +PMS.5=PS3 blev fundet \! +PMS.6=Auto start .srt/.sub undertekster +PMS.7=SkipLoopFilter for H.264 afkodning [KAN FORMINDSKE KVALITETEN] +PMS.8=Undertekster +PMS.9=Alle Lyd Afspillingslister +PMS.10=Deaktivere undertekster +PMS.11=Alle lydspor +PMS.12=Fra Dato +PMS.13=Fra Artist +PMS.16=Fra Album +PMS.19=Fra Genre +PMS.21=Fra kamera model +PMS.22=Fra Artist/Album +PMS.25=Fra ISO indstillinger +PMS.26=Fra Genre/Artist/Album +PMS.31=Foto +PMS.32=Alle billeder +PMS.34=Video +PMS.35=Alle Videoer +PMS.36=HD Videoer +PMS.37=\#- Video Indstillinger -\# +PMS.39=SD Videoer +PMS.41=(gen)isntaller Win32 Tjeneste +PMS.130=Kontakter PS3... +StatusTab.2=Status +StatusTab.3=Venter... +StatusTab.5=Tom +StatusTab.6=Kodnings buffer status: +StatusTab.7=I/O Statistikker: +StatusTab.8=Nuv\u00E6rende bitrate: +StatusTab.10=Peak bitrate: +TSMuxerVideo.0=Demux med MEncoder og indkod alle lydspor til AC-3 +TSMuxerVideo.1=Demux med MEncoder og indkod DTS/FLAC lydspor til LPCM [Forsigtig, s\u00F8gning fungere ikke optimalt] +TSMuxerVideo.2=Tving FPS parses fra FFmpeg i metafiler +TSMuxerVideo.3=Video dekodnings indstillinger kun for TsMuxer motor +TSMuxerVideo.19=Mux Alle lydspor +TrTab2.0=Aktiver/Deaktiver en kodningsmotor +TrTab2.1=Ingen indstillinger for nu +TrTab2.2=Video indkodnings indstilligner med f\u00F8lgende motoere: MEncoder/AviSynth/FFmpeg +TrTab2.3=lydindstillinger g\u00E6lder for f\u00F8lgende dekodere: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Video kvalitetsindstillinger +TrTab2.5=Ofte kodningsindstillinger +TrTab2.6=Sorter kodnings motor listing. Den f\u00F8rste vil vise sig i den originale video mappe +TrTab2.7=Diverse indstillinger +TrTab2.8=Skip kodning for f\u00F8lgende filtyper (ny med komma): +TrTab2.9=Tving kodning for f\u00F8lgende filtyper (ny med komme): +TrTab2.10=Giver den lov til at streamme DTS direkte til din modtager. \nV\u00E6r forsigtig, det er muligt at f\u00E5 statisk lyd. Her er et r\u00E5d:\n- Du skal have en DTS kompatibel modtager forbundet til TOSLINK eller HDMI\n- volume ikonet p\u00E5 XMB skal v\u00E6re p\u00E5 'Normal'\n- Kanalerne ikonet p\u00E5 XMB skal v\u00E6re p\u00E5 'Ventre+H\u00F8jre'\n +TrTab2.11=Motorere +TrTab2.12=Ofte dekodnings indstillinger +TrTab2.13=Ofte indkodnings indstillinger +TrTab2.14=Videofiler motorere +TrTab2.15=Lydfiler motorere +TrTab2.16=Video Web Streaming motorere +TrTab2.17=Lyd Web Streaming motorere +TrTab2.18=Diverse motorere +TrTab2.19=Motoere i fed vil v\u00E6re f\u00F8rste prioritet. +TrTab2.20=og vil erstatte original Video +TrTab2.21=[AviSynth ikke unders\u00F8ttet] +TrTab2.27=DTS/FLAC -> LPCM remux (Du skal bruge en HDMI modtager for streaming LPCM 5.1 \! Gennemsnitlig Bitrate = 4.6Mbps) +TrTab2.28=Beholder DTS lyd i stream (kompatibel med optisk tilslutning) -> Forsigtig, mindre bitrate overbelastning ! +TrTab2.29=AC-3 Lyd bitrate (i Kbits/s) (eks.: 384, 576, 640): +TrTab2.32=MPEG-2 kvalitetsindstillinger: +TrTab2.39=Videon er automatisk indkodedet og muxed til en MPEG-PS / AC-3 audio (Meget kompatibelt p\u00E5 PS3) +TrTab2.40=\nDu kan arbejde med vqscale, vqmin og keyint parametre for at opn\u00E5 en god, selv n\u00E6sten tabsfri kodnings kvalitet. +TrTab2.41=\nUlempen ved dette er VBR bitrate, der undertiden kan toppe over din maks netkapacitet. +TrTab2.42=\nDerfor kan du ogs\u00E5 indstille b\u00E5ndbredden, hvis du er p\u00E5 WiFi, CPL, osv. Men kodnings kvaliteten +TrTab2.43=\ner en balance mellem netv\u00E6rk hastighed og CPU kraft: jo mere kvalitet, +TrTab2.44=\njo mere vil din CPU lide\! Ogs\u00E5, forventer ikke at kunne f\u00E5 1080p film i den reneste kvalitet med 15Mbps :p +TrTab2.50=Antal lyd kanaler: +TrTab2.51=Deaktiver undertekster +TracesTab.3=Fjern +TreeNodeSettings.4=Denne motor er ikke indl\u00E6st\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_de.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_de.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_de.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_de.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,232 @@ +DLNAMediaDatabase.0=Aus Kompatibilit\u00E4tsgr\u00FCnden ist es erforderlich\ndie Mediensammlung neu einzulesen.\nEntschuldige bitte die Unannehmlichkeiten\! +FFMpegDVRMSRemux.0=Alternativer FFmpeg Pfad: +FFMpegDVRMSRemux.1=Einstellungen f\u00FCr DVR-MS remuxing +FFMpegVideo.0=Encoder Einstellungen nur f\u00FCr die AviSynth/FFmpeg-Engine (BEVORZUGE AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Freigabeoptionen +FoldTab.2=Scanne alle freigegebenen Ordner +FoldTab.3=Das Scannen aller freigegebenen Ordner kann sehr lange dauern\!\n +FoldTab.4=M\u00F6chtest du den Scan wirklich starten?\n\n +FoldTab.5=Verstecke Dateiendungen +FoldTab.6=Verstecke \#Video Settings\# Ordner +FoldTab.7=Freigegebene Ordner (Achtung, in der Standardeinstellung ist alles freigegeben\, bitte einschr\u00E4nken\!) +FoldTab.8=Verstecke Transcoding-Engine-Namen +FoldTab.9=Verzeichnis hinzuf\u00FCgen +FoldTab.10=M\u00F6chtest du den Scan abbrechen?\n\n +FoldTab.11=Erm\u00F6gliche die Video-Kopierfunktion auf der PS3 (Achtung\! Die transkodierten Dateien haben keine vorher feststellbare Dateigr\u00F6\u00DFe\!) +FoldTab.12=Sortiere die freigegebenen Ordner +FoldTab.13=Miniaturansichten +FoldTab.14=Benutze MPlayer f\u00FCr Video-Miniaturansicht +FoldTab.15=Alphabetisch (A-Z) +FoldTab.16=Nach Datum, neueste Dateien zuerst +FoldTab.17=Nach Datum, \u00E4lteste Dateien zuerst +FoldTab.18=Sortierreihenfolge: +FoldTab.19=DVD ISO Miniaturansicht +FoldTab.20=ASCIIbetical +FoldTab.21=Bilder Miniaturansicht +FoldTab.23=Download von amazon.com +FoldTab.24=Download von discogs.com +FoldTab.26=Darstellung von Miniaturansichten f\u00FCr Audio: +FoldTab.27=Alternativer Ordner f\u00FCr Video cover art +FoldTab.28=W\u00E4hle einen Ordner +FoldTab.29=Zeige iPhoto Sammlung +FoldTab.30=Zeige iTunes Sammlung +FoldTab.31=Verstecke Ordner ohne Medien (langsam\!) +FoldTab.32=Verstecke Mediensammlung-Ordner +FoldTab.33=Verstecke \#Transcode\# Ordner +FoldTab.34=Zeige Aperture Sammlung +FontFileFilter.3=Truetype Schriftarten +LinksTab.5=Hilfreiche Links: +LooksFrame.5=Beenden +LooksFrame.6=Hauptmen\u00FC +LooksFrame.9=Speichern +LooksFrame.12=Server Neustart +LooksFrame.13=Der Server muss aufgrund einer Konfigurations\u00E4nderung neu gestartet werden +LooksFrame.18=Status +LooksFrame.19=Log +LooksFrame.20=Allgemeine Einstellungen +LooksFrame.21=Transkodierungseinstellungen +LooksFrame.22=Navigations-/Freigabeeinstellungen +LooksFrame.24=FAQ / Hilfe +LooksFrame.25=\u00DCber +MEncoderAviSynth.2=Video-Decoder Einstellungen (nur f\u00FCr AviSynth-Engine) +MEncoderAviSynth.3=Aktiviere den Wechsel der variablen Framerate zu einer konstanten Framerate mittels AviSynth (convertfps=true) +MEncoderVideo.0=\u00DCberspringe Deblocking-Filter Schleife f\u00FCr H.264. K\u00F6nnte Qualit\u00E4t vemindern. +MEncoderVideo.1=Video-/Audio-Decoder Einstellungen (nur f\u00FCr MEncoder-Engine) +MEncoderVideo.2=Audio/Video Synchronisation (alternative Methode) +MEncoderVideo.3=Benutze voreingestellte Codec Parameter (empfohlen\!) +MEncoderVideo.4=Erzwinge von FFmpeg analysierte Framerate +MEncoderVideo.5=Hier kannst du spezifische Optionen hinzuf\u00FCgen, z.B. einen denoise Filter: -vf hqdn3d +MEncoderVideo.6=Benutzerdefinierte Optionen: +MEncoderVideo.7=Audio Sprach-Priorit\u00E4t (Beispiel: ger,eng): +MEncoderVideo.8=Untertiteleinstellungen +MEncoderVideo.9=Untertitel Sprachpriorit\u00E4t (Beispiel: ger,eng): +MEncoderVideo.10=Audio/Untertitel Sprachpriorit\u00E4t (Beispiel: de,off;en,de) +MEncoderVideo.11=Untertitel Codepage (Beispiel: cp1252): +MEncoderVideo.12=ASS Schriftart Einstellungen: Schriftart Skalierung +MEncoderVideo.13=Schriftart outline +MEncoderVideo.14=Schriftart shadow +MEncoderVideo.15=Schriftart sub margin +MEncoderVideo.16=Voreingestellte Schriftart Einstellungen: Schriftart Skalierung +MEncoderVideo.17=Schriftart outline +MEncoderVideo.18=Schriftart blur +MEncoderVideo.19=Schriftart sub margin +MEncoderVideo.20=ASS/SSA Untertitel +MEncoderVideo.21=Fontconfig/eingebettete Schriftarten +MEncoderVideo.22=Lade *.srt/*.sub Untertitel automatisch beim selben Dateinamen +MEncoderVideo.23=FriBiDi mode +MEncoderVideo.24=Spezifische TrueType Schriftart (f\u00FCr asiatische Sprachen): +MEncoderVideo.25=W\u00E4hle eine TrueType Schriftart +MEncoderVideo.26=Deinterlace Filter (Vollbilder statt Zeilensprung) +MEncoderVideo.27=Benutze Video Skalierungsfunktion +MEncoderVideo.28=Breite +MEncoderVideo.29=Experteneinstellungen : Codec spezifische Parameter +MEncoderVideo.30=H\u00F6he +MEncoderVideo.31=Farbe der Untertitel +MEncoderVideo.32=Remux wenn AudioTrack AC-3 ist (kein reencode) +MEncoderVideo.33=Benutzerdefinierte Parameter: +MEncoderVideo.34=Bearbeite Codec spezifische Parameter +MEncoderVideo.35=Verwende Multicore Unterst\u00FCtzung +MEncoderVideo.36=Benutze ASS Standard-Stil +MEncoderVideo.37=Alternativer Ordner f\u00FCr Untertitel +MEncoderVideo.39=Remux DVD ISO video track (kein reencode) +MEncoderVideo.68=\#Hier kannst du spezifische Parameter f\u00FCr einige Codec Kombinationen eintragen.\n +MEncoderVideo.69=\#Wird haupts\u00E4chlich f\u00FCr Audio/Video-Synchronisationsfehler benutzt, aber kann auch f\u00FCr alles andere benutzt werden\n +MEncoderVideo.70=\#Betrachte es als Experteneinstellungen, weil es nicht benutzt werden sollte wenn du nicht genau weisst was du tust\n +MEncoderVideo.71=\#Syntax ist {java condition} :: {MEncoder options} ; Du kannst verschiedene Optionen anh\u00E4ufen\n +MEncoderVideo.72=\#erlaubte Tokens: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Achtung, jede falsch geschriebene Zeile wird gel\u00F6scht\n +MEncoderVideo.75=\#Spezielle Optionen:\n +MEncoderVideo.76=\# -noass: Schalte ASS/SSA Untertitel definitiv ab, da sie die A/V-Synchronisation st\u00F6ren k\u00F6nnen\n +MEncoderVideo.77=\# -nosync: Schalte die alternative A/V-Synchronisationsmethode unter dieser Bedingung definitiv ab (-mc macht das gleiche)\n +MEncoderVideo.78=\# -quality: \u00DCberschreibt Video-Qualit\u00E4tseinstellungen\n +MEncoderVideo.79=\# -mt: Erzwingt die Benutzung des Multithread MEncoder Build (experimentell, k\u00F6nnte instabil sein)\n +MEncoderVideo.80=\#Diese Liste verbessert sich mit der Zeit: Verbesserungen/Feedback zu verschiedenen Codecs/Dateien sind immer willkommen\n +MEncoderVideo.87=\#Nun kannst du eigene Bedingungen/Optionen eingeben\! Hier sind ein paar Beispiele: Um z. B. den Multithread build des MEncoder zu aktivieren\n +MEncoderVideo.88=\#f\u00FCr jeglichen H.264 HD-Inhalt (redundant zu den Haupteinstellungen): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#Zum Entfernen des 24p-Ruckelns auf einem 50hz-TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#Zum Remuxen falls das Video MPEG-2 und ohne Untertitel ist: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=Qualit\u00E4t der DDVD-/VOB-Untertitel (0-4) (je gr\u00F6\u00DFer, desto besser) +MEncoderVideo.93=F\u00FCge Rahmen hinzu um Overscan zu kompensieren: +MEncoderVideo.126=ger,jpn,eng,und +MEncoderVideo.127=ger,jpn,eng,und +MEncoderVideo.128=*,* +NetworkTab.0=Sprache [erfordert Neustart von PMS]: +NetworkTab.1=Archiv-Dateien durchsuchen (.rar/.zip/.cbr) +NetworkTab.2=Miniaturansicht-Erstellung +NetworkTab.3=Minimiert starten +NetworkTab.4=Als Windows-Dienst installieren +NetworkTab.5=Allgemeine Einstellungen +NetworkTab.6=Maximale Gr\u00F6\u00DFe des Transcode Puffers in Megabyte (maximum: MAX_BUFFER_SIZE): +NetworkTab.7=Anzahl der Kerne, die f\u00FCr das Transkodieren benutzt werden (deine CPU hat scheinbar %d): +NetworkTab.8=Suche nach Updates +NetworkTab.9=Automatisch suchen +NetworkTab.11=Du hast den Windows Service installiert. Um ihn zu benutzen musst du diese Anwendung schlie\u00DFen,\n +NetworkTab.12=dann den Dienst in der Computerverwaltung starten (und konfigurieren).\n\n +NetworkTab.13=Die Mediensammlung wird nochmals initialisiert\!\n +NetworkTab.14=Fehler beim Installieren des Windows Services\!\n +NetworkTab.15=Navigations/Analyse-Einstellungen +NetworkTab.16=Miniaturansicht-Suchposition (Sekunden): +NetworkTab.17=Aktiviere die Mediensammlung +NetworkTab.18=Neuinitialisierung der Mediensammlung +NetworkTab.19=Bist du sicher? +NetworkTab.20=Erzwinge die Benutzung der folgenden Netzwerkschnittstelle: +NetworkTab.22=Netzwerkeinstellungen (nur bei Problemen \u00E4ndern\!) +NetworkTab.23=Erzwinge IP-Adresse des Servers: +NetworkTab.24=Erzwinge Port des Servers (Standard ist 5001): +NetworkTab.25=PS3 Einstellungen +NetworkTab.26=Zeichenkodierung deiner PS3-Dateinamen (siehe XMB->System-Einstellungen->Zeichensatz): +NetworkTab.27=Unbenutzte Einstellungen, die du nicht benutzen solltest :p +NetworkTab.28=Turbo-Modus (aktiviere tcp_nodelay) / sei vorsichtig, bin nicht sicher ob es in Ordnung ist das zu tun +NetworkTab.29=Blockiere eingehende Anfragen f\u00FCr die selbe Datei von der Ps3 wenn das Transcodieren bereits angefangen hat +NetworkTab.30=Benutze einen IP-Filter: +NetworkTab.31=Erweiterte HTTP- und Systemeinstellungen +NetworkTab.32=HTTP Engine V2 +NetworkTab.33=Energiesparmodus w\u00E4hrend des Streamens abschalten +NetworkTab.34=Plugins +NetworkTab.35=Maximale Bandbreite in Mb/s (0 bedeutet keine Einschr\u00E4nkung): +PMS.0=PS3 wurde nicht gefunden. Ist sie eingeschaltet? Pr\u00FCfe die Meldungen im Karteireiter "Log", die Netzwerkkonfiguration und die debug.log-Datei +PMS.1=Audio +PMS.2=\#- Mediensammlung -\# +PMS.3=Audio/Video-Synchronisation (alternative Methode) +PMS.4=Deinterlace (Zeilenentflechtung) Filter +PMS.5=PS3 wurde gefunden\! +PMS.6=.srt/.sub Untertitel automatisch laden +PMS.7=SkipLoopFilter f\u00FCr H.264-Decoding [K\u00D6NNTE QUALIT\u00C4T VERMINDERN] +PMS.8=Untertitel +PMS.9=Alle Audio-Playlists +PMS.10=Definitiv Untertitel deaktivieren +PMS.11=Alle Audio Tracks +PMS.12=Nach Datum +PMS.13=Nach K\u00FCnstler +PMS.16=Nach Album +PMS.17=Unbekannter DLNA Client +PMS.19=Nach Genre +PMS.21=Nach Kamera Modell +PMS.22=Nach K\u00FCnstler/Album +PMS.25=Nach ISO Einstellungen +PMS.26=Nach Genre/K\u00FCnstler/Album +PMS.27=Konfiguration sichern +PMS.31=Foto +PMS.32=Alle Fotos +PMS.34=Video +PMS.35=Alle Videos +PMS.36=HD-Videos +PMS.37=\#- Video Einstellungen -\# +PMS.39=SD-Videos +PMS.41=(Neu-)Installation Win32-Dienst +PMS.130=Suche nach Ger\u00E4ten... +ProfileChooser.1=PS3 Media Server Profilauswahl +ProfileChooser.2=Ausw\u00E4hlen +ProfileChooser.3=Profile-Datei (.conf) oder Verzeichnis +StatusTab.2=Status +StatusTab.3=Warten... +StatusTab.5=Leer +StatusTab.6=Status des Transkodierungspuffers: +StatusTab.7=I/O-Statistiken: +StatusTab.8=Aktuelle Bitrate: +StatusTab.9=Erkannte Streaming-Clients (media renderer) +StatusTab.10=Max. Bitrate: +TSMuxerVideo.0=Erzwinge AC-3-remuxing f\u00FCr alle Audiospuren +TSMuxerVideo.1=Erzwinge LPCM-remuxing f\u00FCr DTS/FLAC-Audio (Vorsicht, die Suchfunktion l\u00E4uft noch nicht\!) +TSMuxerVideo.2=Erzwinge die von FFmpeg in der meta-Datei analysierten FPS +TSMuxerVideo.3=Videodecoder-Einstellungen (nur f\u00FCr TsMuxer-Engine) +TSMuxerVideo.19=Muxe alle Audiospuren +TrTab2.0=Aktiviere/Deaktiviere eine Transkodierungs-Engine +TrTab2.1=Noch keine Einstellungen +TrTab2.2=Videoencoder-Einstellungen mit den folgenden Engines: MEncoder/AviSynth/FFmpeg +TrTab2.3=Audio Einstellungen, g\u00FCltig f\u00FCr folgende Decoder: MEncoder/AviSynth/FFmpeg/TsMuxer +TrTab2.4=Video Qualit\u00E4tseinstellungen +TrTab2.5=Allgemeine Transkodierungseinstellungen +TrTab2.6=Sortiere die Liste der Transkodierungs-Engines. Die Erste wird im originalen Video-Ordner angezeigt +TrTab2.7=Sonst. Optionen +TrTab2.8=Kein Transkodieren f\u00FCr folgende Dateitypen (Komma getrennte Liste): +TrTab2.9=Erzwinge das Transkodieren f\u00FCr folgende Dateitypen (Komma getrennte Liste): +TrTab2.10=Erm\u00F6glicht es DTS direkt zum Receiver zu streamen.\nSei vorsichtig, es ist m\u00F6glich einen Brummton zu h\u00F6ren. Hier ein paar Ratschl\u00E4ge:\n- Du ben\u00F6tigst einen DTS-kompatiblen Receiver der per TOSLINK ooder HDMI angeschlossen ist.\n-Das Laust\u00E4rkesymbol am XMB muss auf 'Normal' stehen.\n- Das Kanalsymbol am XMB muss auf 'Links+Rechts' stehen.\n +TrTab2.11=Engines +TrTab2.12=Allgemeine Decodereinstellungen +TrTab2.13=Allgemeine Encodereinstellungen +TrTab2.14=Videodateien-Engines +TrTab2.15=Audiodateien-Engines +TrTab2.16=Video/Webstreaming-Engines +TrTab2.17=Audio/Webstreaming-Engines +TrTab2.18=Sonst. Engines +TrTab2.19=Engine in fett wird die prim\u00E4re sein +TrTab2.20=und wird das originale Video ersetzen +TrTab2.21=[AviSynth nicht unterst\u00FCtzt] +TrTab2.22=Automatisches Audio Resampling von 44.1 oder 48 kHz +TrTab2.27=DTS/FLAC -> LPCM remux (Du brauchst einen HDMI Receiver um LPCM 5.1 zu streamen\! Durchschnittliche Bitrate = 4.6Mbps) +TrTab2.28=Behalte DTS audio im Stream (Kompatibel mit opt. Ausgang / Toslink) -> Vorsicht, leichter Bitrate Overhead\! +TrTab2.29=AC-3 Audio Bitrate (in Kbits/s) (Bsp: 384, 576, 640): +TrTab2.32=MPEG-2 Qualit\u00E4tseinstellungen: +TrTab2.39=Das Video wird automatisch nach MPEG-PS / AC-3 Audio transkodiert und gemuxt (kompatibel zur PS3) +TrTab2.40=\nDu kannst mit den vqscale, vqmin und keyint Parametern experimentieren um gute, sogar fast verlustfreie Transkodierungsqualit\u00E4t zu erzielen. +TrTab2.41=\nDer Nachteil ist, dass die variable Bitrate (VBR) bei komplexen Szenen deine maximale Netzwerkkapazit\u00E4t \u00FCbersteigen kann. +TrTab2.42=\nDarum kannst du auch die max. Bandbreite angeben wenn du WLAN, DLAN, etc. benutzt. Die Transkodierungsqualit\u00E4t +TrTab2.43=\nist aber die Balance zwischen Netzwerkgeschwindigkeit und CPU-Leistung: Je mehr Qualit\u00E4t du in eine erzwungene Bitrate steckst, +TrTab2.44=\ndesto mehr leidet die CPU darunter\! Erwarte deshalb nicht, dass du einen 1080p-Actionfilm in schlechtester Qualit\u00E4t in 15Mbps unterbringen kannst :p +TrTab2.50=Anzahl der Audiokan\u00E4le: +TrTab2.51=Schalte Untertitel definitiv ab +TrTab2.52=Chapters \#Transcode\#-Ordner Unterst\u00FCtzung / Intervall in Minuten: +TracesTab.3=Leeren +TreeNodeSettings.4=Diese Engine ist nicht geladen\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_el.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_el.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_el.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_el.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,180 @@ +FFMpegDVRMSRemux.0=\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03b4\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae FFmpeg: +FFMpegDVRMSRemux.1=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 DVR-MS remuxing +FFMpegVideo.0=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c4\u03bf\u03c5 Encoder \u03bc\u03cc\u03bd\u03bf \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae AviSynth/FFmpeg (PREFER AVISYNTH/MENCODER) +FoldTab.0=<\u038c\u03bb\u03b5\u03c2 \u03bf\u03b9 \u03c3\u03c5\u03c3\u03ba\u03b5\u03c5\u03ad\u03c2> +FoldTab.1=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u039a\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03c9\u03bd \u03c6\u03b1\u03ba\u03ad\u03bb\u03c9\u03bd +FoldTab.2=\u0388\u03c1\u03b5\u03c5\u03bd\u03b1 \u03c3\u03b5 \u03cc\u03bb\u03bf\u03c5\u03c2 \u03c4\u03bf\u03c5\u03c2 \u03ba\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03bf\u03c5\u03c2 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5\u03c2 +FoldTab.3=\u0397 \u0388\u03c1\u03b5\u03c5\u03bd\u03b1 \u03c3\u03b5 \u03cc\u03bb\u03bf\u03c5\u03c2 \u03c4\u03bf\u03c5\u03c2 \u03ba\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03bf\u03c5\u03c2 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5\u03c2 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03b4\u03b9\u03b1\u03c1\u03ba\u03ad\u03c3\u03b5\u03b9 \u03c0\u03bf\u03bb\u03bb\u03ae \u03ce\u03c1\u03b1 \!\n +FoldTab.4=\u0395\u03af\u03c3\u03c4\u03b5 \u03c3\u03af\u03b3\u03bf\u03c5\u03c1\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03ba\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b7\u03bd \u0388\u03c1\u03b5\u03c5\u03bd\u03b1;\n\n +FoldTab.5=\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03b1\u03c4\u03b1\u03bb\u03ae\u03be\u03b5\u03c9\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd +FoldTab.6=\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5 \#Video Settings\# +FoldTab.7=\u039a\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03bf\u03b9 \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf\u03b9 +FoldTab.8=\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03bf\u03bd\u03bf\u03bc\u03ac\u03c4\u03c9\u03bd \u03bc\u03b7\u03c7\u03b1\u03bd\u03ce\u03bd transcoding +FoldTab.9=\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03c6\u03b1\u03ba\u03ad\u03bb\u03bf\u03c5 +FoldTab.10=\u039d\u03b1 \u03b1\u03ba\u03c5\u03c1\u03c9\u03b8\u03b5\u03af \u03b7 \u03ad\u03c1\u03b5\u03c5\u03bd\u03b1;\n\n +FoldTab.11=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b1\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd \u03c3\u03c4\u03bf PS3 / \u03a0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae, \u03b7 \u03c0\u03bb\u03bf\u03ae\u03b3\u03b7\u03c3\u03b7 \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03b9\u03bf \u03b1\u03c1\u03b3\u03ae +FoldTab.12=\u03a4\u03b1\u03be\u03b9\u03bd\u03cc\u03bc\u03b7\u03c3\u03b7 \u03ba\u03bf\u03b9\u03bd\u03cc\u03c7\u03c1\u03b7\u03c3\u03c4\u03c9\u03bd \u03c6\u03b1\u03ba\u03ad\u03bb\u03c9\u03bd +FontFileFilter.3=\u0393\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ad\u03c2 Truetype +LinksTab.5=\u03a7\u03c1\u03ae\u03c3\u03b9\u03bc\u03bf\u03b9 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03b9: +LooksFrame.5=\u0388\u03be\u03bf\u03b4\u03bf\u03c2 +LooksFrame.6=\u039a\u03b5\u03bd\u03c4\u03c1\u03b9\u03ba\u03cc\u03c2 \u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 +LooksFrame.9=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 +LooksFrame.12=\u0395\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03b5\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae +LooksFrame.18=\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 +LooksFrame.19=\u0399\u03c3\u03c4\u03bf\u03c1\u03b9\u03ba\u03cc +LooksFrame.20=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 +LooksFrame.21=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 Transcoding +LooksFrame.22=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03a0\u03bb\u03bf\u03ae\u03b3\u03b7\u03c3\u03b7\u03c2/\u0394\u03b9\u03b1\u03bc\u03bf\u03b9\u03c1\u03b1\u03c3\u03bc\u03bf\u03cd +LooksFrame.24=\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1 +LooksFrame.25=\u03a0\u03b5\u03c1\u03af +MEncoderAviSynth.2=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 Video decoder \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae AviSynth \u03bc\u03cc\u03bd\u03bf +MEncoderAviSynth.3=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03bf\u03c0\u03ae\u03c2 \u03bc\u03b5\u03c4\u03b1\u03b2\u03b1\u03bb\u03bb\u03cc\u03bc\u03b5\u03bd\u03bf\u03c5 framerate change \u03c3\u03b5 \u03c3\u03c4\u03b1\u03b8\u03b5\u03c1\u03cc framerate (convertfps=true) +MEncoderVideo.0=\u0391\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03b1\u03bd\u03b1\u03ba\u03cd\u03ba\u03bb\u03c9\u03c3\u03b7\u03c2 \u03c4\u03bf\u03c5 filter deblocking \u03b3\u03b9\u03b1 H.264. \u039c\u03a0\u039f\u03a1\u0395\u0399 \u039d\u0391 \u039c\u0395\u0399\u03a9\u03a3\u0395\u0399 \u03a4\u0397\u039d \u03a0\u039f\u0399\u039f\u03a4\u0397\u03a4\u0391 \u0395\u0399\u039a\u039f\u039d\u0391\u03a3 +MEncoderVideo.1=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 decoder \u0392\u03af\u03bd\u03c4\u03b5\u03bf/\u0389\u03c7\u03bf\u03c5 \u03bc\u03cc\u03bd\u03bf \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae MEncoder +MEncoderVideo.2=\u0395\u03bd\u03b1\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03bc\u03ad\u03b8\u03bf\u03b4\u03bf\u03c2 \u03c3\u03c5\u03bd\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03bf\u03cd A/V +MEncoderVideo.3=\u03a7\u03c1\u03ae\u03c3\u03b7 \u03c0\u03c1\u03bf\u03b5\u03c0\u03b9\u03bb\u03b5\u03b3\u03bc\u03ad\u03bd\u03c9\u03bd \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03c4\u03c9\u03bd codecs (\u03c3\u03c5\u03c3\u03c4\u03ae\u03bd\u03b5\u03c4\u03b1\u03b9\!) +MEncoderVideo.4=\u0395\u03be\u03b1\u03bd\u03b1\u03b3\u03ba\u03b1\u03c3\u03bc\u03cc\u03c2 framerate \u03c0\u03bf\u03c5 \u03b1\u03bd\u03b1\u03bb\u03cd\u03b8\u03b7\u03ba\u03b5 \u03b1\u03c0\u03cc \u03c4\u03bf FFmpeg +MEncoderVideo.5=\u0395\u03b4\u03ce \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03b5\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03cc\u03c0\u03c9\u03c2 \u03ad\u03bd\u03b1 \u03c6\u03af\u03bb\u03c4\u03c1\u03bf \u03bc\u03b5\u03af\u03c9\u03c3\u03b7\u03c2 \u03b8\u03bf\u03c1\u03cd\u03b2\u03bf\u03c5, \u03b3\u03b9\u03b1 \u03c0\u03b1\u03c1\u03ac\u03b4\u03b5\u03b9\u03b3\u03bc\u03b1: -vf hqdn3d +MEncoderVideo.6=\u0395\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2: +MEncoderVideo.7=\u03a0\u03c1\u03bf\u03c4\u03b1\u03b9\u03c1\u03b5\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1 \u0393\u03bb\u03ce\u03c3\u03c3\u03b1\u03c2 \u03ae\u03c7\u03bf\u03c5: +MEncoderVideo.8=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03a5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd +MEncoderVideo.9=\u03a0\u03c1\u03bf\u03c4\u03b1\u03b9\u03c1\u03b5\u03cc\u03c4\u03b7\u03c4\u03b1 \u0393\u03bb\u03ce\u03c3\u03c3\u03b1\u03c2 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd: +MEncoderVideo.10=\u0393\u03bb\u03c9\u03c3\u03c3\u03b9\u03ba\u03ad\u03c2 \u03c0\u03c1\u03bf\u03c4\u03b5\u03c1\u03b1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u0389\u03c7\u03bf\u03c5/\u03a5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd (\u03c0\u03b1\u03c1\u03ac\u03b4\u03b5\u03b9\u03b3\u03bc\u03b1: en,off;eng,off) +MEncoderVideo.11=\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c3\u03b5\u03bb\u03af\u03b4\u03b1 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd: +MEncoderVideo.12=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd ASS: \u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 +MEncoderVideo.13=\u03a0\u03b5\u03c1\u03af\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 +MEncoderVideo.14=\u03a3\u03ba\u03af\u03b1\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 +MEncoderVideo.15=\u03a0\u03b5\u03c1\u03b9\u03b8\u03ce\u03c1\u03b9\u03bf \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd +MEncoderVideo.16=\u03a0\u03c1\u03bf\u03b5\u03c0\u03af\u03bb\u03b5\u03b3\u03bc\u03ad\u03bd\u03b5\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2: \u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 +MEncoderVideo.17=\u03a0\u03b5\u03c1\u03af\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 +MEncoderVideo.18=\u0398\u03ac\u03bc\u03c0\u03c9\u03bc\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 +MEncoderVideo.19=\u03a0\u03b5\u03c1\u03b9\u03b8\u03ce\u03c1\u03b9\u03bf \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd +MEncoderVideo.20=\u03a5\u03c0\u03cc\u03c4\u03b9\u03c4\u03bb\u03bf\u03b9 ASS/SSA +MEncoderVideo.21=Fontconfig/\u0395\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03bf\u03b9 \u03c5\u03c0\u03cc\u03c4\u03b9\u03c4\u03bb\u03bf\u03b9 +MEncoderVideo.22=\u0391\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b7 \u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7 *.srt/*.sub \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd \u03bc\u03b5 \u03c4\u03bf \u03af\u03b4\u03b9\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1. +MEncoderVideo.24=\u039a\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 TrueType (\u03b3\u03b9\u03b1 \u0391\u03c3\u03b9\u03b1\u03c4\u03b9\u03ba\u03ad\u03c2 \u03b3\u03bb\u03ce\u03c3\u03c3\u03b5\u03c2): +MEncoderVideo.25=\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b3\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac Truetype +MEncoderVideo.26=\u03a6\u03b9\u03bb\u03c4\u03c1\u03bf Deinterlace +MEncoderVideo.27=\u03a7\u03c1\u03ae\u03c3\u03b7 Video Scaler +MEncoderVideo.28=\u039c\u03ae\u03ba\u03bf\u03c2 +MEncoderVideo.29=\u0393\u03b9\u03b1 \u03c0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2 : \u03a0\u03b1\u03c1\u03b1\u03bc\u03b5\u03c4\u03c1\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03c9\u03bd Codecs +MEncoderVideo.30=\u038e\u03c8\u03bf\u03c2 +MEncoderVideo.32=Remux \u03cc\u03c4\u03b1\u03bd \u03bf \u03ae\u03c7\u03bf\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 AC-3 (\u03c7\u03c9\u03c1\u03af\u03c2 \u03b5\u03c0\u03b1\u03bd\u03b1\u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7) +MEncoderVideo.33=\u0395\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03c0\u03b1\u03c1\u03ac\u03bc\u03b5\u03c4\u03c1\u03bf\u03b9: +MEncoderVideo.34=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03b4\u03b9\u03ba\u03ce\u03bd \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03c9\u03bd \u03c4\u03c9\u03bd codecs +MEncoderVideo.35=\u0392\u03b5\u03bb\u03c4\u03b9\u03c9\u03bc\u03ad\u03bd\u03b7 \u03c5\u03c0\u03bf\u03c3\u03c4\u03ae\u03c1\u03b9\u03be\u03b7 \u03c0\u03bf\u03bb\u03c5\u03c0\u03cd\u03c1\u03b7\u03bd\u03c9\u03bd \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03ce\u03bd +MEncoderVideo.68=\#\u0395\u03b4\u03ce \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03b5\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03bf\u03c5\u03c2 \u03b3\u03b9\u03b1 \u03ba\u03ac\u03c0\u03bf\u03b9\u03bf\u03c5\u03c2 \u03c3\u03c5\u03bd\u03b4\u03c5\u03b1\u03c3\u03bc\u03bf\u03cd\u03c2 codecs.\n +MEncoderVideo.69=\#\u0391\u03c6\u03bf\u03c1\u03ac \u03ba\u03c5\u03c1\u03af\u03c9\u03c2 \u03c4\u03b1 \u03c0\u03c1\u03bf\u03b2\u03bb\u03ae\u03bc\u03b1\u03c4\u03b1 \u03c3\u03c5\u03b3\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03bf\u03cd \u0395\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2/\u0389\u03c7\u03bf\u03c5, \u03b1\u03bb\u03bb\u03ac \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af \u03ba\u03b1\u03b9 \u03b1\u03bb\u03bb\u03bf\u03cd\n +MEncoderVideo.70=\#\u03a0\u03c1\u03bf\u03ba\u03b5\u03b9\u03c4\u03b1\u03af \u03b3\u03b9\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03b3\u03b9\u03b1 \u03c0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2 \u03ba\u03b1\u03b9 \u03b4\u03b5\u03bd \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03bf\u03cd\u03bd \u03b1\u03bd \u03b4\u03b5\u03bd \u03be\u03ad\u03c1\u03b5\u03c4\u03b5 \u03c4\u03b9 \u03b1\u03ba\u03c1\u03b9\u03b2\u03ce\u03c2 \u03ba\u03ac\u03bd\u03b5\u03c4\u03b5\n +MEncoderVideo.71=\#\u0397 \u03c3\u03cd\u03bd\u03c4\u03b1\u03be\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 {\u03c0\u03c1\u03bf\u03cb\u03c0\u03cc\u03b8\u03b5\u03c3\u03b7 java} :: {\u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 MEncoder} ; \u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5 \u03c0\u03bf\u03bb\u03bb\u03ad\u03c2 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2\n +MEncoderVideo.72=\#\u0395\u03c0\u03b9\u03c4\u03c1\u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03b1 Tokens: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#\u03a0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae, \u03b1\u03bd \u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03bc\u03c0\u03b5\u03c1\u03b9\u03ad\u03c7\u03b5\u03b9 \u03c3\u03c6\u03ac\u03bb\u03bc\u03b1, \u03b8\u03b1 \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03b5\u03af\n +MEncoderVideo.75=\#\u0395\u03b9\u03b4\u03b9\u03ba\u03ad\u03c2 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2:\n +MEncoderVideo.76=\# -noass: \u03b2\u03ad\u03b2\u03b1\u03b9\u03b7 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd ASS/SSA \u03ba\u03b1\u03b8\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03b9\u03b8\u03b1\u03bd\u03cc\u03bd \u03bd\u03b1 \u03b5\u03c0\u03b7\u03c1\u03b5\u03ac\u03c3\u03bf\u03c5\u03bd \u03c4\u03bf \u03c3\u03c5\u03b3\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03cc \u0395\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2/\u0389\u03c7\u03bf\u03c5\n +MEncoderVideo.77=\# -nosync: \u03b2\u03ad\u03b2\u03b1\u03b9\u03b7 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b5\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae\u03c2 \u03bc\u03b5\u03b8\u03cc\u03b4\u03bf\u03c5 \u03c3\u03c5\u03b3\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03bf\u03cd \u0395\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2/\u0389\u03c7\u03bf\u03c5 \u03b3\u03b9\u03b1 \u03b1\u03c5\u03c4\u03ae\u03bd \u03c4\u03b7\u03bd \u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 (-mc \u03ad\u03c7\u03b5\u03b9 \u03af\u03b4\u03b9\u03bf \u03b1\u03c0\u03bf\u03c4\u03ad\u03bb\u03b5\u03c3\u03bc\u03b1)\n +MEncoderVideo.78=\# -quality: \u03c0\u03b1\u03c1\u03ac\u03ba\u03b1\u03bc\u03c8\u03b7 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c9\u03bd \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2\n +MEncoderVideo.79=\# -mt: \u03a5\u03c0\u03bf\u03c7\u03c1\u03b5\u03c9\u03c4\u03b9\u03ba\u03ae \u03c7\u03c1\u03ae\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03c0\u03bf\u03bb\u03c5\u03c0\u03cd\u03c1\u03b7\u03bd\u03bf\u03c5 MEncoder (\u03c0\u03b5\u03b9\u03c1\u03b1\u03bc\u03b1\u03c4\u03b9\u03ba\u03ae \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1, \u03af\u03c3\u03c9\u03c2 \u03b1\u03c3\u03c4\u03b1\u03b8\u03ae\u03c2)\n +MEncoderVideo.80=\#\u0391\u03c5\u03c4\u03ae \u03b7 \u03bb\u03af\u03c3\u03c4\u03b1 \u03b8\u03b1 \u03b2\u03b5\u03bb\u03c4\u03b9\u03c9\u03b8\u03b5\u03af \u03b5\u03bd \u03ba\u03b1\u03b9\u03c1\u03ce: \u03b2\u03b5\u03bb\u03c4\u03b9\u03ce\u03c3\u03b5\u03b9\u03c2/\u03b1\u03c0\u03b1\u03bd\u03c4\u03ae\u03c3\u03b5\u03b9\u03c2 \u03cc\u03c3\u03bf\u03bd \u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b7\u03bd \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03c4\u03c9\u03bd codecs \u03b5\u03af\u03bd\u03b1\u03b9 \u03c0\u03ac\u03bd\u03c4\u03b1 \u03b1\u03c0\u03bf\u03b4\u03b5\u03ba\u03c4\u03ad\u03c2\n +MEncoderVideo.87=\#\u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03c4\u03ce\u03c1\u03b1 \u03bd\u03b1 \u03b5\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b1\u03b9 \u03c4\u03b9\u03c2 \u03b4\u03b9\u03ba\u03ad\u03c2 \u03c3\u03b1\u03c2 \u03c0\u03c1\u03bf\u03cb\u03c0\u03bf\u03b8\u03ad\u03c3\u03b5\u03b9\u03c2 \! \u03a0\u03b1\u03c1\u03b1\u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03b1: \u03c0.\u03c7, \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03c0\u03bf\u03bb\u03c5\u03c0\u03cd\u03c1\u03b7\u03bd\u03bf\u03c5 MEncoder\n +MEncoderVideo.88=\#\u03b3\u03b9\u03b1 \u03bf\u03c0\u03bf\u03b9\u03bf\u03b4\u03ae\u03c0\u03bf\u03c4\u03b5 H.264 HD \u03bc\u03ad\u03c3\u03bf (\u03c0\u03bb\u03b5\u03bf\u03bd\u03b1\u03c3\u03bc\u03cc\u03c2 \u03b5\u03c6\u03cc\u03c3\u03bf\u03bd \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03b5\u03af \u03b7 \u03ba\u03cd\u03c1\u03b9\u03b1 \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#\u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03b1\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c4\u03c1\u03b5\u03bc\u03ac\u03bc\u03b5\u03bd\u03b7\u03c2 24p \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03c3\u03b5 50Hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#\u03b3\u03b9\u03b1 remux \u03cc\u03c4\u03b1\u03bd \u03c4\u03bf \u03b2\u03af\u03bd\u03c4\u03b5\u03bf \u03b5\u03af\u03bd\u03b1\u03b9 MPEG-2 \u03ba\u03b1\u03b9 \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd \u03c5\u03c0\u03cc\u03c4\u03b9\u03c4\u03bb\u03bf\u03b9: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=\u0393\u03bb\u03ce\u03c3\u03c3\u03b1 [\u03b5\u03c0\u03b1\u03bd\u03b5\u03ba\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 PMS \u03b1\u03c0\u03b1\u03c1\u03b1\u03af\u03c4\u03b7\u03c4\u03b7]: +NetworkTab.1=\u03a5\u03c0\u03bf\u03c3\u03c4\u03ae\u03c1\u03b9\u03be\u03b7 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd .RAR/.ZIP/.CBR +NetworkTab.2=\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03cc\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03c0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7\u03c2 +NetworkTab.3=\u0395\u03bd\u03b1\u03c1\u03be\u03b7 \u03b5\u03bb\u03b1\u03c7\u03b9\u03c3\u03c4\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf +NetworkTab.4=\u0395\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c9\u03c2 \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 Windows +NetworkTab.5=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 +NetworkTab.6=\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03b7 \u03c0\u03c1\u03bf\u03c3\u03c9\u03c1\u03b9\u03bd\u03ae \u03bc\u03bd\u03ae\u03bc\u03b7 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2, \u03c3\u03b5 megabytes (\u03bc\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf: MAX_BUFFER_SIZE): +NetworkTab.7=\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03c0\u03c5\u03c1\u03b7\u03bd\u03ce\u03bd \u03b3\u03b9\u03b1 \u03c7\u03c1\u03ae\u03c3\u03b7 \u03ba\u03b1\u03c4\u03ac \u03c4\u03b7\u03bd \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 (\u03a4\u03bf \u03c3\u03cd\u03c3\u03c4\u03b7\u03bc\u03b1 \u03c3\u03b1\u03c2 \u03b1\u03bd\u03b1\u03c6\u03ad\u03c1\u03b5\u03b9 %d): +NetworkTab.9=English +NetworkTab.11=\u0388\u03c7\u03b5\u03c4\u03b5 \u03b5\u03b3\u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03ae\u03c3\u03b5\u03b9 \u03c4\u03b7\u03bd \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 Windows \u03c4\u03bf\u03c5 PMS \! \u0393\u03b9\u03b1 \u03bd\u03b1 \u03c4\u03b7 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c4\u03b5, \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03ba\u03bb\u03b5\u03af\u03c3\u03b5\u03c4\u03b5 \u03c4\u03ce\u03c1\u03b1 \u03b1\u03c5\u03c4\u03ae\u03bd \u03c4\u03b7\u03bd \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae,\n +NetworkTab.12=\u03ba\u03b1\u03b9 \u03bd\u03b1 \u03b5\u03ba\u03ba\u03b9\u03bd\u03ae\u03c3\u03b5\u03c4\u03b5 (\u03ba\u03b1\u03b9 \u03bd\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5) \u03c4\u03b7\u03bd \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1 \u03b1\u03c0\u03cc \u03c4\u03bf\u03bd \u03a0\u03af\u03bd\u03b1\u03ba\u03b1 \u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03b9\u03ce\u03bd \u0394\u03b9\u03b1\u03c7\u03b5\u03af\u03c1\u03b9\u03c3\u03b7\u03c2 \u03c4\u03c9\u03bd Windows.\n\n +NetworkTab.13=\u0397 \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7 \u03a0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd \u03b8\u03b1 \u03b5\u03c0\u03b1\u03bd\u03b1\u03c1\u03c7\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af \!\n +NetworkTab.14=\u03a3\u03c6\u03ac\u03bb\u03bc\u03b1 \u03ba\u03b1\u03c4\u03ac \u03c4\u03b7\u03bd \u03b5\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c4\u03b7\u03c2 \u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1\u03c2 Windows\!\n +NetworkTab.15=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 \u03a0\u03bb\u03bf\u03ae\u03b3\u03b7\u03c3\u03b7\u03c2/\u0391\u03bd\u03ac\u03bb\u03c5\u03c3\u03b7\u03c2 +NetworkTab.16=\u0394\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf \u03b1\u03c0\u03bf\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03c0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7\u03c2(\u03b2\u03af\u03bd\u03c4\u03b5\u03bf): +NetworkTab.17=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03b7\u03c2 \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7\u03c2 \u03a0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd +NetworkTab.18=\u039d\u03ad\u03b1 \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7 \u03a0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd +NetworkTab.19=\u0395\u03af\u03c3\u03c4\u03b5 \u03c3\u03af\u03b3\u03bf\u03c5\u03c1\u03bf\u03b9; (\u03b7 \u03c0\u03b1\u03bb\u03b9\u03ac \u03b8\u03b1 \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03b5\u03af) +NetworkTab.20=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 \u03b4\u03b9\u03b1\u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03b1\u03c0\u03cc \u03c4\u03bf\u03bd \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ad\u03b1 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5: +NetworkTab.22=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u0394\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5, \u03b1\u03bb\u03bb\u03ac\u03be\u03c4\u03b5 \u03bc\u03cc\u03bd\u03bf \u03b5\u03ac\u03bd \u03b1\u03bd\u03c4\u03b9\u03bc\u03b5\u03c4\u03c9\u03c0\u03af\u03b6\u03b5\u03c4\u03b5 \u03c0\u03c1\u03cc\u03b2\u03bb\u03b7\u03bc\u03b1 +NetworkTab.23=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 IP \u0395\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae: +NetworkTab.24=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 \u03c0\u03cc\u03c1\u03c4\u03b1\u03c2 \u0395\u03be\u03c5\u03c0\u03b7\u03c1\u03b5\u03c4\u03b7\u03c4\u03ae (5001 \u03b1\u03c0\u03cc \u03c0\u03c1\u03bf\u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae): +NetworkTab.25=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 PS3 +NetworkTab.26=\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03c9\u03bd \u03b3\u03b9\u03b1 \u03c4\u03b1 \u03bf\u03bd\u03cc\u03bc\u03b1\u03c4\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd \u03c3\u03c4\u03bf PS3 (\u03b4\u03b5\u03af\u03c4\u03b5 XMB->System settings->Charset): +NetworkTab.27=\u0386\u03c7\u03c1\u03b7\u03c3\u03c4\u03b5\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bf\u03c5 \u03b4\u03b5\u03bd \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b1\u03b3\u03b3\u03af\u03be\u03b5\u03c4\u03b5 :p +NetworkTab.28=\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 Turbo (\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 tcp_nodelay) / \u03c0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae, \u03b4\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03c3\u03af\u03b3\u03bf\u03c5\u03c1\u03bf \u03b1\u03bd \u03c3\u03c5\u03bd\u03af\u03c3\u03c4\u03b1\u03c4\u03b1\u03b9 \u03bd\u03b1 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03b8\u03b5\u03af +NetworkTab.29=\u03a3\u03c4\u03b1\u03bc\u03ac\u03c4\u03b7\u03bc\u03b1 \u03b5\u03b9\u03c3\u03b5\u03c1\u03c7\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd \u03b1\u03b9\u03c4\u03ae\u03c3\u03b5\u03c9\u03bd \u03b3\u03b9\u03b1 \u03c4\u03bf \u03af\u03b4\u03b9\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03cc\u03c4\u03b1\u03bd \u03b7 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03ad\u03c7\u03b5\u03b9 \u03b1\u03c1\u03c7\u03af\u03c3\u03b5\u03b9 +NetworkTab.35=\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf \u03b5\u03cd\u03c1\u03bf\u03c2 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5 \u03c3\u03b5 Mb/s (0 \u03c3\u03b7\u03bc\u03b1\u03af\u03bd\u03b5\u03b9 \u03c7\u03c9\u03c1\u03af\u03c2 \u03cc\u03c1\u03b9\u03bf): +PMS.0=\u0394\u03b5\u03bd \u03ad\u03c7\u03b5\u03b9 \u03b5\u03bd\u03c4\u03bf\u03c0\u03b9\u03c3\u03c4\u03b5\u03af \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1 PS3. \u03a4\u03b7\u03bd \u03ad\u03c7\u03b5\u03c4\u03b5 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03b9; \u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03b5\u03c0\u03af\u03c3\u03b7\u03c2 \u03bd\u03b1 \u03b5\u03bb\u03ad\u03b3\u03be\u03b5\u03c4\u03b5 \u03c4\u03bf \u0399\u03c3\u03c4\u03bf\u03c1\u03b9\u03ba\u03cc \u03ba\u03b1\u03b9/\u03ae \u03c4\u03b9\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c3\u03b1\u03c2, \u03ae \u03ba\u03b1\u03b9 \u03c4\u03bf debug.log file +PMS.1=\u0389\u03c7\u03bf\u03c2 +PMS.2=\#- \u0392\u03b9\u03b2\u03bb\u03b9\u03bf\u03b8\u03ae\u03ba\u03b7 \u03a0\u03bf\u03bb\u03c5\u03bc\u03ad\u03c3\u03c9\u03bd -\# +PMS.3=\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03bc\u03ad\u03b8\u03bf\u03b4\u03bf\u03c2 \u03c3\u03c5\u03b3\u03c7\u03c1\u03bf\u03bd\u03b9\u03c3\u03bc\u03bf\u03cd \u0395/\u0397 +PMS.4=\u03a6\u03af\u03bb\u03c4\u03c1\u03bf Deinterlace +PMS.5=\u0395\u03bd\u03c4\u03bf\u03c0\u03af\u03c3\u03c4\u03b7\u03ba\u03b5 PS3 \! +PMS.6=\u0391\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03bf \u03c6\u03cc\u03c1\u03c4\u03c9\u03bc\u03b1 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd .srt/.sub +PMS.7=SkipLoopFilter \u03b3\u03b9\u03b1 \u03b1\u03c0\u03bf\u03ba\u03bf\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 H.264 [\u039c\u03a0\u039f\u03a1\u0395\u0399 \u039d\u0391 \u039c\u0395\u0399\u03a9\u03a3\u0395\u0399 \u03a4\u0397\u039d \u03a0\u039f\u0399\u039f\u03a4\u0397\u03a4\u0391] +PMS.9=\u038c\u03bb\u03b5\u03c2 \u03bf\u03b9 \u03b7\u03c7\u03b7\u03c4\u03b9\u03ba\u03ad\u03c2 Playlist +PMS.11=\u038c\u03bb\u03b1 \u03c4\u03b1 \u0397\u03c7\u03b7\u03c4\u03b9\u03ba\u03ac \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9\u03b1 +PMS.12=\u039a\u03b1\u03c4\u03ac \u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1 +PMS.13=\u039a\u03b1\u03c4\u03ac \u039a\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7 +PMS.16=\u039a\u03b1\u03c4\u03ac \u0386\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc +PMS.19=\u039a\u03b1\u03c4\u03ac \u0395\u03af\u03b4\u03bf\u03c2 +PMS.21=\u039a\u03b1\u03c4\u03ac \u03bc\u03bf\u03bd\u03c4\u03ad\u03bb\u03bf \u03a8\u03b7\u03c6. \u039c\u03b7\u03c7\u03b1\u03bd\u03ae\u03c2 +PMS.22=\u039a\u03b1\u03c4\u03ac \u039a\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7/\u0386\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc +PMS.25=\u039a\u03b1\u03c4\u03ac \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 ISO +PMS.26=\u039a\u03b1\u03c4\u03ac \u0395\u03af\u03b4\u03bf\u03c2/\u039a\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7/\u0386\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc +PMS.31=\u03a6\u03c9\u03c4\u03bf\u03b3\u03c1\u03b1\u03c6\u03af\u03b5\u03c2 +PMS.32=\u038c\u03bb\u03b5\u03c2 \u03bf\u03b9 \u03a6\u03c9\u03c4\u03bf\u03b3\u03c1\u03b1\u03c6\u03af\u03b5\u03c2 +PMS.34=\u0392\u03af\u03bd\u03c4\u03b5\u03bf +PMS.35=\u038c\u03bb\u03b1 \u03c4\u03b1 \u0392\u03af\u03bd\u03c4\u03b5\u03bf +PMS.36=HD \u0392\u03af\u03bd\u03c4\u03b5\u03bf +PMS.37=\#- \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u0392\u03af\u03bd\u03c4\u03b5\u03bf -\# +PMS.39=SD \u0392\u03af\u03bd\u03c4\u03b5\u03bf +PMS.41=(\u0395\u03c0\u03b1\u03bd)\u03b5\u03b3\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1\u03c2 Win32 +PMS.130=\u0395\u03bd\u03c4\u03bf\u03c0\u03b9\u03c3\u03bc\u03cc\u03c2 PS3... +StatusTab.2=\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 +StatusTab.3=\u0391\u03bd\u03b1\u03bc\u03bf\u03bd\u03ae... +StatusTab.5=\u0386\u03b4\u03b5\u03b9\u03bf +StatusTab.6=\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c3\u03c9\u03c1\u03b9\u03bd\u03ae\u03c2 \u03bc\u03bd\u03ae\u03bc\u03b7\u03c2 Transcoder: +StatusTab.7=\u03a3\u03c4\u03b1\u03c4\u03b9\u03c3\u03c4\u03b9\u03ba\u03ac \u0395\u03b9\u03c3\u03cc\u03b4\u03bf\u03c5/\u0395\u03be\u03cc\u03b4\u03bf\u03c5: +StatusTab.8=\u03a0\u03b1\u03c1\u03ce\u03bd bitrate: +StatusTab.10=\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf Bitrate: +TSMuxerVideo.0=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 AC-3 remux \u03b3\u03b9\u03b1 \u03cc\u03bb\u03b1 \u03c4\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03b1 +TSMuxerVideo.1=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 PCM remux \u03bc\u03b5 \u03ae\u03c7\u03bf DTS/FLAC +TSMuxerVideo.2=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 framerate \u03c0\u03bf\u03c5 \u03b1\u03bd\u03b1\u03bb\u03cd\u03b8\u03b7\u03ba\u03b5 \u03b1\u03c0\u03bf FFmpeg \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf meta +TSMuxerVideo.3=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03b1\u03c0\u03bf\u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ae \u0392\u03af\u03bd\u03c4\u03b5\u03bf \u03b3\u03b9\u03b1 \u03c4\u03b7 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae TsMuxer \u03bc\u03cc\u03bd\u03bf +TrTab2.0=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7/\u0391\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae\u03c2 transcoding +TrTab2.1=\u0394\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 (\u03b1\u03ba\u03cc\u03bc\u03b1) +TrTab2.2=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ae \u0392\u03af\u03bd\u03c4\u03b5\u03bf \u03bc\u03b5 \u03c4\u03b9\u03c2 \u03b1\u03ba\u03cc\u03bb\u03bf\u03c5\u03b8\u03b5\u03c2 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2: MEncoder/AviSynth/FFmpeg +TrTab2.3=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03ae\u03c7\u03bf\u03c5, \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae \u03c3\u03c4\u03bf\u03c5\u03c2 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03b1\u03c0\u03bf\u03ba\u03bf\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ad\u03c2: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u0392\u03af\u03bd\u03c4\u03b5\u03bf +TrTab2.5=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 transcode +TrTab2.6=\u03a4\u03b1\u03be\u03b9\u03bd\u03cc\u03bc\u03b7\u03c3\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1\u03c2 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ce\u03bd transcoding. \u0397 \u03c0\u03c1\u03ce\u03c4\u03b7 \u03b8\u03b1 \u03b5\u03bc\u03c6\u03b1\u03bd\u03b9\u03c3\u03c4\u03b5\u03af \u03c3\u03c4\u03bf\u03bd \u03b1\u03c1\u03c7\u03b9\u03ba\u03cc \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf \u0392\u03af\u03bd\u03c4\u03b5\u03bf +TrTab2.7=\u0394\u03b9\u03ac\u03c6\u03bf\u03c1\u03b5\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 +TrTab2.8=\u039d\u03b1 \u03bc\u03b7\u03bd \u03b3\u03af\u03bd\u03b5\u03c4\u03b1\u03b9 transcode \u03b3\u03b9\u03b1 \u03c4\u03b9\u03c2 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2 (\u03c7\u03c9\u03c1\u03af\u03c3\u03c4\u03b5 \u03bc\u03b5 \u03ba\u03cc\u03bc\u03b1): +TrTab2.9=\u03a5\u03c0\u03bf\u03c7\u03c1\u03ad\u03c9\u03c3\u03b7 transcode \u03b3\u03b9\u03b1 \u03c4\u03b9\u03c2 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9 \u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2 (\u03c7\u03c9\u03c1\u03af\u03c3\u03c4\u03b5 \u03bc\u03b5 \u03ba\u03cc\u03bc\u03b1): +TrTab2.11=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 +TrTab2.12=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03b1\u03c0\u03bf\u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ae +TrTab2.13=\u0393\u03b5\u03bd\u03b9\u03ba\u03ad\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03ba\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03b9\u03b7\u03c4\u03ae +TrTab2.14=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd \u0392\u03af\u03bd\u03c4\u03b5\u03bf +TrTab2.15=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd \u0389\u03c7\u03bf\u03c5 +TrTab2.16=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 \u03b4\u03b9\u03b1\u03b4\u03b9\u03ba\u03c4\u03c5\u03b1\u03ba\u03ae\u03c2 \u03b1\u03bd\u03b1\u03bc\u03b5\u03c4\u03ac\u03b4\u03bf\u03c3\u03b7\u03c2 \u0392\u03af\u03bd\u03c4\u03b5\u03bf +TrTab2.17=\u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 \u03b4\u03b9\u03b1\u03b4\u03b9\u03ba\u03c4\u03c5\u03b1\u03ba\u03ae\u03c2 \u03b1\u03bd\u03b1\u03bc\u03b5\u03c4\u03ac\u03b4\u03bf\u03c3\u03b7\u03c2 \u0389\u03c7\u03bf\u03c5 +TrTab2.18=\u0394\u03b9\u03ac\u03c6\u03bf\u03c1\u03b5 \u039c\u03b7\u03c7\u03b1\u03bd\u03ad\u03c2 +TrTab2.19=\u0397 \u039c\u03b7\u03c7\u03b1\u03bd\u03ae \u03bc\u03b5 Bold \u03ad\u03c7\u03b5\u03b9 \u03c0\u03c1\u03bf\u03c4\u03b1\u03b9\u03c1\u03b5\u03cc\u03c4\u03b7\u03c4\u03b1 +TrTab2.20=\u03ba\u03b1\u03b9 \u03b8\u03b1 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03ae\u03c3\u03b5\u03b9 \u03c4\u03bf \u03b1\u03c1\u03c7\u03b9\u03ba\u03cc \u0392\u03af\u03bd\u03c4\u03b5\u03bf +TrTab2.27=DTS/FLAC -> LPCM remux (\u0391\u03c0\u03b1\u03b9\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03b5\u03bd\u03b9\u03c3\u03c7\u03c5\u03c4\u03ae\u03c2 HDMI \u03b3\u03b9\u03b1 \u03c4\u03b7\u03bd \u03b1\u03bd\u03b1\u03bc\u03b5\u03c4\u03ac\u03b4\u03bf\u03c3\u03b7 \u03ae\u03c7\u03bf\u03c5 PCM 5.1 \! \u039c\u03ad\u03c3\u03bf Bitrate = 4.6Mbps) +TrTab2.29=AC-3 bitrate \u03ae\u03c7\u03bf\u03c5 (\u03c3\u03b5 Kbits/s) (\u03c0\u03c7: 384, 576, 640): +TrTab2.32=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 MPEG-2: +TrTab2.39=\u03a4\u03bf \u0392\u03af\u03bd\u03c4\u03b5\u03bf \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9 \u03b1\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b1 \u03c3\u03b5 \u03bc\u03bf\u03c1\u03c6\u03ae MPEG-PS / AC-3 audio (\u03bc\u03b5 \u03c5\u03c8\u03b7\u03bb\u03ae \u03c3\u03c5\u03bc\u03b2\u03b1\u03c4\u03cc\u03c4\u03b7\u03c4\u03b1 \u03bc\u03b5 \u03c4\u03bf PS3) +TrTab2.40=\n\u039c\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03b1\u03af\u03be\u03b5\u03c4\u03b5 \u03bc\u03b5 \u03c4\u03b9\u03c2 \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03c4\u03c1\u03bf\u03c5\u03c2 vqscale, vqmin and keyint parameters \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03c4\u03cd\u03c7\u03b5\u03c4\u03b5 \u03ba\u03b1\u03bb\u03ae, \u03b1\u03ba\u03bf\u03bc\u03b1 \u03ba\u03b1\u03b9 \u0391\u03c0\u03c9\u03bb\u03b5\u03c3\u03c4\u03b9\u03ba\u03ae \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1 \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03bf\u03c0\u03ae\u03c2. +TrTab2.41=\n\u039c\u03b5\u03b9\u03bf\u03bd\u03ad\u03ba\u03c4\u03b7\u03bc\u03b1 \u03b1\u03c5\u03c4\u03bf\u03cd \u03b5\u03af\u03bd\u03b1\u03b9 \u03cc\u03c4\u03b9 \u03c4\u03bf VBR bitrate \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03ba\u03ac\u03c0\u03bf\u03b9\u03b5\u03c2 \u03c6\u03bf\u03c1\u03ad\u03c2 \u03b1\u03bd \u03be\u03b5\u03c0\u03b5\u03c1\u03ac\u03c3\u03b5\u03b9 \u03c4\u03bf \u03c1\u03c5\u03b8\u03bc\u03cc \u03b4\u03b9\u03b1\u03bc\u03b5\u03c4\u03b1\u03b3\u03c9\u03b3\u03ae\u03c2 \u03c4\u03bf\u03c5 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5 \u03c3\u03b1\u03c2. +TrTab2.42=\n\u0393\u03b9\u03b1 \u03b1\u03c5\u03c4\u03cc \u03bc\u03c0\u03bf\u03c1\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c4\u03b5 \u03b5\u03c0\u03af\u03c3\u03b7\u03c2 \u03c4\u03bf \u03b5\u03cd\u03c1\u03bf\u03c2 \u03c4\u03bf\u03c5 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5 \u03c3\u03b1\u03c2 \u03b1\u03bd \u03b5\u03af\u03c3\u03c4\u03b5 \u03c3\u03b5 WiFi, CPL \u03ba\u03c4\u03bb. \u03a0\u03c1\u03bf\u03c3\u03bf\u03c7\u03ae \u03cc\u03bc\u03c9\u03c2, \u03b7 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1 \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03bf\u03c0\u03ae\u03c2 \u03bc\u03b5\u03c4\u03b1\u03c4\u03c1\u03bf\u03c0\u03ae\u03c2 +TrTab2.43=\n\u03b1\u03c0\u03bf\u03c4\u03b5\u03bb\u03ad\u03b9 \u03b9\u03c3\u03bf\u03c1\u03c1\u03bf\u03c0\u03af\u03b1 \u03bc\u03b5\u03c4\u03b1\u03be\u03cd \u03c4\u03b1\u03c7\u03cd\u03c4\u03b7\u03c4\u03b1\u03c2 \u03b4\u03b9\u03ba\u03c4\u03cd\u03bf\u03c5 \u03ba\u03b1\u03b9 \u03b9\u03c3\u03c7\u03cd \u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03ae: \u03cc\u03c3\u03bf \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b7 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1 \u03b2\u03ac\u03b6\u03bf\u03c5\u03bc\u03b5 \u03c3\u03b5 \u03c0\u03b5\u03c1\u03b9\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf bitrate, +TrTab2.44=\n\u03c4\u03cc\u03c3\u03bf \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03bf \u03b8\u03b1 \u03c5\u03c0\u03bf\u03c6\u03ad\u03c1\u03b5\u03b9 \u03bf \u03b5\u03c0\u03b5\u03be\u03ad\u03c1\u03b3\u03b1\u03c3\u03c4\u03ae\u03c2 \u03c3\u03b1\u03c2\! \u0395\u03c0\u03af\u03c3\u03b7\u03c2, \u03bc\u03b7\u03bd \u03c0\u03b5\u03c1\u03b9\u03bc\u03ad\u03bd\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c7\u03c9\u03c1\u03ad\u03c3\u03b5\u03c4\u03b5 \u03bc\u03b9\u03b1 1080p \u03c4\u03b1\u03b9\u03bd\u03af\u03b1 \u03b4\u03c1\u03ac\u03c3\u03b7\u03c2, \u03c3\u03c4\u03b7\u03bd \u03ba\u03b1\u03bb\u03c5\u03c4\u03b5\u03c1\u03b7 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1, \u03c3\u03b5 15Mbps :p +TrTab2.50=\u039a\u03b1\u03bd\u03ac\u03bb\u03b9\u03b1 \u03ae\u03c7\u03bf\u03c5: +TrTab2.51=\u0392\u03ad\u03b2\u03b1\u03b9\u03b7 \u03b1\u03c0\u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c5\u03c0\u03bf\u03c4\u03af\u03c4\u03bb\u03c9\u03bd +TracesTab.3=\u039a\u03b1\u03b8\u03ac\u03c1\u03b9\u03c3\u03bc\u03b1 +TreeNodeSettings.4=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b7\u03c7\u03b1\u03bd\u03ae \u03b4\u03b5\u03bd \u03ad\u03c7\u03b5\u03b9 \u03c6\u03bf\u03c1\u03c4\u03c9\u03b8\u03b5\u03af\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_es.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_es.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_es.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_es.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,178 @@ +FFMpegDVRMSRemux.0=Ruta Alternativa de FFmpeg: +FFMpegDVRMSRemux.1=Propiedades para remuxing DVR-MS +FFMpegVideo.0=Propiedades de encoder para AviSynth/FFmpeg solamente (AVISYNTH/MENCODER PREFERIDO) +FoldTab.0= +FoldTab.1=Opciones de Uso Compartido +FoldTab.2=Escanear todas las carpetas compartidas +FoldTab.3=Escanear todas las carpetas compartidas puede tardar mucho\!\n +FoldTab.4=Esta seguro de querer empezar el escaneo?\n\n +FoldTab.5=Ocultar extensiones de archivos +FoldTab.6=Ocultar la Carpeta \#Ajustes de Video\# +FoldTab.7=Carpetas compartidas +FoldTab.8=Ocultar los nombres de los motores de transcodificacion +FoldTab.9=A\u00f1adir Directorio +FoldTab.10=Quiere detener el escaneo?\n\n +FoldTab.12=Ordenar las carpetas compartidas +FontFileFilter.3=Fuentes Truetype +LinksTab.5=Enlaces de utilidad: +LooksFrame.5=Salir +LooksFrame.6=Panel Principal +LooksFrame.9=Guardar +LooksFrame.12=Rearrancar el Servidor +LooksFrame.18=Estado +LooksFrame.19=Rastreo +LooksFrame.20=Configuracion General +LooksFrame.21=Ajustes de Transcodificacion +LooksFrame.22=Ajustes Navegar/Compartir +LooksFrame.24=Ayuda +LooksFrame.25=Acerca de +MEncoderAviSynth.2=Ajustes de decoder para AviSynth solamente +MEncoderAviSynth.3=Permitir cambio de numero de fotogramas de variable a constante con AviSynth (convertfps=true) +MEncoderVideo.0=Salta desbloqueo de filtro de loop para H.264. Puede degradar la calidad +MEncoderVideo.1=Ajustes del decoder de Video/Audio para MEncoder solamente +MEncoderVideo.2=Metodo alternativo de sincronia A/V +MEncoderVideo.3=Usar por defecto los parametros de codecs de la aplicacion (Recomendado!) +MEncoderVideo.4=Forzar numero de fotogramas recibido de FFmpeg +MEncoderVideo.5=Pueden a\u00f1adirse aqui opciones especificas, tales como un filtro de ruido por ejemplo: -vf hqdn3d +MEncoderVideo.6=Opciones personalizadas: +MEncoderVideo.7=Prioridad de idioma de audio: +MEncoderVideo.8=Configuracion de subtitulos +MEncoderVideo.9=Prioridad de idioma de subtitulos: +MEncoderVideo.10=Prioridad de idioma de Audio/subtitulos (ej: en,off;eng,off) +MEncoderVideo.11=Codigo de pagina para subtitulos: +MEncoderVideo.12=Ajustes de fuente ASS: Escala de fuente +MEncoderVideo.13=Borde de fuente +MEncoderVideo.14=Sombra de fuente +MEncoderVideo.15=Margen inferior de fuente +MEncoderVideo.16=Propiedades de fuente por defecto: Escala de fuente +MEncoderVideo.17=Borde de fuente +MEncoderVideo.18=Desenfoque de fuente +MEncoderVideo.19=Margen inferior de fuente +MEncoderVideo.20=Subtitulos ASS/SSA +MEncoderVideo.21=Fontconfig/Fuentes imbuidas +MEncoderVideo.22=Autocargar subtitulos *.srt/*.sub con el mismo nombre de archivo +MEncoderVideo.24=Fuente TrueType Especifica (para idiomas asiaticos): +MEncoderVideo.25=Elegir una fuente Truetype +MEncoderVideo.26=Filtro de Desentrelazado +MEncoderVideo.27=Usar Escalador de Video +MEncoderVideo.28=Ancho +MEncoderVideo.29=Ajustes para expertos : Parametros especificos de Codecs +MEncoderVideo.30=Altura +MEncoderVideo.32=Remezcla cuando la pista de audio sea AC-3 (no recodificar) +MEncoderVideo.33=Parametros personalizados: +MEncoderVideo.34=Editar parametros especificos de codecs +MEncoderVideo.35=Soporte multinucleo mejorado +MEncoderVideo.68=\#Aqui se pueden poner parametros especificos para combinaciones de codecs.\n +MEncoderVideo.69=\#Usado sobre todo si hay problemas con la sincronizacion A/V, pero puede usarse para cualquier otra cosa tambien\n +MEncoderVideo.70=\#Considerelo como caracteristicas para expertos, ya que no deberian usarse si no se sabe exactamente que se esta haciendo\n +MEncoderVideo.71=\#La sintaxis es {condicion java} :: {opciones MEncoder} ; Pueden acumularse varias opciones\n +MEncoderVideo.72=\#Tokens permitidos: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Cuidado, cualquier linea mal formada sera borrada\n +MEncoderVideo.75=\#Opciones especiales:\n +MEncoderVideo.76=\# -noass: deshabilitar totalmente los subtitulos ASS/SSA ya que pueden afectar a la sincronia A/V\n +MEncoderVideo.77=\# -nosync: deshabilitar totalmente el metodo alternativo de sincronia A/V para esta condicion (-mc hace lo mismo)\n +MEncoderVideo.78=\# -quality: ignorar la configuracion de calidad de video\n +MEncoderVideo.79=\# -mt: forzar el uso del MEncoder multihilo (experimental, puede resultar inestable)\n +MEncoderVideo.80=\#Esta lista mejorara con el tiempo: ajustes y comentarios sobre codecs/archivos siembre son bienvenidos\n +MEncoderVideo.87=\#Puede especificar sus propias condiciones y opciones! Por ejemplo, para usar el MEncoder multihilo\n +MEncoderVideo.88=\#para cualquier contenido H.264 en HD (redundante con la opcion principal): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#para acelerar un video de 24p a 25p: framerate == 23.976 :: -mpegopts tele_src=24000/1001:tele_dest=25\n +MEncoderVideo.91=\#para hacer remux con video MPEG-2 y sin subtitulos: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=Idioma [necesita rearrancar la aplicacion]: +NetworkTab.1=Examinar archivos .RAR/.ZIP/.CBR +NetworkTab.2=Genracion de imagenes reducidas +NetworkTab.3=Iniciar minimizado +NetworkTab.4=Instalar como Servicio de Windows +NetworkTab.5=Configuracion General +NetworkTab.6=Tama\u00f1o maximo del buffer de transcodificacion, en megabytes (maximo MAX_BUFFER_SIZE): +NetworkTab.7=Number of nucleos usados para transcodificas (parece tener %d): +NetworkTab.11=Ha instalado el servicio de Windows \! Para usarlo, debe salir de esta aplicacion,\n +NetworkTab.12=e iniciar (y configurar) el servicio desde el panel de administracion de Windows.\n\n +NetworkTab.13=La libreria de medios se va a reinicializar \!\n +NetworkTab.14=Error en la instalacion del servicio de Windows!\n +NetworkTab.15=Propiedades de Navegacion/Lectura +NetworkTab.16=Busqueda de imagenes reducidas (en segundos): +NetworkTab.17=Habilitar la libreria de medios +NetworkTab.18=Restaurar la libreria de medios +NetworkTab.19=Esta seguro? +NetworkTab.20=Forzar el siguiente interfaz de red: +NetworkTab.22=Configuracion de red, cambiar solo si tiene problemas +NetworkTab.23=Forzar IP del servidor: +NetworkTab.24=Forzar puerto del servidor (5001 por defecto): +NetworkTab.25=Caracteristicas de la PS3 +NetworkTab.26=Juego de caracteres para archivos de su PS3 (see XMB->Ajustes del sistema->Juego de caracteres): +NetworkTab.27=Caracteristicas no usadas que no deberia usar :p +NetworkTab.28=Modo Turbo (habilita tcp_nodelay) / cuidado, noestoy seguro si se debe hacer +NetworkTab.29=Bloquear peticiones entrantes para el mismo archivo desde la PS3 cuando haya empezado la transcodificacion +NetworkTab.35=Ancho de banda maximo en Mb/s (0 significa ilimitado): +PMS.0=La PS3 no se ha encontrado. Esta encendida? Puede tambien mirar en Rastreo, Configuracion o el archivo debug.log +PMS.1=Audio +PMS.2=\#- Libreria de Medios -\# +PMS.3=metodo alternativo de sincronia A/V +PMS.4=Filtro de Desentrelazado +PMS.5=PS3 encontrada \! +PMS.6=Autocargar subtitulos .srt/.sub +PMS.7=Saltar filtro de bucle para la descodificacion H.264 [PUEDE DEGRADAR LA CALIDAD] +PMS.9=Todas las listas de reproduccion de Audio +PMS.11=Todas las Pistas de Audio +PMS.12=Por Fecha +PMS.13=Por Artista +PMS.16=Por Album +PMS.19=Por Genero +PMS.21=Por modelo de camara +PMS.22=Por Artista/Album +PMS.25=Por ajustes ISO +PMS.26=Por Genero/Artista/Album +PMS.31=Foto +PMS.32=Todas las Fotos +PMS.34=Video +PMS.35=Todos los Videos +PMS.36=Videos HD +PMS.37=\#- Ajustes de Video -\# +PMS.39=Videos SD +PMS.41=(Re)instalando el servicio Win32 +PMS.130=Contactando con la PS3... +StatusTab.2=Estado +StatusTab.3=Esperando... +StatusTab.5=Vacio +StatusTab.6=Estado del bufer de transcodificacion: +StatusTab.7=Estadisticas de E/S: +StatusTab.8=Bitrate actual: +StatusTab.10=Bitrate maximo: +TSMuxerVideo.0=Forzar remezcla AC-3 con todos los archivos +TSMuxerVideo.1=Forzar remezcla PCM con audio DTS/FLAC +TSMuxerVideo.2=Forzar FPS de FFmpeg en el archivo meta +TSMuxerVideo.3=Ajustes de decodificador de video para el motor TsMuxer solamente +TrTab2.0=Habilitar/deshabilitar un motor de transcodificacion +TrTab2.1=Sin ajustes de momento +TrTab2.2=Ajustes de codificador con los siguientes motores: MEncoder/AviSynth/FFmpeg +TrTab2.3=Ajustes de Audio, aplicables a los decodificadores siguientes: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Ajustes de calidad de video +TrTab2.5=Ajustes de transcodificacion comunes +TrTab2.6=Ordenar con los motores de transcodificacion primero. El primero aparecera en la carpeta del video original +TrTab2.7=Opciones varias +TrTab2.8=Saltar la transcodificacion para las extensiones siguientes (separadas por comas): +TrTab2.9=Forzar la transcodificacion para las extensiones siguientes (separadas por comas): +TrTab2.11=Motores +TrTab2.12=Ajustes comunes de decodificador +TrTab2.13=Ajustes comunes de codificador +TrTab2.14=Motores de Archivos de Video +TrTab2.15=Motores de Archivos de Audio +TrTab2.16=Motores de streaming de Video Web +TrTab2.17=Motores de streaming de Audio Web +TrTab2.18=Motores varios +TrTab2.19=El motor en negrita tiene prioridad +TrTab2.20=y sustituira al video original +TrTab2.27=Remux DTS/FLAC -> LPCM (Necesita un receptor A/V con HDMI para enviar PCM 5.1 \! Bitrate medio = 4.6Mbps) +TrTab2.29=Bitrate de Audio AC-3 (en Kbits/s) (ej: 384, 576, 640): +TrTab2.32=Ajustes MPEG-2: +TrTab2.39=El video se codifica y mezcla automaticamente como MPEG-PS con audio AC-3 (muy compatible con PS3) +TrTab2.40=\nPuede jugar con los parametros vqscale, vqmin y keyint para obtener una buena calidad de transcodificacion, casi sin perdidas. +TrTab2.41=\nEl inconveniente es que el bitrate de VBR puede a veces superar la capacidad de su red. +TrTab2.42=\nPor ello puede tambien modificar en ancho de banda si esta en WiFi, CPL, etc. Sin embargo, la calidad de transcodificacion +TrTab2.43=\nes un equilibrio entre velocidad de red y potencia de cpu: cuanta mas calidad quiera en un ancho de banda ajustado, +TrTab2.44=\nmas sufrira su cpu\! Ademas, no pretenda encajar una pelicula de accion a 1080p con la mejor calidad en 15Mbps :p +TrTab2.50=Numero de canales de audio: +TrTab2.51=Deshabilitar subtitulos definitivamente +TracesTab.3=Limpiar +TreeNodeSettings.4=Este motor no esta cargado\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_fi.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_fi.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_fi.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_fi.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,179 @@ +FFMpegDVRMSRemux.0=Vaihtoehtoinen FFmpeg -polku: +FFMpegDVRMSRemux.1=Asetukset DVR-MS remuxingia varten +FFMpegVideo.0=Encoder-asetukset AviSynth/FFmpeg prosessoijalle (ainoastaan) (SUOSI AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Jako-optiot +FoldTab.2=Skannaa kaikki jaetut kansiot +FoldTab.3=Kaikkien kansioiden skannaus voi kest\u00e4\u00e4 kauan \!\n +FoldTab.4=Oletko varma ett\u00e4 haluat k\u00e4ynnist\u00e4\u00e4 skannauksen?\n\n +FoldTab.5=Piilota tiedostop\u00e4\u00e4tteet +FoldTab.6=Piilota \#Videoasetukset\# -kansio +FoldTab.7=Jaetut kansiot +FoldTab.8=Piilota transkoodausprosessien nimet +FoldTab.9=Lis\u00e4\u00e4 hakemisto +FoldTab.10=Haluatko keskeytt\u00e4\u00e4 skannauksen?\n\n +FoldTab.11=Mahdollista transkoodatun videon kopioinnin PS3:lle +FoldTab.12=Lajittele jaetut kansiot +FontFileFilter.3=Truetype -kirjasimet +LinksTab.5=Hy\u00f6dyllisi\u00e4 linkkej\u00e4: +LooksFrame.5=Lopeta +LooksFrame.6=P\u00e4\u00e4valikko +LooksFrame.9=Talleta +LooksFrame.12=K\u00e4ynnist\u00e4 Uudelleen +LooksFrame.18=Status +LooksFrame.19=Traces +LooksFrame.20=Yleinen konfiguraatio +LooksFrame.21=Transkoodauksen asetukset +LooksFrame.22=Navigointi/Levyjako -asetukset +LooksFrame.24=Apua +LooksFrame.25=Ohjelman tietoja +MEncoderAviSynth.2=Video-dekooderi asetukset vain AviSynth-prosessia varten +MEncoderAviSynth.3=Aktivoi AviSynthin muunnos muuttuva framerate -> kiinte\u00e4 framerate(convertfps=true) +MEncoderVideo.0=Ohita loop filter deblokkaus H.264:lle. Saattaa huonontaa laatua +MEncoderVideo.1=Video/Audio decoder -asetukset MEncoder -prosessia varten +MEncoderVideo.2=A/V sync vaihtoehtoinen menetelm\u00e4 +MEncoderVideo.3=K\u00e4yt\u00e4 sovelluksen oletusparametrej\u00e4 koodekeille (Suositellaan\!) +MEncoderVideo.4=Pakota framerate FFmpeg'in antamaksi +MEncoderVideo.5=T\u00e4h\u00e4n voit lis\u00e4t\u00e4 erikoisoptioita, kuten esim. h\u00e4iri\u00f6npoistofiltterin: -vf hqdn3d +MEncoderVideo.6=Erikoisoptiot: +MEncoderVideo.7=Audio -kielen prioriteetti: +MEncoderVideo.8=Tekstityksen asetukset +MEncoderVideo.9=Tekstityskielten prioriteetit: +MEncoderVideo.10=Audio/tekstitys -kielivalinta (es: en,off;eng,off) +MEncoderVideo.11=Tekstityksen koodisivu: +MEncoderVideo.12=ASS kirjasinasetukset: kirjasinkoko +MEncoderVideo.13=Kirjasin-outline +MEncoderVideo.14=Kirjasinvarjostus +MEncoderVideo.15=Kirjasimen alimarginaali +MEncoderVideo.16=Oletus kirjasinasetukset: Kirjasinkoko +MEncoderVideo.17=Kirjasimen \u00e4\u00e4riviivat +MEncoderVideo.18=Kirjasimen ep\u00e4tarkkuus (blur) +MEncoderVideo.19=Kirjasimen alimarginaali +MEncoderVideo.20=ASS/SSA Tekstitys +MEncoderVideo.21=Fontconfig/Sis\u00e4llytetyt kirjasimet +MEncoderVideo.22=Lataa automaattisesti *.srt/*.sub -tekstitykset samannimisen tiedoston kanssa +MEncoderVideo.24=Erityinen TrueType -kirjasin (aasialaisille kielille): +MEncoderVideo.25=Valitse Truetype -kirjasin +MEncoderVideo.26=Deinterlace -suodatin +MEncoderVideo.27=K\u00e4yt\u00e4 videoskaalaaja +MEncoderVideo.28=Leveys +MEncoderVideo.29=Asiantuntija-asetukset : Koodekkikohtaiset parametrit +MEncoderVideo.30=Korkeus +MEncoderVideo.32=Remux kun audioraita AC-3 (ilman uutta enkoodausta ) +MEncoderVideo.33=Erikoisparametrit: +MEncoderVideo.34=Muokkaa koodekkikohtaisia parametreja +MEncoderVideo.35=Parannettu moniydintuki +MEncoderVideo.68=\#T\u00e4ss\u00e4 voit antaa erikoisia parametreja joillekin koodekki-kombinaatioille.\n +MEncoderVideo.69=\#T\u00e4m\u00e4 on enimm\u00e4kseen A/V synkronisaatio-ongelmiin, mutta voidaan k\u00e4ytt\u00e4\u00e4 muihin asioihin my\u00f6s\n +MEncoderVideo.70=\#Pid\u00e4 t\u00e4t\u00e4 eksperttiasetuksena koska t\u00e4t\u00e4 ei pit\u00e4is k\u00e4ytt\u00e4\u00e4 ellei todell\u00e4 tied\u00e4 mit\u00e4 tekee\n +MEncoderVideo.71=\#Syntaksi on {java ehto} :: {MEncoder optiot} ; Voit kumuloida useampia optioita\n +MEncoderVideo.72=\#Sallitut tokenit: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Varo, v\u00e4\u00e4rin kirjoitettu rivi tyhjennet\u00e4\u00e4n\n +MEncoderVideo.75=\#Erikoisoptiot:\n +MEncoderVideo.76=\# -noass: ehdottomasti disabloi ASS/SSA tekstitys koska se voi sotkea A/V synkronoinnin\n +MEncoderVideo.77=\# -nosync: ehdottomasti disabloi A/V synkroinoinnin vaihtoehtoismenetelm\u00e4 t\u00e4lle optiolle (-mc tekee saman)\n +MEncoderVideo.78=\# -quality: m\u00e4\u00e4rit\u00e4 erikseen videon laatuasetukset\n +MEncoderVideo.79=\# -mt: pakota k\u00e4ytt\u00f6\u00f6n monis\u00e4ikeinen MEncoder -versio (kokeellinen, voi olla ep\u00e4vakaa)\n +MEncoderVideo.80=\#T\u00e4m\u00e4 lista tulee paranemaan aikaa my\u00f6ten: s\u00e4\u00e4t\u00f6j\u00e4/palautetta eri koodekeista ja tiedostoista ovat aina tervetulleita\n +MEncoderVideo.87=\#Voit nyt antaa omat ehdot/optiot \! T\u00e4ss\u00e4 on esimerkkej\u00e4: esim. ota k\u00e4ytt\u00f6\u00f6n mt-versio MEncoder'ista\n +MEncoderVideo.88=\#kaikille H.264 HD sis\u00e4ll\u00f6ille (p\u00e4\u00e4llekk\u00e4inen p\u00e4\u00e4option kanssa): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#24p v\u00e4rin\u00e4n poistamiseksi 50hz TV:ss\u00e4 : framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#tee remux kun video on MPEG-2 ja tekstitys puuttuu : vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=Kieli [ohjelma pit\u00e4\u00e4 k\u00e4ynnist\u00e4\u00e4 uudelleen]: +NetworkTab.1=Selaa .RAR/.ZIP/.CBR -arkistoja +NetworkTab.2=Thumbnails generointi +NetworkTab.3=Aloita minimoituna +NetworkTab.4=Asenna Windows-palveluna +NetworkTab.5=Yleiset asetukset +NetworkTab.6=Transcode-puskurin suurin koko, megatavuja (maksimi: MAX_BUFFER_SIZE): +NetworkTab.7=Transkoodauksen k\u00e4ytett\u00e4vien ytimien lukum\u00e4\u00e4r\u00e4 (sinulla on n\u00e4k\u00f6j\u00e4\u00e4n %d): +NetworkTab.11=Olet asentanut Windows-palvelun \! Sen k\u00e4ytt\u00e4miseksi sinun t\u00e4ytyy sulkea t\u00e4m\u00e4 sovellus,\n +NetworkTab.12=sitten k\u00e4ynnist\u00e4\u00e4 (ja konfiguroida) palvelu Windowsin hallinta-toiminnoissa.\n\n +NetworkTab.13=Mediakirjasto initialisoidaan uudelleen \!\n +NetworkTab.14=Virhe Windows-palvelun asennuksessa\!\n +NetworkTab.15=Selailu/Parsinta -asetukset +NetworkTab.16=Thumbnail haku (sekuntteja): +NetworkTab.17=Aktivoi mediakirjasto +NetworkTab.18=Resetoi mediakirjasto +NetworkTab.19=Oletko varma? +NetworkTab.20=Pakota verkkok\u00e4ytt\u00f6 : +NetworkTab.22=Verkkoasetukset, muuta vain jos ongelmia +NetworkTab.23=Pakota palvelimen IP-osoite: +NetworkTab.24=Pakota palvelimen portti (5001 oletuksena): +NetworkTab.25=PS3 asetukset +NetworkTab.26=Merkist\u00f6 PS3:n tiedostonimille (katso XMB->J\u00e4rjestelm\u00e4asetukset->Merkist\u00f6): +NetworkTab.27=K\u00e4ytt\u00e4m\u00e4tt\u00f6mi\u00e4 asetuksia joita sinun ei pit\u00e4isi k\u00e4ytt\u00e4\u00e4 :p +NetworkTab.28=Turbo mode (enable tcp_nodelay) / ole varovainen, en ole varma jos t\u00e4m\u00e4 on ihan ok +NetworkTab.29=Est\u00e4 PS3:sta tuleva pyynt\u00f6 joka koskee samaa tiedostoa kun transkoodaus on jo k\u00e4ynniss\u00e4 +NetworkTab.35=Maksimi kaistanleveys Mb/s (0 means no limit): +PMS.0=PS3:a ei l\u00f6ytynyt. Onko se p\u00e4\u00e4ll\u00e4? Voit my\u00f6s tarkistaa tracet ja/tai konfiguraation, tai my\u00f6s debug.log -tiedoston +PMS.1=Audio +PMS.2=\#- Mediakirjasto -\# +PMS.3=A/V synkronoinnin vaihtoehtoinen menetelm\u00e4 +PMS.4=Deinterlace-suodatin +PMS.5=PS3 l\u00f6ytyi \! +PMS.6=Lataa .srt/.sub tekstitys automaattisesti +PMS.7=SkipLoopFilter for H.264 Decoding [SAATTAA HUONONTAA LAATUA] +PMS.9=Kaikki audio -soittolistat +PMS.11=Kaikki audioraidat +PMS.12=P\u00e4iv\u00e4m\u00e4\u00e4r\u00e4n mukaan +PMS.13=Artistin mukaan +PMS.16=Albumin mukaan +PMS.19=Lajin mukaan +PMS.21=Kameramallin mukaan +PMS.22=Artisti/albumin mukaan +PMS.25=ISO-asetusten mukaan +PMS.26=Lajin/artistin/albumin mukaan +PMS.31=Valokuva +PMS.32=Kaikki valokuvat +PMS.34=Video +PMS.35=Kaikki videot +PMS.36=HD -videot +PMS.37=\#- Videoasetukset -\# +PMS.39=SD -videot +PMS.41=(Uudelleen)installoin Win32 -palvelun +PMS.130=Haetaan PS3:a ... +StatusTab.2=Status +StatusTab.3=Odottaa... +StatusTab.5=Tyhj\u00e4 +StatusTab.6=Transkoodauspuskurin tila: +StatusTab.7=I/O tilastoa: +StatusTab.8=Bittinopeus nyt: +StatusTab.10=Huippubittinopeus: +TSMuxerVideo.0=Demuxaa MEncoder'illa ja enkoodaa kaikki audioraidat AC-3 -muotoon +TSMuxerVideo.1=Demuxaa MEncoder'illa ja enkoodaa DTS/FLAC audioraidat LPCM -muotoon [Varo, haku ei toimi viel\u00e4) +TSMuxerVideo.2=Pakota FPS kuten parsittu FFmpeg metatiedostossa +TSMuxerVideo.3=Videodekoodaus -asetukset vain TsMuxer -prosessoijalle +TrTab2.0=P\u00e4\u00e4lle/pois transkoodausprosessoija +TrTab2.1=Ei asetuksia toistaiseksi +TrTab2.2=Video -enkoodausasetukset seuraavilla prosessoijilla: MEncoder/AviSynth/FFmpeg +TrTab2.3=Audioasetukset, koskee seuraavia dekoodereita: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Videon laatuasetukset +TrTab2.5=Yleiset transkoodausasetukset +TrTab2.6=Lajittele transkoodausprosessoijat. Ensimm\u00e4iset ovat alkuper\u00e4isess\u00e4 videokansiossa +TrTab2.7=Sekalaiset optiot +TrTab2.8=Ohita transkoodaus seuraaville tiedostop\u00e4\u00e4tteille (pilkulla erotettu): +TrTab2.9=Pakota transkoodaus seuraaville tiedostop\u00e4\u00e4tteille (pilkulla erotettu): +TrTab2.11=Prosessoijat +TrTab2.12=Yleiset dekoodausasetukset +TrTab2.13=Yleiset enkoodausasetukset +TrTab2.14=Videotiedostoprosessoijat +TrTab2.15=Audiotiedostoprosessoijat +TrTab2.16=Video webstreaming-prosessoijat +TrTab2.17=Audio webstreaming-prosessoijat +TrTab2.18=Muut prosessoijat +TrTab2.19=Prosessoija paksunnettuna on ykk\u00f6svalinta +TrTab2.20=ja korvaa alkuper\u00e4isen videon +TrTab2.27=DTS/FLAC -> LPCM remux (Tarvitset HDMI -vastaanottimen PCM 5.1 -streamaukseen \! Keskim. Bitrate = 4.6Mbps) +TrTab2.29=AC-3 Audio bitrate (Kbits/s) (ex: 384, 576, 640): +TrTab2.32=MPEG-2 -laatuasetukset: +TrTab2.39=Video transkoodataan ja muxataan automaattisesti muotoon MPEG-PS / AC-3 audio (eritt\u00e4in yhteensopiva PS3:n kanssa) +TrTab2.40=\nVoit kokeilla vqscale, vqmin and keyint parametreja saadaksesi hyv\u00e4n, melkein h\u00e4vi\u00f6tt\u00f6m\u00e4n transkoodauslaadun. +TrTab2.41=\nHaittana t\u00e4lle on VBR bitrate joka voi tehd\u00e4 huipun yli verkkosi maksimikapasiteetin. +TrTab2.42=\nT\u00e4m\u00e4n takia voit my\u00f6s asettaa kaistanleveyden jos verkkosi on WiFi, CPL, tms. Joka tapauksessa, transkoodauslaatu +TrTab2.43=\non taspainoilua verkon nopeuden ja cpu-voiman v\u00e4lill\u00e4: mit\u00e4 enem\u00e4n laatua haluat kapasiteetiltaan rajoitettuun verkkoon, +TrTab2.44=\nsit\u00e4 enemm\u00e4n CPUsi k\u00e4rsii\! Siis, \u00e4l\u00e4 luule ett\u00e4 voit mahduttaa 1080p toimintaelokuvan parhaalla laadulla 15Mb/s verkkoon :p +TrTab2.50=Audiokanavien lukum\u00e4\u00e4r\u00e4: +TrTab2.51=Ehdottomasti kytke pois tekstitykset +TracesTab.3=Tyhjenn\u00e4 +TreeNodeSettings.4=T\u00e4m\u00e4 prosessi ei ole ladattu\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_fr.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_fr.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_fr.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_fr.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,188 @@ +DLNAMediaDatabase.0=Pour un meilleur support de l'application,\nla biblioth\u00E8que m\u00E9dias doit \u00EAtre r\u00E9initialis\u00E9e.\nD\u00E9sol\u00E9 pour le d\u00E9rangement \! +FFMpegDVRMSRemux.0=Chemin alternatif pour ffmpeg +FFMpegDVRMSRemux.1=R\u00E9glages pour le remuxing DVR-MS +FFMpegVideo.0=R\u00E9glages de l'encodage pour AviSynth/FFmpeg (Pr\u00E9f\u00E9rez AviSynth/MEncoder) +FoldTab.0= +FoldTab.1=Options de partage +FoldTab.2=Scan des dossiers +FoldTab.3=Scanner tout les dossiers peut prendre du temps \!\n +FoldTab.4=Etes vous sur?\n\n +FoldTab.5=Cacher les extensions de fichier +FoldTab.6=Cacher le dossier #Options Videos# +FoldTab.7=Dossiers partag\u00E9s +FoldTab.8=Cacher le nom des moteurs de transcodage +FoldTab.9=Ajouter un dossier +FoldTab.10=Voulez vos arretez le scan?\n\n +FoldTab.11=Autorise les copies de vid\u00E9os transcod\u00E9es sur PS3 (Attention, les fichiers n'ont pas de taille fixe !) +FoldTab.12=Tri des dossiers partag\u00E9s +FoldTab.13=Vignettes +FoldTab.14=Utiliser Mplayer pour les vignettes vid\u00E9o +FoldTab.15=Par d\u00E9faut +FoldTab.16=Plus r\u00E9cents d'abord +FoldTab.18=M\u00E9thode de tri des fichiers: +FoldTab.23=T\u00E9l\u00E9charger de amazon.com +FoldTab.24=T\u00E9l\u00E9charger de discogs.com +FoldTab.26=Affichage des pochettes album: +FoldTab.27=Dossier alternatif des vignettes vid\u00E9os +FoldTab.28=Choisissez un dossier +FontFileFilter.3=Fontes TrueType +LinksTab.5=Liens utiles: +LooksFrame.5=Quitter +LooksFrame.6=Panneau principal +LooksFrame.9=Sauver +LooksFrame.12=Red\u00E9marrer Serveur +LooksFrame.13=Le serveur doit \u00EAtre red\u00E9marr\u00E9 due \u00E0 un changement de configuration +LooksFrame.18=Statut +LooksFrame.19=Traces +LooksFrame.20=Configuration g\u00E9n\u00E9rale +LooksFrame.21=R\u00E9glages transcodage +LooksFrame.22=Navigation/Partage de dossiers +LooksFrame.24=Aide +LooksFrame.25=A propos +MEncoderAviSynth.2=R\u00E9glages decodage vid\u00E9o pour AviSynth/MEncoder +MEncoderAviSynth.3=Active la conversion d'un taux de rafraichissement variable par AviSynth (convertfps) +MEncoderVideo.0=Acc\u00E9l\u00E8re le d\u00E9codage vid\u00E9o H.264. D\u00E9grade la qualit\u00E9 +MEncoderVideo.1=R\u00E9glages d\u00E9codage vid\u00E9o pour MEncoder seulement +MEncoderVideo.2=M\u00E9thode alternative synchro A/V +MEncoderVideo.3=Utiliser le param\u00E9trage de codec par d\u00E9faut (recommand\u00E9!) +MEncoderVideo.4=Forcer le taux de rafraichissement +MEncoderVideo.5=Vous pouvez ajouter ici des options sp\u00E9cifiques, comme un filtre anti bruit: -vf hqdn3d +MEncoderVideo.6=R\u00E9glages de d\u00E9codage +MEncoderVideo.7=Priorit\u00E9 des langues +MEncoderVideo.8=R\u00E9glages sous-titres +MEncoderVideo.9=Priorit\u00E9 des sous-titres +MEncoderVideo.10=Priorit\u00E9 des langues/sous-titres (ex: fr,off;fre,off) +MEncoderVideo.11=Codepage des sous-titres +MEncoderVideo.12=Sous-titres ASS: Taille de police +MEncoderVideo.13=Taille du d\u00E9tourage +MEncoderVideo.14=Taille de l'ombre +MEncoderVideo.15=Taille de marge inf\u00E9rieure +MEncoderVideo.16=Fontes par d\u00E9faut: Taille de police +MEncoderVideo.17=Taille du d\u00E9tourage +MEncoderVideo.18=Flou +MEncoderVideo.19=Taille de marge inf\u00E9rieure +MEncoderVideo.20=Sous-titres ASS +MEncoderVideo.21=Fontconfig/Fontes embarqu\u00E9s +MEncoderVideo.22=Auto chargement des fichiers .srt/.sub/.ass +MEncoderVideo.24=Police Truetype sp\u00E9cifique (langues asiatiques): +MEncoderVideo.25=S\u00E9lectionner une police +MEncoderVideo.26=Filtre d\u00E9sentrelacement +MEncoderVideo.27=Redimensionner +MEncoderVideo.28=Largeur +MEncoderVideo.29=R\u00E9glages Expert : param\u00E9tres sp\u00E9cifiques codec +MEncoderVideo.30=Hauteur +MEncoderVideo.32=Remuxer quand la piste audio est en AC-3 (pas de r\u00E9encodage) +MEncoderVideo.33=Param\u00E8tres personnalis\u00E9s: +MEncoderVideo.34=Editer les param\u00E8tres sp\u00E9cifiques +MEncoderVideo.35=Support am\u00E9lior\u00E9 du multicoeur +MEncoderVideo.36=Utiliser le style ASS par d\u00E9faut +MEncoderVideo.37=Dossier alternatif des sous titres +MEncoderVideo.126=fre,jpn,ger,eng,und +MEncoderVideo.127=fre,jpn,ger,eng,und +MEncoderVideo.128=*,* +NetworkTab.0=Langue [red\u00E9marrage obligatoire]: +NetworkTab.1=Parcourir les archives .RAR/.ZIP/.CBR +NetworkTab.2=G\u00E9n\u00E9ration des vignettes +NetworkTab.3=D\u00E9marrer en mode r\u00E9duit +NetworkTab.4=Installer comme service Windows +NetworkTab.5=R\u00E9glages g\u00E9n\u00E9raux +NetworkTab.6=Taille maximum du buffer de transcodage, en m\u00E9gaoctets (maximum: MAX_BUFFER_SIZE): +NetworkTab.7=Nombre de coeurs pour le transcodage (il semble que vous ayez %d): +NetworkTab.11=Vous avez install\u00E9 le service Windows \! Pour l'utiliser, vous devez quitter cette application,\n +NetworkTab.12=puis d\u00E9marrer (et configurer) le service du panneau de configuration windows.\n\n +NetworkTab.13=La m\u00E9diath\u00E8que sera r\u00E9initialis\u00E9e \!\n +NetworkTab.14=Erreur dans l'installation du service Windows!\n +NetworkTab.15=R\u00E9glages navigation/parsing +NetworkTab.16=Positionnement des vignettes (en secondes): +NetworkTab.17=Activer la m\u00E9diath\u00E8que +NetworkTab.18=R\u00E9initialiser la m\u00E9diath\u00E8que +NetworkTab.19=Etes vous sur ? +NetworkTab.20=Forcer l'interface r\u00E9seau: +NetworkTab.22=R\u00E9glages r\u00E9seau +NetworkTab.23=Forcer l'ip du serveur: +NetworkTab.24=Force le port du serveur (5001 par d\u00E9faut): +NetworkTab.25=R\u00E9glages PS3 +NetworkTab.26=Encodage des caract\u00E8res des noms de fichier sur la PS3 (XMB->R\u00E9glages syst\u00E8me): +NetworkTab.27=R\u00E9glages non utilis\u00E9s +NetworkTab.28=Mode turbo (TCP_NODELAY) +NetworkTab.29=Stopper les requetes entrantes pour le m\u00EAme fichier +NetworkTab.30=Utiliser un filtre IP +NetworkTab.35=Bande passante maximum en Mb/s (0 = pas de limite): +PMS.0=La PS3 n'a pas \u00E9t\u00E9 trouv\u00E9e. Est-elle en marche? Vous pouvez v\u00E9rifier les r\u00E9glages g\u00E9n\u00E9raux, et consulter le fichier log. +PMS.1=Audio +PMS.2=\#- M\u00E9diath\u00E8que -\# +PMS.3=Synchro A/V alternative +PMS.4=Filtre d\u00E9sentrelacement +PMS.5=La PS3 a \u00E9t\u00E9 trouv\u00E9e ! +PMS.6=Chargement automatique des .srt/.sub +PMS.7=SkipLoopFilter pour D\u00E9codage H.264 (Peut d\u00E9grader la qualit\u00E9) +PMS.8=Sous-titres +PMS.9=Toutes les playlists Audio +PMS.10=D\u00E9sactiver d\u00E9finitivement les sous-titres +PMS.11=Toutes les pistes Audio +PMS.12=Par Date +PMS.13=Par Artiste +PMS.16=Par Album +PMS.19=Par Genre +PMS.21=Par mod\u00E8le d'appareil photo +PMS.22=Par Artiste/Album +PMS.25=Par r\u00E9glages ISO +PMS.26=Par Genre/Artiste/Album +PMS.31=Photos +PMS.32=Toutes les photos +PMS.34=Videos +PMS.35=Toutes les Videos +PMS.36=Vid\u00E9os HD +PMS.37=\#- R\u00E9glages Vid\u00E9o -\# +PMS.39=Vid\u00E9os SD +PMS.41=(Re)installation du service Win32 +PMS.130=Contact de la PS3... +StatusTab.2=Statut +StatusTab.3=En attente... +StatusTab.5=Vide +StatusTab.6=Statut du buffer de transcodage: +StatusTab.7=Statistiques I/O: +StatusTab.8=D\u00E9bit courant: +StatusTab.10=D\u00E9bit de cr\u00EAte: +TSMuxerVideo.0=Demuxer avec MEncoder et forcer le r\u00E9encodage/remuxing AC-3 pour toutes les pistes audio +TSMuxerVideo.1=Demuxer avec MEncoder et forcer le remuxing LPCM avec le DTS/FLAC pour toutes les pistes audio +TSMuxerVideo.2=Forcer le framerate obtenu de FFmpeg dans le fichier .meta +TSMuxerVideo.3=R\u00E9glages vid\u00E9o pour tsMuxeR seulement +TSMuxerVideo.19=Muxer toutes les pistes audios +TrTab2.0=Activer/D\u00E9sactiver un moteur de transcodage +TrTab2.1=Pas de r\u00E9glages pour l'instant +TrTab2.2=R\u00E9glages encodage valables pour les moteurs suivants: MEncoder/AviSynth/FFmpeg +TrTab2.3=R\u00E9glages audio valables pour les moteurs suivants: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=R\u00E9glages qualit\u00E9 vid\u00E9o +TrTab2.5=R\u00E9glages g\u00E9n\u00E9raux transcodage +TrTab2.6=Trier les moteurs de transcodage. Le premier apparaitra en tant que vid\u00E9o originale +TrTab2.7=Options diverses +TrTab2.8=Ne transcode pas les extensions suivantes (s\u00E9par\u00E9es par une virgule): +TrTab2.9=Force le transcodage des extensions suivantes (s\u00E9par\u00E9es par une virgule): +TrTab2.10=Permet de streamer directement le flux DTS \u00E0 l'ampli\nAttention, il est possible d'avoir un bruit blanc. Voici quelques conseils:\n- Vous devez avoir un ampli compatible DTS, connect\u00E9 en TOSLINK ou HDMI\n- L'icone de volume dans le XMB doit \u00EAtre \u00E0 'Normal'\n- L'icone des canaux audio dans le XMB doit \u00EAtre sur 'Gauche+Droite'\n +TrTab2.11=Moteurs +TrTab2.12=R\u00E9glages communs de d\u00E9codage +TrTab2.13=R\u00E9glages communs d'encodage +TrTab2.14=Moteurs de fichiers vid\u00E9o +TrTab2.15=Moteurs de fichiers audio +TrTab2.16=Moteurs de fichiers web vid\u00E9o +TrTab2.17=Moteurs de fichiers web audio +TrTab2.18=Moteurs divers +TrTab2.19=Le moteur en gras sera prioritaire +TrTab2.20=et remplacera la vid\u00E9o originale +TrTab2.21=[AviSynth non support\u00E9] +TrTab2.27=DTS/FLAC -> LPCM remux (Vous avez besoin d'un ampli HDMI pour le PCM 5.1 \! D\u00E9bit moyen = 4.6Mbps) +TrTab2.28=Streamer le flux DTS (Compatible avec sortie optique) -> Attention, l\u00E9gere augmentation de bitrate ! +TrTab2.29=D\u00E9bit AC-3 Audio (en Kbits/s) (ex: 384, 576, 640): +TrTab2.32=R\u00E9glages qualit\u00E9 MPEG-2: +TrTab2.39=La vid\u00E9o est automatiquement transcod\u00E9 et mux\u00E9 vers un fichier MPEG-PS / AC-3 (compatible PS3) +TrTab2.40=\nVous pouvez jouer avec les param\u00E8tres vqscale, vqmin et keyint pour atteindre une bonne qualit\u00E9, voire m\u00EAme sans perte visible. +TrTab2.41=\nL'inconv\u00E9nient est le d\u00E9bit maximum qui peut parfois atteindre des sommets, d\u00E9passant votre capacit\u00E9 r\u00E9seau. +TrTab2.42=\nC'est pourquoi vous pouvez r\u00E9gler la bande passante si vous \u00EAtes en WiFi, CPL, etc. Cependant, la qualit\u00E9 du transcoding +TrTab2.43=\nest un \u00E9quilibre entre la vitesse du r\u00E9seau et la puissance du processeur: Plus la qualit\u00E9 sera bonne dans un d\u00E9bit limit\u00E9, +TrTab2.44=\nplus le processeur souffrira\! Et ne vous attendez pas \u00E0 mettre une vid\u00E9o 1080p parfaite dans 15Mbits :p +TrTab2.50=Nombre de canaux audio +TrTab2.51=D\u00E9sactiver d\u00E9finitivement les sous-titres. +TrTab2.52=Dur\u00E9e des chapitres dans le dossier #Transcode# (en minutes) +TracesTab.3=Effacer +TreeNodeSettings.4=Ce moteur n'est pas charg\u00E9! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_is.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_is.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_is.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_is.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,212 @@ +DLNAMediaDatabase.0=\u00DEv\u00ED mi\u00F0ur er nau\u00F0synlegt a\u00F0 endurskanna allt skr\u00E1arsafni\u00F0\nvegna breytinga \u00ED \u00FEessari \u00FAtg\u00E1fu.\nAfsaki\u00F0 \u00F3n\u00E6\u00F0i\u00F0\! +FFMpegDVRMSRemux.0=\u00D6nnur sl\u00F3\u00F0 a\u00F0 FFmpeg: +FFMpegDVRMSRemux.1=Stillingar fyrir DVR-MS endurbl\u00F6ndun +FFMpegVideo.0=Stillingar fyrir AviSynth/FFmpeg millik\u00F3\u00F0un (Velji\u00F0 fremur AviSynth/MEncoder) +FoldTab.0=<\u00D6ll Drif> +FoldTab.1=Valkostir deilingar +FoldTab.2=Skanna allar deildar m\u00F6ppur +FoldTab.3=\u00DEa\u00F0 a\u00F0 skanna allar deildar m\u00F6ppur g\u00E6ti teki\u00F0 t\u00EDma\!\n +FoldTab.4=Ertu viss a\u00F0 \u00FE\u00FA viljir skanna m\u00F6ppurnar n\u00FAna?\n\n +FoldTab.5=Fela sk\u00E1arendingar +FoldTab.6=Fela \#- Stillingar -\# m\u00F6ppuna +FoldTab.7=Deildar m\u00F6ppur +FoldTab.8=Fela nafn millik\u00F3\u00F0ara +FoldTab.9=B\u00E6ta vi\u00F0 m\u00F6ppu +FoldTab.10=Viltu st\u00F6\u00F0va sk\u00F6nnun?\n\n +FoldTab.11=Leyfa afritunart\u00F6ku \u00E1 millik\u00F3\u00F0u\u00F0u efni (Athugi\u00F0: Afriti\u00F0 g\u00E6ti or\u00F0i\u00F0 verulega st\u00F3rt) +FoldTab.12=Flokka deildar m\u00F6ppur +FoldTab.13=S\u00FDnishorn +FoldTab.14=Nota Mplayer fyrir s\u00FDnishorn +FoldTab.15=Sj\u00E1lfgefi\u00F0 +FoldTab.16=N\u00FDjast fyrst +FoldTab.18=Ra\u00F0a skr\u00E1m: +FoldTab.19=DVD ISO sm\u00E1myndir +FoldTab.23=Fr\u00E1 amazon.com +FoldTab.24=Fr\u00E1 discogs.com +FoldTab.26=N\u00E1 \u00ED sm\u00E1myndir fyrir hlj\u00F3\u00F0skr\u00E1r: +FoldTab.27=Mappa sem inniheldur sm\u00E1myndir: +FoldTab.28=Veldu m\u00F6ppu +FoldTab.29=S\u00FDna iPhoto safn +FoldTab.30=S\u00FDna iTunes safn +FoldTab.31=Fela m\u00F6ppur me\u00F0 engar gagnlegar skr\u00E1r (Athugi\u00F0: h\u00E6g v\u00F6frun) +FoldTab.32=Fela skr\u00E1arsafni\u00F0 +FoldTab.33=Fela \#Transcode\# M\u00F6ppuna +FontFileFilter.3=TrueType letur +LinksTab.5=Gagnlegir hlekkir: +LooksFrame.5=H\u00E6tta +LooksFrame.6=Stj\u00F3rnbor\u00F0 +LooksFrame.9=Vista +LooksFrame.12=Endurr\u00E6sa \u00FEj\u00F3n +LooksFrame.18=Sta\u00F0a +LooksFrame.19=Rekja +LooksFrame.20=Almennar Stillingar +LooksFrame.21=Stillingar Millik\u00F3\u00F0unar +LooksFrame.22=V\u00F6frun/Deiling Stillingar +LooksFrame.24=Hj\u00E1lp +LooksFrame.25=Um PMS +MEncoderAviSynth.2=Stillingar fyrir AviSynth millik\u00F3\u00F0un +MEncoderAviSynth.3=Virkja \u00FE\u00FD\u00F0ingu fr\u00E1 breytilegu framerate yfir \u00ED st\u00F6\u00F0ugt framerate (convertfps=true) +MEncoderVideo.0=Sleppa lykkjus\u00EDu afblokkun fyrir H.264 (Minni g\u00E6\u00F0i) +MEncoderVideo.1=Stillingar fyrir MEncoder hlj\u00F3\u00F0 & mynd millik\u00F3\u00F0un +MEncoderVideo.2=Hlj\u00F3\u00F0/Mynd a\u00F0rar lei\u00F0ir til samstillingar +MEncoderVideo.3=Nota sj\u00E1lfgefnar stillingar millik\u00F3\u00F0ara fyrir codec skipanir (M\u00E6li me\u00F0 \u00FEessu\!) +MEncoderVideo.4=Ney\u00F0a framerate lesi\u00F0 fr\u00E1 FFmpeg +MEncoderVideo.5=\u00DE\u00FA getur b\u00E6tt vi\u00F0 s\u00E9rt\u00E6kum skipunum h\u00E9r, til a\u00F0 mynda su\u00F0 s\u00EDunni: -vf hqdn3d +MEncoderVideo.6=S\u00E9rt\u00E6kar skipanir: +MEncoderVideo.7=Forgangsr\u00F6\u00F0un hlj\u00F3\u00F0s: +MEncoderVideo.8=Stillingar texta +MEncoderVideo.9=Forgangsr\u00F6\u00F0un texta: +MEncoderVideo.10=Forgangsr\u00F6\u00F0un hlj\u00F3\u00F0s/texta (D\u00E6mi: en,off;eng,off) +MEncoderVideo.11=Letursett textans: +MEncoderVideo.12=ASS letur stillingar: St\u00E6r\u00F0 leturs +MEncoderVideo.13=\u00DAtl\u00EDnur leturs +MEncoderVideo.14=Skuggar leturs +MEncoderVideo.15=Sp\u00E1ss\u00EDa leturs +MEncoderVideo.16=Sj\u00E1lfgefnar letur stillingar: St\u00E6r\u00F0 leturs +MEncoderVideo.17=\u00DAtl\u00EDnur leturs +MEncoderVideo.18=M\u00FDkt leturs +MEncoderVideo.19=Sp\u00E1ss\u00EDa leturs +MEncoderVideo.20=ASS/SSA Textar +MEncoderVideo.21=Fontconfig/\u00C1brennt +MEncoderVideo.22=Hla\u00F0a sj\u00E1lfkrafa *.srt/*.sub textaskr\u00E1r me\u00F0 sama nafni +MEncoderVideo.24=S\u00E9rstakt TrueType letur (fyrir as\u00EDsk tungum\u00E1l): +MEncoderVideo.25=Velja TrueType letur +MEncoderVideo.26=Af-interlace s\u00EDa +MEncoderVideo.27=Nota s\u00E9rstaka st\u00E6r\u00F0 +MEncoderVideo.28=Breidd +MEncoderVideo.29=MEncoder stillingar fyrir lengra komna +MEncoderVideo.30=H\u00E6\u00F0 +MEncoderVideo.32=Endurblanda \u00FEegar AC-3 er til sta\u00F0ar (engin millik\u00F3\u00F0un) +MEncoderVideo.33=Eigin skipanir: +MEncoderVideo.34=Breyta skipunum fyrir codeca +MEncoderVideo.35=Aukin fj\u00F6lkjarna stu\u00F0ningur +MEncoderVideo.36=Nota sj\u00E1lfgefi\u00F0 ASS \u00FAtlit +MEncoderVideo.37=Sl\u00F3\u00F0 \u00E1 m\u00F6ppu sem inniheldur texta +MEncoderVideo.68=\#H\u00E9rna getur \u00FE\u00FA sett \u00FE\u00EDnar eigin skipanir og skilyr\u00F0i fyrir hina og \u00FEessa codeca.\n +MEncoderVideo.69=\#Oftast er \u00FEetta nota\u00F0 ef \u00FEa\u00F0 er einvurskonar vesen me\u00F0 hlj\u00F3\u00F0 & mynd, en \u00FEa\u00F0 m\u00E1 nota \u00FEa\u00F0 fyrir hva\u00F0 sem er.\n +MEncoderVideo.70=\#Ef \u00FE\u00FA veist ekki hva\u00F0 allt \u00FEetta er \u00FE\u00E1 \u00FEarftu l\u00EDklega ekkert a\u00F0 p\u00E6la \u00ED \u00FEessu\!\n +MEncoderVideo.71=\#M\u00E1lskipunin er {java skilyr\u00F0i} :: {MEncoder stillingar} ; \u00DE\u00FA getur blanda\u00F0 fleiri en einni skipun \u00ED einu.\n +MEncoderVideo.72=\#A\u00F0gengilegar breytur: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Ef einhver l\u00EDna er "\u00F3gild" \u00FE\u00E1 er h\u00FAn einfaldlega hunsu\u00F0 og eytt \u00FAt.\n +MEncoderVideo.75=\#Nokkrar MEncoder stillingar:\n +MEncoderVideo.76=\# -noass: Algj\u00F6rlega afvirkja ASS/SSA texta \u00FEar sem \u00FEeir geta trufla\u00F0 hlj\u00F3\u00F0 og mynd samstillingu(out of sync)\n +MEncoderVideo.77=\# -nosync: Algj\u00F6rlega afvirkja hlj\u00F3\u00F0 og mynd samstillingu, \u00F6nnur lei\u00F0 til a\u00F0 gera \u00FEetta er me\u00F0 -mc, \u00FEa\u00F0 virkar eins\n +MEncoderVideo.78=\# -quality: Stillingar \u00E1 g\u00E6\u00F0i\n +MEncoderVideo.79=\# -mt: Ney\u00F0a notkun \u00E1 fj\u00F6l\u00FEr\u00E1\u00F0a MEncoder \u00FAtg\u00E1fu (tilrauna \u00FAtg\u00E1fa, ekki m\u00E6lt me\u00F0 \u00FEessu)\n +MEncoderVideo.80=\#\u00DEessi listi mun breytast og b\u00E6tast me\u00F0 t\u00EDmanum: Allar athugasemdir til a\u00F0 b\u00E6ta listann eru vel \u00FEegnar.\n +MEncoderVideo.87=\#\u00DE\u00FA getur sett \u00FE\u00EDn eigin skilyr\u00F0i/stillingar h\u00E9r \u00ED glugganum fyrir ne\u00F0an\! T\u00F6kum nokkur d\u00E6mi ---\n +MEncoderVideo.88=\#Til a\u00F0 mynda virkja fj\u00F6l\u00FEr\u00E1\u00F0a stu\u00F0ning fyrir allar H.264 HD myndskr\u00E1r:\n\# vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#Til a\u00F0 ey\u00F0a 24p hn\u00F6kra \u00E1 50 hertza sj\u00F3nv\u00F6rpum:\n\# framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#Til a\u00F0 endurblanda(remux, hra\u00F0virkari en millik\u00F3\u00F0un) \u00FEegar skr\u00E1in er MPEG-2 og \u00FEa\u00F0 er enginn texti(subtitle):\n\# vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=Tungum\u00E1l [\u00DEarft a\u00F0 endurr\u00E6sa forriti\u00F0]: +NetworkTab.1=Vafra \u00ED gegnum .RAR/.ZIP/.CBR +NetworkTab.2=\u00DAtb\u00FAa s\u00FDnishorn +NetworkTab.3=Byrja minimized +NetworkTab.4=Setja upp sem Windows Service +NetworkTab.5=Almennar stillingar +NetworkTab.6=H\u00E1marks st\u00E6r\u00F0 minnis sem millik\u00F3\u00F0a\u00F0 efni er veitt \u00ED megab\u00E6tum (mest MAX_BUFFER_SIZE): +NetworkTab.7=Fj\u00F6ldi kjarna nota\u00F0ir fyrir millik\u00F3\u00F0un (svo vir\u00F0ist sem \u00FE\u00FA ert me\u00F0 %d): +NetworkTab.11=\u00DE\u00FA hefur uppsett forriti\u00F0 sem Windows service\! Til a\u00F0 nota \u00FEa\u00F0, loka\u00F0u \u00FEessu forriti,\n +NetworkTab.12=r\u00E6stu s\u00ED\u00F0an (og stilltu) servici\u00F0 fr\u00E1 windows administration panel.\n\n +NetworkTab.13=Skr\u00E1arsafni\u00F0 ver\u00F0ur endurstillt \!\n +NetworkTab.14=Villa kom upp vi\u00F0 uppsetningu Windows service\!\n +NetworkTab.15=Stillingar fyrir v\u00F6frun/lestur +NetworkTab.16=Taka s\u00FDnishorn fr\u00E1 \u00FEessari sek\u00FAndu: +NetworkTab.17=Virkja skr\u00E1arsafni\u00F0 +NetworkTab.18=Endurr\u00E6sa skr\u00E1arsafni\u00F0 +NetworkTab.19=Ertu viss? +NetworkTab.20=Ney\u00F0a notkun \u00E1 \u00FEessu netskilfleti: +NetworkTab.22=Stillingar netkerfis, breyti\u00F0 einungis ef \u00ED vanda +NetworkTab.23=Ney\u00F0a IP t\u00F6lu \u00E1 \u00FEj\u00F3ni: +NetworkTab.24=Ney\u00F0a port \u00E1 \u00FEj\u00F3ni (sj\u00E1lfgefi\u00F0 5001): +NetworkTab.25=PS3 Stillingar +NetworkTab.26=Letursett fyrir skr\u00E1r \u00ED PS3 (Sj\u00E1 XMB->System settings->Charset): +NetworkTab.27=\u00D3nota\u00F0ar stillingar sem \u00FE\u00FA \u00E6ttir ekki a\u00F0 nota +NetworkTab.28=Turbo stilling (virkja tcp_nodelay) / Fara varlega +NetworkTab.29=Hunsa bei\u00F0nir fr\u00E1 PS3 eftir millik\u00F3\u00F0un +NetworkTab.30=Nota IP s\u00EDu: +NetworkTab.31=HTTP og kerfis stillingar fyrir lengra komna +NetworkTab.32=HTTP V\u00E9l V2 +NetworkTab.33=Komast framhj\u00E1 svefnham me\u00F0an streymt er +NetworkTab.34=Vi\u00F0b\u00E6tur +NetworkTab.35=H\u00E1marks notkun bandv\u00EDddar \u00ED Mb/s (0 \u00FE\u00FD\u00F0ir ekkert h\u00E1mark): +PMS.0=PS3 fannst ekki. Er kveikt \u00E1 henni? \u00DE\u00FA getur einnig t\u00E9kka\u00F0 \u00E1 rekjun og/e\u00F0a stillingum, jafnvel debug.log skr\u00E1nna +PMS.1=Hlj\u00F3\u00F0 +PMS.2=\#- Skr\u00E1arsafn -\# +PMS.3=A\u00F0rar Hlj\u00F3\u00F0/Mynd samstillingar a\u00F0fer\u00F0ir +PMS.4=Af-interlace s\u00EDa +PMS.5=PS3 v\u00E9lin \u00FE\u00EDn fannst \! +PMS.6=Hla\u00F0a sj\u00E1lfkrafa .srt/.sub textaskr\u00E1r +PMS.7=Sleppa lykkju-s\u00EDu fyrir H.264 k\u00F3\u00F0un [MINNI G\u00C6\u00D0I] +PMS.8=Texti +PMS.9=Allir Playlistar +PMS.10=Algj\u00F6rlega afvirkja texta +PMS.11=Allar Hlj\u00F3\u00F0skr\u00E1r +PMS.12=Eftir Dagsetningu +PMS.13=Eftir Flytjanda +PMS.16=Eftir Disk +PMS.19=Eftir St\u00EDl +PMS.21=Eftir m\u00F3del myndav\u00E9lar +PMS.22=Eftir Flytjanda/Disk +PMS.25=Eftir ISO stillingu +PMS.26=Eftir St\u00EDl/Flytjanda/Disk +PMS.27=Vista stillingar +PMS.31=Myndir +PMS.32=Allar Myndir +PMS.34=Myndskr\u00E1r +PMS.35=Allar Myndskr\u00E1r +PMS.36=HD Myndskr\u00E1r +PMS.37=\#- Stillingar -\# +PMS.39=SD Myndskr\u00E1r +PMS.41=(Endur)uppsetning \u00E1 Win32 service +PMS.130=Augnablik, reyni a\u00F0 n\u00E1 sambandi vi\u00F0 PS3... +StatusTab.2=Sta\u00F0a +StatusTab.3=B\u00ED\u00F0a... +StatusTab.5=Engin millik\u00F3\u00F0un \u00ED gangi. +StatusTab.6=Sta\u00F0a millik\u00F3\u00F0unar: +StatusTab.7=I/O sta\u00F0a: +StatusTab.8=Bitafl\u00E6\u00F0i: +StatusTab.9=Fann eftirfarandi t\u00E6ki +StatusTab.10=Mesta bitafl\u00E6\u00F0i: +TSMuxerVideo.0=Ney\u00F0a AC-3 afbl\u00F6ndun fyrir allar skr\u00E1r +TSMuxerVideo.1=Ney\u00F0a PCM afbl\u00F6ndun fyrir DTS/FLAC hlj\u00F3\u00F0 +TSMuxerVideo.2=Ney\u00F0a FPS lestur fr\u00E1 FFmpeg innan s\u00F6mu l\u00FDsiskr\u00E1ar +TSMuxerVideo.3=TsMuxer Mynd/Hlj\u00F3\u00F0 k\u00F3\u00F0unar stillingar +TSMuxerVideo.19=Blanda \u00F6llum hlj\u00F3\u00F0r\u00E1sum +TrTab2.0=Virkja/Afvirkja millik\u00F3\u00F0unar forrit +TrTab2.1=Engar stillingar \u00ED bili +TrTab2.2=Stillingar myndskr\u00E1a k\u00F3\u00F0unar fyrir eftirfarandi forrit: MEncoder/AviSynth/FFmpeg +TrTab2.3=Stillingar hlj\u00F3\u00F0s, virkar fyrir eftirfarandi k\u00F3\u00F0ara: MEncoder/AviSynth/FFmpeg +TrTab2.4=Stillingar fyrir g\u00E6\u00F0i myndskr\u00E1a +TrTab2.5=Almennar stillingar fyrir millik\u00F3\u00F0un +TrTab2.6=Ra\u00F0a millik\u00F3\u00F0unar listanum. S\u00FA fyrsta mun byrtast \u00E1 sama sta\u00F0 og mynskr\u00E1in er +TrTab2.7=A\u00F0rar stillingar +TrTab2.8=Sleppa millik\u00F3\u00F0un fyrir eftirfarandi skr\u00E1arendingar (a\u00F0skilja me\u00F0 kommu): +TrTab2.9=Ney\u00F0a millik\u00F3\u00F0un fyrir eftirfarandi skr\u00E1arendingar (a\u00F0skilja me\u00F0 kommu): +TrTab2.10=Leyfir \u00FE\u00E9r a\u00F0 streyma DTS hlj\u00F3\u00F0 beint \u00ED "gegnum" PS3.\nFari\u00F0 varlega, \u00FEa\u00F0 g\u00E6tu myndast hlj\u00F3\u00F0truflanir. Nokkrar r\u00E1\u00F0leggingar ef svo er:\n- \u00DE\u00FA ver\u00F0ur a\u00F0 vera me\u00F0 b\u00FAna\u00F0 sem getur h\u00F6ndla\u00F0 DTS hlj\u00F3\u00F0(sj\u00F3nvarp e\u00F0a heimab\u00ED\u00F3), og \u00FEa\u00F0 ver\u00F0ur a\u00F0 vera tengt me\u00F0 TOSLINK(lj\u00F3s) e\u00F0a HDMI.\n- "Volume" \u00E1 PS3 t\u00F6lvunni ver\u00F0ur a\u00F0 vera stillt \u00E1 0, \u00FE.e.a.s ekki +/- t\u00F6lur\n- Hlj\u00F3\u00F0r\u00E1sinar \u00E1 PS3 ver\u00F0a a\u00F0 vera "Left+Right", ekki anna\u00F0hvort.\n +TrTab2.11=Millik\u00F3\u00F0unar forrit +TrTab2.12=Almennar k\u00F3\u00F0unar stillingar +TrTab2.13=Almennar k\u00F3\u00F0unar stillingar +TrTab2.14=Millik\u00F3\u00F0un myndskr\u00E1a +TrTab2.15=Millik\u00F3\u00F0un hlj\u00F3skr\u00E1a +TrTab2.16=Millik\u00F3\u00F0un vefstreymda myndskr\u00E1a +TrTab2.17=Millik\u00F3\u00F0un vefstreymda hlj\u00F3\u00F0skr\u00E1a +TrTab2.18=\u00D6nnur millik\u00F3\u00F0unar forrit +TrTab2.19=Feitletra\u00F0 nafn s\u00FDnir forgang fyrir +TrTab2.20=millik\u00F3\u00F0un \u00ED s\u00EDnum flokk +TrTab2.21=[Enginn stu\u00F0ningur vi\u00F0 AviSynth] +TrTab2.27=DTS/FLAC -> LPCM endurbl\u00F6ndun (\u00DE\u00FA \u00FEarft HDMI m\u00F3ttakara til a\u00F0 streyma PCM 5.1 \! Bitafl\u00E6\u00F0i a\u00F0 me\u00F0altali = 4.6Mbps) +TrTab2.28=Hafa DTS hlj\u00F3\u00F0 \u00ED streymi (Virkar me\u00F0 optical link) -> Varlega, auka bitafl\u00E6\u00F0i\! +TrTab2.29=AC-3 bitafl\u00E6\u00F0i (\u00ED Kbits/s) (d\u00E6mi: 384, 576, 640): +TrTab2.32=Stillingar fyrir MPEG-2 g\u00E6\u00F0i: +TrTab2.39=Mynskr\u00E1r eru venjulega millik\u00F3\u00F0a\u00F0ar yfir \u00ED MPEG-PS mynd me\u00F0 AC-3 hlj\u00F3\u00F0i (PS3 sty\u00F0ur \u00FEa\u00F0 mj\u00F6g vel) +TrTab2.40=\n\u00DE\u00FA getur leiki\u00F0 \u00FE\u00E9r me\u00F0 vqscale, vqmin og keyint skipuninar til a\u00F0 n\u00E1 g\u00F3\u00F0um, n\u00E1nast fullkomnum g\u00E6\u00F0um \u00ED millik\u00F3\u00F0un. +TrTab2.41=\nGallin vi\u00F0 \u00FEetta er s\u00E1 a\u00F0 breytilegt bitafl\u00E6\u00F0i, sem g\u00E6ti af og til fl\u00E6tt yfir h\u00E1marks getu netkerfis. +TrTab2.42=\n\u00DEess vegna getur \u00FE\u00FA stillt bandv\u00EDddina s\u00E9r, ef \u00FE\u00FA ert \u00E1 WiFi, CPL, osfr. \u00DEannig g\u00E6\u00F0in \u00ED millik\u00F3\u00F0uninni er jafnv\u00E6gi +TrTab2.43=\n\u00E1 milli hra\u00F0a netkerfis og kraft \u00F6rgj\u00F6fans. \u00DEv\u00ED h\u00E6rri g\u00E6\u00F0ium sem \u00FE\u00FA reynir a\u00F0 setja \u00ED takmarka\u00F0ri st\u00E6r\u00F0, \u00FEv\u00ED meira mun +TrTab2.44=\nCPU \u00FEj\u00E1st\! Einnig, ekki gera r\u00E1\u00F0 fyrir \u00FEv\u00ED a\u00F0 geta streymt 1080p hasarmynd \u00ED fullum g\u00E6\u00F0um \u00E1 15Mbps :p +TrTab2.50=Fj\u00F6ldi hlj\u00F3\u00F0r\u00E1sa: +TrTab2.51=Ekki nota texta (subtitles) +TrTab2.52=Stu\u00F0ningur fyrir kafla \u00ED \#Transcode\# / Millibil \u00ED m\u00EDn\u00FAtum: +TracesTab.3=Hreinsa +TreeNodeSettings.4=\u00DEetta forrit vir\u00F0ist ekki vera til sta\u00F0ar\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_it.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_it.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_it.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_it.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,308 @@ +DLNAMediaDatabase.0=Il database della libreria multimediale deve essere riavviato.\nScusate per l'inconveniente\! +DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z +DLNAMediaDatabase.2=Cleanup database... +DLNAMediaDatabase.3=Compacting database... +DLNAMediaDatabase.4=Scanning Folder: +DLNAMediaDatabase.5=Damaged cache has to be deleted but the program couldn't do it.\nStop the program and delete the folder %s manually. +DLNAResource.0=External Subtitles +DLNAResource.1=No Encoding +DLNAResource.2=No Enc. +DLNAResource.3=[%E] {Audio: %c/%A (%b)} {Sub: %t/%S (%u)} +DLNAResource.4=%F - %d [%E] {%x} {Sub: %t/%S (%u)} +FFMpegDVRMSRemux.0=Percorso altenativo per FFmpeg: +FFMpegDVRMSRemux.1=Impostazioni per il DVR-MS remuxing +FFMpegVideo.0=Impostazioni decodifica solo per AviSynth/FFmpeg (meglio Avisynth/MEncoder) +FFMpegVideo.1=Opzioni personali (avanzate) +FoldTab.0= +FoldTab.1=Opzioni di condivisione +FoldTab.2=Scansiona tutte le cartelle condivise +FoldTab.3=Scansionare tutte le cartelle condivise pu\u00f2 richiedere molto tempo \!\n +FoldTab.4=Sicuro di lanciare la scansione?\n\n +FoldTab.5=Nascondi estensione file +FoldTab.6=Nascondi \#Impostazioni Video\# Cartella +FoldTab.7=Cartelle condivise +FoldTab.8=Nascondi il nome del motore di transcodifica +FoldTab.9=Aggiungi Cartella +FoldTab.10=Vuoi fermare la scansione?\n\n +FoldTab.11=Abilita copia video transcodificati su PS3 (Attenzione, i file non hanno dimensione fissa) +FoldTab.12=Ordina le cartelle condivise +FoldTab.13=Icone +FoldTab.14=Usa MPlayer per icone Video +FoldTab.15=Alfabetico (A-Z) +FoldTab.16=Per data decrescente +FoldTab.17=Per data crescente +FoldTab.18=Ordinamento file: +FoldTab.19=Icona ISO DVD +FoldTab.20=ASCIIbetical +FoldTab.21=Icona anteprima +FoldTab.22=Alfanumerico +FoldTab.23=Scarica da amazon.com +FoldTab.24=Scarica da discogs.com +FoldTab.26=Importa icona audio: +FoldTab.27=Cartella alternativa per copertine video +FoldTab.28=Scegli una cartella +FoldTab.29=Mostra libreria iPhoto +FoldTab.30=Mostra libreria iTunes +FoldTab.31=Nascondi cartelle senza file media (Attenzione: rallenta la navigazione) +FoldTab.32=Nascondi cartella cache +FoldTab.33=Nascondi Cartella \#Transcode\# +FoldTab.34=Mostra apertura librerie +FoldTab.35=Nessuna +FontFileFilter.3=TrueType Fonts +LinksTab.5=Link correlati: +LinksTab.6=Data filascio: +LooksFrame.5=Esci +LooksFrame.6=Pannello Principale +LooksFrame.9=Salva +LooksFrame.12=Riavvia Server +LooksFrame.13=Il server deve essere riavviato a causa di un cambiamento di configurazione +LooksFrame.18=Stato +LooksFrame.19=Logs +LooksFrame.20=Configurazione Generale +LooksFrame.21=Impostazioni Transcodifica +LooksFrame.22=Impostazioni di condivisione/navigazione +LooksFrame.24=Aiuto +LooksFrame.25=Informazioni +LooksFrame.26=FOR TESTING ONLY, POSSIBLY UNSTABLE +MEncoderAviSynth.2=Video decoder settings for AviSynth engine only +MEncoderAviSynth.3=Abilita in AviSynth il cambio di framerate da variabile a costante (convertfps=true) +MEncoderAviSynth.4=# AviSynth script is now fully customisable\n +MEncoderAviSynth.5=# The following variables are available:\n +MEncoderAviSynth.6=# : The complete DirectShowSource instruction, e.g. DirectShowSource(filename, convertfps)\n +MEncoderAviSynth.7=# : The complete subtitle instruction if there's any detected (SRT/SUB/IDX/ASS/SSA)\n +MEncoderAviSynth.8=# : The video filename for if you want to do all this by yourself\n +MEncoderAviSynth.10=\n +MEncoderAviSynth.11=\n +MEncoderVideo.0=Salta il ciclo del filtro deblocking per H264. Possibile perdita di qualita' +MEncoderVideo.1=Impostazioni decoder Video/Audio solo per MEncoder +MEncoderVideo.2=Metodo alternativo sincronizzazione A/V +MEncoderVideo.3=Usare di default i parametri dei codec (Raccomandato) +MEncoderVideo.4=Forza framerate ricavato da FFmpeg +MEncoderVideo.5=Puoi aggiungere opzioni specifiche, come il filtro riduzione disturbo: -vf hqdn3d +MEncoderVideo.6=Impostazioni personalizzate: +MEncoderVideo.7=Priorit\u00e0 ligua audio: +MEncoderVideo.8=Impostazioni sottotitoli +MEncoderVideo.9=Priorit\u00e0 lingua sottotitoli: +MEncoderVideo.10=Priorit\u00e0 lingua audio/sottotitoli (es: en,off;jpn,eng) +MEncoderVideo.11=Tabella codici non-Unicode per sottotitoli: +MEncoderVideo.12=Ignora impostazioni di stile sottotitoli: +MEncoderVideo.13=Contorno font +MEncoderVideo.14=Ombra font +MEncoderVideo.15=Sotto-margine (px) +MEncoderVideo.16=Impostazioni sottotitoli crittografati +MEncoderVideo.17=Margine font +MEncoderVideo.18=Blur font +MEncoderVideo.19=Sotto-margine (%) +MEncoderVideo.20=Usa Sottotitoli stile ASS/SSA +MEncoderVideo.21=Fontconfig/Embedded fonts +MEncoderVideo.22=Carica automaticamente sottitoli *.srt/*.sub con lo stesso nome del file +MEncoderVideo.23=FriBiDi mode +MEncoderVideo.24=Specifica font TrueType (per sottotitoli): +MEncoderVideo.25=Seleziona un font TrueType +MEncoderVideo.26=Filtro deinterlacciamento +MEncoderVideo.27=Usa Video Scaler +MEncoderVideo.28=Larghezza +MEncoderVideo.29=Impostazioni avanzate: parametri specifici dei codecs +MEncoderVideo.30=Altezza +MEncoderVideo.31=colore sottotitoli +MEncoderVideo.32=Mantieni traccia AC-3 (senza ricodifica, puo' causare dialoghi muti e problemi di sincronia A/V) +MEncoderVideo.33=Parametri personalizzati: +MEncoderVideo.34=Edita i parametri specifici dei codecs +MEncoderVideo.35=Usa CPU Multi core +MEncoderVideo.36=Usa stile incorporato +MEncoderVideo.37=Cartella Alternativa Sottotitoli +MEncoderVideo.39=Remuxa tracce video DVD ISO (non ricodifica) +MEncoderVideo.68=\#Here you can put specific parameters for some codec combinations.\n +MEncoderVideo.69=\#It's mostly for A/V synchronization issues, but it can be used for anything else as well\n +MEncoderVideo.70=\#Consider it like expert settings as this shouldn't be used if you don't know exactly what you're doing\n +MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n +MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Careful, any malformed line will be wiped out\n +MEncoderVideo.75=\#Special options:\n +MEncoderVideo.76=\# -noass: definitely disable ASS/SSA subtitles as they can mess up A/V sync\n +MEncoderVideo.77=\# -nosync: definitely disable A/V sync alternative method for this condition (-mc will do the same)\n +MEncoderVideo.78=\# -quality: override video quality settings\n +MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n +MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n +MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n +MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=DVD/VOBsub qualit\u00e0 sottotitoli (0-4) (piu' \u00e8 meglio): +MEncoderVideo.93=Aggiunge bordi per compensare overscan: +MEncoderVideo.94=Priorit\u00e0 lingua: +MEncoderVideo.95=Priorit\u00e0 tags: +MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ +MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ +MEncoderVideo.98=cp1252 /* Windows - Western Europe */ +MEncoderVideo.99=cp1253 /* Windows - Greek */ +MEncoderVideo.100=cp1254 /* Windows - Turkish */ +MEncoderVideo.101=cp1255 /* Windows - Hebrew */ +MEncoderVideo.102=cp1256 /* Windows - Arabic */ +MEncoderVideo.103=cp1257 /* Windows - Baltic */ +MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ +MEncoderVideo.105=ISO-8859-1 /* Western Europe */ +MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ +MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ +MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ +MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ +MEncoderVideo.110=ISO-8859-6 /* Arabic */ +MEncoderVideo.111=ISO-8859-7 /* Greek */ +MEncoderVideo.112=ISO-8859-8 /* Hebrew */ +MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ +MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ +MEncoderVideo.115=ISO-8859-11 /* Thai */ +MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ +MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ +MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ +MEncoderVideo.119=ISO-8859-16 /* Central European languages */ +MEncoderVideo.120=cp932 /* Japanese */ +MEncoderVideo.121=cp936 /* Chinese */ +MEncoderVideo.122=cp949 /* Korean */ +MEncoderVideo.123=cp950 /* Big5, Taiwanese, Cantonese */ +MEncoderVideo.124=UTF-8 /* Unicode */ +MEncoderVideo.125=Scelta colore sottotitoli +MEncoderVideo.126=eng,fre,jpn,ger,und +MEncoderVideo.127=eng,fre,jpn,ger,und +MEncoderVideo.128=*,* +MEncoderVideo.129=/* Auto */ +MEncoderVideo.130=enca:ru:cp1251 /* Russian (auto) */ +MEncoderVideo.131=enca:pl:cp1250 /* Eastern Europe (auto) */ +MEncoderVideo.132=enca:zh:big5 /* Chinese (auto) */ +NetworkTab.0=Lingua [necessario riavvio applicazione]: +NetworkTab.1=Sfoglia archivi .RAR/.ZIP/.CBR +NetworkTab.2=Generazione icone +NetworkTab.3=Esegui minimizzato +NetworkTab.4=Installa come un Servizio di Windows +NetworkTab.5=Impostazioni Generali +NetworkTab.6=Dimensione massima del buffer per transcodifica, in megabytes (maximum: MAX_BUFFER_SIZE): +NetworkTab.7=Numero di core usati per la transcodifica (sembra tu ne abbia %d): +NetworkTab.8=Cerca Aggiornamenti +NetworkTab.9=Ricerca automatica +NetworkTab.11=Hai installato il servizio di Windows. Per usarlo devi uscire da questa applicazione,\n +NetworkTab.12=quindi avviarlo (e configurarlo) dal pannello di amministrazione di windows.\n\n +NetworkTab.13=Il catalogo multimediale verr\u00e0 reinizializzato\n +NetworkTab.14=Errore di installazione del servizio Windows\n +NetworkTab.15=Impostazioni Navigazione/Analisi +NetworkTab.16=Posizione ricerca anteprima (in secondi): +NetworkTab.17=Abilita la libreria multimediale +NetworkTab.18=Resetta libreria multimediale +NetworkTab.19=Sei sicuro? +NetworkTab.20=Forza interfaccia di rete: +NetworkTab.22=Impostazioni di Rete (avanzate) +NetworkTab.23=Forza IP del server: +NetworkTab.24=Forza porta del server (5001 di default): +NetworkTab.25=Impostazioni PS3 +NetworkTab.26=Codifica caratteri per i nomi file PS3 (vedi XMB->Impostazioni di sistema->Codifica Caratteri): +NetworkTab.27=Impostazioni non usate che non dovresti usare :p +NetworkTab.28=Modalit\u00e0 turbo (abilita tcp_nodelay) / attenzione, forse \u00e8 meglio non farlo +NetworkTab.29=Blocca richieste per lo stesso file dalla PS3 quando la transcodifica \u00e8 iniziata +NetworkTab.30=Usa un filtro IP: +NetworkTab.31=HTTP avanzate e impostazioni di sistema +NetworkTab.32=HTTP Engine V2 +NetworkTab.33=Previeni la sospensione del sistema durante lo streaming +NetworkTab.34=Plugins +NetworkTab.35=Banda massima in Mb/s (0 significa senza limite): +NetworkTab.36=Renderer predefinito quando il rilevamento automatico fallisce: +NetworkTab.37=Renderer sconosciuto +NetworkTab.38=Forza renderer predefinito (disabilita rilevamento automatico) +PMS.0=Nessun renderer trovato +PMS.1=Audio +PMS.2=\#- Libreria Multimediale -\# +PMS.3=Metodo alternativo sincronizzazione A/V +PMS.4=Filtro Deinterlacciamento +PMS.5=Connesso alla PS3 +PMS.6=Carica automaticamente sottotitoli .srt/.sub +PMS.7=Salta LoopFilter per la decodifica H264 [possibile perdita di qualita'] +PMS.8=Sottotitoli +PMS.9=Tutte le Playlist Audio +PMS.10=Disabilita sottotitoli definitivamente +PMS.11=Tutte le tracce audio +PMS.12=Per Data +PMS.13=Per Artista +PMS.16=Per Album +PMS.17=Renderer sconosciuto +PMS.18=Connesso +PMS.19=Per Genere +PMS.21=Per modello camera +PMS.22=Per Artista/Album +PMS.25=Per impostazioni ISO +PMS.26=Per Genere/Artista/Album +PMS.27=Salva configurazione +PMS.28=Per Lettera/Artista/Album +PMS.31=Foto +PMS.32=Tutte le Foto +PMS.34=Video +PMS.35=Tutti i Video +PMS.36=Video HD +PMS.37=\#- Impostazioni Video -\# +PMS.39=Video SD +PMS.40=Immagini DVD +PMS.41=Re-installare servizio Windows +PMS.42=Errore durante l'avvio di UMS +PMS.130=Ricerca renderers... +ProfileChooser.1=Scelta Profilo PS3 Media Server +ProfileChooser.2=Selezionare +ProfileChooser.3=Profile file (.conf) o cartella +StatusTab.2=Stato +StatusTab.3=Attendi... +StatusTab.5=Vuoto +StatusTab.6=Stato buffer transcodifica: +StatusTab.7=Statistiche I/O: +StatusTab.8=Bitrate corrente: +StatusTab.9=Rilevati altri media renderers +StatusTab.10=Bitrate massimo: +StatusTab.11=Mb/s +StatusTab.12=MB +TracesTab.3=Clear +TranscodeVirtualFolder.0=\#--TRANSCODE--\# +TreeNodeSettings.4=Questo motore non \u00e8 caricato\! +TrTab2.0=Abilita/disabilita motore di transcodifica +TrTab2.1=Nessuna impostazione per ora +TrTab2.2=Impostazioni encoder video per i seguenti motori: Mencoder/AviSynth/FFmpeg +TrTab2.3=Impostazioni audio, per i seguenti decoders: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Impostazioni qualit\u00e0 video +TrTab2.5=Impostazioni di transcodifica comuni +TrTab2.6=Cambia posizione del motore di transcodifica. Il primo in alto sara' quello di default. +TrTab2.7=Opzioni varie +TrTab2.8=Salta transcodifica per le seguenti estensioni (separati da virgola): +TrTab2.9=Forza transcodifica per le seguenti estensioni (separati da virgola): +TrTab2.10=Consente di inviare flussi DTS direttamente al riproduttore.\nAttenzione, \u00e8 possibile che si generi un suono statico. Note:\n- dovete avere un riproduttore compatibile con DTS, connesso con TOSLINK o HDMI\n- L'Icona del volume su XMB deve essere su 'Normal'\n- L'Icona dei canali su XMB deve essere su 'Left+Right'\n +TrTab2.11=Motori +TrTab2.12=Impostazioni comuni decoder +TrTab2.13=Impostazioni comuni encoder +TrTab2.14=Motori File Video +TrTab2.15=Motori File Audio +TrTab2.16=Motori Video Web Streaming +TrTab2.17=Motori Audio Web Streaming +TrTab2.18=Altri Motori +TrTab2.19=I motori sono in ordine decrescente; +TrTab2.20=il primo e' in alto +TrTab2.21=[AviSynth non supportato] +TrTab2.22=Audio ricampionato automaticamente a 44.1 o 48 kHz +TrTab2.27=Usa LPCM per l'audio (non ricodifica) +TrTab2.28= mantieni audio DTS (non ricodifica, compatibile con uscita ottica o HDMI) +TrTab2.29=Audio ricodifica AC3 bitrate (in Kbits/s) (es: 384, 576, 640): +TrTab2.32=Impostazioni MPEG-2: +TrTab2.39=Il video \u00e8 automaticamente transcodificato e muxato con audio MPEG-PS / AC3 (molto compatibile con PS3) +TrTab2.40=\nPuoi riprodurre con i parametri vqscale, vqmin e keyint per ottenere una transcodifica quasi senza perdita di qualit\u00e0. +TrTab2.41=\nL'inconveniente a questo \u00e8 che il bitrare VBR pu\u00f2 a volte eccedere la tua banda di rete. +TrTab2.42=\nPer questo puoi anche impostare la banda se sei su WiFi, CPL, etc. Comunque, la qualit\u00e0 di transcodifica +TrTab2.43=\n\u00e8 il bilancio tra velocit\u00e0 di rete e potenza della CPU: pi\u00f9 qualit\u00e0 metti su in un piccolo bitrate, +TrTab2.44=\npi\u00f9 la CPU ne soffrir\u00e0\! Inoltre, non aspettarti che un film in 1080p stia in massima qualit\u00e0 su 15Mbps :p +TrTab2.50=Numero massimo di canali audio in uscita per ricodifica AC-3: +TrTab2.51=Disabilita definitivamente sottotitoli +TrTab2.52=\#--TRANSCODE--\# cartella di supporto per i capitoli: (intervallo in minuti) +TrTab2.55=2 canali (Stereo) +TrTab2.56=6 canali (5.1) +TrTab2.60=Ottima Qualita' +TrTab2.61=Senza perdita di qualita' +TrTab2.62=Buona qualita' +TrTab2.63=Buona qualita' per transcodifica HD via Wi-Fi +TrTab2.64=Media qualita' per transcodifica HD via Wi-Fi +TrTab2.65=Bassa qualita', CPU lente o per transcodifica HD via Wi-Fi +TSMuxerVideo.0=Demuxa con Mencoder e codifica tutte le tracce audio in AC3 +TSMuxerVideo.1=Demuxa con MEncoder e codifica le tracce audio DTS/FLAC in LPCM [Attenzione, la ricerca non funziona] +TSMuxerVideo.2=Forza il FPS analizzato da FFmpeg nel meta file +TSMuxerVideo.3=Impostazioni decoder video solo per tsMuxeR +TSMuxerVideo.19=Muxa tutte le tracce audio diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_iw.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_iw.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_iw.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_iw.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,287 @@ +DLNAMediaDatabase.0=\u05D1\u05E1\u05D9\u05E1 \u05D4\u05E0\u05EA\u05D5\u05E0\u05D9\u05DD \u05E9\u05DC \u05D4\u05DE\u05D8\u05DE\u05D5\u05DF \u05D3\u05D5\u05E8\u05E9 \u05D4\u05E4\u05E2\u05DC\u05D4 \u05DE\u05D7\u05D3\u05E9.\n\u05E1\u05DC\u05D9\u05D7\u05D4 \u05E2\u05DC \u05D0\u05D9 \u05D4\u05E0\u05E2\u05D9\u05DE\u05D5\u05EA \! +DLNAMediaDatabase.1=\u05D0,\u05D1,\u05D2,\u05D3,\u05D4,\u05D5,\u05D6,\u05D7,\u05D8,\u05D9,\u05DB,\u05DC,\u05DE,\u05E0,\u05E1,\u05E2,\u05E4,\u05E6,\u05E7,\u05E8,\u05E9,\u05EA,\u05E5,\u05E3,\u05DA,\u05DD +DLNAMediaDatabase.2=\u05E0\u05D9\u05E7\u05D9\u05D5\u05DF \u05D1\u05E1\u05D9\u05E1 \u05E0\u05EA\u05D5\u05E0\u05D9\u05DD... +DLNAMediaDatabase.3=\u05D3\u05D5\u05D7\u05E1 \u05D1\u05E1\u05D9\u05E1 \u05E0\u05EA\u05D5\u05E0\u05D9\u05DD... +DLNAMediaDatabase.4=\u05E1\u05D5\u05E8\u05E7 \u05EA\u05D9\u05E7\u05D9\u05D4: +FFMpegDVRMSRemux.0=\u05D3\u05E8\u05DA FFmpeg \u05D7\u05DC\u05D5\u05E4\u05D9\u05EA: +FFMpegDVRMSRemux.1=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05E2\u05D1\u05D5\u05E8 remuxing \u05E9\u05DC DVR-MS +FFMpegVideo.0=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05E7\u05D9\u05D3\u05D5\u05D3 \u05E2\u05D1\u05D5\u05E8 \u05DE\u05E0\u05D5\u05E2\u05D9 AviSynth/FFmpeg \u05D1\u05DC\u05D1\u05D3 (\u05D1\u05E2\u05D3\u05D9\u05E4\u05D5\u05EA AviSynth/MEncoder) +FoldTab.0=<\u05DB\u05DC \u05D4\u05DB\u05D5\u05E0\u05E0\u05D9\u05DD> +FoldTab.1=\u05D0\u05E4\u05E9\u05E8\u05D5\u05D9\u05D5\u05EA \u05E9\u05D9\u05EA\u05D5\u05E3 +FoldTab.2=\u05E1\u05E8\u05D5\u05E7 \u05D0\u05EA \u05DB\u05DC \u05D4\u05EA\u05D9\u05E7\u05D9\u05D5\u05EA \u05D4\u05DE\u05E9\u05D5\u05EA\u05E4\u05D5\u05EA +FoldTab.3=\u05E1\u05E8\u05D9\u05E7\u05EA \u05DB\u05DC \u05D4\u05EA\u05D9\u05E7\u05D9\u05D5\u05EA \u05D4\u05DE\u05E9\u05D5\u05EA\u05E4\u05D5\u05EA \u05E2\u05DC\u05D5\u05DC \u05DC\u05E7\u05D7\u05EA \u05DC\u05D0 \u05DE\u05E2\u05D8 \u05D6\u05DE\u05DF \!\n +FoldTab.4=\u05D0\u05EA\u05D4 \u05D1\u05D8\u05D5\u05D7 \u05E9\u05D1\u05E8\u05E6\u05D5\u05E0\u05DA \u05DC\u05D4\u05E8\u05D9\u05E5 \u05E1\u05E8\u05D9\u05E7\u05D4?\n\n +FoldTab.5=\u05D4\u05E1\u05EA\u05E8 \u05D0\u05EA \u05DB\u05DC \u05D4\u05E1\u05D9\u05D5\u05DE\u05D5\u05EA +FoldTab.6=\u05D4\u05E1\u05EA\u05E8 \u05EA\u05D9\u05E7\u05D9\u05EA \#\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5\# +FoldTab.7=\u05EA\u05D9\u05E7\u05D9\u05D5\u05EA \u05DE\u05E9\u05D5\u05EA\u05E4\u05D5\u05EA +FoldTab.8=\u05D4\u05E1\u05EA\u05E8 \u05E9\u05DE\u05D5\u05EA \u05DE\u05E0\u05D5\u05E2\u05D9 \u05E7\u05D9\u05D3\u05D5\u05D3 +FoldTab.9=\u05D4\u05D5\u05E1\u05E3 \u05EA\u05D9\u05E7\u05D9\u05D4 +FoldTab.10=\u05D4\u05D0\u05DD \u05D1\u05E8\u05E6\u05D5\u05E0\u05DA \u05DC\u05D1\u05D8\u05DC \u05D0\u05EA \u05D4\u05E1\u05E8\u05D9\u05E7\u05D4?\n\n +FoldTab.11=\u05D0\u05E4\u05E9\u05E8 \u05D4\u05E2\u05EA\u05E7\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 \u05DE\u05E7\u05D5\u05D3\u05D3 \u05DC PS3 (\u05D6\u05D4\u05D9\u05E8\u05D5\u05EA, \u05DC\u05E7\u05D1\u05E6\u05D9\u05DD \u05DE\u05E7\u05D5\u05D3\u05D3\u05D9\u05DD \u05D0\u05D9\u05DF \u05D2\u05D5\u05D3\u05DC \u05E7\u05D1\u05D5\u05E2!) +FoldTab.12=\u05DE\u05D9\u05D9\u05DF \u05D0\u05EA \u05D4\u05EA\u05D9\u05E7\u05D9\u05D5\u05EA \u05D4\u05DE\u05E9\u05D5\u05EA\u05E4\u05D5\u05EA +FoldTab.13=\u05EA\u05DE\u05D5\u05E0\u05D5\u05EA \u05DE\u05D5\u05E7\u05D8\u05E0\u05D5\u05EA +FoldTab.14=\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1 MPlayer \u05E2\u05D1\u05D5\u05E8 \u05EA\u05DE\u05D5\u05E0\u05D5\u05EA \u05DE\u05D5\u05E7\u05D8\u05E0\u05D5\u05EA \u05D1\u05EA\u05E6\u05D5\u05E8\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 +FoldTab.15=\u05D0\u05DC\u05E4\u05D1\u05D9\u05EA\u05D9 (\u05D0-\u05EA) +FoldTab.16=\u05DC\u05E4\u05D9 \u05EA\u05D0\u05E8\u05D9\u05DA, \u05D4\u05D7\u05D3\u05E9 \u05D1\u05D9\u05D5\u05EA\u05E8 \u05E8\u05D0\u05E9\u05D5\u05DF +FoldTab.17=\u05DC\u05E4\u05D9 \u05EA\u05D0\u05E8\u05D9\u05DA, \u05D4\u05D9\u05E9\u05DF \u05D1\u05D9\u05D5\u05EA\u05E8 \u05E8\u05D0\u05E9\u05D5\u05DF +FoldTab.18=\u05E1\u05D3\u05E8 \u05D4\u05E7\u05D1\u05E6\u05D9\u05DD: +FoldTab.19=\u05EA\u05DE\u05D5\u05E0\u05D5\u05EA \u05DE\u05D5\u05E7\u05D8\u05E0\u05D5\u05EA \u05E9\u05DC DVD ISO +FoldTab.20=ASCIIbetical +FoldTab.21=\u05EA\u05DE\u05D5\u05E0\u05D5\u05EA \u05DE\u05D5\u05E7\u05D8\u05E0\u05D5\u05EA +FoldTab.22=\u05D0\u05DC\u05E4\u05D0\u05E0\u05D5\u05DE\u05E8\u05D9 +FoldTab.23=\u05D4\u05D5\u05E8\u05D3 \u05DE amazon.com +FoldTab.24=\u05D4\u05D5\u05E8\u05D3 \u05DE discogs.com +FoldTab.26=\u05EA\u05DE\u05D5\u05E0\u05D5\u05EA \u05DE\u05D5\u05E7\u05D8\u05E0\u05D5\u05EA \u05DC\u05E7\u05D1\u05E6\u05D9 \u05D0\u05D5\u05D3\u05D9\u05D5: +FoldTab.27=\u05EA\u05D9\u05E7\u05D9\u05EA \u05DB\u05D9\u05E1\u05D5\u05D9 \u05D5\u05D9\u05D3\u05D0\u05D5 \u05D7\u05DC\u05D5\u05E4\u05D9\u05EA +FoldTab.28=\u05D1\u05D7\u05E8 \u05EA\u05D9\u05E7\u05D9\u05D4 +FoldTab.29=\u05D4\u05E6\u05D2 \u05E1\u05E4\u05E8\u05D9\u05D9\u05EA iPhoto +FoldTab.30=\u05D4\u05E6\u05D2 \u05E1\u05E4\u05E8\u05D9\u05D9\u05EA iTunes +FoldTab.31=\u05D4\u05E1\u05EA\u05E8 \u05EA\u05D9\u05E7\u05D9\u05D5\u05EA \u05E8\u05D9\u05E7\u05D5\u05EA/\u05D7\u05E1\u05E8\u05D5\u05EA \u05DE\u05D3\u05D9\u05D4 (\u05D6\u05D4\u05D9\u05E8\u05D5\u05EA, \u05E2\u05DC\u05D5\u05DC \u05DC\u05D2\u05E8\u05D5\u05DD \u05DC\u05D8\u05E2\u05D9\u05E0\u05D4 \u05D0\u05D9\u05D8\u05D9\u05EA!) +FoldTab.32=\u05D4\u05E1\u05EA\u05E8 \u05EA\u05D9\u05E7\u05D9\u05EA \u05DE\u05D8\u05DE\u05D5\u05DF +FoldTab.33=\u05D4\u05E1\u05EA\u05E8 \u05EA\u05D9\u05E7\u05D9\u05EA \#\u05E7\u05D9\u05D3\u05D5\u05D3\# +FoldTab.34=\u05D4\u05E6\u05D2 \u05E1\u05E4\u05E8\u05D9\u05D9\u05EA aperture +FontFileFilter.3=\u05E4\u05D5\u05E0\u05D8\u05D9\u05DD \u05DE\u05E1\u05D5\u05D2 TrueType +LinksTab.5=\u05DC\u05D9\u05E0\u05E7\u05D9\u05DD \u05DE\u05D5\u05E2\u05D9\u05DC\u05D9\u05DD: +LinksTab.6=Build: +LooksFrame.5=\u05E6\u05D0 +LooksFrame.6=\u05E4\u05D0\u05E0\u05DC \u05E8\u05D0\u05E9\u05D9 +LooksFrame.9=\u05E9\u05DE\u05D5\u05E8 +LooksFrame.12=\u05D4\u05E4\u05E2\u05DC \u05DE\u05D7\u05D3\u05E9 \u05D0\u05EA \u05D4\u05E9\u05E8\u05EA +LooksFrame.13=\u05D9\u05E9 \u05DC\u05D4\u05E4\u05E2\u05D9\u05DC \u05DE\u05D7\u05D3\u05E9 \u05D0\u05EA \u05D4\u05E9\u05E8\u05EA \u05E2\u05E7\u05D1 \u05E9\u05D9\u05E0\u05D5\u05D9\u05D9 \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05E9\u05D5\u05E0\u05D9\u05DD +LooksFrame.18=\u05E1\u05D8\u05D8\u05D5\u05E1 +LooksFrame.19=\u05E2\u05E7\u05D1\u05D5\u05EA +LooksFrame.20=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DB\u05DC\u05DC\u05D9\u05D5\u05EA +LooksFrame.21=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05E7\u05D9\u05D3\u05D5\u05D3 +LooksFrame.22=\u05E0\u05D9\u05D5\u05D5\u05D8/\u05D0\u05E4\u05E9\u05E8\u05D5\u05D9\u05D5\u05EA \u05E9\u05D9\u05EA\u05D5\u05E3 +LooksFrame.24=\u05E2\u05D6\u05E8\u05D4 +LooksFrame.25=\u05D0\u05D5\u05D3\u05D5\u05EA +LooksFrame.26=\u05DC\u05D1\u05D3\u05D9\u05E7\u05D4 \u05D1\u05DC\u05D1\u05D3! \u05E2\u05DC\u05D5\u05DC \u05DC\u05D4\u05D9\u05D5\u05EA \u05DC\u05D0 \u05D9\u05E6\u05D9\u05D1 +MEncoderAviSynth.2=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA Video decoder \u05E2\u05D1\u05D5\u05E8 \u05DE\u05E0\u05D5\u05E2 AviSynth \u05D1\u05DC\u05D1\u05D3 +MEncoderAviSynth.3=\u05D4\u05E4\u05E2\u05DC \u05E7\u05E6\u05D1 \u05E7\u05D1\u05D5\u05E2 \u05D1\u05DE\u05E7\u05D5\u05DD \u05E7\u05E6\u05D1 \u05DE\u05E9\u05EA\u05E0\u05D4 \u05DC AviSynth (convertfps=true) +MEncoderAviSynth.4=#\u05E0\u05D9\u05EA\u05DF \u05DC\u05D4\u05EA\u05D0\u05D9\u05DD \u05D1\u05D0\u05D5\u05E4\u05DF \u05D0\u05D9\u05E9\u05D9\u05EA \u05D0\u05EA \u05E1\u05E7\u05E8\u05D9\u05E4\u05D8 AviSynth \u05D1\u05E6\u05D5\u05E8\u05D4 \u05DE\u05DC\u05D0\u05D4 \u05DB\u05E2\u05EA !\n +MEncoderAviSynth.5=#\u05E2\u05DC\u05D9\u05D9\u05DA \u05DC\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1\u05DE\u05E9\u05EA\u05E0\u05D9\u05DD \u05D4\u05D1\u05D0\u05D9\u05DD (\"clip\" \u05D4\u05D9\u05E0\u05DD \u05DE\u05E9\u05EA\u05E0\u05D9 \u05D4 avisynth \u05E9\u05DC \u05D4\u05E1\u05E8\u05D8):\n +MEncoderAviSynth.6=#: insert the complete DirectShowSource instruction [ clip=DirectShowSource(movie, convertfps) ]\n +MEncoderAviSynth.7=#: insert the complete TextSub/VobSub instruction if there's any detected srt/sub/idx/ass subtitle file\n +MEncoderAviSynth.8=#: variable of the movie filename, if you want to do all this by yourself\n +MEncoderAviSynth.9=#Be careful, the custom script MUST return the clip object\n +MEncoderAviSynth.10=<\u05E1\u05E8\u05D8>\n +MEncoderAviSynth.11=<\u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA>\n +MEncoderAviSynth.12=\u05D4\u05D7\u05D6\u05E8 \u05E7\u05DC\u05D9\u05E4 +MEncoderVideo.0=\u05D3\u05DC\u05D2 \u05E2\u05DC loop filter deblocking \u05E2\u05D1\u05D5\u05E8 \u05E7\u05D1\u05E6\u05D9\u05DD \u05DE\u05E1\u05D5\u05D2 h264. \u05E2\u05DC\u05D5\u05DC \u05DC\u05D4\u05D5\u05E8\u05D9\u05D3 \u05DE\u05D0\u05D9\u05DB\u05D5\u05EA \u05D4\u05D5\u05D9\u05D3\u05D0\u05D5. +MEncoderVideo.1=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5/\u05D0\u05D5\u05D3\u05D9\u05D5 \u05E2\u05D1\u05D5\u05E8 \u05DE\u05E0\u05D5\u05E2 MEncoder \u05D1\u05DC\u05D1\u05D3 +MEncoderVideo.2=\u05E9\u05D9\u05D8\u05EA \u05E1\u05E0\u05DB\u05E8\u05D5\u05DF \u05D0\u05DC\u05D8\u05E8\u05E0\u05D8\u05D9\u05D1\u05D9\u05EA \u05DC A/V +MEncoderVideo.3=\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1\u05E4\u05E8\u05DE\u05D8\u05E8\u05D9 \u05D1\u05E8\u05D9\u05E8\u05EA \u05DE\u05D7\u05D3\u05DC \u05DC\u05E7\u05D5\u05D3\u05E7\u05D9\u05DD (\u05DE\u05D5\u05DE\u05DC\u05E5!) +MEncoderVideo.4=\u05DB\u05E4\u05D4 \u05E7\u05E6\u05D1 \u05DE FFmpeg +MEncoderVideo.5=\u05D1\u05D0\u05E4\u05E9\u05E8\u05D5\u05EA\u05DA \u05DC\u05D4\u05D5\u05E1\u05D9\u05E3 \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DE\u05E9\u05DC\u05DA, \u05DC\u05DE\u05E9\u05DC \u05D4\u05E4\u05E2\u05DC\u05EA \u05E4\u05D9\u05DC\u05D8\u05E8 \u05D4\u05E4\u05D7\u05EA\u05EA \u05E8\u05E2\u05E9: -vf hqdn3d +MEncoderVideo.6=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DE\u05D5\u05EA\u05D0\u05DE\u05D5\u05EA \u05D0\u05D9\u05E9\u05D9\u05EA: +MEncoderVideo.7=\u05E2\u05D3\u05D9\u05E4\u05D5\u05EA \u05DC\u05E9\u05E4\u05EA \u05D0\u05D5\u05D3\u05D9\u05D5: +MEncoderVideo.8=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA +MEncoderVideo.9=\u05E2\u05D3\u05D9\u05E4\u05D5\u05EA \u05DC\u05E9\u05E4\u05EA \u05EA\u05E8\u05D2\u05D5\u05DD: +MEncoderVideo.10=\u05E2\u05D3\u05D9\u05E4\u05D5\u05EA \u05DC\u05E9\u05E4\u05EA \u05D0\u05D5\u05D3\u05D9\u05D5/\u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA (\u05DC\u05D3\u05D5\u05D2\u05DE\u05D4: en,off;jpn,eng) +MEncoderVideo.11=\u05E7\u05D5\u05D3 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA (\u05DC\u05E2\u05D1\u05E8\u05D9\u05EA \u05D1\u05D7\u05E8: ISO-8859-8): +MEncoderVideo.12=\u05E2\u05E7\u05D5\u05E3 \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05DE\u05E2\u05D5\u05E6\u05D1\u05D5\u05EA: \u05D2\u05D5\u05D3\u05DC \u05D2\u05D5\u05E4\u05DF +MEncoderVideo.13=\u05DE\u05EA\u05D0\u05E8 \u05D2\u05D5\u05E4\u05DF +MEncoderVideo.14=\u05E6\u05DC \u05D2\u05D5\u05E4\u05DF +MEncoderVideo.15=\u05DE\u05D9\u05D6\u05D5\u05D2 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA (px) +MEncoderVideo.16=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D8\u05E7\u05E1\u05D8 \u05E4\u05E9\u05D5\u05D8 \u05DC\u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA: \u05D2\u05D5\u05D3\u05DC \u05D2\u05D5\u05E4\u05DF +MEncoderVideo.17=\u05DE\u05EA\u05D0\u05E8 \u05D2\u05D5\u05E4\u05DF +MEncoderVideo.18=\u05D8\u05E9\u05D8\u05D5\u05E9 \u05D2\u05D5\u05E4\u05DF +MEncoderVideo.19=\u05DE\u05D9\u05D6\u05D5\u05D2 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA (%) +MEncoderVideo.20=\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1\u05E2\u05D9\u05E6\u05D5\u05D1 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05DE\u05E1\u05D5\u05D2 ASS/SSA +MEncoderVideo.21=\u05D2\u05D5\u05E4\u05DF \u05DE\u05D5\u05D8\u05DE\u05E2 \u05D1\u05D5\u05D9\u05D3\u05D0\u05D5 +MEncoderVideo.22=\u05D8\u05E2\u05DF \u05D1\u05E6\u05D5\u05E8\u05D4 \u05D0\u05D5\u05D8\u05D5\u05DE\u05D8\u05D9\u05EA \u05E7\u05D1\u05E6\u05D9 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05DE\u05E1\u05D5\u05D2 *.srt/*.sub \u05D1\u05E2\u05DC\u05D9 \u05D0\u05D5\u05EA\u05D5 \u05E9\u05DD \u05E7\u05D5\u05D1\u05E5 +MEncoderVideo.23=\u05DE\u05E6\u05D1 FriBiDi +MEncoderVideo.24=\u05E6\u05D9\u05D9\u05DF \u05D2\u05D5\u05E4\u05DF \u05DE\u05E1\u05D5\u05D2 TrueType (\u05E2\u05D1\u05D5\u05E8 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA): +MEncoderVideo.25=\u05D1\u05D7\u05E8 \u05E4\u05D5\u05E0\u05D8 TrueType +MEncoderVideo.26=\u05E4\u05D9\u05DC\u05D8\u05E8 Deinterlace +MEncoderVideo.27=\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1\u05E8\u05D6\u05D5\u05DC\u05D5\u05E6\u05D9\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 \u05DE\u05D5\u05EA\u05D0\u05DE\u05EA \u05D0\u05D9\u05E9\u05D9\u05EA +MEncoderVideo.28=\u05E8\u05D5\u05D7\u05D1 +MEncoderVideo.29=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DE\u05D5\u05DE\u05D7\u05D9\u05DD : \u05E4\u05E8\u05DE\u05D8\u05E8\u05D9\u05DD \u05E1\u05E4\u05E6\u05D9\u05E4\u05D9\u05DD \u05DC\u05E7\u05D5\u05D3\u05E7\u05D9\u05DD +MEncoderVideo.30=\u05D2\u05D5\u05D1\u05D4 +MEncoderVideo.31=\u05E6\u05D1\u05E2 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA +MEncoderVideo.32=\u05D1\u05E6\u05E2 Remux \u05DB\u05D0\u05E9\u05E8 \u05E8\u05E6\u05D5\u05E2\u05EA \u05D4\u05E9\u05DE\u05E2 \u05D4\u05D9\u05E0\u05D4 \u05D1\u05E4\u05D5\u05E8\u05DE\u05D8 AC-3 (\u05DC\u05DC\u05D0 \u05E7\u05D9\u05D3\u05D5\u05D3 \u05DE\u05D7\u05D3\u05E9) +MEncoderVideo.33=\u05E4\u05E8\u05DE\u05D8\u05E8\u05D9\u05DD \u05DE\u05D5\u05EA\u05D0\u05DE\u05D9\u05DD \u05D0\u05D9\u05E9\u05D9\u05EA: +MEncoderVideo.34=\u05E2\u05E8\u05D5\u05DA \u05E4\u05E8\u05DE\u05D8\u05E8\u05D9\u05DD \u05E1\u05E4\u05E6\u05D9\u05E4\u05D9\u05DD \u05DC\u05E7\u05D5\u05D3\u05E7\u05D9\u05DD +MEncoderVideo.35=\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1\u05DE\u05E1\u05E4\u05E8 \u05DC\u05D9\u05D1\u05D5\u05EA +MEncoderVideo.36=\u05E1\u05D2\u05E0\u05D5\u05DF \u05DE\u05D5\u05D8\u05DE\u05E2 +MEncoderVideo.37=\u05EA\u05D9\u05E7\u05D9\u05D9\u05EA \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05D0\u05DC\u05D8\u05E8\u05E0\u05D8\u05D9\u05D1\u05D9\u05EA: +MEncoderVideo.39=\u05D4\u05D6\u05E8\u05DD \u05E7\u05D1\u05E6\u05D9 \u05D5\u05D9\u05D3\u05D0\u05D5 \u05DE\u05E1\u05D5\u05D2 DVD ISO (\u05DC\u05DC\u05D0 \u05E7\u05D9\u05D3\u05D5\u05D3) +MEncoderVideo.68=\#\u05DB\u05D0\u05DF \u05D1\u05D0\u05E4\u05E9\u05E8\u05D5\u05EA\u05DA \u05DC\u05EA\u05EA \u05E4\u05E8\u05DE\u05D8\u05E8\u05D9\u05DD \u05E1\u05E4\u05E6\u05D9\u05E4\u05D9\u05D9\u05DD \u05E2\u05D1\u05D5\u05E8 \u05E7\u05D5\u05DE\u05D1\u05D9\u05E0\u05E6\u05D9\u05D5\u05EA \u05E9\u05DC \u05E7\u05D5\u05D3\u05E7\u05D9\u05DD \u05DE\u05E1\u05D5\u05D9\u05DE\u05D9\u05D9\u05DD.\n +MEncoderVideo.69=\#\u05D6\u05D4 \u05D1\u05E2\u05D9\u05E7\u05E8 \u05DC\u05E1\u05E0\u05DB\u05E8\u05D5\u05DF \u05D0\u05D5\u05D3\u05D9\u05D5/\u05D5\u05D9\u05D3\u05D0\u05D5, \u05D0\u05D1\u05DC \u05E0\u05D9\u05EA\u05DF \u05DC\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1\u05D6\u05D4 \u05DC\u05DB\u05DC \u05D3\u05D1\u05E8 \u05D0\u05D7\u05E8\n +MEncoderVideo.70=\#\u05D9\u05E9 \u05DC\u05D4\u05EA\u05D9\u05D9\u05D7\u05E1 \u05DC\u05D6\u05D4 \u05DB\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DE\u05D5\u05DE\u05D7\u05D9\u05DD, \u05DE\u05D5\u05DE\u05DC\u05E5 \u05DC\u05D0 \u05DC\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1\u05D6\u05D4 \u05D1\u05DE\u05D9\u05D3\u05D4 \u05D5\u05D0\u05EA\u05D4 \u05DC\u05D0 \u05D9\u05D5\u05D3\u05E2 \u05DE\u05D4 \u05D0\u05EA\u05D4 \u05E2\u05D5\u05E9\u05D4\n +MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n +MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#\u05D6\u05D4\u05D9\u05E8\u05D5\u05EA, \u05E9\u05D5\u05E8\u05D4 \u05E4\u05D2\u05D5\u05DE\u05D4 \u05EA\u05D9\u05DE\u05D7\u05E7\n +MEncoderVideo.75=\#\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DE\u05D9\u05D5\u05D7\u05D3\u05D5\u05EA:\n +MEncoderVideo.76=\# -noass: \u05D1\u05D8\u05DC \u05D1\u05E6\u05D5\u05E8\u05D4 \u05DE\u05D5\u05D7\u05DC\u05D8\u05EA \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05DE\u05E1\u05D5\u05D2 ASS/SSA \u05DE\u05DB\u05D9\u05D5\u05D5\u05DF \u05E9\u05D4\u05DD \u05E2\u05DC\u05D5\u05DC\u05D9\u05DD \u05DC\u05D2\u05E8\u05D5\u05DD \u05DC\u05E1\u05E0\u05DB\u05E8\u05D5\u05DF \u05D5\u05D9\u05D3\u05D0\u05D5/\u05D0\u05D5\u05D3\u05D9\u05D5 \u05E9\u05D2\u05D5\u05D9\n +MEncoderVideo.77=\# -nosync: \u05D1\u05D8\u05DC \u05D1\u05E6\u05D5\u05E8\u05D4 \u05DE\u05D5\u05D7\u05DC\u05D8\u05EA \u05E9\u05D9\u05D8\u05EA \u05E1\u05E0\u05DB\u05E8\u05D5\u05DF \u05D5\u05D9\u05D3\u05D0\u05D5/\u05D0\u05D5\u05D3\u05D9\u05D5 \u05D0\u05DC\u05D8\u05E8\u05E0\u05D8\u05D9\u05D1\u05D9\u05EA \u05D1\u05DE\u05E6\u05D1 \u05D6\u05D4 (-mc \u05D9\u05D1\u05E6\u05E2 \u05D0\u05EA \u05D0\u05D5\u05EA\u05D4 \u05E4\u05E2\u05D5\u05DC\u05D4)\n +MEncoderVideo.78=\# -quality: \u05E2\u05D5\u05E7\u05E3 \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D0\u05D9\u05DB\u05D5\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5\n +MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n +MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n +MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n +MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=\u05D0\u05D9\u05DB\u05D5\u05EA \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05DE\u05E1\u05D5\u05D2 DVD/VOBsub (\u05D2\u05D1\u05D5\u05D4 \u05D9\u05D5\u05EA\u05E8 \u05D4\u05D9\u05E0\u05D5 \u05D0\u05D9\u05DB\u05D5\u05EA\u05D9 \u05D9\u05D5\u05EA\u05E8) (0-4): +MEncoderVideo.93=\u05D4\u05D5\u05E1\u05E3 \u05D2\u05D1\u05D5\u05DC\u05D5\u05EA \u05D1\u05DE\u05D9\u05D3\u05D4 \u05D5\u05E6\u05E8\u05D9\u05DA: +MEncoderVideo.94=\u05D4\u05DB\u05E8\u05D7 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA: +MEncoderVideo.95=\u05D4\u05DB\u05E8\u05D7 \u05EA\u05D2\u05D9\u05D5\u05EA: +MEncoderVideo.96=cp1250 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05DE\u05D6\u05E8\u05D7 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 */ +MEncoderVideo.97=cp1251 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05E7\u05D9\u05E8\u05D9\u05DC\u05D9\u05EA */ +MEncoderVideo.98=cp1252 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05DE\u05E2\u05E8\u05D1 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 */ +MEncoderVideo.99=cp1253 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05D9\u05D5\u05D5\u05E0\u05D9\u05EA*/ +MEncoderVideo.100=cp1254 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05D8\u05D5\u05E8\u05E7\u05D9\u05EA*/ +MEncoderVideo.101=cp1255 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05E2\u05D1\u05E8\u05D9\u05EA */ +MEncoderVideo.102=cp1256 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05E2\u05E8\u05D1\u05D9\u05EA */ +MEncoderVideo.103=cp1257 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05D1\u05DC\u05D8\u05D9\u05EA */ +MEncoderVideo.104=cp1258 /* \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 - \u05D5\u05D9\u05D0\u05D8\u05E0\u05DE\u05D9\u05EA */ +MEncoderVideo.105=ISO-8859-1 /* \u05DE\u05D6\u05E8\u05D7 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 */ +MEncoderVideo.106=ISO-8859-2 /* \u05DE\u05D6\u05E8\u05D7 \u05D5\u05DE\u05E8\u05DB\u05D6 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 */ +MEncoderVideo.107=ISO-8859-3 /* \u05DE\u05D6\u05E8\u05D7 \u05D5\u05DE\u05E2\u05E8\u05D1 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 */ +MEncoderVideo.108=ISO-8859-4 /* \u05DE\u05E2\u05E8\u05D1 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 \u05D5\u05D4\u05DE\u05D3\u05D9\u05E0\u05D5\u05EA \u05D4\u05D1\u05DC\u05D8\u05D9\u05D5\u05EA */ +MEncoderVideo.109=ISO-8859-5 /* \u05D0\u05DC\u05E4\u05D1\u05D9\u05EA \u05E7\u05E8\u05D9\u05DC\u05D9 */ +MEncoderVideo.110=ISO-8859-6 /* \u05E2\u05E8\u05D1\u05D9\u05EA */ +MEncoderVideo.111=ISO-8859-7 /* \u05D9\u05D5\u05D5\u05E0\u05D9\u05EA */ +MEncoderVideo.112=ISO-8859-8 /* \u05E2\u05D1\u05E8\u05D9\u05EA */ +MEncoderVideo.113=ISO-8859-9 /* \u05DE\u05E2\u05E8\u05D1 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 \u05D5\u05D8\u05D5\u05E8\u05E7\u05D9\u05EA \u05DE\u05EA\u05D5\u05E7\u05E0\u05EA */ +MEncoderVideo.114=ISO-8859-10 /* \u05DE\u05E2\u05E8\u05D1 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 \u05D5\u05E9\u05E4\u05D5\u05EA \u05E0\u05D5\u05E8\u05D3\u05D9\u05D5\u05EA */ +MEncoderVideo.115=ISO-8859-11 /* \u05EA\u05D0\u05D9\u05DC\u05E0\u05D3\u05D9\u05EA */ +MEncoderVideo.116=ISO-8859-13 /* \u05E9\u05E4\u05D5\u05EA \u05D1\u05DC\u05D8\u05D9\u05D5\u05EA \u05D5\u05E4\u05D5\u05DC\u05E0\u05D9\u05EA */ +MEncoderVideo.117=ISO-8859-14 /* \u05E9\u05E4\u05D5\u05EA \u05E7\u05DC\u05D8\u05D9\u05D5\u05EA */ +MEncoderVideo.118=ISO-8859-15 /* \u05D1\u05E1\u05D9\u05DE\u05DF \u05D4\u05D0\u05D9\u05E8\u05D5\u05E4\u05D0\u05D9 */ +MEncoderVideo.119=ISO-8859-16 /* \u05E9\u05E4\u05D5\u05EA \u05DE\u05E8\u05DB\u05D6 \u05D0\u05D9\u05E8\u05D5\u05E4\u05D4 */ +MEncoderVideo.120=cp932 /* \u05D9\u05E4\u05E0\u05D9\u05EA */ +MEncoderVideo.121=cp936 /* \u05E1\u05D9\u05E0\u05D9\u05EA */ +MEncoderVideo.122=cp949 /* \u05E7\u05D5\u05E8\u05D0\u05E0\u05D9\u05EA */ +MEncoderVideo.123=cp950 /* Big5, \u05D8\u05D9\u05D9\u05D5\u05D5\u05D0\u05E0\u05D9\u05EA, \u05E7\u05E0\u05D8\u05D5\u05E0\u05D6\u05D9\u05EA */ +MEncoderVideo.124=UTF-8 /* \u05D9\u05D5\u05E0\u05D9\u05E7\u05D5\u05D3 */ +MEncoderVideo.125=\u05D1\u05D7\u05E8 \u05E6\u05D1\u05E2 \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA +NetworkTab.0=\u05E9\u05E4\u05D4 [\u05E0\u05D3\u05E8\u05E9 \u05D1\u05D0\u05EA\u05D7\u05D5\u05DC \u05D4\u05EA\u05D5\u05DB\u05E0\u05D4]: +NetworkTab.1=\u05D3\u05E4\u05D3\u05E3 \u05D1\u05D0\u05E8\u05DB\u05D9\u05D5\u05E0\u05D9\u05DD \u05D3\u05D7\u05D5\u05E1\u05D9\u05DD (.rar/.zip/.cbr) +NetworkTab.2=\u05E6\u05D5\u05E8 \u05EA\u05DE\u05D5\u05E0\u05D5\u05EA \u05DE\u05D5\u05E7\u05D8\u05E0\u05D5\u05EA +NetworkTab.3=\u05D4\u05EA\u05D7\u05DC \u05D1\u05DE\u05E6\u05D1 \u05DE\u05DE\u05D5\u05D6\u05E2\u05E8 +NetworkTab.4=\u05D4\u05EA\u05E7\u05DF \u05DB\u05D9\u05D9\u05E9\u05D5\u05DD \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 +NetworkTab.5=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DB\u05DC\u05DC\u05D9\u05D5\u05EA +NetworkTab.6=\u05D2\u05D5\u05D3\u05DC \u05DE\u05E7\u05E1\u05D9\u05DE\u05DC\u05D9 \u05E9\u05DC \u05DE\u05D2\u05D4 \u05D1\u05D9\u05D9\u05D8 \u05DC\u05D4\u05D6\u05E8\u05DE\u05D4 (\u05DE\u05E7\u05E1\u05D9\u05DE\u05D5\u05DD: MAX_BUFFER_SIZE): +NetworkTab.7=\u05DE\u05E1\u05E4\u05E8 \u05DC\u05D9\u05D1\u05D5\u05EA \u05D1\u05D4\u05DD \u05D9\u05E2\u05E9\u05D4 \u05E9\u05D9\u05DE\u05D5\u05E9 \u05DC\u05D4\u05D6\u05E8\u05DE\u05D4 (\u05E0\u05E8\u05D0\u05D4 \u05E9\u05D9\u05E9 \u05DC\u05DA %d): +NetworkTab.8=\u05D1\u05D3\u05D5\u05E7 \u05DC\u05E2\u05D3\u05DB\u05D5\u05E0\u05D9\u05DD +NetworkTab.9=\u05D1\u05D3\u05D5\u05E7 \u05D0\u05D5\u05D8\u05D5\u05DE\u05D8\u05D9\u05EA +NetworkTab.11=\u05D4\u05EA\u05E7\u05E0\u05EA \u05D0\u05EA \u05D4PMS \u05DB\u05D9\u05D9\u05E9\u05D5\u05DD \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 \! \u05E0\u05D3\u05E8\u05E9\u05EA \u05D4\u05E4\u05E2\u05DC\u05D4 \u05DE\u05D7\u05D3\u05E9 \u05E9\u05DC \u05D4\u05EA\u05D5\u05DB\u05E0\u05D4,\n +NetworkTab.12=\u05D4\u05E4\u05E2\u05DC (\u05D5\u05D4\u05D2\u05D3\u05E8) \u05D0\u05EA \u05D4\u05D9\u05D9\u05E9\u05D5\u05DD \u05DE\u05DC\u05D5\u05D7 \u05D4\u05D1\u05E7\u05E8\u05D4 \u05E9\u05DC \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1.\n\n +NetworkTab.13=\u05D4\u05DE\u05D8\u05DE\u05D5\u05DF \u05D9\u05D5\u05E4\u05E2\u05DC \u05DE\u05D7\u05D3\u05E9 \!\n +NetworkTab.14=\u05E9\u05D2\u05D9\u05D0\u05D4 \u05D1\u05D4\u05EA\u05E7\u05E0\u05EA \u05D9\u05E9\u05D5\u05DD \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1!\n +NetworkTab.15=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05E0\u05D9\u05D5\u05D5\u05D8/\u05E2\u05D9\u05D1\u05D5\u05D3 +NetworkTab.16=\u05D7\u05D9\u05E4\u05D5\u05E9 \u05EA\u05DE\u05D5\u05E0\u05D5\u05EA \u05DE\u05D5\u05E7\u05D8\u05E0\u05D5\u05EA (\u05D1\u05E9\u05E0\u05D9\u05D5\u05EA): +NetworkTab.17=\u05D0\u05E4\u05E9\u05E8 \u05D0\u05EA \u05D4\u05DE\u05D8\u05DE\u05D5\u05DF +NetworkTab.18=\u05D0\u05EA\u05D7\u05DC \u05DE\u05D8\u05DE\u05D5\u05DF +NetworkTab.19=\u05D0\u05EA\u05D4 \u05D1\u05D8\u05D5\u05D7? +NetworkTab.20=\u05E7\u05D1\u05E2 \u05E8\u05E9\u05EA \u05DC\u05E9\u05D9\u05DE\u05D5\u05E9: +NetworkTab.22=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05E8\u05E9\u05EA (\u05DE\u05EA\u05E7\u05D3\u05DD) +NetworkTab.23=\u05D4\u05DB\u05E8\u05D7 IP \u05E9\u05DC \u05D4\u05E9\u05E8\u05EA: +NetworkTab.24=\u05D4\u05DB\u05E8\u05D7 \u05E4\u05D5\u05E8\u05D8 \u05DC\u05E9\u05E8\u05EA (5001 \u05D1\u05E8\u05D9\u05E8\u05EA \u05DE\u05D7\u05D3\u05DC): +NetworkTab.25=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA PS3 +NetworkTab.26=Character encoding of your PS3 file names (see XMB->System settings->Charset): +NetworkTab.27=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05E9\u05DC\u05D0 \u05D1\u05E9\u05D9\u05DE\u05D5\u05E9 \u05E9\u05E2\u05D3\u05D9\u05E3 \u05E9\u05DC\u05D0 \u05EA\u05E9\u05EA\u05DE\u05E9 \u05D1\u05D4\u05DD :p +NetworkTab.28=\u05DE\u05E6\u05D1 \u05D8\u05D5\u05E8\u05D1\u05D5 (enable tcp_nodelay) / \u05D6\u05D4\u05D9\u05E8\u05D5\u05EA, \u05DC\u05D0 \u05D1\u05D8\u05D5\u05D7 \u05E9\u05D6\u05D4 \u05D1\u05E1\u05D3\u05E8 \u05DC\u05D4\u05E4\u05E2\u05D9\u05DC \u05DE\u05E6\u05D1 \u05D6\u05D4! +NetworkTab.29=\u05DE\u05E0\u05E2 \u05D1\u05E7\u05E9\u05D5\u05EA \u05E0\u05DB\u05E0\u05E1\u05D5\u05EA \u05E2\u05D1\u05D5\u05E8 \u05D0\u05D5\u05EA\u05D5 \u05D4\u05E7\u05D5\u05D1\u05E5 \u05DE\u05D4 PS3 \u05DB\u05D0\u05E9\u05E8 \u05D4\u05D6\u05E8\u05DE\u05D4 \u05D4\u05D7\u05DC\u05D4 +NetworkTab.30=\u05D4\u05E9\u05EA\u05DE\u05E9 \u05D1\u05DE\u05E1\u05E0\u05DF IP: +NetworkTab.31=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA HTTP \u05D5\u05DE\u05E2\u05E8\u05DB\u05EA \u05DE\u05EA\u05E7\u05D3\u05DE\u05D5\u05EA +NetworkTab.32=\u05DE\u05E0\u05D5\u05E2 HTTP V2 +NetworkTab.33=\u05DE\u05E0\u05E2 \u05DE\u05DE\u05E2\u05E8\u05DB\u05EA \u05D4\u05D4\u05E4\u05E2\u05DC\u05D4 \u05DC\u05D4\u05D9\u05DB\u05E0\u05E1 \u05DC\u05DE\u05E6\u05D1 \u05E9\u05D9\u05E0\u05D4 \u05D1\u05E2\u05EA \u05D4\u05D6\u05E8\u05DE\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 +NetworkTab.34=\u05EA\u05D5\u05E1\u05E4\u05D5\u05EA +NetworkTab.35=\u05E8\u05D5\u05D7\u05D1 \u05DE\u05E7\u05E1\u05D9\u05DE\u05DC\u05D9 \u05D1\u05DE\u05D2\u05D4 \u05D1\u05D9\u05D9\u05D8 \u05DC\u05E9\u05E0\u05D9\u05D9\u05D4 (0 \u05D6\u05D4 \u05DC\u05DC\u05D0 \u05D4\u05D2\u05D1\u05DC\u05D4): +PMS.0=\u05DC\u05D0 \u05E0\u05DE\u05E6\u05D0\u05D5 \u05DE\u05DB\u05E9\u05D9\u05E8\u05D9\u05DD +PMS.1=\u05D0\u05D5\u05D3\u05D9\u05D5 +PMS.2=\#- \u05DE\u05D8\u05DE\u05D5\u05DF -\# +PMS.3=\u05E9\u05D9\u05D8\u05D4 \u05D0\u05DC\u05D8\u05E8\u05E0\u05D8\u05D9\u05D1\u05D9\u05EA \u05DC\u05E1\u05E0\u05DB\u05E8\u05D5\u05DF \u05D5\u05D9\u05D3\u05D0\u05D5/\u05D0\u05D5\u05D3\u05D9\u05D5 +PMS.4=\u05E4\u05D9\u05DC\u05D8\u05E8 Deinterlace +PMS.5=\u05DE\u05D7\u05D5\u05D1\u05E8 \u05DC PS3 +PMS.6=\u05D8\u05E2\u05DF \u05D0\u05D5\u05D8\u05D5\u05DE\u05D8\u05D9\u05EA \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05DE\u05E1\u05D5\u05D2 .srt/.sub +PMS.7=SkipLoopFilter for H.264 Decoding (Could degrade quality) +PMS.8=\u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA +PMS.9=\u05DB\u05DC \u05E8\u05E9\u05D9\u05DE\u05D5\u05EA \u05D4\u05D4\u05E9\u05DE\u05E2\u05D4 +PMS.10=\u05D1\u05D8\u05DC \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05D1\u05E6\u05D5\u05E8\u05D4 \u05DE\u05D5\u05D7\u05DC\u05D8\u05EA +PMS.11=\u05DB\u05DC \u05E8\u05E6\u05D5\u05E2\u05D5\u05EA \u05D4\u05E9\u05DE\u05E2 +PMS.12=\u05DC\u05E4\u05D9 \u05EA\u05D0\u05E8\u05D9\u05DA +PMS.13=\u05DC\u05E4\u05D9 \u05D0\u05DE\u05DF +PMS.16=\u05DC\u05E4\u05D9 \u05D0\u05DC\u05D1\u05D5\u05DD +PMS.17=\u05DE\u05DB\u05E9\u05D9\u05E8 \u05DC\u05D0 \u05DE\u05D5\u05DB\u05E8 +PMS.18=\u05DE\u05D7\u05D5\u05D1\u05E8 +PMS.19=\u05DC\u05E4\u05D9 \u05D6'\u05D0\u05E0\u05E8 +PMS.21=\u05DC\u05E4\u05D9 \u05DE\u05D5\u05D3\u05DC \u05D4\u05DE\u05E6\u05DC\u05DE\u05D4 +PMS.22=\u05DC\u05E4\u05D9 \u05D0\u05DE\u05DF/\u05D0\u05DC\u05D1\u05D5\u05DD +PMS.25=\u05DC\u05E4\u05D9 \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA ISO +PMS.26=\u05DC\u05E4\u05D9 \u05D6'\u05D0\u05E0\u05E8/\u05D0\u05DE\u05DF/\u05D0\u05DC\u05D1\u05D5\u05DD +PMS.27=\u05E9\u05DE\u05D5\u05E8 \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA +PMS.31=\u05EA\u05DE\u05D5\u05E0\u05D4 +PMS.32=\u05DB\u05DC \u05D4\u05EA\u05DE\u05D5\u05E0\u05D5\u05EA +PMS.34=\u05D5\u05D9\u05D3\u05D0\u05D5 +PMS.35=\u05DB\u05DC \u05D4\u05E1\u05E8\u05D8\u05D9\u05DD/\u05E1\u05E8\u05D8\u05D5\u05E0\u05D9\u05DD +PMS.36=\u05D5\u05D9\u05D3\u05D0\u05D5 HD +PMS.37=\#- \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 -\# +PMS.39=\u05D5\u05D9\u05D3\u05D0\u05D5 SD +PMS.41=\u05DE\u05EA\u05E7\u05D9\u05DF \u05DB\u05D9\u05D9\u05E9\u05D5\u05DD \u05D5\u05D5\u05D9\u05E0\u05D3\u05D5\u05E1 +PMS.130=\u05DE\u05D7\u05E4\u05E9 \u05DE\u05DB\u05E9\u05D9\u05E8\u05D9\u05DD... +ProfileChooser.1=\u05D1\u05D5\u05E8\u05E8 \u05D4\u05E4\u05E8\u05D5\u05E4\u05D9\u05DC\u05D9\u05DD \u05E9\u05DC PS3 Media Server +ProfileChooser.2=\u05D1\u05D7\u05E8 +ProfileChooser.3=\u05E7\u05D5\u05D1\u05E5 \u05E4\u05E8\u05D5\u05E4\u05D9\u05DC (.conf) \u05D0\u05D5 \u05EA\u05D9\u05E7\u05D9\u05D4 +StatusTab.2=\u05E1\u05D8\u05D8\u05D5\u05E1 +StatusTab.3=\u05DE\u05DE\u05EA\u05D9\u05DF... +StatusTab.5=\u05E8\u05D9\u05E7 +StatusTab.6=\u05DE\u05E6\u05D1 \u05D4\u05D6\u05E8\u05DE\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5: +StatusTab.7=I/O \u05E1\u05D8\u05D8\u05D9\u05E1\u05D8\u05D9\u05E7\u05D5\u05EA: +StatusTab.8=\u05E7\u05E6\u05D1 \u05E0\u05D5\u05DB\u05D7\u05D9: +StatusTab.9=\u05D7\u05D9\u05D1\u05D5\u05E8\u05D9\u05DD \u05E9\u05D4\u05EA\u05D2\u05DC\u05D5 +StatusTab.10=\u05E7\u05E6\u05D1 \u05E9\u05D9\u05D0: +StatusTab.11=\u05DE"\u05D1 \u05DC\u05E9\u05E0\u05D9\u05D9\u05D4 +TSMuxerVideo.0=Demux with MEncoder and encode all audio tracks to AC-3 +TSMuxerVideo.1=Demux with MEncoder and encode DTS/FLAC audio tracks to LPCM [Careful, seeking don't work yet] +TSMuxerVideo.2=\u05D1\u05D3\u05D5\u05E7 \u05E7\u05E6\u05D1 \u05E4\u05E8\u05D9\u05D9\u05DE\u05D9\u05DD \u05DC\u05E4\u05E0\u05D9 \u05D4\u05E4\u05E2\u05DC\u05D4 \u05C2(\u05E2\u05DC\u05D5\u05DC \u05DC\u05EA\u05E7\u05DF \u05D1\u05E2\u05D9\u05D5\u05EA \u05E1\u05E0\u05DB\u05E8\u05D5\u05DF \u05D0\u05D5\u05D3\u05D9\u05D5/\u05D5\u05D9\u05D3\u05D0\u05D5) +TSMuxerVideo.3=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 \u05E2\u05D1\u05D5\u05E8 \u05DE\u05E0\u05D5\u05E2 tsMuxeR \u05D1\u05DC\u05D1\u05D3 +TSMuxerVideo.19=\u05D7\u05E4\u05E9 \u05E2\u05D1\u05D5\u05E8 \u05E8\u05E6\u05D5\u05E2\u05D5\u05EA \u05E9\u05DE\u05E2 \u05D1\u05DB\u05DC \u05D4\u05E9\u05E4\u05D5\u05EA +TrTab2.0=\u05D4\u05E4\u05E2\u05DC/\u05D1\u05D8\u05DC \u05DE\u05E0\u05D5\u05E2 \u05D4\u05D6\u05E8\u05DE\u05D4 +TrTab2.1=\u05DC\u05D0 \u05E7\u05D9\u05D9\u05DE\u05D5\u05EA \u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05E0\u05DB\u05D5\u05DF \u05DC\u05E2\u05DB\u05E9\u05D9\u05D5 +TrTab2.2=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 \u05E2\u05DD \u05D4\u05DE\u05E0\u05D5\u05E2\u05D9\u05DD \u05D4\u05D1\u05D0\u05D9\u05DD: MEncoder/AviSynth/FFmpeg +TrTab2.3=\u05D0\u05E4\u05E9\u05E8\u05D5\u05D9\u05D5\u05EA \u05D0\u05D5\u05D3\u05D9\u05D5, \u05D7\u05DC \u05E2\u05DC: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D0\u05D9\u05DB\u05D5\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 +TrTab2.5=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 \u05DE\u05E9\u05D5\u05EA\u05E4\u05D5\u05EA (\u05DB\u05DC \u05D4\u05DE\u05E0\u05D5\u05E2\u05D9\u05DD) +TrTab2.6=\u05DE\u05D9\u05D9\u05DF \u05D0\u05EA \u05EA\u05D9\u05E7\u05D9\u05EA \u05DE\u05E0\u05D5\u05E2\u05D9 \u05D4\u05D6\u05E8\u05DE\u05EA \u05D4\u05D5\u05D9\u05D3\u05D0\u05D5. \u05D4\u05E8\u05D0\u05E9\u05D5\u05DF \u05D9\u05D5\u05E4\u05D9\u05E2 \u05D1\u05EA\u05D9\u05E7\u05D9\u05EA \u05D4\u05D5\u05D9\u05D3\u05D0\u05D5 \u05D4\u05DE\u05E7\u05D5\u05E8\u05D9\u05EA +TrTab2.7=\u05E9\u05D5\u05E0\u05D5\u05EA +TrTab2.8=\u05D3\u05DC\u05D2 \u05E2\u05DC \u05D4\u05D6\u05E8\u05DE\u05EA \u05E1\u05E8\u05D8\u05D9\u05DD \u05D1\u05E7\u05D1\u05E6\u05D9\u05DD \u05D1\u05E2\u05DC\u05D9 \u05D4\u05E1\u05D9\u05D5\u05DE\u05D5\u05EA \u05D4\u05D1\u05D0\u05D5\u05EA (\u05DE\u05D5\u05E4\u05E8\u05D3 \u05E2"\u05D9 \u05E4\u05E1\u05D9\u05E7): +TrTab2.9=\u05D4\u05DB\u05E8\u05D7 \u05D4\u05D6\u05E8\u05DE\u05EA \u05E1\u05E8\u05D8\u05D9\u05DD \u05DC\u05E7\u05D1\u05E6\u05D9\u05DD \u05D1\u05E2\u05DC\u05D9 \u05D4\u05E1\u05D9\u05D5\u05DE\u05D5\u05EA \u05D4\u05D1\u05D0\u05D5\u05EA (\u05DE\u05D5\u05E4\u05E8\u05D3 \u05E2"\u05D9 \u05E4\u05E1\u05D9\u05E7): +TrTab2.10=Allows you to stream DTS directly to your receiver.\nBe careful, it's possible to have a static sound. Notes:\n- You must have a DTS compatible receiver, connected on TOSLINK or HDMI\n- The volume icon on XMB must be on 'Normal'\n- The channels icon on XMB must be on 'Left+Right'\n +TrTab2.11=\u05DE\u05E0\u05D5\u05E2\u05D9\u05DD +TrTab2.12=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DE\u05E4\u05E2\u05E0\u05D7 \u05DE\u05E9\u05D5\u05EA\u05E4\u05D5\u05EA +TrTab2.13=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA \u05DE\u05E7\u05D5\u05D3\u05D3 \u05DE\u05E9\u05D5\u05EA\u05E4\u05D5\u05EA +TrTab2.14=\u05DE\u05E0\u05D5\u05E2\u05D9 \u05E7\u05D1\u05E6\u05D9 \u05D5\u05D9\u05D3\u05D0\u05D5 +TrTab2.15=\u05DE\u05E0\u05D5\u05E2\u05D9 \u05E7\u05D1\u05E6\u05D9 \u05D0\u05D5\u05D3\u05D9\u05D5 +TrTab2.16=\u05DE\u05E0\u05D5\u05E2\u05D9 \u05D4\u05D6\u05E8\u05DE\u05EA \u05D5\u05D9\u05D3\u05D0\u05D5 \u05DE\u05D4\u05E8\u05E9\u05EA +TrTab2.17=\u05DE\u05E0\u05D5\u05E2\u05D9 \u05D4\u05D6\u05E8\u05DE\u05EA \u05D0\u05D5\u05D3\u05D9\u05D5 \u05DE\u05D4\u05E8\u05E9\u05EA +TrTab2.18=\u05E9\u05D5\u05E0\u05D5\u05EA +TrTab2.19=\u05DE\u05E0\u05D5\u05E2\u05D9\u05DD \u05D4\u05D9\u05E0\u05DD \u05D1\u05E1\u05D3\u05E8 \u05D9\u05D5\u05E8\u05D3 +TrTab2.20=\u05E1\u05D3\u05E8; \u05D4\u05D2\u05D1\u05D5\u05D4 \u05D1\u05D9\u05D5\u05EA\u05E8 \u05E8\u05D0\u05E9\u05D5\u05DF +TrTab2.21=(AviSynth \u05D0\u05D9\u05E0\u05D5 \u05E0\u05EA\u05DE\u05DA) +TrTab2.22=\u05D3\u05D2\u05D9\u05DE\u05D5\u05EA \u05D0\u05D5\u05D3\u05D9\u05D5 \u05D0\u05D5\u05D8\u05D5\u05DE\u05D8\u05D9\u05D5\u05EA \u05DC 44.1 \u05D0\u05D5 48 kHz +TrTab2.27=\u05D4\u05DE\u05E8\u05EA DTS/FLAC \u05DC LPCM (\u05EA\u05D6\u05D3\u05E7\u05E7 \u05DC\u05E8\u05E1\u05D9\u05D1\u05E8 HDMI \u05E2\u05DC \u05DE\u05E0\u05EA \u05DC\u05D4\u05D6\u05E8\u05D9\u05DD LPCM 5.1) +TrTab2.28=\u05D4\u05E9\u05D0\u05E8 \u05D0\u05D5\u05D3\u05D9\u05D5 \u05DE\u05E1\u05D5\u05D2 DTS \u05D1\u05D4\u05D6\u05E8\u05DE\u05D4 (\u05D1\u05D7\u05D9\u05D1\u05D5\u05E8 \u05DB\u05D1\u05DC \u05D0\u05D5\u05E4\u05D8\u05D9) +TrTab2.29=\u05E7\u05E6\u05D1 \u05D4\u05D6\u05E8\u05DE\u05EA \u05D0\u05D5\u05D3\u05D9\u05D5 \u05D1 AC-3 (\u05D1\u05E7"\u05D1 \u05DC\u05E9\u05E0\u05D9\u05D9\u05D4) (\u05D3\u05D5\u05D2\u05DE\u05D4: 384, 576, 640): +TrTab2.32=\u05D4\u05D2\u05D3\u05E8\u05D5\u05EA MPEG-2: +TrTab2.39=The video is automatically transcoded and muxed to a MPEG-PS / AC-3 audio (highly compatible on PS3) +TrTab2.40=\nYou can play with the vqscale, vqmin and keyint parameters to achieve good, even almost lossless transcoding quality. +TrTab2.41=\nThe drawback to this is the VBR bitrate, which can sometimes peak above your max network capacity. +TrTab2.42=\nThat's why you can also set the bandwidth if you're on WiFi, CPL, etc. However, the transcoding quality +TrTab2.43=\nis a balance between network speed and CPU power: the more quality you put into a constrained bitrate, +TrTab2.44=\nthe more your CPU will suffer\! Also, don't expect to fit a 1080p action movie in the purest quality in 15Mbps :p +TrTab2.50=\u05DE\u05E1\u05E4\u05E8 \u05DE\u05E7\u05E1\u05D9\u05DE\u05DC\u05D9 \u05E9\u05DC \u05E2\u05E8\u05D5\u05E6\u05D9 \u05D0\u05D5\u05D3\u05D9\u05D5: +TrTab2.51=\u05D1\u05D8\u05DC \u05DB\u05EA\u05D5\u05D1\u05D9\u05D5\u05EA \u05D1\u05D0\u05D5\u05E4\u05DF \u05DE\u05D5\u05D7\u05DC\u05D8 +TrTab2.52=\u05EA\u05DE\u05D9\u05DB\u05D4 \u05D1\u05D7\u05DC\u05D5\u05E7\u05D4 \u05DC\u05E4\u05E8\u05E7\u05D9\u05DD \u05E9\u05DC \u05E7\u05D1\u05E6\u05D9 \u05D5\u05D9\u05D3\u05D0\u05D5 / \u05DE\u05E8\u05D5\u05D5\u05D7 \u05D1\u05D3\u05E7\u05D5\u05EA: +TrTab2.55=2 \u05E2\u05E8\u05D5\u05E6\u05D9\u05DD (\u05E1\u05D8\u05E8\u05D9\u05D0\u05D5) +TrTab2.56=6 \u05E2\u05E8\u05D5\u05E6\u05D9\u05DD (5.1) +TrTab2.60=\u05D0\u05D9\u05DB\u05D5\u05EA \u05DB\u05DE\u05E2\u05D8 \u05D4\u05DB\u05D9 \u05D8\u05D5\u05D1\u05D4 +TrTab2.61=\u05D0\u05D9\u05DB\u05D5\u05EA \u05D4\u05DB\u05D9 \u05D8\u05D5\u05D1\u05D4 +TrTab2.62=\u05D0\u05D9\u05DB\u05D5\u05EA \u05D8\u05D5\u05D1\u05D4 +TrTab2.63=\u05D1\u05D0\u05D9\u05DB\u05D5\u05EA \u05D8\u05D5\u05D1\u05D4 - WIFI \u05D1\u05D7\u05D9\u05D1\u05D5\u05E8 HD \u05D4\u05D6\u05E8\u05DE\u05EA \u05E1\u05E8\u05D8\u05D9 +TrTab2.64=\u05D1\u05D0\u05D9\u05DB\u05D5\u05EA \u05D1\u05D9\u05E0\u05D5\u05E0\u05D9\u05EA - WIFI \u05D1\u05D7\u05D9\u05D1\u05D5\u05E8 HD \u05D4\u05D6\u05E8\u05DE\u05EA \u05E1\u05E8\u05D8\u05D9 +TrTab2.65=\u05D0\u05D9\u05DB\u05D5\u05EA \u05E0\u05DE\u05D5\u05DB\u05D4, \u05E2\u05D1\u05D5\u05E8 \u05DE\u05E2\u05D1\u05D3 \u05D1\u05E8\u05DE\u05D4 \u05E0\u05DE\u05D5\u05DB\u05D4 - WIFI \u05D4\u05D6\u05E8\u05DE\u05EA \u05E1\u05E8\u05D8\u05D9\u05DD \u05D1\u05D7\u05D9\u05D1\u05D5\u05E8 +TracesTab.3=\u05E0\u05E7\u05D4 +TreeNodeSettings.4=\u05DE\u05E0\u05D5\u05E2 \u05D6\u05D4 \u05DC\u05D0 \u05E0\u05D8\u05E2\u05DF\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ja.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ja.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ja.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ja.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,199 @@ +DLNAMediaDatabase.0=\u30BD\u30D5\u30C8\u306E\u6539\u826F\u3084\u30B5\u30DD\u30FC\u30C8\u306E\u70BA\u3001\n\u30E1\u30C7\u30A3\u30A2\u30E9\u30A4\u30D6\u30E9\u30EA\u306E\u518D\u69CB\u7BC9\u304C\u5FC5\u8981\u3067\u3059\u3002\n\u3054\u4E0D\u4FBF\u3092\u304A\u304B\u3051\u3057\u3066\u7533\u3057\u8A33\u3042\u308A\u307E\u305B\u3093\u3002 \! +FFMpegDVRMSRemux.0=FFmpeg\u306E\u30D1\u30B9: +FFMpegDVRMSRemux.1=DVR-MS remux\u8A2D\u5B9A +FFMpegVideo.0=AviSynth/FFmpeg\u30A8\u30F3\u30B3\u30FC\u30C9\u8A2D\u5B9A(AviSynth/MEncoder\u306E\u65B9\u304C\u826F\u597D) +FoldTab.0=<\u5168\u30C9\u30E9\u30A4\u30D6> +FoldTab.1=\u5171\u6709\u30AA\u30D7\u30B7\u30E7\u30F3 +FoldTab.2=\u5168\u5171\u6709\u30D5\u30A9\u30EB\u30C0\u3092\u30B9\u30AD\u30E3\u30F3 +FoldTab.3=\u5168\u5171\u6709\u30D5\u30A9\u30EB\u30C0\u3092\u30B9\u30AD\u30E3\u30F3\u4E2D \u6642\u9593\u304C\u304B\u304B\u308A\u307E\u3059 \!\n +FoldTab.4=\u30B9\u30AD\u30E3\u30F3\u3092\u958B\u59CB\u3057\u307E\u3059\u304B?\n\n +FoldTab.5=\u62E1\u5F35\u5B50\u3092\u8868\u793A\u3057\u306A\u3044 +FoldTab.6=\#\u30D3\u30C7\u30AA\u306E\u8A2D\u5B9A\#\u3092\u8868\u793A\u3057\u306A\u3044 +FoldTab.7=\u5171\u6709\u30D5\u30A9\u30EB\u30C0 +FoldTab.8=\u5909\u63DB\u30A8\u30F3\u30B8\u30F3\u540D\u3092\u8868\u793A\u3057\u306A\u3044 +FoldTab.9=\u30D5\u30A9\u30EB\u30C0\u8FFD\u52A0 +FoldTab.10=\u30B9\u30AD\u30E3\u30F3\u3092\u4E2D\u6B62\u3057\u307E\u3059\u304B?\n\n +FoldTab.11=PS3\u3078\u306E\u30B3\u30D4\u30FC\u6642\u306B\u3082\u5909\u63DB\u3059\u308B (\u30B5\u30A4\u30BA\u306F\u5897\u52A0\u3057\u307E\u3059) +FoldTab.12=\u5171\u6709\u30D5\u30A9\u30EB\u30C0\u306E\u4E26\u3079\u5909\u3048 +FoldTab.13=\u30B5\u30E0\u30CD\u30A4\u30EB +FoldTab.14=\u52D5\u753B\u306E\u30B5\u30E0\u30CD\u30A4\u30EB\u306BMplayer\u3092\u4F7F\u3046 +FoldTab.15=\u6A19\u6E96 +FoldTab.16=\u5C65\u6B74\u9806 +FoldTab.18=\u30D5\u30A1\u30A4\u30EB\u306E\u6574\u5217\u65B9\u6CD5: +FoldTab.23=amazon.com\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9 +FoldTab.24=discogs.com\u304B\u3089\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9 +FoldTab.26=\u30A2\u30EB\u30D0\u30E0\u30A2\u30FC\u30C8: +FoldTab.27=\u30D3\u30C7\u30AA\u30AB\u30D0\u30FC\u30A2\u30FC\u30C8 +FoldTab.28=\u30D5\u30A9\u30EB\u30C0\u3092\u9078\u629E +FontFileFilter.3=TrueType\u30D5\u30A9\u30F3\u30C8 +LinksTab.5=\u53C2\u8003\u30EA\u30F3\u30AF: +LooksFrame.5=\u7D42\u4E86 +LooksFrame.6=\u30E1\u30A4\u30F3\u30D1\u30CD\u30EB +LooksFrame.9=\u4FDD\u5B58 +LooksFrame.12=\u30B5\u30FC\u30D0\u30FC\u3092\u518D\u8D77\u52D5 +LooksFrame.18=\u30B9\u30C6\u30FC\u30BF\u30B9 +LooksFrame.19=\u30C8\u30EC\u30FC\u30B9 +LooksFrame.20=\u57FA\u672C\u8A2D\u5B9A +LooksFrame.21=\u5909\u63DB\u8A2D\u5B9A +LooksFrame.22=\u8868\u793A/\u5171\u6709\u8A2D\u5B9A +LooksFrame.24=\u3088\u304F\u3042\u308B\u8CEA\u554F +LooksFrame.25=\u6982\u8981 +MEncoderAviSynth.2=AviSynth\u6620\u50CF\u30C7\u30B3\u30FC\u30C9\u8A2D\u5B9A +MEncoderAviSynth.3=AviSynth\u3067VFR\u304B\u3089CFR\u3078\u5909\u63DB\u3059\u308B (convertfps=true) +MEncoderVideo.0=H.264\u30C7\u30D6\u30ED\u30C3\u30AF\u30D5\u30A3\u30EB\u30BF\u3092\u7121\u52B9\u306B\u3059\u308B:\u6620\u50CF\u54C1\u8CEA\u306F\u4F4E\u4E0B\u3057\u307E\u3059 CPU\u304C\u5F37\u529B\u306A\u3089\u4E0D\u8981 +MEncoderVideo.1=MEncoder \u6620\u50CF/\u97F3\u58F0\u30C7\u30B3\u30FC\u30C9\u8A2D\u5B9A +MEncoderVideo.2=\u30D3\u30C7\u30AA\u3068\u97F3\u58F0\u306E\u540C\u671F\u3092\u884C\u3046 +MEncoderVideo.3=\u30B3\u30FC\u30C7\u30C3\u30AF\u3054\u3068\u306E\u6A19\u6E96\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u4F7F\u3046 \uFF08\u63A8\u5968\uFF09 +MEncoderVideo.4=FFmpeg\u304B\u3089\u30D5\u30EC\u30FC\u30E0\u30EC\u30FC\u30C8\u53D6\u5F97 +MEncoderVideo.5=\u30D5\u30A3\u30EB\u30BF\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u8FFD\u52A0\u3067\u304D\u307E\u3059 \u30CE\u30A4\u30BA\u9664\u53BB\u306E\u4F8B: -vfhqdn3d +MEncoderVideo.6=\u8FFD\u52A0\u30D1\u30E9\u30E1\u30FC\u30BF: +MEncoderVideo.7=\u97F3\u58F0\u8A00\u8A9E \u512A\u5148\u9806\u4F4D: +MEncoderVideo.8=\u5B57\u5E55\u8A2D\u5B9A +MEncoderVideo.9=\u5B57\u5E55\u8A00\u8A9E\u306E\u512A\u5148\u9806\u4F4D: +MEncoderVideo.10=\u97F3\u58F0/\u5B57\u5E55\u8A00\u8A9E \u512A\u5148\u5EA6 (\u4F8B en,off;eng,off) +MEncoderVideo.11=\u5B57\u5E55\u306E\u6587\u5B57\u30B3\u30FC\u30C9: +MEncoderVideo.12=ASS\u30D5\u30A9\u30F3\u30C8\u8A2D\u5B9A: \u30D5\u30A9\u30F3\u30C8\u306E\u62E1\u5927\u7387 +MEncoderVideo.13=\u30D5\u30A9\u30F3\u30C8\u306E\u30A2\u30A6\u30C8\u30E9\u30A4\u30F3 +MEncoderVideo.14=\u30D5\u30A9\u30F3\u30C8\u306E\u5F71 +MEncoderVideo.15=\u30D5\u30A9\u30F3\u30C8\u306E\u9593\u9694 +MEncoderVideo.16=\u6A19\u6E96\u30D5\u30A9\u30F3\u30C8\u8A2D\u5B9A: \u30D5\u30A9\u30F3\u30C8\u306E\u62E1\u5927\u7387 +MEncoderVideo.17=\u30D5\u30A9\u30F3\u30C8\u306E\u30A2\u30A6\u30C8\u30E9\u30A4\u30F3 +MEncoderVideo.18=\u30D5\u30A9\u30F3\u30C8\u306E\u307C\u304B\u3057 +MEncoderVideo.19=\u30D5\u30A9\u30F3\u30C8\u306E\u9593\u9694 +MEncoderVideo.20=ASS/SSA \u5B57\u5E55 +MEncoderVideo.21=\u57CB\u8FBC\u30D5\u30A9\u30F3\u30C8\u306E\u8ABF\u6574 +MEncoderVideo.22=\u52D5\u753B\u3068\u540C\u540D\u306E.srt.sub\u3092\u81EA\u52D5\u3067\u8AAD\u307F\u8FBC\u3080 +MEncoderVideo.24=TrueType\u30D5\u30A9\u30F3\u30C8\u3092\u6307\u5B9A (\u30A2\u30B8\u30A2\u8A00\u8A9E\u7528): +MEncoderVideo.25=TrueType\u30D5\u30A9\u30F3\u30C8\u3092\u9078\u629E +MEncoderVideo.26=\u30A4\u30F3\u30BF\u30FC\u30EC\u30FC\u30B9\u89E3\u9664 +MEncoderVideo.27=\u62E1\u5927\u7E2E\u5C0F\u3059\u308B +MEncoderVideo.28=\u5E45 +MEncoderVideo.29=\u8A73\u7D30\u8A2D\u5B9A\uFF1A\u30B3\u30FC\u30C7\u30C3\u30AF\u5225\u306B\u30D1\u30E9\u30E1\u30FC\u30BF\u6307\u5B9A +MEncoderVideo.30=\u9AD8\u3055 +MEncoderVideo.32=\u97F3\u58F0\u304CAC3\u306E\u6642 remux\u3059\u308B (\u518D\u30A8\u30F3\u30B3\u30FC\u30C9\u306F\u3057\u306A\u3044) +MEncoderVideo.33=\u8FFD\u52A0\u30D1\u30E9\u30E1\u30FC\u30BF: +MEncoderVideo.34=\u30B3\u30FC\u30C7\u30C3\u30AF\u5225\u306B\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6307\u5B9A +MEncoderVideo.35=\u30DE\u30EB\u30C1\u30B3\u30A2\u5BFE\u5FDC\u3092\u6709\u52B9\u306B\u3059\u308B +MEncoderVideo.36=ASS\u5B57\u5E55\u306E\u30B9\u30BF\u30A4\u30EB\u3092\u30C7\u30D5\u30A9\u30EB\u30C8\u306B\u3059\u308B +MEncoderVideo.37=\u5B57\u5E55\u30D5\u30A9\u30EB\u30C0\u306E\u30D1\u30B9 +MEncoderVideo.68=\#\u5E7E\u3064\u304B\u306E\u30B3\u30FC\u30C7\u30C3\u30AF\u306E\u7D44\u307F\u5408\u308F\u305B\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002\n +MEncoderVideo.69=\#\u4E3B\u306B\u6620\u50CF/\u97F3\u58F0\u540C\u671F\u306E\u4E0D\u5177\u5408\u3092\u4FEE\u6B63\u3059\u308B\u305F\u3081\u3067\u3059\u3002\u4ED6\u306E\u76EE\u7684\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u6307\u5B9A\u3059\u308B\u3053\u3068\u3082\u53EF\u80FD\u3067\u3059\u3002\n +MEncoderVideo.70=\#\u3053\u308C\u306F\u4E0A\u7D1A\u8005\u5411\u304D\u306E\u8A2D\u5B9A\u3067\u3059\u3002 \u5206\u304B\u3089\u306A\u3044\u5834\u5408\u3001\u7D76\u5BFE\u306B\u5909\u66F4\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044\u3002\n +MEncoderVideo.71=\#\u66F8\u5F0F\uFF1A {java\u306E\u72B6\u614B} :: {MEncoder\u306E\u30AA\u30D7\u30B7\u30E7\u30F3} ; \u30D1\u30E9\u30E1\u30FC\u30BF\u3092\u8907\u6570\u7D44\u307F\u5408\u308F\u305B\u308B\u3053\u3068\u3082\u53EF\u80FD\u3067\u3059\n +MEncoderVideo.72=\#java\u306E\u72B6\u614B\u3067\u4F7F\u3048\u308B\u30D1\u30E9\u30E1\u30FC\u30BF\u4E00\u89A7: filename srtfile container vcodec acodec samplerate framerate width height channelsduration\n +MEncoderVideo.73=\#\u6CE8\u610F\u3057\u3066\u66F8\u3044\u3066\u304F\u3060\u3055\u3044\uFF01\u5909\u306A\u884C\u304C\u3042\u308C\u3070\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3059\u3002\n +MEncoderVideo.75=\#\u7279\u6B8A\u306A\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC:\n +MEncoderVideo.76=\# -noass: ASS/SSA\u5B57\u5E55\u3092\u7121\u52B9\u306B\u3057\u307E\u3059\u3002\u6620\u50CF/\u97F3\u58F0\u540C\u671F\u304C\u3046\u307E\u304F\u3044\u304B\u306A\u3044\u5834\u5408\u306B\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044\u3002\n +MEncoderVideo.77=\# -nosync: \u30D3\u30C7\u30AA/\u97F3\u58F0\u540C\u671F\u3092\u7121\u52B9\u306B\u3057\u307E\u3059 (-mc\u3082\u540C\u69D8\u306E\u6A5F\u80FD\u3067\u3059)\n +MEncoderVideo.78=\# -quality: \u30D3\u30C7\u30AA\u306E\u54C1\u8CEA\u8A2D\u5B9A\n +MEncoderVideo.79=\# -mt: MEncoder\u306E\u30DE\u30EB\u30C1\u30B9\u30EC\u30C3\u30C9\u7248\u3092\u5F37\u5236\u7684\u306B\u4F7F\u3044\u307E\u3059(\u5B9F\u9A13\u4E2D\u3067\u4E0D\u5B89\u5B9A)\n +MEncoderVideo.80=\#\u3053\u306E\u30EA\u30B9\u30C8\u306F\u6539\u826F\u3057\u3066\u3044\u304F\u4E88\u5B9A\u3067\u3059\u3002\u30B3\u30FC\u30C7\u30C3\u30AF\u3084\u30D5\u30A1\u30A4\u30EB\u306E\u8ABF\u6574\u65B9\u6CD5/\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u306F\u3044\u3064\u3067\u3082\u6B53\u8FCE\u3067\u3059\u3002\n +MEncoderVideo.87=\#\u3042\u306A\u305F\u306F\u3082\u3046\u81EA\u5206\u306E\u8A2D\u5B9A\u3092\u66F8\u304F\u3053\u3068\u304C\u3067\u304D\u307E\u3059! \u30DE\u30EB\u30C1\u30B9\u30EC\u30C3\u30C9\u7248MEncoder\u3092\u4F7F\u3046\u4F8B\n +MEncoderVideo.88=\#H.264 HD\u30D3\u30C7\u30AA\u306E\u4F8B: vcodec == h264 && width >= 1280 ::-mt -lavdopts fast\n +MEncoderVideo.89=\#50hz\u30C6\u30EC\u30D3\u3067\u306E24p\u306E\u63FA\u308C\u3092\u53D6\u308A\u9664\u304F\u4F8B: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#MPEG-2\u30D3\u30C7\u30AA\u3067\u5B57\u5E55\u304C\u7121\u3051\u308C\u3070remux\u3059\u308B\u4F8B: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=\u8868\u793A\u8A00\u8A9E [\u30BD\u30D5\u30C8\u306E\u518D\u8D77\u52D5\u304C\u5FC5\u8981]: +NetworkTab.1=\u5727\u7E2E\u30D5\u30A1\u30A4\u30EB(.rar/.zip/.cbr)\u306E\u4E2D\u8EAB\u3092\u8868\u793A\u3059\u308B +NetworkTab.2=\u30B5\u30E0\u30CD\u30A4\u30EB\u3092\u751F\u6210\u3059\u308B +NetworkTab.3=\u8D77\u52D5\u6642\u306B\u6700\u5C0F\u5316 +NetworkTab.4=Windows\u30B5\u30FC\u30D3\u30B9\u306B\u767B\u9332 +NetworkTab.5=\u4E00\u822C\u8A2D\u5B9A +NetworkTab.6=\u5909\u63DB\u7528\u30D0\u30C3\u30D5\u30A1\u306E\u6700\u5927\u30B5\u30A4\u30BA \u5358\u4F4D\u306FMB(\u6700\u5927\uFF1A MAX_BUFFER_SIZE) +NetworkTab.7=\u5909\u63DB\u306B\u4F7F\u7528\u3059\u308BCPU\u30B3\u30A2\u6570 (\u73FE\u5728 %d): +NetworkTab.11=Windows\u30B5\u30FC\u30D3\u30B9\u306B\u767B\u9332\u3057\u307E\u3057\u305F \! \u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u30BD\u30D5\u30C8\u3092\u7D42\u4E86\u3057,\n +NetworkTab.12=Windows\u306E\u7BA1\u7406\u30D1\u30CD\u30EB\u304B\u3089\u30B5\u30FC\u30D3\u30B9\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044l.\n\n +NetworkTab.13=\u30E1\u30C7\u30A3\u30A2\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u521D\u671F\u5316\u3057\u307E\u3059 \!\n +NetworkTab.14=Windows\u30B5\u30FC\u30D3\u30B9\u306B\u767B\u9332\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F!\n +NetworkTab.15=\u8868\u793A\u8A2D\u5B9A +NetworkTab.16=\u8868\u793A\u5F85\u3061\u6642\u9593 (\u79D2): +NetworkTab.17=\u30E1\u30C7\u30A3\u30A2\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u6709\u52B9\u306B\u3059\u308B +NetworkTab.18=\u30E1\u30C7\u30A3\u30A2\u30E9\u30A4\u30D6\u30E9\u30EA\u3092\u521D\u671F\u5316\u3059\u308B +NetworkTab.19=\u672C\u5F53\u306B\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +NetworkTab.20=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30C7\u30D0\u30A4\u30B9\u3092\u6307\u5B9A +NetworkTab.22=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u8A2D\u5B9A \u63A5\u7D9A\u306B\u554F\u984C\u304C\u3042\u308B\u6642\u3060\u3051\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044 +NetworkTab.23=\u30B5\u30FC\u30D0\u30FC\u306EIP: [\u30BD\u30D5\u30C8\u306E\u518D\u8D77\u52D5\u304C\u5FC5\u8981] +NetworkTab.24=\u30B5\u30FC\u30D0\u30FC\u306E\u30DD\u30FC\u30C8 (\u6A19\u6E965001) [\u30BD\u30D5\u30C8\u306E\u518D\u8D77\u52D5\u304C\u5FC5\u8981]: +NetworkTab.25=PS3\u8A2D\u5B9A +NetworkTab.26=PS3\u672C\u4F53\u306E\u6587\u5B57\u30BB\u30C3\u30C8\uFF08XMB->\u672C\u4F53\u8A2D\u5B9A->\u6587\u5B57\u30BB\u30C3\u30C8\u3067\u78BA\u8A8D\u3067\u304D\u307E\u3059\uFF09: +NetworkTab.27=\u5371\u967A\u306A\u8A2D\u5B9A\u3000\u307E\u3060\u4F7F\u3048\u307E\u305B\u3093\uFF08\u00B4\u30FB\u03C9\u30FB\uFF40\uFF09 +NetworkTab.28=\u30BF\u30FC\u30DC\u30E2\u30FC\u30C9(tcp_nodelay\u3092\u6709\u52B9\u306B\u3059\u308B) / \u4F55\u304C\u8D77\u304D\u3066\u3082\u77E5\u308A\u307E\u305B\u3093 +NetworkTab.29=\u30C8\u30E9\u30F3\u30B9\u30B3\u30FC\u30C9\u958B\u59CB\u5F8C\u306B\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u306E\u30EA\u30AF\u30A8\u30B9\u30C8\u3092\u30D6\u30ED\u30C3\u30AF +NetworkTab.30=IP\u30D5\u30A3\u30EB\u30BF: +NetworkTab.35=\u5E2F\u57DF\u5236\u9650\u306E\u6700\u5927\u5024: Mb/s (0\u306F\u5236\u9650\u7121\u3057): +PMS.0=PS3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002PS3\u306E\u96FB\u6E90\u306F\u5165\u3063\u3066\u3044\u307E\u3059\u304B? \u8A2D\u5B9A\u3001\u30C8\u30EC\u30FC\u30B9\u3001debuglog\u3092\u30C1\u30A7\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044 +PMS.1=\u97F3\u697D +PMS.2=\#- Media\u30E9\u30A4\u30D6\u30E9\u30EA -\# +PMS.3=\u30D3\u30C7\u30AA\u3068\u97F3\u58F0\u306E\u540C\u671F\u3092\u884C\u3046 +PMS.4=\u30A4\u30F3\u30BF\u30FC\u30EC\u30FC\u30B9\u89E3\u9664 +PMS.5=PS3\u3068\u63A5\u7D9A\u4E2D \! +PMS.6=srt.sub\u3092\u81EA\u52D5\u3067\u8AAD\u307F\u8FBC\u3080 +PMS.7=H.264\u30C7\u30D6\u30ED\u30C3\u30AF\u30D5\u30A3\u30EB\u30BF\u3092\u7121\u52B9\u306B\u3059\u308B [\u6620\u50CF\u54C1\u8CEA\u306F\u4E0B\u304C\u308A\u307E\u3059] +PMS.8=\u5B57\u5E55 +PMS.9=\u5168\u3066\u306E\u97F3\u697D\u306E\u30D7\u30EC\u30A4\u30EA\u30B9\u30C8 +PMS.10=\u5B57\u5E55\u3092\u7121\u52B9\u306B\u3059\u308B +PMS.11=\u3059\u3079\u3066\u306E\u97F3\u697D +PMS.12=\u65E5\u4ED8\u5225 +PMS.13=\u30A2\u30FC\u30C6\u30A3\u30B9\u30C8\u5225 +PMS.16=\u30A2\u30EB\u30D0\u30E0\u5225 +PMS.19=\u30B8\u30E3\u30F3\u30EB\u5225 +PMS.21=\u30AB\u30E1\u30E9\u5225 +PMS.22=\u30A2\u30FC\u30C6\u30A3\u30B9\u30C8/\u30A2\u30EB\u30D0\u30E0\u5225 +PMS.25=ISO\u306E\u8A2D\u5B9A\u5225 +PMS.26=\u30B8\u30E3\u30F3\u30EB/\u30A2\u30FC\u30C6\u30A3\u30B9\u30C8/\u30A2\u30EB\u30D0\u30E0\u5225 +PMS.31=\u753B\u50CF +PMS.32=\u3059\u3079\u3066\u306E\u753B\u50CF +PMS.34=\u30D3\u30C7\u30AA +PMS.35=\u3059\u3079\u3066\u306E\u30D3\u30C7\u30AA +PMS.36=HD\u30D3\u30C7\u30AA +PMS.37=\#- \u30D3\u30C7\u30AA\u8A2D\u5B9A -\# +PMS.39=SD\u30D3\u30C7\u30AA +PMS.41=Windows\u30B5\u30FC\u30D3\u30B9\u306B(\u518D)\u767B\u9332 +PMS.130=PS3\u3092\u691C\u7D22\u4E2D... +StatusTab.2=\u30B9\u30C6\u30FC\u30BF\u30B9 +StatusTab.3=\u5F85\u6A5F\u4E2D... +StatusTab.5=Empty +StatusTab.6=\u30C8\u30E9\u30F3\u30B9\u30B3\u30FC\u30C9\u30D0\u30C3\u30D5\u30A1\u306E\u72B6\u6CC1 +StatusTab.7=I/O \u7D71\u8A08: +StatusTab.8=\u30D3\u30C3\u30C8\u30EC\u30FC\u30C8: +StatusTab.10=\u6700\u5927\u30D3\u30C3\u30C8\u30EC\u30FC\u30C8: +TSMuxerVideo.0=MEncoder\u3067\u5206\u96E2\u3057\u3001\u5168\u3066\u306E\u97F3\u58F0\u3092AC3\u3078\u518D\u5909\u63DB\u3059\u308B +TSMuxerVideo.1=MEncoder\u3067\u5206\u96E2\u3057\u3001DTS/FLAC\u3092LPCM\u306B\u518D\u5909\u63DB\u3059\u308B [\u30B7\u30FC\u30AF\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059] +TSMuxerVideo.2=FFmpeg\u3067\u30E1\u30BF\u30D5\u30A1\u30A4\u30EB\u304B\u3089FPS\u3092\u53D6\u5F97\u3059\u308B +TSMuxerVideo.3=TsMuxer\u6620\u50CF\u30C7\u30B3\u30FC\u30C9\u8A2D\u5B9A +TSMuxerVideo.19=\u5168\u3066\u306E\u97F3\u58F0\u30C8\u30E9\u30C3\u30AF\u3092mux +TrTab2.0=\u5909\u63DB\u30A8\u30F3\u30B8\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B +TrTab2.1=\u8A2D\u5B9A\u3067\u304D\u308B\u9805\u76EE\u306F\u3042\u308A\u307E\u305B\u3093\u3002 +TrTab2.2=\u30D3\u30C7\u30AA\u306E\u30A8\u30F3\u30B3\u30FC\u30C9\u8A2D\u5B9A: MEncoder/AviSynth/FFmpeg +TrTab2.3=\u97F3\u58F0\u30C7\u30B3\u30FC\u30C9\u306E\u8A2D\u5B9A: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=\u30D3\u30C7\u30AA\u306E\u54C1\u8CEA\u8A2D\u5B9A +TrTab2.5=\u57FA\u672C\u8A2D\u5B9A +TrTab2.6=\u5909\u63DB\u30A8\u30F3\u30B8\u30F3\u306E\u9806\u5E8F\u3092\u4E26\u3073\u66FF\u3048\u307E\u3059\u3002\u6700\u521D\u306E1\u3064\u304C\u30AA\u30EA\u30B8\u30CA\u30EB\u30D3\u30C7\u30AA\u306E\u30D5\u30A9\u30EB\u30C0\u306B\u73FE\u308C\u307E\u3059\u3002 +TrTab2.7=\u305D\u306E\u4ED6\u306E\u30AA\u30D7\u30B7\u30E7\u30F3 +TrTab2.8=\u5909\u63DB\u3057\u306A\u3044\u62E1\u5F35\u5B50 (\u30B3\u30F3\u30DE\u3067\u533A\u5207\u3063\u3066\u304F\u3060\u3055\u3044): +TrTab2.9=\u5F37\u5236\u5909\u63DB\u3059\u308B\u62E1\u5F35\u5B50 (\u30B3\u30F3\u30DE\u3067\u533A\u5207\u3063\u3066\u304F\u3060\u3055\u3044): +TrTab2.10=Allows you to stream DTS directly to your receiver.\nBe careful, it's possible to have a static sound. Here's some advices:\n- You must have a DTS compatible receiver, connected on TOSLINK or HDMI\n- The volume icon on XMB must be on 'Normal'\n- The channels icon on XMB must be on 'Left+Right'\n +TrTab2.11=\u30A8\u30F3\u30B8\u30F3 +TrTab2.12=\u30C7\u30B3\u30FC\u30C9\u8A2D\u5B9A +TrTab2.13=\u30A8\u30F3\u30B3\u30FC\u30C9\u8A2D\u5B9A +TrTab2.14=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u30A8\u30F3\u30B8\u30F3 +TrTab2.15=\u97F3\u58F0\u30D5\u30A1\u30A4\u30EB\u30A8\u30F3\u30B8\u30F3 +TrTab2.16=\u30D3\u30C7\u30AA\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0\u914D\u4FE1\u30A8\u30F3\u30B8\u30F3 +TrTab2.17=\u97F3\u58F0\u30B9\u30C8\u30EA\u30FC\u30DF\u30F3\u30B0\u914D\u4FE1\u30A8\u30F3\u30B8\u30F3 +TrTab2.18=\u305D\u306E\u4ED6\u30A8\u30F3\u30B8\u30F3 +TrTab2.19=\u592A\u5B57\u306E\u30A8\u30F3\u30B8\u30F3\u304C\u6700\u512A\u5148\u3055\u308C\u307E\u3059\u3002 +TrTab2.20=\u30D3\u30C7\u30AA\u306E\u5909\u63DB\u306B\u4F7F\u7528\u3055\u308C\u307E\u3059\u3002 +TrTab2.21=[AviSynth\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093] +TrTab2.27=DTS/FLAC -> LPCM\u306Bremux (HDMI\u53D7\u4FE1\u5074\u304CPCM 5.1\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 \! \u5E73\u5747\u30D3\u30C3\u30C8\u30EC\u30FC\u30C8 = 4.6Mbps) +TrTab2.28=DTS\u306E\u307E\u307E\u30B9\u30C8\u30EA\u30FC\u30E0\u51FA\u529B\u3059\u308B (\u5149\u51FA\u529B\u6E96\u62E0) -> \u30D3\u30C3\u30C8\u30EC\u30FC\u30C8\u8D85\u904E\u306B\u6CE8\u610F +TrTab2.29=AC-3\u97F3\u58F0\u306E\u30D3\u30C3\u30C8\u30EC\u30FC\u30C8 (Kbits/s\u5358\u4F4D) (\u4F8B: 384, 576, 640): +TrTab2.32=MPEG-2\u30D3\u30C7\u30AA\u54C1\u8CEA\u8A2D\u5B9A: +TrTab2.39=\u6A19\u6E96\u3067\u518D\u751F\u3067\u304D\u306A\u3044\u30D5\u30A1\u30A4\u30EB\u306F\u81EA\u52D5\u7684\u306BMPEG-PS/AC-3(PS3\u3068\u4E92\u63DB\u6027\u304C\u9AD8\u3044)\u306B\u5909\u63DB\u3055\u308C\u307E\u3059 +TrTab2.40=\n\u74B0\u5883\u306B\u3088\u3063\u3066\u306Fvqscale, vqmin, keyint\u3092\u6307\u5B9A\u3059\u308B\u3068\u3044\u3044\u3067\u3057\u3087\u3046\u3002 \u6A19\u6E96\u306F\u3001\u307B\u307C\u30ED\u30B9\u30EC\u30B9\u3067\u5909\u63DB\u3057\u307E\u3059 +TrTab2.41=\n\u6B20\u70B9\u3068\u3057\u3066\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u5E2F\u57DF\u3092\u304B\u306A\u308A\u5FC5\u8981\u3068\u3057\u307E\u3059 +TrTab2.42=\n\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304C\u7121\u7DDA\u3084\u4E0B\u4F4D\u306E\u898F\u683C\u3067\u3042\u308C\u3070\u30C8\u30E9\u30F3\u30B9\u30B3\u30FC\u30C9\u54C1\u8CEA\u3092\u8ABF\u6574\u3057\u3066\u304F\u3060\u3055\u3044 +TrTab2.43=\n\u203B\u30D3\u30C3\u30C8\u30EC\u30FC\u30C8\u3092\u5236\u9650\u3059\u308B\u3068CPU\u30D1\u30EF\u30FC\u304C\u5FC5\u8981\u306B\u306A\u308A\u307E\u3059\! +TrTab2.44=\n1080P\u306E\u30A2\u30AF\u30B7\u30E7\u30F3\u6620\u753B\u306A\u3069\u306F15Mbps\u3067\u306F\u4E0D\u8DB3\u3067\u3059 +TrTab2.50=\u97F3\u58F0\u30C1\u30E3\u30F3\u30CD\u30EB\u6570: +TrTab2.51=\u5168\u3066\u306E\u5B57\u5E55\u3092\u7121\u52B9\u306B\u3059\u308B +TracesTab.3=\u6D88\u53BB +TreeNodeSettings.4=\u3053\u306E\u9805\u76EE\u306F\u8D77\u52D5\u3057\u3066\u3044\u307E\u305B\u3093\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ko.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ko.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ko.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ko.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,219 @@ +DLNAMediaDatabase.0=\uC880\uB354 \uB098\uC740 \uC131\uB2A5\uC744 \uC704\uD574\uC11C\uB294,\n\uBBF8\uB514\uC5B4\uB77C\uC774\uBE0C\uB7EC\uB9AC \uB370\uC774\uD130\uB97C \uCD08\uAE30\uD654 \uD574\uC57C \uD569\uB2C8\uB2E4.\n\uBD88\uD3B8\uC744 \uB4DC\uB824 \uC8C4\uC1A1\uD569\uB2C8\uB2E4\! +FFMpegDVRMSRemux.0=FFmpeg\uB97C \uB300\uCCB4\uD558\uB294 \uD504\uB85C\uADF8\uB7A8 \uC704\uCE58: +FFMpegDVRMSRemux.1=DVR-MS remuxing \uC124\uC815 +FFMpegVideo.0=\uC778\uCF54\uB354 \uC124\uC815 (AviSynth/FFmpeg engine only, AviSynth/MEncoder\uB97C \uCD94\uCC9C\uD568) +FoldTab.0=<\uBAA8\uB4E0 \uB4DC\uB77C\uC774\uBC84> +FoldTab.1=\uACF5\uC720\uC635\uC158 +FoldTab.2=\uBAA8\uB4E0 \uACF5\uC720\uD3F4\uB354 \uAC80\uC0C9 +FoldTab.3=\uBAA8\uB4E0 \uACF5\uC720\uD3F4\uB354\uB97C \uAC80\uC0C9\uD558\uB294\uB370 \uC2DC\uAC04\uC774 \uB9CE\uC774 \uAC78\uB9BD\uB2C8\uB2E4 \!\n +FoldTab.4=\uBBF8\uB514\uC5B4\uC2A4\uCE94\uC744 \uC2DC\uC791\uD558\uACA0\uC2B5\uB2C8\uAE4C?\n\n +FoldTab.5=\uD30C\uC77C\uD655\uC7A5\uC790 \uC228\uAE30\uAE30 +FoldTab.6=\#Video Settings\# \uD3F4\uB354 \uC228\uAE30\uAE30 +FoldTab.7=\uACF5\uC720\uD3F4\uB354 +FoldTab.8=\uCF54\uB371\uC774\uB984 \uC228\uAE30\uAE30 +FoldTab.9=\uB514\uB809\uD1A0\uB9AC \uCD94\uAC00 +FoldTab.10=\uC2A4\uCE94\uB3D9\uC791\uC744 \uC815\uC9C0\uD558\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?\n\n +FoldTab.11=\uBCC0\uD658\uD558\uC5EC \uBE44\uB514\uC624\uD30C\uC77C \uBCF5\uC0AC (\uC8FC\uC758\! \uD30C\uC77C \uC0AC\uC774\uC988\uAC00 \uBCC0\uACBD\uB428) +FoldTab.12=\uACF5\uC720\uD3F4\uB354 \uC815\uB82C\uBC29\uBC95 +FoldTab.13=\uC378\uB124\uC77C +FoldTab.14=MPlayer\uB97C \uD1B5\uD55C \uBE44\uB514\uC624 \uBBF8\uB9AC\uBCF4\uAE30 +FoldTab.15=\uC54C\uD30C\uBCB3\uC21C\uC11C (A-Z) +FoldTab.16=\uC2DC\uAC04\uC21C\uC11C, \uCD5C\uC2E0\uD30C\uC77C\uC21C +FoldTab.17=\uC2DC\uAC04\uC21C\uC11C, \uC608\uC804\uD30C\uC77C\uC21C +FoldTab.18=\uD30C\uC77C\uC815\uB82C: +FoldTab.19=DVD ISO \uC378\uB124\uC77C +FoldTab.20=ASCII \uBC30\uC5F4\uC21C\uC11C +FoldTab.21=Image \uC378\uB124\uC77C +FoldTab.23=amazon.com \uC5D0\uC11C \uB2E4\uC6B4\uB85C\uB4DC +FoldTab.24=discogs.com \uC5D0\uC11C \uB2E4\uC6B4\uB85C\uB4DC +FoldTab.26=\uC624\uB514\uC624 \uC378\uB124\uC77C \uD45C\uC2DC \uBC29\uBC95: +FoldTab.27=\uAC15\uC81C\uD560\uB2F9 \uD560 \uBE44\uB514\uC624 \uCEE4\uBC84 \uD30C\uC77C \uC704\uCE58 +FoldTab.28=\uD3F4\uB354 \uC120\uD0DD +FoldTab.29=iPhoto \uB77C\uC774\uBE0C\uB7EC\uB9AC \uBCF4\uAE30 +FoldTab.30=iTunes \uB77C\uC774\uBE0C\uB7EC\uB9AC \uBCF4\uAE30 +FoldTab.31=\uBE44\uC5B4\uC788\uB294 \uBBF8\uB514\uC5B4\uD3F4\uB354 \uC228\uAE30\uAE30 (\uC8FC\uC758\! \uCEE4\uC11C\uC774\uB3D9\uC774 \uB290\uB824\uC9D0) +FoldTab.32=\uBBF8\uB514\uC5B4 \uB77C\uC774\uBE0C\uB7EC\uB9AC \uD3F4\uB354 \uC228\uAE30\uAE30 +FoldTab.33=\#Transcode\# \uD3F4\uB354 \uC228\uAE30\uAE30 +FoldTab.34=Aperture \uB77C\uC774\uBE0C\uB7EC\uB9AC \uBCF4\uAE30 +FontFileFilter.3=\uD2B8\uB8E8\uD0C0\uC785\uAE00\uAF34 +LinksTab.5=\uB3C4\uC6C0\uB418\uB294 \uC0AC\uC774\uD2B8\uB4E4: +LooksFrame.5=Quit +LooksFrame.6=Main Panel +LooksFrame.9=\uC0C1\uD0DC\uC800\uC7A5 +LooksFrame.12=\uC7AC\uC2DC\uC791 +LooksFrame.18=\uC0C1\uD0DC\uC815\uBCF4 +LooksFrame.19=\uB514\uBC84\uAE45\uB85C\uADF8 +LooksFrame.20=\uC77C\uBC18\uC124\uC815 +LooksFrame.21=\uBE44\uB514\uC624/\uC624\uB514\uC624 \uC124\uC815 +LooksFrame.22=\uD654\uBA74\uD45C\uC2DC/\uACF5\uC720\uC124\uC815 +LooksFrame.24=\uB3C4\uC6C0\uB9D0 +LooksFrame.25=\uD504\uB85C\uADF8\uB7A8\uC815\uBCF4 +MEncoderAviSynth.2=\uBE44\uB514\uC624 \uB514\uCF54\uB354 \uC124\uC815 (AviSynth engine only) +MEncoderAviSynth.3=AviSynth \uD504\uB808\uC784\uC18D\uB3C4 \uD2B9\uC815\uAC12\uC73C\uB85C \uAC15\uC81C \uC124\uC815 (convertfps=true) +MEncoderVideo.0=Skip loop filter deblocking for h264. Can degrade quality. +MEncoderVideo.1=\uBE44\uB514\uC624/\uC624\uB514\uC624 \uB514\uCF54\uB354 \uC124\uC815 (MEncoder engine only) +MEncoderVideo.2=A/V \uB3D9\uAE30\uD654 \uB300\uCCB4 \uBC29\uBC95 +MEncoderVideo.3=\uC5B4\uD50C\uB9AC\uCF00\uC774\uC158 \uAE30\uBCF8 \uCF54\uB371 \uC124\uC815 \uC0AC\uC6A9 (\uAD8C\uC7A5\uC0AC\uD56D!) +MEncoderVideo.4=FFmpeg\uC73C\uB85C\uB9CC \uD504\uB808\uC784\uC18D\uB3C4 \uC81C\uC5B4\uD558\uAE30 +MEncoderVideo.5=You can add here specific options, such as a denoise filter for example: -vf hqdn3d +MEncoderVideo.6=\uC0AC\uC6A9\uC790\uC815\uC758 \uC635\uC158: +MEncoderVideo.7=\uC74C\uC131\uC5B8\uC5B4 \uC6B0\uC120\uC21C\uC704: +MEncoderVideo.8=\uC790\uB9C9 \uC124\uC815 +MEncoderVideo.9=\uC790\uB9C9\uC5B8\uC5B4 \uC6B0\uC120\uC21C\uC704: +MEncoderVideo.10=\uC624\uB514\uC624/\uC790\uB9C9 \uC5B8\uC5B4 \uD45C\uC2DC \uC21C\uC11C (ex: en,off;jpn,eng) +MEncoderVideo.11=\uC790\uB9C9 \uCF54\uB4DC\uD398\uC774\uC9C0: +MEncoderVideo.12=ASS \uC790\uB9C9 \uC124\uC815: \uAE00\uAF34 \uD06C\uAE30 +MEncoderVideo.13=\uC790\uB9C9 \uC678\uACFD\uC120 +MEncoderVideo.14=\uC790\uB9C9 \uADF8\uB9BC\uC790 +MEncoderVideo.15=\uC790\uB9C9 \uC544\uB798 \uC5EC\uBC31 +MEncoderVideo.16=\uAE30\uBCF8 \uAE00\uAF34 \uC124\uC815: \uAE00\uAF34 \uD06C\uAE30 +MEncoderVideo.17=\uC790\uB9C9 \uC678\uACFD\uC120 +MEncoderVideo.18=\uC790\uB9C9 \uD750\uB9BC \uC815\uB3C4 +MEncoderVideo.19=\uC790\uB9C9 \uC544\uB798 \uC5EC\uBC31 +MEncoderVideo.20=ASS/SSA \uC790\uB9C9 +MEncoderVideo.21=Fontconfig/\uB0B4\uC7A5 \uAE00\uAF34 +MEncoderVideo.22=\uBE44\uB514\uC624\uC640 \uC774\uB984\uC774 \uAC19\uC744 \uACBD\uC6B0 \uC790\uB3D9\uC73C\uB85C \uC790\uB9C9 \uB85C\uB4DC\uD558\uAE30 *.srt/*.sub +MEncoderVideo.23=FriBiDi \uBAA8\uB4DC +MEncoderVideo.24=\uC790\uB9C9 \uD2B8\uB8E8\uD0C0\uC785 \uAE00\uAF34 (\uC544\uC2DC\uC544\uC5B8\uC5B4): +MEncoderVideo.25=\uC790\uB9C9 \uD2B8\uB8E8\uD0C0\uC785 \uAE00\uAF34 +MEncoderVideo.26=Deinterlace filter +MEncoderVideo.27=\uBE44\uB514\uC624 \uD654\uBA74\uD06C\uAE30 \uAC15\uC81C\uC124\uC815 +MEncoderVideo.28=\uAC00\uB85C\uD06C\uAE30 +MEncoderVideo.29=\uD658\uACBD\uBCC0\uC218\uAC12 \uB0B4\uBCF4\uB0B4\uAE30 : \uCF54\uB371\uAD00\uB828 \uC124\uC815\uAC12 +MEncoderVideo.30=\uC138\uB85C\uD06C\uAE30 +MEncoderVideo.31=\uC0C9\uC0C1 +MEncoderVideo.32=AC-3 \uC624\uB514\uC624 \uC778\uCF54\uB529 \uD558\uC9C0 \uC54A\uAE30 +MEncoderVideo.33=\uC0AC\uC6A9\uC790\uC815\uC758 \uC124\uC815: +MEncoderVideo.34=\uCF54\uB371 \uBCC0\uD658 \uC124\uC815 +MEncoderVideo.35=\uBA40\uD2F0\uCF54\uC5B4 CPU \uC0AC\uC6A9\uD558\uAE30 +MEncoderVideo.36=ASS \uAE30\uBCF8 \uC2A4\uD0C0\uC77C \uC0AC\uC6A9\uD558\uAE30 +MEncoderVideo.37=\uC790\uB9C9\uC744 \uB530\uB85C \uAD00\uB9AC\uD558\uB294 \uACBD\uC6B0 \uD3F4\uB354\uC704\uCE58 +MEncoderVideo.39=DVD ISO \uBE44\uB514\uC624 \uC778\uCF54\uB529 \uD558\uC9C0 \uC54A\uAE30 +MEncoderVideo.68=\#\uC5EC\uAE30\uC5D0 \uB2F9\uC2E0\uC774 \uC6D0\uD558\uB294 \uD2B9\uBCC4\uD55C \uCF54\uB371\uBCC0\uD658 \uD30C\uB77C\uBA54\uD130\uB97C \uC9C0\uC815\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n +MEncoderVideo.69=\#\uBE44\uB514\uC624 \uC624\uB514\uC624\uAC04\uC758 \uB3D9\uAE30\uD654 \uBB38\uC81C\uAC00 \uB9CE\uC9C0\uB9CC, \uAC01 \uAE30\uAE30\uBCC4\uB85C \uC124\uC815\uAC12\uC774 \uB2E4\uB97C\uBFD0 \uC218\uC815\uC740 \uAC00\uB2A5\uD569\uB2C8\uB2E4\n +MEncoderVideo.70=\#\uC804\uBB38\uAC00\uAC00 \uC544\uB2C8\uB77C\uBA74 \uC138\uBD80\uC124\uC815\uC740 \uD558\uC9C0 \uC54A\uC544\uB3C4 \uCDA9\uBD84\uD788 \uC0AC\uC6A9\uD558\uB294\uB370 \uBB38\uC81C\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.\n +MEncoderVideo.71=\#\uC785\uB825 \uD615\uC2DD\uC740 {java condition} :: {MEncoder options} ; \uC785\uB2C8\uB2E4.\n +MEncoderVideo.72=\#\uC0AC\uC6A9\uAC00\uB2A5 \uD1A0\uD070\uB4E4: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#\uC8FC\uC758, \uD615\uC2DD\uC774 \uB2E4\uB97C\uACBD\uC6B0 \uD574\uB2F9 \uB77C\uC778\uC740 \uB3D9\uC791\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4\n +MEncoderVideo.75=\#\uD2B9\uBCC4\uD55C \uC635\uC158\uB4E4:\n +MEncoderVideo.92=DVD/VOBsub \uC790\uB9C9 \uD574\uC0C1\uB3C4 (0-4) (\uD070\uAC12\uC774 \uB354\uC88B\uC74C): +MEncoderVideo.93=Add borders for overscan compensation: +NetworkTab.0=\uC5B8\uC5B4 [PMS \uC7AC\uC2DC\uC791 \uD544\uC694]: +NetworkTab.1=\uC555\uCD95\uD30C\uC77C \uB0B4\uC6A9\uBCF4\uAE30 (.rar/.zip/.cbr) +NetworkTab.2=\uC378\uB124\uC77C \uD45C\uC2DC +NetworkTab.3=\uCD5C\uC18C\uD654 \uBAA8\uB4DC\uB85C \uC2E4\uD589 +NetworkTab.4=\uC708\uB3C4\uC6B0 \uC11C\uBE44\uC2A4\uB85C \uC124\uCE58 +NetworkTab.5=\uC77C\uBC18 \uC124\uC815 +NetworkTab.6=\uBE44\uB514\uC624 \uBCC0\uD658 \uBC84\uD37C \uCD5C\uB300\uD06C\uAE30 (\uB2E8\uC704MB, \uCD5C\uB300: MAX_BUFFER_SIZE): +NetworkTab.7=\uBCC0\uD658\uC2DC \uC0AC\uC6A9\uD560 CPU \uC218 (it seems you have %d): +NetworkTab.8=\uC5C5\uB370\uC774\uD2B8 \uD655\uC778 +NetworkTab.9=\uC790\uB3D9 \uC5C5\uB370\uC774\uD2B8 +NetworkTab.11=\uC708\uB3C4\uC6B0 \uC11C\uBE44\uC2A4 \uB4F1\uB85D \uC644\uB8CC\! \uC0AC\uC6A9\uD558\uB824\uBA74 \uC774 \uC5B4\uD50C\uB9AC\uCF00\uC774\uC158\uC744 \uB2EB\uACE0,\n +NetworkTab.12=\uC81C\uC5B4\uD310\uC758 \uC708\uB3C4\uC6B0 \uC11C\uBE44\uC2A4 \uAD00\uB9AC\uC790\uC5D0\uC11C PMS\uB97C \uC2DC\uC791\uD558\uC2ED\uC2DC\uC694.\n\n +NetworkTab.13=\uBBF8\uB514\uC5B4\uB77C\uC774\uBE0C\uB7EC\uB9AC \uB370\uC774\uD130\uB294 \uCD08\uAE30\uD654 \uB429\uB2C8\uB2E4\!\n +NetworkTab.14=\uC708\uB3C4\uC6B0 \uC11C\uBE44\uC2A4 \uB4F1\uB85D \uC2E4\uD328\!\n +NetworkTab.15=\uB124\uBE44\uAC8C\uC774\uC158/\uD30C\uC2F1 \uC124\uC815 +NetworkTab.16=\uC378\uB124\uC77C \uAC00\uC838\uC62C \uD654\uBA74 \uC704\uCE58 (\uCD08\uB2E8\uC704): +NetworkTab.17=\uBBF8\uB514\uC5B4 \uB77C\uC774\uBE0C\uB7EC\uB9AC/\uCE90\uC26C \uC0AC\uC6A9\uD558\uAE30 +NetworkTab.18=\uBBF8\uB514\uC5B4 \uB77C\uC774\uBE0C\uB7EC\uB9AC \uCD08\uAE30\uD654 +NetworkTab.19=\uADF8\uB300\uB85C \uC9C4\uD589\uD574\uB3C4 \uC88B\uC2B5\uB2C8\uAE4C? +NetworkTab.20=\uB124\uD2B8\uC6CC\uD06C \uCE74\uB4DC: +NetworkTab.22=\uB124\uD2B8\uC6CC\uD06C \uC124\uC815, \uBB38\uC81C\uAC00 \uC788\uC744 \uACBD\uC6B0\uB9CC \uC785\uB825 +NetworkTab.23=\uAC15\uC81C\uD560\uB2F9 \uC544\uC774\uD53C: +NetworkTab.24=\uAC15\uC81C\uD560\uB2F9 \uD3EC\uD2B8 (\uAE30\uBCF8\uAC12 5001): +NetworkTab.25=PS3 \uD658\uACBD\uC124\uC815 +NetworkTab.26=Character encoding of your PS3 file names (see XMB->System settings->Charset): +NetworkTab.27=Unused settings you shouldn't use :p +NetworkTab.28=Turbo mode (enable tcp_nodelay) / be careful, not sure if that's ok to do this +NetworkTab.29=Block incoming request for the same file from PS3 when transcode has started +NetworkTab.30=IP \uD544\uD130 \uC0AC\uC6A9: +NetworkTab.31=\uC804\uBB38\uC801\uC778 HTTP \uC124\uC815 \uBC0F \uC2DC\uC2A4\uD15C \uC124\uC815 +NetworkTab.32=HTTP \uC5D4\uC9C4 V2 +NetworkTab.33=\uBBF8\uB514\uC5B4 \uC7AC\uC0DD\uC911 \uCEF4\uD4E8\uD130 \uAEBC\uC9D0 \uBC29\uC9C0 +NetworkTab.34=\uD50C\uB7EC\uADF8\uC778 +NetworkTab.35=\uCD5C\uB300 \uB300\uC5ED\uD3ED Mb/s (0 means no limit): +PMS.0=PS3\uB97C \uCC3E\uC744\uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC804\uC6D0\uC774 \uCF1C\uC838 \uC788\uB294\uC9C0 \uD655\uC778\uD558\uC138\uC694. +PMS.1=\uC624\uB514\uC624 +PMS.2=\#- Cache -\# +PMS.3=A/V \uB3D9\uAE30\uD654 \uBC29\uBC95 \uAC15\uC81C \uD560\uB2F9 +PMS.4=Deinterlace Filter +PMS.5=PS3\uAC00 \uAC80\uC0C9 \uB418\uC5C8\uC2B5\uB2C8\uB2E4 \! +PMS.6=\uC790\uB3D9\uC73C\uB85C \uC790\uB9C9 \uAC00\uC838\uC624\uAE30 (.srt/.sub) +PMS.7=SkipLoopFilter for H.264 Decoding [COULD DEGRADE QUALITY] +PMS.8=\uC790\uB9C9 +PMS.9=\uBAA8\uB4E0 \uC74C\uC545 \uB9AC\uC2A4\uD2B8 +PMS.10=\uBAA8\uB4E0 \uC790\uB9C9 \uBB34\uC2DC +PMS.11=\uBAA8\uB4E0 \uC624\uB514\uC624 \uD2B8\uB799 +PMS.12=\uB0A0\uC9DC\uBCC4 +PMS.13=\uAC00\uC218\uBCC4 +PMS.16=\uC568\uBC94\uBCC4 +PMS.17=Unknown renderer +PMS.19=\uC7A5\uB974\uBCC4 +PMS.21=\uCE74\uBA54\uB77C\uBAA8\uB378\uBCC4 +PMS.22=\uAC00\uC218/\uC568\uBC94\uBCC4 +PMS.25=ISO\uC124\uC815\uBCC4 +PMS.26=\uC7A5\uB974/\uAC00\uC218/\uC568\uBC94\uBCC4 +PMS.27=\uC124\uC815 \uC800\uC7A5 +PMS.31=\uC774\uBBF8\uC9C0 +PMS.32=\uBAA8\uB4E0 \uC774\uBBF8\uC9C0 +PMS.34=\uBE44\uB514\uC624 +PMS.35=\uBAA8\uB4E0 \uBE44\uB514\uC624 +PMS.36=HD \uBE44\uB514\uC624 +PMS.37=\#- Video Settings -\# +PMS.39=SD \uBE44\uB514\uC624 +PMS.41=Win32 \uC11C\uBE44\uC2A4 (\uC7AC)\uC124\uCE58 \uC911... +PMS.130=\uC601\uC0C1\uD45C\uC2DC\uC7A5\uCE58\uB97C \uCC3E\uB294 \uC911... +ProfileChooser.1=PS3 Media Server Profile Chooser +ProfileChooser.2=Select +ProfileChooser.3=Profile file (.conf) or directory +StatusTab.2=\uC0C1\uD0DC +StatusTab.3=\uAE30\uB2E4\uB9AC\uB294\uC911... +StatusTab.5=\uBE44\uC5B4\uC788\uC74C +StatusTab.6=\uBCC0\uD658\uBC84\uD37C \uC0C1\uD0DC: +StatusTab.7=I/O \uD1B5\uACC4: +StatusTab.8=\uBE44\uD2B8\uB808\uC774\uD2B8: +StatusTab.9=\uAC80\uC0C9\uB41C \uBBF8\uB514\uC5B4 \uD45C\uC2DC\uC7A5\uCE58 +StatusTab.10=Peak bitrate: +TSMuxerVideo.0=Demux with MEncoder and encode all audio tracks to AC-3 +TSMuxerVideo.1=Demux with MEncoder and encode DTS/FLAC audio tracks to LPCM [\uC8FC\uC758, \uC7AC\uC0DD\uC704\uCE58 \uC774\uB3D9\uC774 \uC548\uB428] +TSMuxerVideo.2=\uBA54\uD0C0 \uD30C\uC77C\uC5D0\uC11C FPS \uC124\uC815\uD558\uAE30 (FFmpeg \uC0AC\uC6A9) +TSMuxerVideo.3=\uBE44\uB514\uC624 \uB514\uCF54\uB354 \uC124\uC815\uC744 TsMuxer \uC5D4\uC9C4\uC5D0\uB9CC \uC801\uC6A9\uD558\uAE30 +TSMuxerVideo.19=\uBAA8\uB4E0 \uC624\uB514\uC624 \uCC44\uB110\uC744 Mux \uD558\uAE30 +TrTab2.0=\uC2E4\uC2DC\uAC04 \uBE44\uB514\uC624\uBCC0\uD658 \uC0AC\uC6A9\uC5EC\uBD80 +TrTab2.1=\uC9C0\uAE08 \uC124\uC815\uD558\uC9C0 \uC54A\uC74C +TrTab2.2=\uBE44\uB514\uC624 \uC778\uCF54\uB354 \uC124\uC815 : MEncoder/AviSynth/FFmpeg +TrTab2.3=\uC624\uB514\uC624 \uC778\uCF54\uB354 \uC124\uC815: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=\uBE44\uB514\uC624 \uD654\uC9C8 \uC124\uC815 +TrTab2.5=\uBE44\uB514\uC624 \uBCC0\uD658 \uC124\uC815 +TrTab2.6=\uBE44\uB514\uC624\uBCC0\uD658 \uC5D4\uC9C4 \uB9AC\uC2A4\uD2B8 \uC815\uB82C. \uD3F4\uB354\uC5D0 \uC5D4\uC9C4\uD558\uB098\uAC00 \uD45C\uC2DC\uB428 +TrTab2.7=\uAE30\uD0C0 \uC635\uC158 +TrTab2.8=\uBE44\uB514\uC624\uBCC0\uD658\uC744 \uBB34\uC2DC\uD560 \uD655\uC7A5\uC790 (\uC27C\uD45C\uB85C \uAD6C\uBD84): +TrTab2.9=\uBE44\uB514\uC624\uBCC0\uD658\u00C0\u00CC \uAF2D \uD544\uC694\uD55C \uD655\uC7A5\uC790 (\uC27C\uD45C\uB85C \uAD6C\uBD84): +TrTab2.10=Allows you to stream DTS directly to your receiver.\nBe careful, it's possible to have a static sound. Notes:\n- You must have a DTS compatible receiver, connected on TOSLINK or HDMI\n- The volume icon on XMB must be on 'Normal'\n- The channels icon on XMB must be on 'Left+Right'\n +TrTab2.11=\uC5D4\uC9C4 +TrTab2.12=\uB514\uCF54\uB354 \uC124\uC815 +TrTab2.13=\uC778\uCF54\uB354 \uC124\uC815 +TrTab2.14=\uBE44\uB514\uC624 \uD30C\uC77C \uC5D4\uC9C4 +TrTab2.15=\uC624\uB514\uC624 \uD30C\uC77C \uC5D4\uC9C4 +TrTab2.16=\uC6F9\uBE44\uB514\uC624 \uC2A4\uD2B8\uB9BC \uC5D4\uC9C4 +TrTab2.17=\uC6F9\uC624\uB514\uC624 \uC2A4\uD2B8\uB9BC \uC5D4\uC9C4 +TrTab2.18=\uAE30\uD0C0 \uC5D4\uC9C4 +TrTab2.19=\uB0B4\uB9BC\uCC28\uC21C\uC73C\uB85C \uC5D4\uC9C4\uC815\uB82C +TrTab2.20=\uC815\uB82C; \uAC00\uC7A5 \uB192\uC740\uAC83\uC774 \uC704\uC5D0 +TrTab2.21=[AviSynth \uC9C0\uC6D0 \uC548\uD568] +TrTab2.22=\uC790\uB3D9 \uC624\uB514\uC624 \uB9AC\uC0D8\uD50C\uB9C1 44.1, 48 kHz +TrTab2.27=DTS/FLAC -> LPCM remux (LPCM 5.1 \uC2A4\uB974\uB9BC\uC744 \uC704\uD55C HDMI \uB9AC\uC2DC\uBC84 \uD544\uC694\! \uD3C9\uADE0 \uBE44\uD2B8\uB808\uC774\uD2B8 = 4.6Mbps) +TrTab2.28=DTS \uC624\uB514\uC624 \uC2A4\uD2B8\uB9BC \uC720\uC9C0 (\uAD11\uC6D0\uB2E8\uC790\uCD9C\uB825\uAC00\uB2A5) -> \uC8FC\uC758, \uC624\uBC84\uD5E4\uB4DC \uBC1C\uC0DD \uAC00\uB2A5! +TrTab2.29=AC-3 \uC624\uB514\uC624 \uBE44\uD2B8\uB808\uC774\uD2B8 (in Kbits/s) (ex: 384, 576, 640): +TrTab2.32=MPEG-2 \uBE44\uB514\uC624 \uD654\uC9C8 \uC124\uC815: +TrTab2.39=\uD574\uB2F9 \uBE44\uB514\uC624\uB294 MPEG-PS / AC-3 audio \uB85C \uC790\uB3D9 \uBCC0\uD658 \uB418\uC5C8\uC2B5\uB2C8\uB2E4 (highly compatible on PS3) +TrTab2.40=\nYou can play with the vqscale, vqmin and keyint parameters to achieve good, even almost lossless transcoding quality. +TrTab2.41=\nThe drawback to this is the VBR bitrate, which can sometimes peak above your max network capacity. +TrTab2.42=\nThat's why you can also set the bandwidth if you're on WiFi, CPL, etc. However, the transcoding quality +TrTab2.43=\nis a balance between network speed and CPU power: the more quality you put into a constrained bitrate, +TrTab2.44=\nthe more your CPU will suffer\! Also, don't expect to fit a 1080p action movie in the purest quality in 15Mbps :p +TrTab2.50=\uCD5C\uB300 \uC624\uB514\uC624 \uCC44\uB110 \uC218: +TrTab2.51=\uBAA8\uB4E0 \uC790\uB9C9 \uBB34\uC2DC +TrTab2.52=\#Transcode\# \uD3F4\uB354 \uC9C0\uC6D0 / 1\uBD84 \uB2E8\uC704: +TracesTab.3=\uC9C0\uC6B0\uAE30 +TreeNodeSettings.4=\uD574\uB2F9 \uC5D4\uC9C4\uC740 \uB85C\uB4DC\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_nl.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_nl.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_nl.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_nl.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,301 @@ +DLNAMediaDatabase.0=De mediabibliotheek moet opnieuw geinitialiseerd worden.\nExcuses voor het ongemak! +DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z +DLNAMediaDatabase.2=Opruimen database... +DLNAMediaDatabase.3=Comprimeren database... +DLNAMediaDatabase.4=Scannen Folder: +FFMpegDVRMSRemux.0=Alternatieve FFmpeg locatie: +FFMpegDVRMSRemux.1=Instellingen voor remuxen van DVR-MS +FFMpegVideo.0=Encoder instellingen (alleen voor de AviSynth/FFmpeg decoder, gebruik bij voorkeur de AviSynth/MEncoder) +FFMpegVideo.1=Encoder instellingen (alleen voor de FFmpeg decoder) +FoldTab.0= +FoldTab.1=Opties voor delen +FoldTab.2=Scan alle gedeelde mappen +FoldTab.3=Het scannen van alle mappen kan lang duren!\n +FoldTab.4=Weet je zeker dat je de scan wilt starten?\n\n +FoldTab.5=Verberg bestandsextensies +FoldTab.6=Verberg \#- Video Instellingen -\# map +FoldTab.7=Gedeelde mappen +FoldTab.8=Verberg namen van decoders +FoldTab.9=Map toevoegen +FoldTab.10=Wil je de scan stoppen?\n\n +FoldTab.11=Inschakelen getranscodeerde video kopie naar PS3 (let op: bestanden hebben geen vaste grootte!) +FoldTab.12=Sorteer gedeelde mappen +FoldTab.13=Miniaturen +FoldTab.14=Gebruik MPlayer voor video miniaturen +FoldTab.15=Alfabetisch (A-Z) +FoldTab.16=Nieuwste bovenaan +FoldTab.17=Oudste bovenaan +FoldTab.18=Sorteervolgorde: +FoldTab.19=DVD ISO miniaturen +FoldTab.20=ASCII (tekenset) volgorde +FoldTab.21=Miniaturen van afbeeldingen +FoldTab.22=Alfanumeriek +FoldTab.23=Downloaden van amazon.com +FoldTab.24=Downloaden van discogs.com +FoldTab.26=Audio miniaturen weergeven: +FoldTab.27=Alternatieve map voor video albumhoezen: +FoldTab.28=Kies map +FoldTab.29=Toon iPhoto bibliotheek +FoldTab.30=Toon iTunes bibliotheek +FoldTab.31=Verberg lege mappen en mappen zonder media (let op: langzamer browsen) +FoldTab.32=Verberg \#- Mediabibliotheek -\# map +FoldTab.33=Verberg \#--TRANSCODE--\# map +FoldTab.34=Toon aperture bibliotheek +FoldTab.35=Geen +FontFileFilter.3=Truetype Lettertypen +LinksTab.5=Nuttige links: +LinksTab.6=Build: +LooksFrame.5=Afsluiten +LooksFrame.6=Hoofdscherm +LooksFrame.9=Opslaan +LooksFrame.12=Server herstarten +LooksFrame.13=De server herstarten vanwege een configuratie wijziging +LooksFrame.18=Status +LooksFrame.19=Sporen +LooksFrame.20=Algemene Configuratie +LooksFrame.21=Transcode Instellingen +LooksFrame.22=Navigatie/Delen Instellingen +LooksFrame.24=Help +LooksFrame.25=Over +LooksFrame.26=ALLEEN OM TE TESTEN, MOGELIJK INSTABIEL +MEncoderAviSynth.2=Video decoder instellingen (alleen voor de AviSynth decoder) +MEncoderAviSynth.3=Inschakelen: verander AviSynth variabele framerate in een constante framerate (convertfps=true) +MEncoderAviSynth.4=# AviSynth script kan nu volledig aangepast worden\n +MEncoderAviSynth.5=# De volgende variabelen zijn beschikbaar:\n +MEncoderAviSynth.6=# : De volledige DirectShowSource instructie, bijv. DirectShowSource(filename, convertfps)\n +MEncoderAviSynth.7=# : De volledige instructie voor ondertiteling als deze gedetecteerd wordt (SRT/SUB/IDX/ASS/SSA)\n +MEncoderAviSynth.8=# : De video bestandsnaam, voor als u dit voor een bestand zelf wil doen\n +MEncoderAviSynth.10=\n +MEncoderAviSynth.11=\n +MEncoderVideo.0=Overslaan van "loop filter" deblokkering voor H.264 (kwaliteit kan afnemen) +MEncoderVideo.1=Video/Audio decoder instellingen (alleen voor de MEncoder decoder) +MEncoderVideo.2=A/V synchronisatie alternatieve methode +MEncoderVideo.3=Gebruik de standaard applicatie codec parameters (aanbevolen!) +MEncoderVideo.4=Forceer de ontlede framerate vanuit FFmpeg +MEncoderVideo.5=Hier kunnen specifieke opties toevoegen worden, bijvoorbeeld een denoise filter: -vf hqdn3d +MEncoderVideo.6=Aangepaste opties: +MEncoderVideo.7=Audio taal prioriteit: +MEncoderVideo.8=Ondertiteling instellingen +MEncoderVideo.9=Ondertiteling taal prioriteit: +MEncoderVideo.10=Audio en ondertiteling taal prioriteit (bijv. eng,off;jpn,eng): +MEncoderVideo.11=Codetabel (voor niet-Unicode ondertitels): +MEncoderVideo.12=ASS lettertype instellingen: Lettertype schaal +MEncoderVideo.13=Lettertype omlijning +MEncoderVideo.14=Lettertype schaduw +MEncoderVideo.15=Ondermarge (px) +MEncoderVideo.16=Standaard lettertype instellingen: Lettertype schaal +MEncoderVideo.17=Lettertype omlijning +MEncoderVideo.18=Lettertype vervaging +MEncoderVideo.19=Ondermarge (%) +MEncoderVideo.20=Gebruik ASS/SSA ondertitel vormgeving +MEncoderVideo.21=Lettertype configuratie/ingesloten fonts +MEncoderVideo.22=Automatisch laden van .srt/.sub ondertitels met dezelfde bestandsnaam +MEncoderVideo.23=FriBiDi functie +MEncoderVideo.24=Specifiek TrueType lettertype (voor ondertitels): +MEncoderVideo.25=Selecteer Truetype Lettertype +MEncoderVideo.26=Deinterlace filter +MEncoderVideo.27=Gebruik video verschaling +MEncoderVideo.28=Breedte +MEncoderVideo.29=Expert Instellingen: codec specifieke parameters +MEncoderVideo.30=Hoogte +MEncoderVideo.31=Kleur ondertitels +MEncoderVideo.32=Gebruik originele AC-3 track (niet hercoderen, wat kan leiden tot onhoorbare dialoog en A/V synchronisatie problemen) +MEncoderVideo.33=Aangepaste parameters: +MEncoderVideo.34=Wijzig codecs specifieke parameters +MEncoderVideo.35=Gebruik meerdere CPU cores +MEncoderVideo.36=Gebruik ingesloten stijl +MEncoderVideo.37=Alternatieve map voor ondertitels: +MEncoderVideo.39=Remux DVD ISO video track (niet hercoderen) +MEncoderVideo.68=\# Hier kun je specifieke parameters opgeven voor diverse codec combinaties.\n +MEncoderVideo.69=\# Het is vooral voor A/V synchronisatie problemen, maar het kan ook voor andere doeleinden worden gebruikt.\n +MEncoderVideo.70=\# Zie dit als expert instellingen. Deze niet gebruiken als je niet zeker weet wat je doet.\n +MEncoderVideo.71=\# De Syntax is {java voorwaarde} :: {MEncoder optie} (je kunt meerdere opties achter elkaar gebruiken)\n +MEncoderVideo.72=\# Te gebruiken eigenschappen: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\# Let op: elke verkeerde regel wordt gewist.\n +MEncoderVideo.75=\# Speciale opties:\n +MEncoderVideo.76=\# -noass: uitschakelen ASS/SSA ondertitels omdat ze de A/V synchronisatie kunnen ontregelen\n +MEncoderVideo.77=\# -nosync: uitschakelen A/V sync alternatieve methode voor deze voorwaarde (-mc doet hetzelfde)\n +MEncoderVideo.78=\# -quality: overschrijf video kwaliteit instellingen\n +MEncoderVideo.79=\# -mt: forceer gebruik van de multithreaded MEncoder build\n +MEncoderVideo.80=\# Deze lijst zal met de tijd verbeteren. Verbeteringen op verschillende codecs/bestanden zijn altijd welkom.\n +MEncoderVideo.87=\# Je kunt je eigen voorwaarden en opties instellen! Een paar voorbeelden: bijvoorbeeld om de mt build van MEncoder in te schakelen,\n +MEncoderVideo.88=\# voor iedere H.264 HD content (tegelijk met de hoofdoptie): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\# Om 24p judder te verwijderen bij een 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\# Om te remuxen wanneer de video MPEG-2 is en er geen ondertitels zijn: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=DVD/VOBsub ondertitel kwaliteit (0-4) (hoger is beter): +MEncoderVideo.93=Voeg randen toe ter compensatie van overscan: +MEncoderVideo.94=Gedwongen ondertiteling: +MEncoderVideo.95=Gedwongen tags: +MEncoderVideo.96=cp1250 /* Windows - Oost Europa */ +MEncoderVideo.97=cp1251 /* Windows - Cyrillisch */ +MEncoderVideo.98=cp1252 /* Windows - West Europa */ +MEncoderVideo.99=cp1253 /* Windows - Grieks */ +MEncoderVideo.100=cp1254 /* Windows - Turks */ +MEncoderVideo.101=cp1255 /* Windows - Hebreeuws */ +MEncoderVideo.102=cp1256 /* Windows - Arabisch */ +MEncoderVideo.103=cp1257 /* Windows - Baltisch */ +MEncoderVideo.104=cp1258 /* Windows - Vietnamees */ +MEncoderVideo.105=ISO-8859-1 /* West Europa */ +MEncoderVideo.106=ISO-8859-2 /* West en Centraal Europa */ +MEncoderVideo.107=ISO-8859-3 /* West en Zuid Europa */ +MEncoderVideo.108=ISO-8859-4 /* West Europa en Baltische landen */ +MEncoderVideo.109=ISO-8859-5 /* Cyrillisch alfabet */ +MEncoderVideo.110=ISO-8859-6 /* Arabisch */ +MEncoderVideo.111=ISO-8859-7 /* Grieks */ +MEncoderVideo.112=ISO-8859-8 /* Hebreeuws */ +MEncoderVideo.113=ISO-8859-9 /* West Europa en Turks */ +MEncoderVideo.114=ISO-8859-10 /* West Europa en Scandinavische talen */ +MEncoderVideo.115=ISO-8859-11 /* Thai */ +MEncoderVideo.116=ISO-8859-13 /* Baltische talen en Pools */ +MEncoderVideo.117=ISO-8859-14 /* Keltische talen */ +MEncoderVideo.118=ISO-8859-15 /* Met euro teken */ +MEncoderVideo.119=ISO-8859-16 /* Centraal Europese talen */ +MEncoderVideo.120=cp932 /* Japans */ +MEncoderVideo.121=cp936 /* Chinees */ +MEncoderVideo.122=cp949 /* Koreaans */ +MEncoderVideo.123=cp950 /* Big5, Thais, Kantonees */ +MEncoderVideo.124=UTF-8 /* Unicode */ +MEncoderVideo.125=Kies Kleur Ondertitels +MEncoderVideo.126=dut,eng,und +MEncoderVideo.127=dut,eng,und +MEncoderVideo.128=*,* +MEncoderVideo.129=/* Automatisch */ +MEncoderVideo.130=enca:ru:cp1251 /* Russisch (automatisch) */ +MEncoderVideo.131=enca:pl:cp1250 /* Oost Europa (automatisch) */ +MEncoderVideo.132=enca:zh:big5 /* Chinees (automatisch) */ +NetworkTab.0=Taal (opnieuw starten nodig): +NetworkTab.1=Doorzoek ingepakte archieven (.rar/.zip/.cbr) +NetworkTab.2=Miniaturen genereren +NetworkTab.3=Start geminimaliseerd +NetworkTab.4=Installeren als Windows Service +NetworkTab.5=Algemene instellingen +NetworkTab.6=Maximale grootte van de transcode buffer, in megabytes (maximaal: MAX_BUFFER_SIZE): +NetworkTab.7=Aantal cores voor het transcoderen (totaal gedetecteerd: %d): +NetworkTab.8=Controleren op updates +NetworkTab.9=Controleer automatisch +NetworkTab.11=Je hebt de Windows service geinstalleerd! Om deze te gebruiken, moet je deze applicatie sluiten,\n +NetworkTab.12=en daarna de service starten (en configureren) vanuit het Windows Systeembeheer->Services scherm.\n\n +NetworkTab.13=De mediabibliotheek zal opnieuw worden geinitialiseerd!\n +NetworkTab.14=Fout in de installatie van de Windows service!\n +NetworkTab.15=Navigatie/Presentatie instellingen +NetworkTab.16=Miniatuur genereer positie (in seconden): +NetworkTab.17=Inschakelen mediabibliotheek +NetworkTab.18=Reset mediabibliotheek +NetworkTab.19=Weet je het zeker? +NetworkTab.20=Netwerk interface: +NetworkTab.22=Netwerkinstellingen (geavanceerd) +NetworkTab.23=IP-adres van de server: +NetworkTab.24=Poort van de server (standaard 5001): +NetworkTab.25=PS3 Instellingen +NetworkTab.26=Karakterset van PS3 bestandsnamen (zie ook XMB->Systeeminstellingen->Tekenset): +NetworkTab.27=Ongebruikte instellingen die je beter niet kunt gebruiken +NetworkTab.28=Turbo mode (inschakelen tcp_nodelay) (let op: je kunt dit wellicht beter niet gebruiken) +NetworkTab.29=Blokkeer inkomende verzoeken vanaf de PS3 voor hetzelfde bestand als het transcoderen is begonnen +NetworkTab.30=Gebruik een IP filter (whitelist): +NetworkTab.31=Geavanceerde HTTP en systeeminstellingen +NetworkTab.32=HTTP Engine V2 +NetworkTab.33=Voorkom dat het besturingssysteem in slaapstand valt tijdens het streamen +NetworkTab.34=Plugin systeem +NetworkTab.35=Maximale bandbreedte in Mb/s (0 betekent geen limiet): +NetworkTab.36=Standaard renderer als automatische detectie mislukt: +NetworkTab.37=Onbekende renderer +NetworkTab.38=Gebruik de standaard renderer (schakelt automatische detectie uit) +PMS.0=Geen renderers gevonden +PMS.1=Audio +PMS.2=\#- Mediabibliotheek -\# +PMS.3=A/V sync alternatieve methode +PMS.4=Deinterlace Filter +PMS.5=Verbonden met PS3 +PMS.6=Automatisch laden van .srt/.sub ondertitels +PMS.7=Overslaan LoopFilter voor H.264 decoderen (kwaliteit kan afnemen) +PMS.8=Ondertitels +PMS.9=Alle Audio Afspeellijsten +PMS.10=Ondertiteling Uitschakelen +PMS.11=Alle Audio Tracks +PMS.12=Op Datum +PMS.13=Op Artiest +PMS.16=Op Album +PMS.17=Onbekende renderer +PMS.18=Verbonden +PMS.19=Op Genre +PMS.21=Op Camera model +PMS.22=Op Artiest/Album +PMS.25=Op ISO instellingen +PMS.26=Op Genre/Artiest/Album +PMS.27=Configuratie opslaan +PMS.28=Op Letter/Artiest/Album +PMS.31=Foto +PMS.32=Alle Foto's +PMS.34=Video +PMS.35=Alle Video's +PMS.36=HD Video's +PMS.37=\#- Video Instellingen -\# +PMS.39=SD Video's +PMS.40=DVD Images +PMS.41=(Her)installeren Win32 service +PMS.130=Zoeken naar renderers... +ProfileChooser.1=PS3 Media Server Profielkiezer +ProfileChooser.2=Selecteer +ProfileChooser.3=Profielbestand (.conf) of map +StatusTab.2=Status +StatusTab.3=Wachten... +StatusTab.5=Leeg +StatusTab.6=Transcode buffer status: +StatusTab.7=I/O statistieken: +StatusTab.8=Huidige bitrate: +StatusTab.9=Gedetecteerde media renderers +StatusTab.10=Hoogste bitrate: +StatusTab.11=Mb/s +StatusTab.12=MB +TSMuxerVideo.0=Demuxen met MEncoder en encoderen van alle audio tracks naar AC-3 +TSMuxerVideo.1=Demuxen met MEncoder en encoderen van DTS / FLAC audio tracks naar LPCM (let op: het zoeken werkt nog niet) +TSMuxerVideo.2=Gebruik ontlede FPS vanuit FFmpeg in de meta file +TSMuxerVideo.3=Video decoder instellingen (alleen voor de TsMuxeR decoder) +TSMuxerVideo.19=Mux alle audio tracks +TrTab2.0=In- of uitschakelen van een decoder +TrTab2.1=Nog geen instellingen +TrTab2.2=Video encoder instellingen voor de volgende decoders: MEncoder/AviSynth/FFmpeg +TrTab2.3=Audio instellingen, van toepassing op de volgende decoders: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Video kwaliteit instellingen +TrTab2.5=Algemene transcode instellingen +TrTab2.6=Sorteer de decoders lijst. De eerste zal in de originele map gebruikt worden. +TrTab2.7=Diverse opties +TrTab2.8=Niet transcoderen voor deze bestandsextensies (komma gescheiden): +TrTab2.9=Altijd transcoderen voor deze bestandsextensies (komma gescheiden): +TrTab2.10=Laat DTS rechtstreeks naar je receiver streamen.\nLet op: het is mogelijk dat er statische ruis ontstaat. Een paar adviezen:\n- Je moet een geschikte DTS receiver hebben, verbonden met TOSLINK of HDMI.\n- Het volume icoon moet in de XMB op 'Normaal' staan.\n- Het icoon voor kanalen moet in de XMB op 'Links+Rechts' staan.\n +TrTab2.11=Decoders +TrTab2.12=Algemene decoder instellingen +TrTab2.13=Algemene encoder instellingen +TrTab2.14=Decoders voor Videobestanden +TrTab2.15=Decoders voor Audiobestanden +TrTab2.16=Decoders voor Web Video +TrTab2.17=Decoders voor Web Audio +TrTab2.18=Overige Decoders +TrTab2.19=Decoders staan in aflopende +TrTab2.20=volgorde. De bovenste is eerst +TrTab2.21= (niet ondersteund door AviSynth) +TrTab2.22=Automatisch veranderen van de samplingfrequentie naar 44.1 of 48 kHz +TrTab2.27=Gebruik LPCM voor audio (niet hercoderen) +TrTab2.28=Gebruik originele DTS track (niet hercoderen) (te gebruiken met AV receiver door middel van optische of HDMI uitgang) +TrTab2.29=AC-3 audio bitrate voor hercoderen (in kbit/s) (bijv. 576, 640): +TrTab2.32=MPEG-2 instellingen: +TrTab2.39=De video wordt automatisch getranscodeerd en gemuxed naar MPEG-PS / AC-3 audio (zeer geschikt voor de PS3). +TrTab2.40=\nJe kunt spelen met de vscale, vqmin en keyint parameters om goede, bijna perfecte getranscodeerde kwaliteit te bereiken. +TrTab2.41=\nNadeel hiervan is dat de variabele bitrate soms boven je maximale netwerkcapaciteit uitkomt. +TrTab2.42=\nDaarom kun je de bandbreedte instellen als je over een WiFi, CPL, etc. verbinding beschikt. Echter, de kwaliteit van het transcoderen is een +TrTab2.43=\nbalans tussen de snelheid van het netwerk en de kracht van de processor: hoe meer kwaliteit je instelt met een beperkte bitrate, +TrTab2.44=\nhoe zwaarder de processor belast wordt! Verwacht niet dat je een 1080p actie film in perfecte kwaliteit met 15Mbps kunt streamen. +TrTab2.50=Maximum aantal audio kanalen uitvoer voor AC-3 hercoderen: +TrTab2.51=Ondertiteling uitschakelen +TrTab2.52=Hoofdstuk ondersteuning \#--TRANSCODE--\# map (interval in minuten): +TrTab2.55=2 kanalen (stereo) +TrTab2.56=6 kanalen (5.1) +TrTab2.60=Uitstekende kwaliteit +TrTab2.61=Zonder kwaliteitsverlies +TrTab2.62=Goede kwaliteit +TrTab2.63=Goede kwaliteit voor HD Wifi transcoderen +TrTab2.64=Matige kwaliteit voor HD Wifi transcoderen +TrTab2.65=Lage kwaliteit, low-end CPU of HD Wifi transcoderen +TracesTab.3=Wissen +TranscodeVirtualFolder.0=\#--TRANSCODE--\# +TreeNodeSettings.4=Deze decoder is niet geladen! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_no.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_no.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_no.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_no.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,213 @@ +DLNAMediaDatabase.0=Media bibliotekets database m\u00E5 reinitialiseres.\nBeklager tr\u00F8bbelet\! +FFMpegDVRMSRemux.0=Alternativ FFmpeg adresse: +FFMpegDVRMSRemux.1=Instillinger for DVR-MS konvertering +FFMpegVideo.0=Instillinger for konvertering av AviSynth/FFmpeg (Prioriterer AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Instillinger for deling +FoldTab.2=S\u00F8k gjennom alle delte mapper +FoldTab.3=S\u00F8ke gjennom alle mapper kan ta lang tid \!\n +FoldTab.4=Er du sikker p\u00E5 at du vil starte s\u00F8ket?\n\n +FoldTab.5=Ikke vis filendelser +FoldTab.6=Ikke vis \#Video Instillinger\# mapper +FoldTab.7=Delte Mapper +FoldTab.8=Ikke vis transkodingsmetode +FoldTab.9=Sett inn adresse +FoldTab.10=Vil du stoppe s\u00F8ket?\n\n +FoldTab.11=Tillat kopiering av transkodet video til PS3. +FoldTab.12=Sorter delte mapper +FoldTab.13=Miniatyrbilder +FoldTab.14=Bruk Mplayer for video-miniatyrbilder +FoldTab.15=Standard +FoldTab.16=Nyeste f\u00F8rst +FoldTab.18=Sorterings metode: +FoldTab.19=DVD ISO miniatyrbilder +FoldTab.23=Last ned ifra amazon.com +FoldTab.24=Last ned ifra discogs.com +FoldTab.26=Miniatyrbilder for lydfiler: +FoldTab.27=Alternativ mappe for cover bilder: +FoldTab.28=Velg en mappe +FoldTab.29=Vis iPhoto bibliotek +FoldTab.30=Vis iTunes bibliotek +FoldTab.31=Gjem tomme kataloger (Advarsel: gir tregere opplisting) +FoldTab.32=Gjem Media-bibliotek katalogen +FoldTab.33=Gjem \#Transcode\# katalogen +FoldTab.34=Vis aperture bibliotek +FontFileFilter.3=Truetype Font +LinksTab.5=Nyttige lenker: +LooksFrame.5=Slutt +LooksFrame.6=Hoved Panel +LooksFrame.9=Lagre +LooksFrame.12=Omstart av Server +LooksFrame.18=Status +LooksFrame.19=Logging +LooksFrame.20=Hovedkonfigurasjon +LooksFrame.21=Transkodings Instillinger +LooksFrame.22=Deling/Navigerings Instillinger +LooksFrame.24=Hjelp +LooksFrame.25=Om programmet +MEncoderAviSynth.2=Instillinger for video dekoding kun med AviSynth +MEncoderAviSynth.3=Sl\u00E5 p\u00E5 AviSynth variabel til fast bilde per sekund (convertfps=true) +MEncoderVideo.0=Ikke bruk loop filter deblocking for H.264. Kan gi d\u00E5rligere kvalitet +MEncoderVideo.1=Lyd/Bilde transkoding instillinger for MEncoder +MEncoderVideo.2=Lyd/bilde alternativ synkroniserings metode +MEncoderVideo.3=Bruk programmets standard codec parametre (Anbefalt\!) +MEncoderVideo.4=Bestem bilde per sekund for FFmpeg +MEncoderVideo.5=Her kan du legge til spesielle instillinger, slik som et st\u00F8yreduserende filter f.eks: -vf hqdn3d +MEncoderVideo.6=Mine instillinger: +MEncoderVideo.7=Spr\u00E5klyd prioritet: +MEncoderVideo.8=Undertekst instillinger +MEncoderVideo.9=Undertekst spr\u00E5k prioritet: +MEncoderVideo.10=Lyd/Undertekst spr\u00E5k prioritet (eks: en,off;eng,off) +MEncoderVideo.11=Undertekst codepage: +MEncoderVideo.12=ASS skrift instillinger: Skrift st\u00F8rrelse +MEncoderVideo.13=Skrift outline +MEncoderVideo.14=Skrift skygge +MEncoderVideo.15=Skrift margin +MEncoderVideo.16=Normal skrift instillinger: Skrift st\u00F8rrelse +MEncoderVideo.17=Skrift outline +MEncoderVideo.18=Skrift blur +MEncoderVideo.19=Skrift margin +MEncoderVideo.20=ASS/SSA Undertekst +MEncoderVideo.21=Fontconfig/Innbakt skrift +MEncoderVideo.22=Autokj\u00F8r *.srt/*.sub undertekst med samme fil navn +MEncoderVideo.24=Spesifiser TrueType Font (for asiatiske spr\u00E5k): +MEncoderVideo.25=Velg en Truetype Font +MEncoderVideo.26=Deinterlace filter +MEncoderVideo.27=Bruk Video Skalering +MEncoderVideo.28=Bredde +MEncoderVideo.29=Ekspert instillinger : Codec parametre +MEncoderVideo.30=H\u00F8yde +MEncoderVideo.32=Remux n\u00E5r lydfil er AC-3 (ikke konverter) +MEncoderVideo.33=Egne instillinger: +MEncoderVideo.34=Forandre en codecs spesielle instillinger +MEncoderVideo.35=Optimal multikjerne st\u00F8tte +MEncoderVideo.36=Bruk ASS standard stil +MEncoderVideo.37=Alternativ undertekst-katalog +MEncoderVideo.68=\#Her kan du sette inn spesifikke parametre for noen codec kombinasjoner.\n +MEncoderVideo.69=\#Det er mest for lyd/bilde synkroniserings problemer, men kan bli brukt til andre ting\n +MEncoderVideo.70=\#Se p\u00E5 det som ekspert instillinger,du ikke b\u00F8r r\u00F8re dette om du ikke vet hva du gj\u00F8r\n +MEncoderVideo.71=\#Syntax er {java condition} :: {MEncoder options} ; Du kan kombinere flere valg\n +MEncoderVideo.72=\#Parametre akseptert: filnavn srtfil container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Forsiktig, feil skrevet linje blir slettet/ignorert\n +MEncoderVideo.75=\#Spesielle instillinger:\n +MEncoderVideo.76=\# -noass: skru av ASS/SSA undertekst siden det kan \u00F8delegge for lyd/bilde synkroniseringen\n +MEncoderVideo.77=\# -nosync: skru av alternativ lyd/bilde synkroniserings metode for denne tilstand (-mc vil gj\u00F8re det samme)\n +MEncoderVideo.78=\# -kvalitet: overstyr video kvalitets instillinger\n +MEncoderVideo.79=\# -mt: tving frem bruk av flere kjerner til MEncoder(under testing, kan v\u00E6re ustabil)\n +MEncoderVideo.80=\#Denne listen vil bli bedre med tiden: justeringer/tilbakemeldinger p\u00E5 forskjellige codecs/filer er alltid \u00F8nskelig\n +MEncoderVideo.87=\#Du kan n\u00E5 bruke dine egene instillinger. Her er noen eksempler: f.eks, sl\u00E5 p\u00E5 mt build i MEncoder\n +MEncoderVideo.88=\#for all H.264 HD video (overkj\u00F8res i hoved instillinger): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#for \u00E5 fjerne 24p "hakking" p\u00E5 en 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#for og remuxe n\u00E5r video er MPEG-2 og det ikke finnes undertekst: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=Spr\u00E5k [krever omstart av programmet]: +NetworkTab.1=S\u00F8k i .RAR/.ZIP/.CBR/.CBZ arkiver +NetworkTab.2=Lag miniatyrbilder +NetworkTab.3=Start minimert +NetworkTab.4=Installer som en Windows Service +NetworkTab.5=Generelle instillinger +NetworkTab.6=Transkodingsbufferets maks st\u00F8rrelse, i megabytes (maks: MAX_BUFFER_SIZE): +NetworkTab.7=Antall kjerner som skal brukes for transkoding (Det ser ut som du har %d): +NetworkTab.11=Du har installert som Windows service\! For \u00E5 bruke det, s\u00E5 m\u00E5 du avslutte programmet,\n +NetworkTab.12=s\u00E5 starte (og konfigurere) programmet fra kontrollpanelet i Windows.\n\n +NetworkTab.13=Biblioteket vil bli gjennoppbygd\!\n +NetworkTab.14=Feil under installasjonen av Windows service\!\n +NetworkTab.15=Instillinger for Navigering og Mediebibliotek +NetworkTab.16=Lag miniatyrbilde etter X sekunder. X= +NetworkTab.17=Bruk mediebibliotek +NetworkTab.18=Nullstill mediebibliotek +NetworkTab.19=Er du sikker? +NetworkTab.20=Bruk f\u00F8lgene nettverkskort: +NetworkTab.22=Nettverks Instillinger, forandres kun ved problemer +NetworkTab.23=Server IP-adresse: +NetworkTab.24=Server port (5001 som standard): +NetworkTab.25=PS3 Instillinger +NetworkTab.26=Tegnsetting av PS3 fil navn (se XMB->Systeminstillinger->Tegnsett): +NetworkTab.27=Ubrukt instillinger du ikke b\u00F8r r\u00F8re :p +NetworkTab.28=Turbo mode (sl\u00E5 p\u00E5 tcp_nodelay) / v\u00E6r forsiktig, ikke sikkert det er mulig \u00E5 gj\u00F8re dette +NetworkTab.29=Blokker foresp\u00F8sm\u00E5l om samme fil fra PS3 n\u00E5r transkoding har startet +NetworkTab.30=Bruk et IP filter: +NetworkTab.31=Avansert HTTP og system innstillinger +NetworkTab.32=HTTP Motor V2 +NetworkTab.33=Forhindre str\u00F8msparing mens man streamer +NetworkTab.34=Plugins +NetworkTab.35=Maks b\u00E5ndbredde i Mb/s (0 betyr ingen grense): +PMS.0=PS3 har ikke blitt funnet. Er den sl\u00E5tt p\u00E5? Du kan se i loggen og/eller konfigurasjonen, alternativt debug.log filen +PMS.1=Musikk +PMS.2=\#- Media Bibliotek -\# +PMS.3=Lyd/bilde alternativ synkroniserings metode +PMS.4=Deinterlace Filter +PMS.5=PS3 er funnet\! +PMS.6=Bruk automatisk .srt/.sub undertekstfiler +PMS.7=SkipLoopFilter for H.264 Decoding [KAN SVEKKE KVALITETEN] +PMS.8=Undertekster +PMS.9=Alle Musikkspillelister +PMS.10=Definitivt sl\u00E5 av undertekster +PMS.11=Alle musikk filer +PMS.12=Etter Dato +PMS.13=Etter Artist +PMS.16=Etter Album +PMS.19=Etter Genre +PMS.21=Etter kamera model +PMS.22=Etter Artist/Album +PMS.25=Etter ISO parametre +PMS.26=Etter Genre/Artist/Album +PMS.27=Lagre konfigurasjon +PMS.31=Bilder +PMS.32=Alle Bilder +PMS.34=Video +PMS.35=Alle Videoer +PMS.36=HD Videoer +PMS.37=\#- Video Instillinger -\# +PMS.39=SD Videoer +PMS.41=(Re)installer Windows service +PMS.130=Kontakter PS3... +StatusTab.2=Status +StatusTab.3=Venter... +StatusTab.5=Tom +StatusTab.6=Transkodingsbuffer status: +StatusTab.7=Inn/Ut statistikk: +StatusTab.8=Bitrate akkurat n\u00E5: +StatusTab.9=Detekterte media enheter +StatusTab.10=Maks bitrate: +TSMuxerVideo.0=Bruk AC-3 remuxing for all lyd +TSMuxerVideo.1=Bruk PCM remuxing for DTS/FLAC lyd +TSMuxerVideo.2=Bruk FPS tolket med FFmpeg i metafilen +TSMuxerVideo.3=Video dekoder instillinger for TsMuxer +TSMuxerVideo.19=Mux alle lydspor +TrTab2.0=Sl\u00E5 p\u00E5/av en transkodingsmetode +TrTab2.1=Ingen instillinger for \u00F8yeblikket. +TrTab2.2=Video transkodingsinnstillinger for f\u00F8lgene: MEncoder/AviSynth/FFmpeg +TrTab2.3=Lyd instillinger, for: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Videokvalitets instillinger +TrTab2.5=Generell transkodings instillinger +TrTab2.6=Sorter listen for transkodingsmetoder. Den \u00F8verste vil bli brukt i den orginale video katalogen +TrTab2.7=Diverse instillinger +TrTab2.8=Ingen transkoding for f\u00F8lgende filendelser (skill med komma): +TrTab2.9=Obligatorisk transkoding for f\u00F8lgende filendelser (skill med komma): +TrTab2.10=Tillater \u00E5 sende DTS direkte til din surround decoder.\nV\u00E6r forsiktig, det er mulig at lyden kommer som bare st\u00F8y.\nGode r\u00E5d:\n- Skru ned volumet p\u00E5 forsterkeren din f\u00F8r du tester.\n- Du m\u00E5 ha en DTS godkjent dekoder tilkoblet via optisk (TOSLINK) eller HDMI.\n- Volum instillingen i PS3 m\u00E5 v\u00E6re "normal".\n- Kanal instillingen m\u00E5 settes til "left+right".\n +TrTab2.11=Transkodingsmetoder +TrTab2.12=Vanlige dekodingsinnstillinger +TrTab2.13=Vanlige transkodingsinnstillinger +TrTab2.14=Videokonverteringsmetoder +TrTab2.15=Lydkonverteringsmetoder +TrTab2.16=Video Web Streaming +TrTab2.17=Audio Web Streaming +TrTab2.18=Diverse transkodingsmetoder +TrTab2.19=Transkodingsmetoden i fet skrift vil ha h\u00F8yeste prioritet +TrTab2.20=og vil erstattte den orginale filen ved behov. +TrTab2.21=[AviSynth ikke st\u00F8ttet] +TrTab2.27=DTS/FLAC -> LPCM remux (Du trenger en HDMI motager for streaming av PCM 5.1 \! Normal hastighet = 4.6Mbps) +TrTab2.28=Behold DTS lyd, (Fungerer med optisk/digital lydutganger) -> Forsiktig, krever litt ekstra b\u00E5ndbredde\! +TrTab2.29=AC-3 Audio bitrate (i Kbits/s) (ex: 384, 576, 640): +TrTab2.32=MPEG-2 instillinger: +TrTab2.39=Videoene blir automatisk transkodet til MPEG-PS / AC-3 audio (fungerer veldig bra p\u00E5 PS3) +TrTab2.40=\nDu kan forandre p\u00E5 vqscale, vqmin og keyint parameterene slik at du f\u00E5r en god, og nesten tapsl\u00F8s transkodings kvalitet. +TrTab2.41=\nBakdelen med dette er at VBR bitraten av og til kan komme over maks kapasitet p\u00E5 nettverket ditt. +TrTab2.42=\nDerfor kan du ogs\u00E5 sette inn b\u00E5ndbredden om du bruker tr\u00E5dl\u00F8st nettverk, CPL, etc. Men, transkodings kvaliteten +TrTab2.43=\ner en balanse mellom nettverkshastighet og prosessor kraft: jo mer kvalitet du vil bruke med en begrenset b\u00E5ndbredde, +TrTab2.44=\njo mer vil prosessoren din jobbe\! Forvent derfor ikke at du klarer \u00E5 kj\u00F8re en full HD film med beste kvalitet p\u00E5 et 15Mbps nettverk:p +TrTab2.50=Antall lyd kanaler (H\u00F8ytalere): +TrTab2.51=Skru av all undertekst +TrTab2.52=Kapitler i \#Transcode\#-katalog / Oppdeling i minutter: +TracesTab.3=T\u00F8m +TreeNodeSettings.4=Denne transkodingsmetoden er ikke i bruk\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_pl.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_pl.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_pl.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_pl.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,215 @@ +DLNAMediaDatabase.0=Dla lepszego wsparcia i poprawy aplikacji,\nbiblioteka musi by\u0107 przeinicjalizowana.\nPrzepraszamy za niedogodno\u015B\u0107\! +FFMpegDVRMSRemux.0=Alternatywna \u015Bcie\u017Cka FFmpeg: +FFMpegDVRMSRemux.1=Ustawienia demultipleksowania DVR-MS +FFMpegVideo.0=Ustawienia kodera tylko dla silnika AviSynth/FFmpeg (PREFEROWANY AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Opcje udost\u0119pniania +FoldTab.2=Przeskanuj wszystkie udost\u0119pnione foldery +FoldTab.3=Skanowanie wszystkich udost\u0119pnionych folder\u00F3w mo\u017Ce zaj\u0105\u0107 bardzo du\u017Co czasu \!\n +FoldTab.4=Czy na pewno chcesz rozpocz\u0105\u0107 skanowanie?\n\n +FoldTab.5=Ukryj rozszerzenia plik\u00F3w +FoldTab.6=Ukryj folder \#- Ustawienia Wideo -\# +FoldTab.7=Foldery udost\u0119pnione +FoldTab.8=Ukryj nazwy silnik\u00F3w transkoduj\u0105cych +FoldTab.9=Dodaj \u015Bcie\u017Ck\u0119 +FoldTab.10=Czy chcesz przerwa\u0107 skanowanie?\n\n +FoldTab.11=W\u0142\u0105cz transkodowan\u0105 kopi\u0119 wideo na PS3 (Ostro\u017Cnie, pliki nie maj\u0105 ustalonego rozmiaru\!) +FoldTab.12=Posortuj udost\u0119pnione foldery +FoldTab.13=Miniatury +FoldTab.14=U\u017Cywaj MPlayer-a do miniatur wideo +FoldTab.15=Domy\u015Blnie +FoldTab.16=Nowsze na pocz\u0105tku +FoldTab.18=Metoda sortowania plik\u00F3w: +FoldTab.19=Miniatury DVD ISO +FoldTab.21=Miniatury zdj\u0119\u0107 +FoldTab.23=Pobierz z amazon.com +FoldTab.24=Pobierz z discogs.com +FoldTab.26=Wy\u015Bwietlanie miniatur audio: +FoldTab.27=Alternatywny folder z ok\u0142adkami wideo +FoldTab.28=Wybierz folder +FoldTab.29=Poka\u017C bibliotek\u0119 aperture +FoldTab.29=Poka\u017C bibliotek\u0119 iPhoto +FoldTab.30=Poka\u017C bibliotek\u0119 iTunes +FoldTab.31=Ukryj foldery puste/bez medi\u00F3w (Ostrze\u017Cenie: wolniejsze przegl\u0105danie) +FoldTab.32=Ukryj folder biblioteki medi\u00F3w +FoldTab.33=Ukryj folder \#Transcode\# +FontFileFilter.3=Czcionki TrueType +LinksTab.5=Przydatne linki: +LooksFrame.5=Wyj\u015Bcie +LooksFrame.6=Panel g\u0142\u00F3wny +LooksFrame.9=Zapisz +LooksFrame.12=Zrestartuj Serwer +LooksFrame.18=Status +LooksFrame.19=\u015Aledzenie +LooksFrame.20=Konfiguracja og\u00F3lna +LooksFrame.21=Ustawienia transkodowania +LooksFrame.22=Ustawienia nawigacji/udost\u0119pniania +LooksFrame.24=Cz\u0119ste pytania/pomoc +LooksFrame.25=O programie +MEncoderAviSynth.2=Ustawienia dekodera wideo tylko dla silnika AviSynth +MEncoderAviSynth.3=W AviSynth zamie\u0144 zmienn\u0105 ilo\u015B\u0107 klatek na sta\u0142\u0105 ilo\u015B\u0107 klatek (convertfps=true) +MEncoderVideo.0=Pomi\u0144 filtr deblokowania dla H.264: MO\u017BE POGORSZY\u0106 JAKO\u015A\u0106, wy\u0142\u0105cz je\u015Bli tw\u00F3j procesor nie jest zbyt szybki\!\! +MEncoderVideo.1=Ustawienia dekodera d\u017Awi\u0119ku/wideo tylko dla silnika MEncoder +MEncoderVideo.2=Alternatywna metoda synchronizacji A/V +MEncoderVideo.3=U\u017Cyj domy\u015Blnych parametr\u00F3w aplikacji dla kodek\u00F3w (zalecane) +MEncoderVideo.4=Wymu\u015B ilo\u015B\u0107 klatek/sek pobran\u0105 z FFmpeg +MEncoderVideo.5=Tutaj mo\u017Cesz doda\u0107 specyficzne opcje, takie jak np. filtr redukcji szum\u00F3w: -vf hqdn3d +MEncoderVideo.6=W\u0142asne opcje: +MEncoderVideo.7=Priorytet j\u0119zyka \u015Bcie\u017Cki d\u017Awi\u0119kowej: +MEncoderVideo.8=Ustawienia napis\u00F3w +MEncoderVideo.9=Priorytet j\u0119zyk\u00F3w napis\u00F3w: +MEncoderVideo.10=Priorytet j\u0119zyk\u00F3w d\u017Awi\u0119ku/napis\u00F3w (np: en,off;eng,off) +MEncoderVideo.11=Strona kodowa napis\u00F3w: +MEncoderVideo.12=Ustawienia czcionki dla ASS: Rozmiar czcionki +MEncoderVideo.13=Obrys czcionki +MEncoderVideo.14=Cieniowanie czcionki +MEncoderVideo.15=Margines czcionki +MEncoderVideo.16=Ustawienia domy\u015Blne czcionki: Rozmiar czcionki +MEncoderVideo.17=Obrys czcionki +MEncoderVideo.18=Rozmycie czcionki +MEncoderVideo.19=Margines czcionki +MEncoderVideo.20=Napisy ASS/SSA +MEncoderVideo.21=Czcionki Fontconfig/wbudowane +MEncoderVideo.22=Automatycznie \u0142aduj napisy *.srt/*.sub z t\u0105 sam\u0105 nazw\u0105 pliku +MEncoderVideo.24=Specyficzna czcionka TrueType (dla j\u0119zyk\u00F3w azjatyckich): +MEncoderVideo.25=Wybierz czcionk\u0119 TrueType +MEncoderVideo.26=Usuwanie przeplotu +MEncoderVideo.27=Skalowanie obrazu +MEncoderVideo.28=Szeroko\u015B\u0107 +MEncoderVideo.29=Ustawienia dla ekspert\u00F3w: Parametry poszczeg\u00F3lnych kodek\u00F3w +MEncoderVideo.30=Wysoko\u015B\u0107 +MEncoderVideo.32=Demultipleksuj \u015Bcie\u017Ck\u0119 d\u017Awi\u0119kow\u0105 AC-3 (bez przekodowywania) +MEncoderVideo.33=W\u0142asne parametry: +MEncoderVideo.34=Edytuj specyficzne parametry kodek\u00F3w +MEncoderVideo.35=Rozszerzone wsparcie wielordzeniowe dla zawarto\u015Bci HD H.264 +MEncoderVideo.36=U\u017Cyj domy\u015Blny styl ASS +MEncoderVideo.37=Alternatywny folder z napisami +MEncoderVideo.39=Demultipleksuj wideo w obrazach ISO DVD (bez przekodowywania) +MEncoderVideo.68=\#Tutaj mo\u017Cesz wpisa\u0107 parametry specyficzne dla niekt\u00F3rych kombinacji kodek\u00F3w.\n +MEncoderVideo.69=\#Wykorzystywane g\u0142\u00F3wnie w przypadku problem\u00F3w z synchronizacj\u0105 A/V , ale mo\u017Ce by\u0107 u\u017Cyte r\u00F3wnie\u017C do innych ustawie\u0144\n +MEncoderVideo.70=\#Ustawienia eksperckie - nie powinny by\u0107 u\u017Cywane je\u015Bli nie jeste\u015B absolutnie pewien co robisz\n +MEncoderVideo.71=\#Sk\u0142adnia {warunek java} :: {opcje MEncoder} ; Mo\u017Cna po\u0142\u0105czy\u0107 kilka opcji\n +MEncoderVideo.72=\#Dozwolone tokeny: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Ostro\u017Cnie, ka\u017Cda \u017Ale sformatowana linia b\u0119dzie wymazana\n +MEncoderVideo.75=\#Opcje specjalne:\n +MEncoderVideo.76=\# -noass: definitywnie wy\u0142\u0105cz napisy ASS/SSA poniewa\u017C mog\u0105 zepsu\u0107 synchronizacje A/V\n +MEncoderVideo.77=\# -nosync: definitywnie wy\u0142\u0105cz alternatywn\u0105 metod\u0119 synchronizacji A/V (-mc robi to samo)\n +MEncoderVideo.78=\# -quality: nadpisz ustawienia jako\u015Bci obrazu\n +MEncoderVideo.79=\# -mt: wymu\u015B u\u017Cycie wielow\u0105tkowego MEncoder (eksperymentalne, mo\u017Ce by\u0107 niestabilne)\n +MEncoderVideo.80=\#Ta lista z czasem zostanie poprawiona: wszystkie opinie/rady na temat kodek\u00F3w/plik\u00F3w s\u0105 mile widziane\n +MEncoderVideo.87=\#Tutaj mo\u017Cesz wpisa\u0107 w\u0142asne warunki/opcje\! Oto przyk\u0142ady: np. do w\u0142\u0105czenia wielow\u0105tkowej wersji MEncoder\n +MEncoderVideo.88=\#dla ka\u017Cdej zawarto\u015Bci H.264 HD (zb\u0119dne z g\u0142\u00F3wnymi opcjami): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#do usuni\u0119cia warkotu 24p na 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#remuksuj kiedy obraz jest zakodowany w MPEG-2 i nie ma napis\u00F3w: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=J\u0119zyk [potrzebny restart aplikacji]: +NetworkTab.1=Przegl\u0105daj archiwa .RAR/.ZIP/.CBR +NetworkTab.2=Generowanie miniatur +NetworkTab.3=Rozpocznij zminimalizowany +NetworkTab.4=Zainstaluj jako us\u0142ug\u0119 Windows +NetworkTab.5=Ustawienia og\u00F3lne +NetworkTab.6=Maksymalna wielko\u015B\u0107 bufora traskodowania, w megabajtach (maksimum: MAX_BUFFER_SIZE): +NetworkTab.7=Ilo\u015B\u0107 rdzeni u\u017Cywana do transkodowania (wygl\u0105da na to, \u017Ce masz %d): +NetworkTab.11=Zainstalowa\u0142e\u015B us\u0142ug\u0119 Windows \! Aby j\u0105 u\u017Cy\u0107, musisz wyj\u015B\u0107 z programu,\n +NetworkTab.12=a nast\u0119pnie uruchomi\u0107 (i skonfigurowa\u0107) us\u0142ug\u0119 z panelu administracyjnego Windows.\n\n +NetworkTab.13=Biblioteka medi\u00F3w zostanie zainicjalizowana \!\n +NetworkTab.14=B\u0142\u0105d w instalacji us\u0142ugi Windows\!\n +NetworkTab.15=Ustawienia nawigacji/analizy +NetworkTab.16=Moment pobierania miniatury (w sek.): +NetworkTab.17=W\u0142acz bibliotek\u0119 medi\u00F3w / buforowanie +NetworkTab.18=Zresetuj bibliotek\u0119 medi\u00F3w +NetworkTab.19=Jeste\u015B pewien? +NetworkTab.20=Wymu\u015B sie\u0107 na interfejsie: +NetworkTab.22=Ustawienia sieci, zmie\u0144 tylko w przypadku problem\u00F3w +NetworkTab.23=Wymu\u015B IP serwera: +NetworkTab.24=Wymu\u015B port serwera (5001 domy\u015Blnie): +NetworkTab.25=Ustawienia PS3 +NetworkTab.26=Kodowanie znak\u00F3w nazw plik\u00F3w twojej PS3 (sprawd\u017A XMB->System settings->Charset): +NetworkTab.27=Niewykorzystywane ustawienia kt\u00F3rych nie powiniene\u015B u\u017Cywa\u0107 :p +NetworkTab.28=Tryb turbo (w\u0142\u0105cz tcp_nodelay) / b\u0105d\u017A ostro\u017Cny, niewiadomo czy to jest ok +NetworkTab.29=Blokuj przychodz\u0105ce z PS3 pro\u015Bby o ten sam plik, gdy rozpocz\u0119\u0142o si\u0119 transkodowanie +NetworkTab.30=U\u017Cyj filtr IP: +NetworkTab.31=Ustawienia zawansowane systemu i HTTP +NetworkTab.32=Silnik HTTP V2 +NetworkTab.33=W czasie streamingu zapobiegaj u\u015Bpieniu systemu +NetworkTab.34=System wtyczek +NetworkTab.35=Maksymalny transfer w Mb/s (0 oznacz brak limitu): +PMS.0=Konsola PS3 nie zosta\u0142a znaleziona. Czy na pewno jest w\u0142\u0105czona? Mo\u017Cesz sprawdzi\u0107 log \u015Bledzenia, konfiguracj\u0119 oraz plik debug.log +PMS.1=D\u017Awi\u0119k +PMS.2=\#- Biblioteka Medi\u00F3w -\# +PMS.3=Alternatywna metoda synchronizacji A/V +PMS.4=Usuni\u0119cie przeplotu +PMS.5=Konsola PS3 zosta\u0142a znaleziona \! +PMS.6=Automatycznie \u0142aduj napisy .srt/.sub +PMS.7=Wy\u0142\u0105cz filtr deblokowania przy dekodowaniu H.264 [MOZE POGORSZYC JAKOSC] +PMS.8=Napisy +PMS.9=Wszystkie playlisty d\u017Awi\u0119kowe +PMS.10=Definitywnie wy\u0142\u0105cz napisy +PMS.11=Wszystkie \u015Bcie\u017Cki d\u017Awi\u0119kowe +PMS.12=Wg daty +PMS.13=Wg artysty +PMS.16=Wg albumu +PMS.19=Wg rodzaju +PMS.21=Wg modelu aparatu +PMS.22=Wg artysty/albumu +PMS.25=Wg ustawie\u0144 ISO +PMS.26=Wg gatunku/artysty/albumu +PMS.27=Zapisz konfiguracj\u0119 +PMS.31=Zdj\u0119cie +PMS.32=Wszystkie zdj\u0119cia +PMS.34=Wideo +PMS.35=Wszystkie wideo +PMS.36=Wideo HD +PMS.37=\#- Ustawienia Wideo -\# +PMS.39=Wideo SD +PMS.41=(Re)instalacja us\u0142ugi Windows +PMS.130=Kontaktuj\u0119 si\u0119 z PS3... +StatusTab.2=Status +StatusTab.3=Czekam... +StatusTab.5=Pusty +StatusTab.6=Status bufora transkodowania: +StatusTab.7=Statystyka We/Wy: +StatusTab.8=Aktualna przep\u0142ywno\u015B\u0107: +StatusTab.9=Wykryte odtwarzacze +StatusTab.10=Najwy\u017Csza przep\u0142ywno\u015B\u0107: +TSMuxerVideo.0=Demultipleksuj MEncoderem i koduj wszystkie \u015Bcie\u017Cki audio do AC-3 +TSMuxerVideo.1=Demultipleksuj MEncoderem i koduj \u015Bcie\u017Cki audio DTS/FLAC do LPCM [Ostro\u017Cnie, przewijanie jeszcze nie dzia\u0142a] +TSMuxerVideo.2=Wymu\u015B ilo\u015B\u0107 klatek/sek pobran\u0105 z FFmpeg w pliku meta +TSMuxerVideo.3=Ustawienia dekodera wideo tylko dla silnika TsMuxer +TSMuxerVideo.19=Multipleksuj wszystkie \u015Bcie\u017Cki audio +TrTab2.0=W\u0142\u0105cz/wy\u0142\u0105cz silnik transkodowania +TrTab2.1=W tej chwili brak ustawie\u0144 +TrTab2.2=Ustawienia kodera wideo dla nast\u0119puj\u0105cych silnik\u00F3w: MEncoder/AviSynth/FFmpeg +TrTab2.3=Ustawienia d\u017Awi\u0119ku u\u017Cywane dla dekoderow MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Ustawienia jako\u015Bci obrazu +TrTab2.5=Wsp\u00F3lne ustawienia transkodowania +TrTab2.6=Sortuj list\u0119 silnik\u00F3w transkodujacych. Pierwszy pojawi si\u0119 w oryginalnym folderze wideo +TrTab2.7=R\u00F3\u017Cne opcje +TrTab2.8=Pomi\u0144 transkodowanie dla nast\u0119puj\u0105cych rozszerze\u0144 (rozdzielone przecinkiem): +TrTab2.9=Wymu\u015B transkodowanie dla nast\u0119puj\u0105cych rozszerze\u0144 (rozdzielone przecinkiem): +TrTab2.10=Pozwala na strumieniowanie DTS do odbiornika.\nUwa\u017Caj, mo\u017Cliwy jest sta\u0142y ton. Oto kilka porad:\n- musisz mie\u0107 odbiornik kompatybilny z DTS, pod\u0142\u0105czony przez TOSLINK lub HDMI\n- ikona g\u0142o\u015Bno\u015Bci w XMB musi by\u0107 \u2018Normal\u2019\n- ikona kana\u0142\u00F3w w XMB musi by\u0107 \u2018Left+Right\u2019\n +TrTab2.11=Silniki +TrTab2.12=Wsp\u00F3lne ustawienia dekodera +TrTab2.13=Wsp\u00F3lne ustawienia kodera +TrTab2.14=Silniki plik\u00F3w wideo +TrTab2.15=Silniki plik\u00F3w audio +TrTab2.16=Silniki strumieniowania wideo WWW +TrTab2.17=Silniki strumieniowania audio WWW +TrTab2.18=R\u00F3\u017Cne silniki +TrTab2.19=Silnik pogrubiony b\u0119dzie mia\u0142 priorytet +TrTab2.20=i zast\u0105pi oryginalne wideo +TrTab2.21=[Nie dzia\u0142a z AviSynth] +TrTab2.27=Multipleksuj DTS/FLAC do LPCM (Musisz mie\u0107 odbiornik HDMI do przesy\u0142ania PCM 5.1 \! \u015Arednia przep\u0142ywno\u015B\u0107 = 4.6Mbps) +TrTab2.28=Pozostaw d\u017Awi\u0119k DTS w strumieniu (kompatybilne z wyj\u015Bciem optycznym) -> Ostro\u017Cnie, dodatkowa przep\u0142ywno\u015B\u0107\! +TrTab2.29=Przep\u0142ywno\u015B\u0107 d\u017Awieku AC-3 (w Kbits/s) (np: 384, 576, 640): +TrTab2.32=Ustawienia jako\u015Bci MPEG-2: +TrTab2.39=Porady dotycz\u0105ce kodera:\n\nWideo jest automatycznie transkodowane i multipleksowane do MPEG-PS / AC-3 (du\u017Ca kompatybilno\u015B\u0107 z PS3) +TrTab2.40=\nMo\u017Cesz zmienia\u0107 parametry vqscale, vqmin and keyint aby osi\u0105gn\u0105\u0107 dobr\u0105, nawet bezstratn\u0105 jako\u015B\u0107 transkodowania. +TrTab2.41=\nMo\u017Ce to powodowa\u0107 problem z przep\u0142ywno\u015Bci\u0105 dla VBR, kt\u00F3ra czasami mo\u017Ce przekroczy\u0107 mo\u017Cliwo\u015Bci sieci. +TrTab2.42=\nDlatego, je\u015Bli u\u017Cywasz WiFi, CPL, itd., mo\u017Cesz ustawi\u0107 transfer maksymalny sieci. Musisz wypo\u015Brodkowa\u0107 jako\u015B\u0107 transkodowania +TrTab2.43=\npomi\u0119dzy szybko\u015Bci\u0105 sieci i moc\u0105 procesora: im wi\u0119ksz\u0105 jako\u015Bci w\u0142o\u017Cysz w ograniczon\u0105 przep\u0142ywno\u015B\u0107, +TrTab2.44=\ntym wi\u0119cej b\u0119dzie cierpia\u0142 procesor\! Dodatkowo, nie oczekuj \u017Ce zmie\u015Bcisz film akcji 1080p najlepszej jako\u015Bci w 15Mbps :p +TrTab2.50=Ilo\u015B\u0107 kana\u0142\u00F3w audio: +TrTab2.51=Definitywnie wy\u0142\u0105cz napisy +TrTab2.52=U\u017Cywaj rozdzia\u0142\u00F3w w folderze \#Transcode\# / Odst\u0119py w minutach: +TracesTab.3=Wyczy\u015B\u0107 +TreeNodeSettings.4=Ten silnik nie jest za\u0142adowany\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_pt.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_pt.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_pt.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_pt.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,214 @@ +DLNAMediaDatabase.0=Para melhorar o suporte e a qualidade da aplica\u00E7\u00E3o,\na base de dados da biblioteca de media tem de ser reiniciada.\nPedimos desculpa pelo facto \! +FFMpegDVRMSRemux.0=Caminho FFmpeg Alternativo: +FFMpegDVRMSRemux.1=Defini\u00E7\u00F5es para DVR-MS remuxing +FFMpegVideo.0=Defini\u00E7\u00F5es do codificador s\u00F3 para o motor AviSynth/FFmpeg (PREFERIR AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Op\u00E7\u00F5es de Partilha +FoldTab.2=Pesquisar todas as pastas partilhadas +FoldTab.3=Pesquisar todas as pastas partilhadas poder\u00E1 demorar muito tempo \!\n +FoldTab.4=Tem a certeza que quer iniciar a pesquisa?\n\n +FoldTab.5=Esconder extens\u00E3o dos ficheiros +FoldTab.6=Ocultar Pasta \#Defini\u00E7\u00F5es de V\u00EDdeo\# +FoldTab.7=Pastas Partilhadas +FoldTab.8=Esconder nomes dos motores de transcoding +FoldTab.9=Adicionar Pasta +FoldTab.10=Deseja terminar a pesquisa?\n\n +FoldTab.11=Activar c\u00F3pia de v\u00EDdeo na PS3 / Aten\u00E7\u00E3o, a navega\u00E7\u00E3o poder\u00E1 tornar-se lenta +FoldTab.12=Ordenar as pastas partilhadas +FoldTab.13=Miniaturas +FoldTab.14=Usar Mplayer para miniaturas de V\u00EDdeo +FoldTab.15=Padr\u00E3o +FoldTab.16=Mais recentes primeiro +FoldTab.18=M\u00E9todo de ordena\u00E7\u00E3o de ficheiros: +FoldTab.19=Miniaturas DVD ISO +FoldTab.23=Download de amazon.com +FoldTab.24=Download de discogs.com +FoldTab.26=Miniaturas de \u00C1udio: +FoldTab.27=Pasta alternativa para capas de v\u00EDdeo +FoldTab.28=Escolha uma pasta +FoldTab.29=Mostrar biblioteca do iPhoto +FoldTab.30=Mostrar biblioteca do iTunes +FoldTab.31=Esconder pastas vazias/n\u00E3o media (Cuidado: navega\u00E7\u00E3o mais lenta) +FoldTab.32=Esconder pasta de biblioteca de media +FoldTab.33=Esconder Pasta \#Transcode\# +FoldTab.34=Mostrar biblioteca do aperture +FontFileFilter.3=Fontes Truetype +LinksTab.5=Links \u00FAteis: +LooksFrame.5=Sair +LooksFrame.6=Painel Principal +LooksFrame.9=Guardar +LooksFrame.12=Reiniciar Servidor +LooksFrame.18=Estado +LooksFrame.19=Registo +LooksFrame.20=Configura\u00E7\u00E3o Geral +LooksFrame.21=Defini\u00E7\u00F5es de Transcoding +LooksFrame.22=Navega\u00E7\u00E3o/Defini\u00E7\u00F5es de Partilha +LooksFrame.24=FAQ / Ajuda +LooksFrame.25=Sobre +MEncoderAviSynth.2=Defini\u00E7\u00F5es do Descodificador de V\u00EDdeo apenas para o motor AviSynth +MEncoderAviSynth.3=Activar a mudan\u00E7a do AviSynth para framerate constante (convertfps=true) +MEncoderVideo.0=N\u00E3o usar loop filter deblocking para H.264: Pode degradar a qualidade, desactive se o CPU for suficientemente r\u00E1pido\! +MEncoderVideo.1=Defini\u00E7\u00F5es do Descodificador apenas para o motor V\u00EDdeo/\u00C1udio MEncoder +MEncoderVideo.2=M\u00E9todo alternativo de sincroniza\u00E7\u00E3o A/V +MEncoderVideo.3=Usar par\u00E2metros padr\u00E3o dos codecs (Recomendado\!\n) +MEncoderVideo.4=For\u00E7ar framerate analizado pelo FFmpeg +MEncoderVideo.5=Aqui pode adicionar op\u00E7\u00E3es espec\u00EDficas, tais como um filtro de denoise, por exemplo: -vf hqdn3d +MEncoderVideo.6=Op\u00E7\u00F5es personalizadas: +MEncoderVideo.7=Prioridade da linguagem \u00E1udio: +MEncoderVideo.8=Defini\u00E7\u00F5es de Legendas +MEncoderVideo.9=Prioridade de Linguagem para Legendas: +MEncoderVideo.10=Prioridade de Linguagem \u00E1udio/Legendas (exemplo: en,off;eng,off) +MEncoderVideo.11=P\u00E1gina de C\u00F3digo das Legendas: +MEncoderVideo.12=Defini\u00E7\u00F5es de fonte ASS: Escala de Fonte +MEncoderVideo.13=Contorno da Fonte +MEncoderVideo.14=Sombra da Fonte +MEncoderVideo.15=Margem da Fonte +MEncoderVideo.16=Defini\u00E7\u00F5es padr\u00E3o de fontes: Escala de Fonte +MEncoderVideo.17=Contorno da Fonte +MEncoderVideo.18=Borr\u00E3o da Fonte +MEncoderVideo.19=Margem da Fonte +MEncoderVideo.20=Legendas ASS/SSA +MEncoderVideo.21=Fontconfig/Fontes incorporadas +MEncoderVideo.22=Auto carregar legendas *.srt/*.sub com o mesmo nome do ficheiro +MEncoderVideo.24=Fonte TrueType espec\u00EDfica (para l\u00EDnguas asi\u00E1ticas): +MEncoderVideo.25=Seleccionar Fonte Truetype +MEncoderVideo.26=Filtro Deinterlace +MEncoderVideo.27=Usar v\u00EDdeo scaler +MEncoderVideo.28=Largura +MEncoderVideo.29=Defini\u00E7\u00F5es avan\u00E7adas: Par\u00E2metros espec\u00EDficos de Codecs +MEncoderVideo.30=Altura +MEncoderVideo.32=Remux quando a pista de \u00E1udio for AC-3 (sem recodifica\u00E7\u00E3o) +MEncoderVideo.33=Par\u00E2metros personalizados: +MEncoderVideo.34=Editar par\u00E2metros personalizados de codecs +MEncoderVideo.35=Suporte multicore melhorado para conte\u00FAdo H.264 HD +MEncoderVideo.36=Usar estilo ASS original +MEncoderVideo.37=Pasta alternativa para legendas +MEncoderVideo.39=Remuxar faixa de video DVD ISO (sem reencode) +MEncoderVideo.68=\#Aqui pode usar par\u00E2metros espec\u00EDficos para algumas combina\u00E7\u00F5es de codecs.\n +MEncoderVideo.69=\#\\u00c9 usado maioritariamente para problemas de sincroniza\u00E7\u00E3o A/V, mas pode ser usado para qualquer outro fim, tamb\u00E9m\n +MEncoderVideo.70=\#Considerar como defini\u00E7\u00F5es avan\u00E7adas, n\u00E3o devendo ser usado se n\u00E3o souber exactamente como\n +MEncoderVideo.71=\#A sintaxe \u00E9 {java condition} :: {MEncoder options} ; Pode acumular diversas op\u00E7\u00F5es\n +MEncoderVideo.72=\#Tokens autorizados: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Cuidado, qualquer linha mal composta ser\u00E1 eliminada\n +MEncoderVideo.75=\#Op\u00E7\u00F5es especiais:\n +MEncoderVideo.76=\# -noass: desactiva definitivamente legendas ASS/SSA visto poderem interferir com a sincroniza\u00E7\u00E3o A/V\n +MEncoderVideo.77=\# -nosync: desactiva definitivamente m\u00E9todo alternativo de sincroniza\u00E7\u00E3o A/V para esta condi\u00E7\u00E3o (-mc far\u00E1 o mesmo)\n +MEncoderVideo.78=\# -quality: sobrepor defini\u00E7\u00F5es de quailidade de v\u00EDdeo\n +MEncoderVideo.79=\# -mt: for\u00E7ar utiliza\u00E7\u00E3o do build MEncoder multithreaded (experimental, poder\u00E1 ser inst\u00E1vel)\n +MEncoderVideo.80=\#Esta lista ser\u00E1 melhorada com o tempo: ajustes/feedbacks em v\u00E1rios ficheiros/codecs ser\u00E3o sempre bem-vindos\n +MEncoderVideo.87=\#Pode usar aqui as suas pr\u00F3prias condi\u00E7\u00F5es/op\u00E7\u00F5es\!\n Alguns exemplos: para activar o build mt do MEncoder\n +MEncoderVideo.88=\#para qualquer conte\u00FAdo HD H.264(redundante com a op\u00E7\u00E3o principal): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#para remover 24p judder numa TV de 50hz: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#para remux quando o v\u00EDdeo for MPEG-2 e n\u00E3o houver legendas: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=L\u00EDngua [tem de reiniciar a aplica\u00E7\u00E3o]: +NetworkTab.1=Navegar nos ficheiros .RAR/.ZIP/.CBR +NetworkTab.2=Gerar miniaturas +NetworkTab.3=Iniciar minimizado +NetworkTab.4=Instalar como Servi\u00E7o do Windows +NetworkTab.5=Defini\u00E7\u00F5es Gerais +NetworkTab.6=Tamanho m\u00E1ximo do buffer de transcode, em megabytes (m\u00E1ximo: MAX_BUFFER_SIZE): +NetworkTab.7=N\u00FAmero de n\u00FAcleos usados para transcoding (parece que tem %d): +NetworkTab.11=Instalou o servi\u00E7o no Windows \! Para usar, tem de sair da aplica\u00E7\u00E3o,\n +NetworkTab.12=depois iniciar (e configurar) o servi\u00E7o pelo painel de gest\u00E3o do Windows.\n\n +NetworkTab.13=A biblioteca de media ser\u00E1 reiniciada \!\n +NetworkTab.14=Erro na instala\u00E7\u00E3o do servi\u00E7o do Windows\!\n +NetworkTab.15=Defini\u00E7\u00F5es de Navega\u00E7\u00E3o/An\u00E1lize +NetworkTab.16=Posi\u00E7\u00E3o de procura de miniatura (em segundos): +NetworkTab.17=Activar biblioteca de media +NetworkTab.18=Repor biblioteca de media +NetworkTab.19=Tem a certeza? +NetworkTab.20=For\u00E7ar rede no interface: +NetworkTab.22=Defini\u00E7\u00F5es de Rede, mude apenas se tiver problemas +NetworkTab.23=For\u00E7ar IP do servidor: +NetworkTab.24=For\u00E7ar porta do servidor (5001 por defeito): +NetworkTab.25=Defini\u00E7\u00F5es PS3 +NetworkTab.26=Codifica\u00E7\u00E3o de caracteres dos nomes dos da PS3 (ver XMB->Defini\u00E7\u00F5es de sistema->Charset): +NetworkTab.27=Defini\u00E7\u00F5es n\u00E3o utilizadas que n\u00E3o deve usar :p +NetworkTab.28=Modo Turbo (activa tcp_nodelay) / use com cuidado, poder\u00E1 n\u00E3o ser bom usar isto +NetworkTab.29=Bloquear pedidos para o mesmo ficheiro a partir da PS3 assim que o transcode iniciar +NetworkTab.30=Usar filtro IP: +NetworkTab.31=Defini\u00E7\u00F5es avan\u00E7adas de HTTP e do sistema +NetworkTab.32=Motor HTTP V2 +NetworkTab.33=Prevenir modo de suspens\u00E3o enquanto faz stream +NetworkTab.34=Sistema de Plugins +NetworkTab.35=Largura de banda m\u00E1xima em Mb/s (0 significa sem limite): +PMS.0=A PS3 n\u00E3o foi encontrada. Estar\u00E1 ligada? Verifique o registo e/ou configura\u00E7\u00E3o, ou ent\u00E3o no ficheiro debug.log +PMS.1=\u00C1udio +PMS.2=\#- Biblioteca de Media -\# +PMS.3=M\u00E9todo alternativo para sincroniza\u00E7\u00E3o A/V +PMS.4=Filtro de Deinterlace +PMS.5=PS3 encontrada \! +PMS.6=Auto carregar legendas .srt/.sub +PMS.7=SkipLoopFilter para Descodifica\u00E7\u00E3o H.264 [PODER\u00C1 DEGRADAR A QUALIDADE] +PMS.8=Legendas +PMS.9=Todas as Playlists de \u00E1udio +PMS.10=Desactivar legendas definitivamente +PMS.11=Todas as faixas \u00E1udio +PMS.12=Por Data +PMS.13=Por Artista +PMS.16=Por Album +PMS.19=Por G\u00E9nero +PMS.21=Por modelo de c\u00E2mara +PMS.22=Por Artista/Album +PMS.25=Por defini\u00E7\u00F5es ISO +PMS.26=Por G\u00E9nero/Artista/Album +PMS.27=Guardar configura\u00E7\u00E3o +PMS.31=Foto +PMS.32=Todas as Fotos +PMS.34=V\u00EDdeo +PMS.35=Todos os V\u00EDdeos +PMS.36=V\u00EDdeos HD +PMS.37=\#- Defini\u00E7\u00F5es de V\u00EDdeo -\# +PMS.39=V\u00EDdeos SD +PMS.41=(Re)instalar servi\u00E7o Win32 +PMS.130=A Contactar a PS3... +StatusTab.2=Estado +StatusTab.3=A aguardar... +StatusTab.5=Vazio +StatusTab.6=Estado do buffer de Transcoding: +StatusTab.7=Estat\u00EDstica de E/S: +StatusTab.8=Bitrate actual: +StatusTab.9=Media renderers detectados +StatusTab.10=Pico de bitrate: +TSMuxerVideo.0=For\u00E7ar AC-3 remuxing com todos os ficheiros +TSMuxerVideo.1=For\u00E7ar PCM remuxing com \u00E1udio DTS/FLAC +TSMuxerVideo.2=For\u00E7ar FPS analizado pelo FFmpeg no ficheiro meta +TSMuxerVideo.3=Defini\u00E7\u00F5es do Descodificador de V\u00EDdeo apenas para o motor TsMuxer +TSMuxerVideo.19=Muxar todas a faixas de audio +TrTab2.0=Activar/desactivar um motor de transcoding +TrTab2.1=Sem defini\u00E7\u00F5es para configurar por agora +TrTab2.2=Defini\u00E7\u00F5es do codificador de v\u00EDdeo com os seguintes motores: MEncoder/AviSynth/FFmpeg +TrTab2.3=Defini\u00E7\u00F5es \u00E1udio, a aplicar aos seguintes descodificadores: MEncoder/AviSynth/FFmpeg +TrTab2.4=Defini\u00E7\u00F5es de qualidade de V\u00EDdeo +TrTab2.5=Defini\u00E7\u00F5es comuns de transcode +TrTab2.6=Ordenar a lista de motores de transcoding. O primeiro ir\u00E1 aparecer na pasta original de v\u00EDdeo +TrTab2.7=V\u00E1rias op\u00E7\u00F5es +TrTab2.8=Saltar transcode para as seguintes extens\u00F5es (separadas por v\u00EDrgulas): +TrTab2.9=For\u00E7ar transcode para as seguintes extens\u00F5es (separadas por v\u00EDrgulas): +TrTab2.10=Permite fazer stream de DTS directamente para o receptor.\nAten\u00E7\u00E3o, \u00E9 poss\u00EDvel que se ou\u00E7a um som de est\u00E1tica. Conselhos:\n- Tem de ter um receptor compat\u00EDvel com DTS, ligado atrav\u00E9s de TOSLINK ou HDMI\n- O \u00EDcone de volume no XMB tem de estar em 'Normal'\n- O \u00EDcone dos canais no XMB tem de estar 'Left+Right'\n +TrTab2.11=Motores +TrTab2.12=Defini\u00E7\u00F5es comuns do descodificador +TrTab2.13=Defini\u00E7\u00F5es comuns do codificador +TrTab2.14=Motores de ficheiros de v\u00EDdeo +TrTab2.15=Motores de ficheiros de \u00E1udio +TrTab2.16=Motores de streaming de v\u00EDdeo web +TrTab2.17=Motores de streaming de \u00E1udio Web +TrTab2.18=Motores v\u00E1rios +TrTab2.19=Motor a negrito ser\u00E1 o priorit\u00E1rio +TrTab2.20=e ir\u00E1 substituir o v\u00EDdeo original +TrTab2.21=[AviSynth n\u00E3o suportado] +TrTab2.27=DTS/FLAC -> LPCM remux (Necessita um receptor HDMI para streaming de PCM 5.1 \! Bitrate m\u00E9dio = 4.6Mbps) +TrTab2.28=Manter o \u00E1udio DTS no stream (Compat\u00EDvel com sa\u00EDda \u00F3ptica) -> Aten\u00E7\u00E3o, ligeiro aumento no bitrate \!\n +TrTab2.29=Bitrate de \u00E1udio AC-3 (em Kbits/s) (ex: 384, 576, 640): +TrTab2.32=Defini\u00E7\u00F5es MPEG-2: +TrTab2.39=Dicas do codificador:\n\nO v\u00EDdeo \u00E9 automaticamente codificado e muxado em MPEG-PS / AC-3 \u00E1udio (compatibilidade elevada com a PS3) +TrTab2.40=\nPode tentar mudar o par\u00E2metro vqscale, vqmin and keyint para atingir uma boa, quase sem perda, qualidade de transcoding. +TrTab2.41=\nO \u00FAnico sen\u00E3o \u00E9 que o bitrate VBR poder\u00E1 atingir picos acima da capacidade m\u00E1xima da rede. +TrTab2.42=\nPor essa raz\u00E3o deve ajustar a largura de banda se usar WiFi, CPL, etc. Contudo, a qualidade de transcoding +TrTab2.43=\n\u00E9 um equilibrio entre velocidade da rede e capacidade do CPU: quanto maior for a qualidade num bitrate reduzido, +TrTab2.44=\nmais o CPU ser\u00E1 afectado\! Al\u00E9m disso, n\u00E3o espere que um filme de ac\u00E7\u00E3o a 1080p fique com a melhor qualidade a 15Mbps :p +TrTab2.50=N\u00FAmero de canais de \u00E1udio: +TrTab2.51=Desactivar completamente as legendas +TrTab2.52=Intervalo em minutos para a pasta Capitulos \#Transcode\# : +TracesTab.3=Limpar +TreeNodeSettings.4=Este motor n\u00E3o est\u00E1 carregado\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ro.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ro.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ro.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ro.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,182 @@ +FFMpegDVRMSRemux.0=cale alternativa pentru FFmpeg: +FFMpegDVRMSRemux.1=Setari pentru DVR-MS remuxing +FFMpegVideo.0=Setari codec pentru AviSynth/FFmpeg doar motorul (RECOMANDAT AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Optiuni Partajare +FoldTab.2=Scanare toate folderele partajate +FoldTab.3=Scanarea tuturor folderelor partajate poate dura mult timp \!\n +FoldTab.4=Sunteti sigur ca vreti sa porniti scanarea?\n\n +FoldTab.5=Ascunde extensia fisierelor +FoldTab.6=Ascunde \#Setari Video\# Folder +FoldTab.7=Foldere Partajate +FoldTab.8=Ascunde numele motoarelor de conversie +FoldTab.9=Adauga Director +FoldTab.10=Doriti oprirea scanarii?\n\n +FoldTab.11=Activare copiere a fisierelor convertite pe PS3 (Atentie, fisierele nu au marime fixa !) +FoldTab.12=Sortare foldere partajate +FontFileFilter.3=Fonturi Truetype +LinksTab.5=Adrese Ajutatoare: +LooksFrame.5=Iesire +LooksFrame.6=Panou De Administrare +LooksFrame.9=Salveaza +LooksFrame.12=Restarteaza Server +LooksFrame.18=Statut +LooksFrame.19=Monitorizare +LooksFrame.20=Configurare Generala +LooksFrame.21=Setari Convertire +LooksFrame.22=Setari Navigare/Partajare +LooksFrame.24=Ajutor +LooksFrame.25=Despre +MEncoderAviSynth.2=Setari decodor video doar pentru motorul AviSynth +MEncoderAviSynth.3=Activeaza AviSynth framerate variabil schimba in framerate constant (convertestefps=adevarat) +MEncoderVideo.0=Sariti peste loop filter deblocking pentru H.264. Poate degrada calitatea +MEncoderVideo.1=Video/Audio setari decodor doar pentru motorul MEncoder +MEncoderVideo.2=A/V sync metoda alternativa +MEncoderVideo.3=Utilizeaza parametrii de decodare standard (Recomandat!) +MEncoderVideo.4=Forteaza framerate analizat de la FFmpeg +MEncoderVideo.5=Puteti adauga aici optiuni specifice, ca a filtrului denoise de exemplu: -vf hqdn3d +MEncoderVideo.6=Optiuni Preferentiale: +MEncoderVideo.7=Prioritate limbaj audio: +MEncoderVideo.8=Setari Subtitrare +MEncoderVideo.9=Limbaj de subtitrare prioritar: +MEncoderVideo.10=Audio/subtitrare prioritara (ex: ro,off;rom,off) +MEncoderVideo.11=Subtitrari, pagina codari: +MEncoderVideo.12=ASS Setari Font: Scala Font +MEncoderVideo.13=Contur Font +MEncoderVideo.14=Umbra Font +MEncoderVideo.15=Margini Font +MEncoderVideo.16=Setari font standard: Scalare Font +MEncoderVideo.17=Contur Font +MEncoderVideo.18=Obscuritate Font +MEncoderVideo.19=Margini Font +MEncoderVideo.20=ASS/SSA Subtitrari +MEncoderVideo.21=Fontconfig/Fonturi Integrate +MEncoderVideo.22=Incarcare automata subtitrari de tip *.srt/*.sub care au aceeiasi denumire cu fisierul video +MEncoderVideo.24=Specificati Fontul (pentru limba asiatica): +MEncoderVideo.25=Selectati Font +MEncoderVideo.26=Deinterlace filter +MEncoderVideo.27=Utilizare scalare video +MEncoderVideo.28=Largime +MEncoderVideo.29=Setari avansate : Parametrii specifici codecuri +MEncoderVideo.30=Inaltime +MEncoderVideo.32=Remuxare cand pista audio este AC# (nu reencoda) +MEncoderVideo.33=Parametrii Preferentiali: +MEncoderVideo.34=Editeaza parametrii codecului +MEncoderVideo.35=Suport multicor +MEncoderVideo.36=Utilizeaza ASS stil standard +MEncoderVideo.68=\#Aici puteti adauga optiuni specifice pentru mai multe combinatii de codecuri.\n +MEncoderVideo.69=\#Neaparat pentru sincronizarea A/V , dar poate fi folosit si pentru aorice altceva cu incredere\n +MEncoderVideo.70=\#Aceste setari necesita un volum mai avansat de cunostinte,daca nu stiti ce faceti mai bine lasati totul asa cum este\n +MEncoderVideo.71=\#Sintaxa este {conditie java} :: {optiuni MEncoder} ; Puteti cumula mai multe optiuni\n +MEncoderVideo.72=\#Liceente autorizate: nume fisier fisier srt retinator vcodec acodec rata simpla framerate latime inaltime durata canale\n +MEncoderVideo.73=\#Atentie, orice linie malformata va fi nefunctionala\n +MEncoderVideo.75=\#Optiuni Speciale:\n +MEncoderVideo.76=\# -faraass: dezactivare definitiva subtitrari ASS/SSA deoarece pot decala sincronizarea audio/video\n +MEncoderVideo.77=\# -farasync: dezactivare definitiva A/V sync metoda alternativa pentru aceasta conditie (-mc va face la fel)\n +MEncoderVideo.78=\# -calitate: suprascrie setarile calitatii video\n +MEncoderVideo.79=\# -mt: forteaza utilizarea pentru multithreaded MEncoder construit (experimental, poate fi instabil)\n +MEncoderVideo.80=\#Aceasta lista se va inbunatati cu timpul: tweaks/feedbacks on various codecs/files are always welcome\n +MEncoderVideo.87=\#Va puteti pune conditiile dumneavoastra/optiunile ! Cateva exemple: de exemplu, pentru a activa mt parte din MEncoder\n +MEncoderVideo.88=\#pentru orice continut H.264 HD (redondant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#pentru a remuxa cand video este MPEG-2 xi nu exista nici-o subtitrare: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=Limbaj [necesita restartarea aplicatiei]: +NetworkTab.1=Navigati in arhive .RAR/.ZIP/.CBR +NetworkTab.2= Generare Thumbnails +NetworkTab.3=Porneste ascuns +NetworkTab.4=Instalare ca serviciu Windows +NetworkTab.5=Setari Generale +NetworkTab.6=Transcodare marime maxima buffer, in megabytes (maximu: MAX_BUFFER_SIZE): +NetworkTab.7=Numarul de coruri folosite pentru transcodare (inseamna ca aveti %d): +NetworkTab.11=Ati instalat serviciul Windows \! Pentru al utiliza, trebuie sa inchideti aplicatia,\n +NetworkTab.12=apoi porniti (si configurati) serviciul din panoul de administrare al Windowsului.\n\n +NetworkTab.13=Libraria media va fi reinitializata \!\n +NetworkTab.14=Eroare la instalarea serviciului in Windows!\n +NetworkTab.15=Navigare/Analizare setari +NetworkTab.16=Thumbnail cautare pozitie (in secunde): +NetworkTab.17=Activare Librarie Media +NetworkTab.18=Resetare Librarie Media +NetworkTab.19=Sunteti Sigur? +NetworkTab.20=Fortare retea pe interfata: +NetworkTab.22=Setari retea, modificati numai daca exista probleme +NetworkTab.23=Fortare Ip server: +NetworkTab.24=Fortare port server (5001 standard): +NetworkTab.25=Setari PS3 +NetworkTab.26=Codare carcater pentru fisierle din PS3 (vezi XMB->System settings->Charset): +NetworkTab.27=Setarile nefolosite nu ar trebui utilizate :p +NetworkTab.28=Modul Turbo (activare tcp_nodelay) / atentie, nu este sigur ca functioneaza aceasta optiune +NetworkTab.29=Blocare cererea de la acelasi fisier din PS3 cand convertirea a inceput +NetworkTab.35=Banda maxima in Mb/s (0 inseamna nelimitat): +PMS.0=PS3 a fost gasit. Este pornit? Puteti verifica si in monitorizare si/sau in configurare, sau in fisierul debug.log +PMS.1=Audio +PMS.2=\#- Librarie Media -\# +PMS.3=A/V sync metoda alternativa +PMS.4=Filtru Deinterlace +PMS.5=PS3 a fost gasit \! +PMS.6=Auto incarcare subtitrari .srt/.sub +PMS.7=SkipLoopFilter pentru decodare H.264 [POATE DEGRADA CALITATEA] +PMS.8=Subtitrari +PMS.9=Toate Playlisturile audio +PMS.10=Dezactivare difinitiva subtitrari +PMS.11=Toate pistele audio +PMS.12=Dupa Data +PMS.13=Dupa Artist +PMS.16=Dupa album +PMS.19=Dupa Gen +PMS.21=Dupa modelul camerei +PMS.22=Dupa Artist/Album +PMS.25=Dupa setari ISO +PMS.26=Dupa Gen/Artist/Album +PMS.31=Poze +PMS.32=Toate Pozele +PMS.34=Video +PMS.35=Toate Videourile +PMS.36=Videouri HD +PMS.37=\#- Setari Video -\# +PMS.39=Videouri SD +PMS.41=(Re)instalare serviciu Win32 +PMS.130=Contactare PS3... +StatusTab.2=Statut +StatusTab.3=In asteptare... +StatusTab.5=Gol +StatusTab.6=Statut buffer transcodare: +StatusTab.7=I/O statistici: +StatusTab.8=Bitrate curent: +StatusTab.10=Alege bitrate: +TSMuxerVideo.0=Demuxare cu MEncoder si encodarea tuturor pistelor audio in AC-3 +TSMuxerVideo.1=Demuxare cu MEncoder si encodarea pistelor audio DTS/FLAC in LPCM [Atentie, seeking este inca nefunctional] +TSMuxerVideo.2=Fortare FPS analizat de la FFmpeg in fisierlu meta +TSMuxerVideo.3=Setarile decoderului video pentru TsMuxer numai pentru motor +TrTab2.0=Activare/dezactivare motor de transcodare +TrTab2.1=Nici o setare pentru moment +TrTab2.2=Setari encoder video cu urmatoarele motoare: MEncoder/AviSynth/FFmpeg +TrTab2.3=Setari audio, pentru urmatoare decodere: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Setari calitate video +TrTab2.5=Setari transcoder comune +TrTab2.6=Sortarea listei motoarelor de transcodare. Primul va fi vizibil in folderul video +TrTab2.7=Optiuni diverse +TrTab2.8=Sariti transcodarea pentru urmatoarele extensii (separate prin virgula): +TrTab2.9=Fortare transcodare pentru urmatoarele extensii (separate prin virgula): +TrTab2.11=Motoare +TrTab2.12=Setari comune decodare +TrTab2.13=Setari comune codare +TrTab2.14=Motoare pentru fisiere video +TrTab2.15=Motoare pentru fisiere audio +TrTab2.16=Motoare Streaming Video Web +TrTab2.17=Motoare Streaming Audio Web +TrTab2.18=Diverse Motoare +TrTab2.19=Motorul cu caracter ingrosat va fi prioritar +TrTab2.20=si vor inlocui video original +TrTab2.27=DTS/FLAC -> LPCM remux (Trebuie sa aveti un receiver HDMI pentru audio PCM 5.1 \! Bitrate foarte mare = 4.6Mbps) +TrTab2.29=AC-3 Audio bitrate (in Kbits/s) (ex: 384, 576, 640): +TrTab2.32=Setari MPEG-2: +TrTab2.39=Fisierul video este automat transcodat si muxat in MPEG-PS / AC-3 audio (de inalta fidelitate compatibl cu PS3) +TrTab2.40=\nPuteti umbla la parametrii vqscale, vqmin si keyint pentru a obtine o mai buna performanta, chiar aproape de o calitate lossless. +TrTab2.41=\nLipsa pentru aceasta este VBR bitrate care cateodata poate alege sa foloseasca capacitatea maxima a retelei dvs. +TrTab2.42=\nDe aceea puteti seta banda daca sunteti intr-o retea WiFi, CPL, etc. Oricum, calitatea transcodarii +TrTab2.43=\neste balansata intre viteza retelei si puterea procesorului: cu cat veti creste calitatea video mai mult veti forta bitrateul, +TrTab2.44=\niar procesorul dvs va suferi mai mult\! Si, nu va asteptati sa vizualizati un film la calitatea 1080p in calitatea pura cu o viteza de 15Mbps :p +TrTab2.50=Numarul de canale audio: +TrTab2.51=Dezactivare subtitrari definitiva +TracesTab.3=Sterge +TreeNodeSettings.4=Acest motor nu este incarcat\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ru.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ru.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_ru.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_ru.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,230 @@ +DLNAMediaDatabase.0=\u0412\u0432\u0438\u0434\u0443 \u0434\u0430\u043B\u044C\u043D\u0435\u0439\u0448\u0435\u0439 \u0440\u0430\u0437\u0440\u0430\u0431\u043E\u0442\u043A\u0438 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\n\u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0437\u0430\u043D\u043E\u0432\u043E \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0431\u0430\u0437\u0443 \u0434\u0430\u043D\u043D\u044B\u0445 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u043C\u0435\u0434\u0438\u0430.\n\u041F\u0440\u0438\u043D\u043E\u0441\u0438\u043C \u0438\u0437\u0432\u0438\u043D\u0435\u043D\u0438\u044F \u0437\u0430 \u043D\u0435\u0443\u0434\u043E\u0431\u0441\u0442\u0432\u0430 \! +FFMpegDVRMSRemux.0=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u043F\u0443\u0442\u044C \u043A FFmpeg: +FFMpegDVRMSRemux.1=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u043B\u044F \u0440\u0435\u043C\u0443\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F DVR-MS +FFMpegVideo.0=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u044D\u043D\u043A\u043E\u0434\u0435\u0440\u0430 \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0434\u0432\u0438\u0436\u043A\u0430 AviSynth/FFmpeg (PREFER AVISYNTH/MENCODER) +FoldTab.0=<\u0412\u0441\u0435 \u0434\u0438\u0441\u043A\u0438> +FoldTab.1=\u041E\u043F\u0446\u0438\u0438 \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 +FoldTab.2=\u0421\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0441\u0435 \u043F\u0430\u043F\u043A\u0438 \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 +FoldTab.3=\u0421\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0432\u0441\u0435\u0445 \u043F\u0430\u043F\u043E\u043A \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 \u0437\u0430\u0439\u043C\u0435\u0442 \u043C\u043D\u043E\u0433\u043E \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \!\n +FoldTab.4=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u043D\u0430\u0447\u0430\u0442\u044C \u0441\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435?\n\n +FoldTab.5=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F \u0444\u0430\u0439\u043B\u043E\u0432 +FoldTab.6=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \#Video Settings\# +FoldTab.7=\u041F\u0430\u043F\u043A\u0438 \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 +FoldTab.8=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u0438\u043C\u0435\u043D\u0430 \u0434\u0432\u0438\u0436\u043A\u043E\u0432 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F +FoldTab.9=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0430\u043F\u043A\u0443 +FoldTab.10=\u0412\u044B \u0445\u043E\u0442\u0438\u0442\u0435 \u043F\u0440\u0435\u0440\u0432\u0430\u0442\u044C \u0441\u043A\u0430\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435?\n\n +FoldTab.11=\u0410\u043A\u0442\u0438\u0432\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u0443\u044E \u0432\u0438\u0434\u0435\u043E\u043A\u043E\u043F\u0438\u044E \u043D\u0430 PS3 (\u043E\u0441\u0442\u043E\u0440\u043E\u0436\u043D\u043E, \u0443 \u0444\u0430\u0439\u043B\u043E\u0432 \u043D\u0435 \u0444\u0438\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440!) +FoldTab.12=\u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0438 \u043E\u0431\u0449\u0435\u0433\u043E \u0434\u043E\u0441\u0442\u0443\u043F\u0430 +FoldTab.13=\u041A\u0430\u0434\u0440\u044B \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 +FoldTab.14=Mplayer \u0434\u043B\u044F \u043A\u0430\u0434\u0440\u043E\u0432 \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 +FoldTab.15=\u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E +FoldTab.16=\u041F\u043E \u0434\u0430\u0442\u0435, \u043D\u043E\u0432\u044B\u0435 \u0432 \u043D\u0430\u0447\u0430\u043B\u0435 +FoldTab.17=\u041F\u043E \u0434\u0430\u0442\u0435, \u0441\u0442\u0430\u0440\u044B\u0435 \u0432 \u043D\u0430\u0447\u0430\u043B\u0435 +FoldTab.18=\u041C\u0435\u0442\u043E\u0434 \u0441\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0438 \u0444\u0430\u0439\u043B\u043E\u0432: +FoldTab.19=\u041A\u0430\u0434\u0440\u044B \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0434\u043B\u044F DVD ISO +FoldTab.20=\u041F\u043E \u043A\u043E\u0434\u0443 ASCII +FoldTab.21=\u041F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u0444\u0430\u0439\u043B\u043E\u0432 \u0441 \u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u044F\u043C\u0438 +FoldTab.23=\u0421\u043A\u0430\u0447\u0430\u0442\u044C \u0441 amazon.com +FoldTab.24=\u0421\u043A\u0430\u0447\u0430\u0442\u044C \u0441 discogs.com +FoldTab.26=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u043A\u0430\u0434\u0440\u044B \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 \u0430\u0443\u0434\u0438\u043E: +FoldTab.27=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0430\u044F \u043F\u0430\u043F\u043A\u0430 \u043E\u0431\u043B\u043E\u0436\u0435\u043A \u0432\u0438\u0434\u0435\u043E +FoldTab.28=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0430\u043F\u043A\u0443 +FoldTab.29=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 iPhoto +FoldTab.30=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 iTunes +FoldTab.31=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0438 \u0431\u0435\u0437 \u043C\u0435\u0434\u0438\u0430 \u0444\u0430\u0439\u043B\u043E\u0432 (\u041C\u0435\u0434\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u043F\u0430\u043F\u043E\u043A) +FoldTab.32=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u043C\u0435\u0434\u0438\u0430 +FoldTab.33=\u0421\u043A\u0440\u044B\u0432\u0430\u0442\u044C \u043F\u0430\u043F\u043A\u0443 #Transcode# +FoldTab.34=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 Aperture +FontFileFilter.3=\u0428\u0440\u0438\u0444\u0442\u044B Truetype +LinksTab.5=\u041F\u043E\u043B\u0435\u0437\u043D\u044B\u0435 \u0441\u0441\u044B\u043B\u043A\u0438: +LooksFrame.5=\u0412\u044B\u0445\u043E\u0434 +LooksFrame.6=\u0413\u043B\u0430\u0432\u043D\u0430\u044F \u043F\u0430\u043D\u0435\u043B\u044C +LooksFrame.9=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C +LooksFrame.12=\u041F\u0435\u0440\u0435\u0437\u0430\u043F\u0443\u0441\u043A C\u0435\u0440\u0432\u0435\u0440\u0430 +LooksFrame.18=\u0421\u0442\u0430\u0442\u0443\u0441 +LooksFrame.19=\u0416\u0443\u0440\u043D\u0430\u043B +LooksFrame.20=\u0413\u043B\u0430\u0432\u043D\u044B\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +LooksFrame.21=\u041E\u043F\u0446\u0438\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F +LooksFrame.22=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F/\u043E\u0431\u0449\u0438\u0439 \u0434\u043E\u0441\u0442\u0443\u043F +LooksFrame.24=\u0421\u043F\u0440\u0430\u0432\u043A\u0430 +LooksFrame.25=\u041E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0435 +MEncoderAviSynth.2=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0432\u0438\u0434\u0435\u043E \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0434\u0432\u0438\u0436\u043A\u0430 AviSynth +MEncoderAviSynth.3=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u043C\u0435\u043D\u0443 \u043F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0439 \u0447\u0430\u0441\u0442\u043E\u0442\u044B \u043A\u0430\u0434\u0440\u043E\u0432 AviSynth \u0432 \u043A\u043E\u043D\u0441\u0442\u0430\u043D\u0442\u043D\u0443\u044E (convertfps\=true) +MEncoderVideo.0=\u041E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0444\u0438\u043B\u044C\u0442\u0440\u0430\u0446\u0438\u044E H.264. \u041A\u0410\u0427\u0415\u0421\u0422\u0412\u041E \u041C\u041E\u0416\u0415\u0422 \u0423\u0425\u0423\u0414\u0428\u0418\u0422\u042C\u0421\u042F +MEncoderVideo.1=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0432\u0438\u0434\u0435\u043E/\u0430\u0443\u0434\u0438\u043E \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0434\u0432\u0438\u0436\u043A\u0430 MEncoder +MEncoderVideo.2=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0438 A/V +MEncoderVideo.3=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0434\u043B\u044F \u043A\u043E\u0434\u0435\u043A\u043E\u0432 (\u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0443\u0435\u0442\u0441\u044F\!) +MEncoderVideo.4=\u041F\u0440\u0438\u043D\u0443\u0436\u0434\u0430\u0442\u044C \u0447\u0430\u0441\u0442\u043E\u0442\u0443 \u043A\u0430\u0434\u0440\u043E\u0432, \u0441\u0447\u0438\u0442\u0430\u043D\u043D\u0443\u044E \u0438\u0437 FFmpeg +MEncoderVideo.5=\u0417\u0434\u0435\u0441\u044C \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0442\u044C \u0434\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u043E\u043F\u0446\u0438\u0438, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0444\u0438\u043B\u044C\u0442\u0440 \u0443\u0434\u0430\u043B\u0435\u043D\u0438\u044F \u0448\u0443\u043C\u0430: -vf hqdn3d +MEncoderVideo.6=\u0421\u0432\u043E\u0438 \u043E\u043F\u0446\u0438\u0438: +MEncoderVideo.7=\u041F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 \u044F\u0437\u044B\u043A\u0430 \u0437\u0432\u0443\u043A\u043E\u0432\u043E\u0439 \u0434\u043E\u0440\u043E\u0436\u043A\u0438: +MEncoderVideo.8=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 +MEncoderVideo.9=\u041F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 \u044F\u0437\u044B\u043A\u043E\u0432 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: +MEncoderVideo.10=\u041F\u0440\u0438\u043E\u0440\u0438\u0442\u0435\u0442 \u044F\u0437\u044B\u043A\u043E\u0432 \u0437\u0432\u0443\u043A\u0430/\u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 (\u041D\u0430\u043F\u0440\u0438\u043C\u0435\u0440: en,off;jpn,eng) +MEncoderVideo.11=\u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430 \u0434\u043B\u044F \u043D\u0435-\u044E\u043D\u0438\u043A\u043E\u0434 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: +MEncoderVideo.12=\u0421\u0442\u0438\u043B\u044C ASS/SSA \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: \u041C\u0430\u0441\u0448\u0442\u0430\u0431 +MEncoderVideo.13=\u041E\u0431\u0432\u043E\u0434\u043A\u0430 +MEncoderVideo.14=\u0422\u0435\u043D\u044C +MEncoderVideo.15=\u041E\u0442\u0441\u0442\u0443\u043F \u0441\u043D\u0438\u0437\u0443 +MEncoderVideo.16=\u0421\u0442\u0438\u043B\u044C \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0445 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: \u041C\u0430\u0441\u0448\u0442\u0430\u0431 +MEncoderVideo.17=\u041E\u0431\u0432\u043E\u0434\u043A\u0430 +MEncoderVideo.18=\u0420\u0430\u0437\u043C\u044B\u0442\u0438\u0435 +MEncoderVideo.19=\u041E\u0442\u0441\u0442\u0443\u043F \u0441\u043D\u0438\u0437\u0443 +MEncoderVideo.20=\u041F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C ASS/SSA \u0444\u043E\u0440\u043C\u0430\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 +MEncoderVideo.21=Fontconfig/\u0432\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0435 \u0448\u0440\u0438\u0444\u0442\u044B +MEncoderVideo.22=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044C \u043E\u0434\u043D\u043E\u0438\u043C\u0435\u043D\u043D\u044B\u0435 *.srt/*.sub \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B +MEncoderVideo.23=FriBiDi \u0440\u0435\u0436\u0438\u043C +MEncoderVideo.24=\u0428\u0440\u0438\u0444\u0442 TrueType (\u0434\u043B\u044F \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432): +MEncoderVideo.25=\u0412\u044B\u0431\u0440\u0430\u0442\u044C \u0448\u0440\u0438\u0444\u0442 TrueType +MEncoderVideo.26=\u0424\u0438\u043B\u044C\u0442\u0440 \u0434\u0435\u0438\u043D\u0442\u0435\u0440\u043B\u0435\u0439\u0441\u0438\u043D\u0433\u0430 +MEncoderVideo.27=\u041C\u0430\u0441\u0448\u0442\u0430\u0431\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0438\u0434\u0435\u043E +MEncoderVideo.28=\u0428\u0438\u0440\u0438\u043D\u0430 +MEncoderVideo.29=\u041E\u043F\u0446\u0438\u0438 \u0434\u043B\u044F \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432 : \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0434\u043B\u044F \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u044B\u0445 \u043A\u043E\u0434\u0435\u043A\u043E\u0432 +MEncoderVideo.30=\u0412\u044B\u0441\u043E\u0442\u0430 +MEncoderVideo.31=\u0426\u0432\u0435\u0442 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 +MEncoderVideo.32=\u0421\u043E\u0445\u0440\u0430\u043D\u044F\u0442\u044C AC-3 \u0434\u043E\u0440\u043E\u0436\u043A\u0443 (\u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F, \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\u0437\u044B\u0432\u0430\u0442\u044C \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B \u0441 \u0442\u0438\u0445\u0438\u043C \u0437\u0432\u0443\u043A\u043E\u043C \u0438 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0435\u0439) +MEncoderVideo.33=\u0421\u0432\u043E\u0438 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B: +MEncoderVideo.34=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u043A\u043E\u0434\u0435\u043A\u043E\u0432 +MEncoderVideo.35=\u041F\u043E\u0434\u0434\u0435\u0440\u0436\u043A\u0430 \u043C\u043D\u043E\u0433\u043E\u044F\u0434\u0435\u0440\u043D\u044B\u0445 \u0426\u041F\u0423 +MEncoderVideo.36=\u0412\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0439 \u0441\u0442\u0438\u043B\u044C +MEncoderVideo.37=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0430\u044F \u043F\u0430\u043F\u043A\u0430 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 +MEncoderVideo.39=\u0414\u0435\u043B\u0430\u0442\u044C \u0440\u0435\u043C\u0443\u043A\u0441 DVD ISO \u0432\u0438\u0434\u0435\u043E \u0434\u043E\u0440\u043E\u0436\u043A\u0438 (\u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F) +MEncoderVideo.68=\#\u0417\u0434\u0435\u0441\u044C \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u043B\u044F\u0442\u044C \u0441\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0434\u043B\u044F \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u043A\u043E\u043C\u0431\u0438\u043D\u0430\u0446\u0438\u0439 \u043A\u043E\u0434\u0435\u043A\u043E\u0432.\n +MEncoderVideo.69=\#\u0412 \u043E\u0441\u043D\u043E\u0432\u043D\u043E\u043C \u044D\u0442\u043E \u0434\u0435\u043B\u0430\u0435\u0442\u0441\u044F \u043F\u0440\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u0445 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0438 \u0430\u0443\u0434\u0438\u043E/\u0432\u0438\u0434\u0435\u043E, \u043D\u043E \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u043E \u0438 \u0441 \u0434\u0440\u0443\u0433\u0438\u043C\u0438 \u0446\u0435\u043B\u044F\u043C\u0438\n +MEncoderVideo.70=\#\u0421\u043C\u043E\u0442\u0440\u0438\u0442\u0435 \u043D\u0430 \u044D\u0442\u043E \u043A\u0430\u043A \u043D\u0430 \u043E\u043F\u0446\u0438\u0438 \u0434\u043B\u044F \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432, \u043D\u0435 \u0442\u0440\u043E\u0433\u0430\u0439\u0442\u0435 \u044D\u0442\u0438 \u043E\u043F\u0446\u0438\u0438, \u0435\u0441\u043B\u0438 \u0442\u043E\u0447\u043D\u043E \u043D\u0435 \u0437\u043D\u0430\u0435\u0442\u0435, \u0447\u0442\u043E \u0434\u0435\u043B\u0430\u0435\u0442\u0435\n +MEncoderVideo.71=\#\u0421\u0438\u043D\u0442\u0430\u043A\u0441: {java condition} :: {MEncoder options} ; \u041C\u043E\u0436\u043D\u043E \u0441\u043E\u0432\u043C\u0435\u0449\u0430\u0442\u044C \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043E\u043F\u0446\u0438\u0439\n +MEncoderVideo.72=\#\u0410\u0432\u0442\u043E\u0440\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0442\u043E\u043A\u0435\u043D\u044B: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#\u041E\u0441\u0442\u043E\u0440\u043E\u0436\u043D\u043E, \u043F\u043B\u043E\u0445\u043E \u0441\u0444\u043E\u0440\u043C\u0443\u043B\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u0441\u0442\u0440\u043E\u043A\u0438 \u0431\u0443\u0434\u0443\u0442 \u0443\u0434\u0430\u043B\u0435\u043D\u044B\n +MEncoderVideo.75=\#\u0421\u043F\u0435\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0435 \u043E\u043F\u0446\u0438\u0438:\n +MEncoderVideo.76=\# -noass: \u043F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B ASS/SSA, \u0442.\u043A. \u043E\u043D\u0438 \u043C\u043E\u0433\u0443\u0442 \u043F\u043E\u0432\u043B\u0438\u044F\u0442\u044C \u043D\u0430 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u044E \u0430\u0443\u0434\u0438\u043E/\u0432\u0438\u0434\u0435\u043E\n +MEncoderVideo.77=\# -nosync: \u043F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0430\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0438 \u0430\u0443\u0434\u0438\u043E/\u0432\u0438\u0434\u0435\u043E \u0434\u043B\u044F \u044D\u0442\u043E\u0433\u043E \u0443\u0441\u043B\u043E\u0432\u0438\u044F (-mc \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u0435\u0442 \u0442\u0430\u043A \u0436\u0435)\n +MEncoderVideo.78=\# -quality: \u043F\u043E\u0434\u0430\u0432\u043B\u044F\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0432\u0438\u0434\u0435\u043E\n +MEncoderVideo.79=\# -mt: \u043F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u043C\u043D\u043E\u0433\u043E\u0442\u0440\u0435\u0434\u043E\u0432\u043E\u0439 \u0441\u0431\u043E\u0440\u043A\u0438 MEncoder (\u044D\u043A\u0441\u043F\u0435\u0440\u0438\u043C\u0435\u043D\u0442\u0430\u043B\u044C\u043D\u0430\u044F \u043E\u043F\u0446\u0438\u044F, \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043D\u0435\u0441\u0442\u0430\u0431\u0438\u043B\u044C\u043D\u0430)\n +MEncoderVideo.80=\#\u0414\u0430\u043D\u043D\u044B\u0439 \u0441\u043F\u0438\u0441\u043E\u043A \u0441\u043E \u0432\u0440\u0435\u043C\u0435\u043D\u0435\u043C \u0440\u0430\u0441\u0448\u0438\u0440\u0438\u0442\u0441\u044F: \u043F\u0440\u0438\u0441\u044B\u043B\u0430\u0439\u0442\u0435 \u043D\u0430\u043C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u0440\u0430\u0437\u043D\u044B\u0445 \u043A\u043E\u0434\u0435\u043A\u043E\u0432/\u0444\u0430\u0439\u043B\u043E\u0432\n +MEncoderVideo.87=\#\u0417\u0434\u0435\u0441\u044C \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0441\u0444\u043E\u0440\u043C\u0443\u043B\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043E\u0431\u0441\u0442\u0432\u0435\u043D\u043D\u044B\u0435 \u0443\u0441\u043B\u043E\u0432\u0438\u044F/\u043E\u043F\u0446\u0438\u0438. \! \u0412\u043E\u0442 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u0438\u043C\u0435\u0440\u043E\u0432: \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, \u0447\u0442\u043E\u0431\u044B \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C mt-\u0441\u0431\u043E\u0440\u043A\u0443 MEncoder\n +MEncoderVideo.88=\#\u0434\u043B\u044F \u0432\u0441\u0435\u0433\u043E \u043A\u043E\u043D\u0442\u0435\u043D\u0442\u0430 H.264 HD (\u0441\u043E\u0432\u043F\u0430\u0434\u0430\u0435\u0442 \u0441 \u0433\u043B\u0430\u0432\u043D\u043E\u0439 \u043E\u043F\u0446\u0438\u0435\u0439): vcodec \=\= h264 && width >\= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#\u0447\u0442\u043E\u0431\u044B \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0434\u0435\u0440\u0433\u0430\u043D\u044C\u0435 24 \u043A\u0430\u0434\u0440\u043E\u0432 \u043D\u0430 \u0442\u0435\u043B\u0435\u0432\u0438\u0437\u043E\u0440\u0435 50-\u0413\u0446: framerate \=\= 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#\u0414\u0435\u043B\u0430\u0442\u044C \u0440\u0435\u043C\u0443\u043A\u0441, \u0435\u0441\u043B\u0438 \u0432\u0438\u0434\u0435\u043E \u0432 \u0444\u043E\u0440\u043C\u0430\u0442\u0435 MPEG-2 \u0438 \u043D\u0435\u0442 \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432: vcodec \=\= mpeg2 && srtfile \=\= null :: -ovc copy -nosync +MEncoderVideo.92=\u041A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u043E\u0432 DVD/VOBsub (0-4) (\u0431\u043E\u043B\u044C\u0448\u0435 - \u043B\u0443\u0447\u0448\u0435): +MEncoderVideo.93=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0440\u0430\u043C\u043A\u0443 \u0434\u043B\u044F \u043A\u043E\u043C\u043F\u0435\u043D\u0441\u0430\u0446\u0438\u0438 \u043E\u0432\u0435\u0440\u0441\u043A\u0430\u043D\u0430: +MEncoderVideo.94=\u0424\u043E\u0440\u0441. \u0441\u0443\u0431\u0442.: +MEncoderVideo.95=\u0424\u043E\u0440\u0441. \u0442\u044D\u0433\u0438: +MEncoderVideo.129=/* \u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 */ +MEncoderVideo.130=enca:ru:cp1251 /* \u0420\u0443\u0441\u0441\u043A\u0438\u0435 (\u0430\u0432\u0442\u043E) */ +MEncoderVideo.131=enca:pl:cp1250 /* \u0412\u043E\u0441\u0442\u043E\u0447\u043D\u0430\u044F \u0415\u0432\u0440\u043E\u043F\u0430 (\u0430\u0432\u0442\u043E) */ +MEncoderVideo.132=enca:zh:big5 /* \u041A\u0438\u0442\u0430\u0439\u0441\u043A\u0438\u0435 (\u0430\u0432\u0442\u043E) */ +NetworkTab.0=\u042F\u0437\u044B\u043A [\u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0443 \u043D\u0443\u0436\u043D\u043E \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0437\u0430\u043D\u043E\u0432\u043E]: +NetworkTab.1=\u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u0432 \u0430\u0440\u0445\u0438\u0432\u0430\u0445 .RAR/.ZIP/.CBR +NetworkTab.2=\u0413\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043A\u0430\u0434\u0440\u043E\u0432 \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 +NetworkTab.3=\u0417\u0430\u043F\u0443\u0441\u043A\u0430\u0442\u044C \u0432 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043D\u043E\u043C \u0432\u0438\u0434\u0435 +NetworkTab.4=\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u043A\u0430\u043A \u0441\u0435\u0440\u0432\u0438\u0441 Windows +NetworkTab.5=\u041E\u0431\u0449\u0438\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +NetworkTab.6=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u0431\u0443\u0444\u0435\u0440\u0430 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0435\u0440\u0430, \u0432 \u043C\u0435\u0433\u0430\u0431\u0430\u0439\u0442\u0430\u0445 (\u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C: MAX_BUFFER_SIZE): +NetworkTab.7=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u044F\u0434\u0435\u0440 \u0434\u043B\u044F \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F (\u043A\u0430\u0436\u0435\u0442\u0441\u044F, \u0447\u0442\u043E \u0443 \u0412\u0430\u0441 \u0435\u0441\u0442\u044C %d): +NetworkTab.8=\u041F\u0440\u043E\u0432\u0435\u0440\u0438\u0442\u044C \u043E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u044F +NetworkTab.9=\u041F\u0440\u043E\u0432\u0435\u0440\u044F\u0442\u044C \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 +NetworkTab.11=\u0412\u044B \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u043B\u0438 \u0441\u0435\u0440\u0432\u0438\u0441 \u0434\u043B\u044F Windows\! \u0427\u0442\u043E\u0431\u044B \u043D\u0430\u0447\u0430\u0442\u044C \u0438\u043C \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F, \u0432\u044B\u0439\u0434\u0438\u0442\u0435 \u0438\u0437 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B,\n +NetworkTab.12=\u0430 \u0437\u0430\u0442\u0435\u043C \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0435 (\u0438 \u043F\u0440\u043E\u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0443\u0439\u0442\u0435) \u0441\u0435\u0440\u0432\u0438\u0441 \u0432 \u043F\u0430\u043D\u0435\u043B\u0438 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F Windows.\n\n +NetworkTab.13=\u0411\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0430 \u043C\u0435\u0434\u0438\u0430 \u0431\u0443\u0434\u0435\u0442 \u0437\u0430\u043D\u043E\u0432\u043E \u0438\u043D\u0438\u0446\u0438\u0430\u043B\u0438\u0437\u0438\u0440\u043E\u0432\u0430\u043D\u0430\!\n +NetworkTab.14=\u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0435 \u0441\u0435\u0440\u0432\u0438\u0441\u0430 \u0434\u043B\u044F Windows\!\n +NetworkTab.15=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u0438 \u0438 \u0430\u043D\u0430\u043B\u0438\u0437\u0430 +NetworkTab.16=\u041F\u043E\u0437\u0438\u0446\u0438\u044F \u043A\u0430\u0434\u0440\u0430 \u043F\u0440\u0435\u0434\u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0430 (\u0432 \u0441\u0435\u043A\u0443\u043D\u0434\u0430\u0445): +NetworkTab.17=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0443 \u043C\u0435\u0434\u0438\u0430 +NetworkTab.18=\u041F\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0430 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u0438 \u043C\u0435\u0434\u0438\u0430 +NetworkTab.19=\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B? +NetworkTab.20=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0432\u0430\u043D\u0438\u0435 \u0441\u0435\u0442\u0435\u0432\u043E\u0433\u043E \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430: +NetworkTab.22=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0441\u0435\u0442\u0438, \u0438\u0437\u043C\u0435\u043D\u044F\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u0430\u0445 +NetworkTab.23=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 IP \u0441\u0435\u0440\u0432\u0435\u0440\u0430: +NetworkTab.24=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u043F\u043E\u0440\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 (\u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u044B\u0439: 5001): +NetworkTab.25=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 PS3 +NetworkTab.26=\u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430 \u0438\u043C\u0435\u043D \u0444\u0430\u0439\u043B\u043E\u0432 PS3 (\u0441\u043C. XMB->\u0423\u0441\u0442\u0430\u043D\u043E\u0432\u043A\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u044B->\u041A\u043E\u0434\u0438\u0440\u043E\u0432\u043A\u0430): +NetworkTab.27=\u041D\u0435\u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u043C\u044B\u0435 \u043E\u043F\u0446\u0438\u0438, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u043D\u0435 \u043D\u0430\u0434\u043E \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C :p +NetworkTab.28=\u0422\u0443\u0440\u0431\u043E-\u0440\u0435\u0436\u0438\u043C (\u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C tcp_nodelay) / \u043E\u0441\u0442\u043E\u0440\u043E\u0436\u043D\u043E, \u043D\u0435 \u0443\u0432\u0435\u0440\u0435\u043D \u0447\u0442\u043E \u044D\u0442\u043E \u043C\u043E\u0436\u043D\u043E +NetworkTab.29=\u0411\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0445\u043E\u0434\u044F\u0449\u0438\u0439 \u0437\u0430\u043F\u0440\u043E\u0441 \u043D\u0430 \u0442\u043E\u0442 \u0436\u0435 \u0444\u0430\u0439\u043B \u043E\u0442 PS3, \u0435\u0441\u043B\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043D\u0430\u0447\u0430\u043B\u043E\u0441\u044C +NetworkTab.30=\u0424\u0438\u043B\u044C\u0442\u0440 \u043F\u043E IP: +NetworkTab.31=\u041F\u0440\u043E\u0434\u0432\u0438\u043D\u0443\u0442\u044B\u0435 HTTP \u0438 \u0441\u0438\u0441\u0442\u0435\u043C\u043D\u044B\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +NetworkTab.32=HTTP \u0434\u0432\u0438\u0436\u043E\u043A V2 +NetworkTab.33=\u041D\u0435 \u0434\u043E\u043F\u0443\u0441\u043A\u0430\u0442\u044C "\u0421\u043F\u044F\u0449\u0438\u0439 \u0440\u0435\u0436\u0438\u043C" \u041E\u0421 \u0432\u043E \u0432\u0440\u0435\u043C\u044F \u0441\u0442\u0440\u0438\u043C\u0438\u043D\u0433\u0430 +NetworkTab.34=\u041F\u043B\u0430\u0433\u0438\u043D\u044B +NetworkTab.35=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430\u044F \u0448\u0438\u0440\u0438\u043D\u0430 \u043A\u0430\u043D\u0430\u043B\u0430 \u0432 \u041C\u0431\u0438\u0442/\u0441 (0 \= \u043D\u0435\u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u043D\u043E): +PMS.0=\u041F\u0440\u0438\u0441\u0442\u0430\u0432\u043A\u0430 PS3 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u0430. \u041E\u043D\u0430 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0430? \u041F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B\u044B \u0438\u043B\u0438 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E, \u0430 \u0442\u0430\u043A\u0436\u0435 \u0444\u0430\u0439\u043B debug.log +PMS.1=\u0410\u0443\u0434\u0438\u043E +PMS.2=\#- Cache -\# +PMS.3=\u0410\u043B\u044C\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0430\u0446\u0438\u0438 A/V +PMS.4=\u0424\u0438\u043B\u044C\u0442\u0440 \u0434\u0435\u0438\u043D\u0442\u0435\u0440\u043B\u0435\u0439\u0441\u0438\u043D\u0433\u0430 +PMS.5=\u041F\u0440\u0438\u0441\u0442\u0430\u0432\u043A\u0430 PS3 \u043D\u0430\u0439\u0434\u0435\u043D\u0430\! +PMS.6=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B .srt/.sub +PMS.7=SkipLoopFilter \u0434\u043B\u044F \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F H.264 [\u041C\u041E\u0416\u0415\u0422 \u0423\u0425\u0423\u0414\u0428\u0418\u0422\u042C \u041A\u0410\u0427\u0415\u0421\u0422\u0412\u041E] +PMS.8=\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044B +PMS.9=\u0412\u0441\u0435 \u043F\u043B\u0435\u0439\u043B\u0438\u0441\u0442\u044B \u0430\u0443\u0434\u0438\u043E +PMS.10=\u041F\u043E\u0441\u0442\u043E\u044F\u043D\u043D\u043E \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B +PMS.11=\u0412\u0441\u0435 \u0442\u0440\u0435\u043A\u0438 \u0430\u0443\u0434\u0438\u043E +PMS.12=\u041F\u043E \u0434\u0430\u0442\u0435 +PMS.13=\u041F\u043E \u0430\u0440\u0442\u0438\u0441\u0442\u0443 +PMS.16=\u041F\u043E \u0430\u043B\u044C\u0431\u043E\u043C\u0443 +PMS.18=\u041C\u0435\u0434\u0438\u0430 \u0441\u0435\u0440\u0432\u0435\u0440 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D +PMS.19=\u041F\u043E \u0436\u0430\u043D\u0440\u0443 +PMS.21=\u041F\u043E \u043C\u043E\u0434\u0435\u043B\u0438 \u043A\u0430\u043C\u0435\u0440\u044B +PMS.22=\u041F\u043E \u0430\u0440\u0442\u0438\u0441\u0442\u0443/\u0430\u043B\u044C\u0431\u043E\u043C\u0443 +PMS.25=\u041F\u043E \u043E\u043F\u0446\u0438\u044F\u043C ISO +PMS.26=\u041F\u043E \u0436\u0430\u043D\u0440\u0443/\u0430\u0440\u0442\u0438\u0441\u0442\u0443/\u0430\u043B\u044C\u0431\u043E\u043C\u0443 +PMS.31=\u0424\u043E\u0442\u043E +PMS.32=\u0412\u0441\u0435 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438 +PMS.34=\u0412\u0438\u0434\u0435\u043E +PMS.35=\u0412\u0441\u0435 \u0432\u0438\u0434\u0435\u043E +PMS.36=\u0412\u0438\u0434\u0435\u043E HD +PMS.37=\#- Video Settings -\# +PMS.39=\u0412\u0438\u0434\u0435\u043E SD +PMS.41=(\u0421\u043D\u043E\u0432\u0430) \u0443\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u0441\u0435\u0440\u0432\u0438\u0441 Win32 +PMS.130=\u041F\u043E\u0438\u0441\u043A \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432... +StatusTab.2=\u0421\u0442\u0430\u0442\u0443\u0441 +StatusTab.3=\u041E\u0436\u0438\u0434\u0430\u043D\u0438\u0435... +StatusTab.5=\u041F\u0443\u0441\u0442\u043E\u0439 +StatusTab.6=\u0421\u0442\u0430\u0442\u0443\u0441 \u0431\u0443\u0444\u0435\u0440\u0430 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F: +StatusTab.7=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 I/O: +StatusTab.8=\u0422\u0435\u043A\u0443\u0449\u0438\u0439 \u0431\u0438\u0442\u0440\u0435\u0439\u0442: +StatusTab.9=\u041E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u043D\u044B\u0435 \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0430 +StatusTab.10=\u041C\u0430\u043A\u0441. \u0431\u0438\u0442\u0440\u0435\u0439\u0442: +TSMuxerVideo.0=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0440\u0435\u043C\u0443\u043A\u0441\u0438\u043D\u0433 AC-3 \u043D\u0430 \u0432\u0441\u0435\u0445 \u0444\u0430\u0439\u043B\u0430\u0445 +TSMuxerVideo.1=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0440\u0435\u043C\u0443\u043A\u0441\u0438\u043D\u0433 PCM \u0441 \u0430\u0443\u0434\u0438\u043E \u0432 DTS/FLAC +TSMuxerVideo.2=\u041F\u0440\u0438\u043D\u0443\u0434\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 FPS \u0438\u0437 FFmpeg \u0432 \u043C\u0435\u0442\u0430\u0444\u0430\u0439\u043B\u0435 +TSMuxerVideo.3=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0434\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0432\u0438\u0434\u0435\u043E \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u043B\u044F \u0434\u0432\u0438\u0436\u043A\u0430 TsMuxer +TSMuxerVideo.19=\u041C\u0443\u043A\u0441\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0432\u0441\u0435 \u0430\u0443\u0434\u0438\u043E\u043F\u043E\u0442\u043E\u043A\u0438 +TrTab2.0=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C/\u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0434\u0432\u0438\u0436\u043E\u043A \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F +TrTab2.1=\u041F\u043E\u043A\u0430 \u043E\u043F\u0446\u0438\u0439 \u043D\u0435\u0442 +TrTab2.2=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u044D\u043D\u043A\u043E\u0434\u0435\u0440\u0430 \u0432\u0438\u0434\u0435\u043E \u0434\u043B\u044F \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0434\u0432\u0438\u0436\u043A\u043E\u0432: MEncoder/AviSynth/FFmpeg +TrTab2.3=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0430\u0443\u0434\u0438\u043E \u0434\u043B\u044F \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0445 \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u043E\u0432: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0432\u0438\u0434\u0435\u043E +TrTab2.5=\u041E\u0431\u0449\u0438\u0435 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F +TrTab2.6=\u0421\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u043A\u0430 \u0441\u043F\u0438\u0441\u043A\u043E\u0432 \u0434\u0432\u0438\u0436\u043A\u043E\u0432 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F. \u041F\u0435\u0440\u0432\u044B\u0439 \u0431\u0443\u0434\u0435\u0442 \u043F\u043E\u044F\u0432\u043B\u044F\u0442\u044C\u0441\u044F \u0432 \u043E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u044C\u043D\u043E\u0439 \u043F\u0430\u043F\u043A\u0435 \u0432\u0438\u0434\u0435\u043E +TrTab2.7=\u0420\u0430\u0437\u043D\u044B\u0435 \u043E\u043F\u0446\u0438\u0438 +TrTab2.8=\u041D\u0435 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B \u0441\u043E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C\u0438 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F\u043C\u0438 (\u0427\u0435\u0440\u0435\u0437 \u0437\u0430\u043F\u044F\u0442\u0443\u044E): +TrTab2.9=\u0412\u0441\u0435\u0433\u0434\u0430 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0444\u0430\u0439\u043B\u044B \u0441\u043E \u0441\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u043C\u0438 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u0438\u044F\u043C\u0438 (\u0427\u0435\u0440\u0435\u0437 \u0437\u0430\u043F\u044F\u0442\u0443\u044E): +TrTab2.10=\u041F\u043E\u0437\u0432\u043E\u043B\u044F\u0435\u0442 \u0441\u0442\u0440\u0438\u043C\u0438\u043D\u0433 \u0437\u0432\u0443\u043A\u0430 DTS \u043F\u0440\u044F\u043C\u043E \u043D\u0430 \u0440\u0435\u0441\u0438\u0432\u0435\u0440.\n\u041E\u0441\u0442\u043E\u0440\u043E\u0436\u043D\u043E, \u0432\u043E\u0437\u043C\u043E\u0436\u0435\u043D \u0437\u0432\u0443\u043A \u043F\u043E\u043C\u0435\u0445. \u0412\u043E\u0442 \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0441\u043E\u0432\u0435\u0442\u043E\u0432:\n- \u0412\u0430\u0448 \u0440\u0435\u0441\u0438\u0432\u0435\u0440 \u0434\u043E\u043B\u0436\u0435\u043D \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044C DTS \u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0442\u044C\u0441\u044F \u0447\u0435\u0440\u0435\u0437 TOSLINK \u0438\u043B\u0438 HDMI\n- \u0421\u0438\u043C\u0432\u043E\u043B \u0433\u0440\u043E\u043C\u043A\u043E\u0441\u0442\u0438 \u043D\u0430 XMB \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C 'Normal'\n- \u0421\u0438\u043C\u0432\u043E\u043B \u043A\u0430\u043D\u0430\u043B\u043E\u0432 \u043D\u0430 XMB \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C 'Left+Right'\n +TrTab2.11=\u0414\u0432\u0438\u0436\u043A\u0438 +TrTab2.12=\u041E\u0431\u0449\u0438\u0435 \u043E\u043F\u0446\u0438\u0438 \u0434\u0435\u043A\u043E\u0434\u0435\u0440\u0430 +TrTab2.13=\u041E\u0431\u0449\u0438\u0435 \u043E\u043F\u0446\u0438\u0438 \u044D\u043D\u043A\u043E\u0434\u0435\u0440\u0430 +TrTab2.14=\u0414\u0432\u0438\u0436\u043A\u0438 \u0432\u0438\u0434\u0435\u043E\u0444\u0430\u0439\u043B\u043E\u0432 +TrTab2.15=\u0414\u0432\u0438\u0436\u043A\u0438 \u0430\u0443\u0434\u0438\u043E\u0444\u0430\u0439\u043B\u043E\u0432 +TrTab2.16=\u0414\u0432\u0438\u0436\u043A\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0438\u043C\u0438\u043D\u0433\u0430 \u0432\u0438\u0434\u0435\u043E +TrTab2.17=\u0414\u0432\u0438\u0436\u043A\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0438\u043C\u0438\u043D\u0433\u0430 \u0430\u0443\u0434\u0438\u043E +TrTab2.18=\u0420\u0430\u0437\u043D\u044B\u0435 \u0434\u0432\u0438\u0436\u043A\u0438 +TrTab2.19=\u0414\u0432\u0438\u0436\u043A\u0438 \u0432 \u043F\u043E\u0440\u044F\u0434\u043A\u0435 \u0443\u0431\u044B\u0432\u0430\u043D\u0438\u044F; +TrTab2.20=\u0432\u0435\u0440\u0445\u043D\u0438\u0439 \u0431\u0443\u0434\u0435\u0442 \u043F\u0435\u0440\u0432\u044B\u043C +TrTab2.21=[AviSynth \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044F] +TrTab2.22=\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0430\u044F \u043F\u0435\u0440\u0435\u0434\u0438\u0441\u043A\u0440\u0435\u0442\u0438\u0437\u0430\u0446\u0438\u044F \u0430\u0443\u0434\u0438\u043E \u0432 44.1 \u0438\u043B\u0438 48 \u043A\u0413\u0446 +TrTab2.27=\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C LPCM \u0434\u043B\u044F \u043F\u0435\u0440\u0435\u0434\u0430\u0447\u0438 \u0430\u0443\u0434\u0438\u043E (\u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F) +TrTab2.28=\u0421\u043E\u0445\u0440\u0430\u043D\u044F\u0442\u044C DTS \u0434\u043E\u0440\u043E\u0436\u043A\u0443 (\u0431\u0435\u0437 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F, \u0441\u043E\u0432\u043C\u0435\u0441\u0442\u0438\u043C\u043E \u0441 \u0440\u0435\u0441\u0438\u0432\u0435\u0440\u0430\u043C\u0438 \u0447\u0435\u0440\u0435\u0437 \u043E\u043F\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u0438\u043B\u0438 HDMI \u0432\u044B\u0445\u043E\u0434) +TrTab2.29=\u0411\u0438\u0442\u0440\u0435\u0439\u0442 \u0430\u0443\u0434\u0438\u043E \u0434\u043B\u044F AC-3 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F (\u0432 \u041A\u0431\u0438\u0442/\u0441) (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 : 576, 640): +TrTab2.32=\u041E\u043F\u0446\u0438\u0438 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0432\u0438\u0434\u0435\u043E MPEG-2: +TrTab2.39=\u0412\u0438\u0434\u0435\u043E \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u0443\u0435\u0442\u0441\u044F \u0438 \u043C\u0443\u043A\u0441\u0438\u0440\u0443\u0435\u0442\u0441\u044F \u0432 \u0444\u043E\u0440\u043C\u0430\u0442 MPEG-PS / AC-3 \u0430\u0443\u0434\u0438\u043E (\u0432\u044B\u0441\u043E\u043A\u0430\u044F \u0441\u043E\u0432\u043C\u0435\u0441\u0442\u0438\u043C\u043E\u0441\u0442\u044C \u0441 PS3) +TrTab2.40=\n\u041C\u043E\u0436\u0435\u0442\u0435 \u043F\u043E\u0438\u0433\u0440\u0430\u0442\u044C\u0441\u044F \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C\u0438 vqscale, vqmin \u0438 keyint, \u0447\u0442\u043E\u0431\u044B \u0434\u043E\u0441\u0442\u0438\u0447\u044C \u0445\u043E\u0440\u043E\u0448\u0435\u0433\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u043F\u043E\u0447\u0442\u0438 \u0431\u0435\u0437 \u043F\u043E\u0442\u0435\u0440\u044C. +TrTab2.41=\n\u041D\u0435\u0434\u043E\u0441\u0442\u0430\u0442\u043E\u043A \u0432 \u0442\u043E\u043C, \u0447\u0442\u043E \u044D\u0442\u043E VBR-\u0431\u0438\u0442\u0440\u0435\u0439\u0442, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u043C\u043E\u0436\u0435\u0442 \u043F\u0440\u0435\u0432\u044B\u0441\u0438\u0442\u044C \u0448\u0438\u0440\u0438\u043D\u0443 \u043A\u0430\u043D\u0430\u043B\u0430 \u0432\u0430\u0448\u0435\u0439 \u0441\u0435\u0442\u0438. +TrTab2.42=\n\u041F\u043E\u044D\u0442\u043E\u043C\u0443 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u044C \u0448\u0438\u0440\u0438\u043D\u0443 \u043A\u0430\u043D\u0430\u043B\u0430: \u0435\u0441\u043B\u0438 \u0412\u044B \u043D\u0430 WiFi, CPL, \u0438\u0442\u0434. \u041E\u0434\u043D\u0430\u043A\u043E \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u043E \u0442\u0440\u0430\u043D\u0441\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F +TrTab2.43=\n\u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0431\u0430\u043B\u0430\u043D\u0441\u043E\u043C \u043C\u0435\u0436\u0434\u0443 \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u044C\u044E \u0441\u0435\u0442\u0438 \u0438 \u043C\u043E\u0449\u043D\u043E\u0441\u0442\u044C\u044E \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\u0430: \u0447\u0435\u043C \u0431\u043E\u043B\u044C\u0448\u0435 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0430 \u0412\u044B \u0432\u043F\u0438\u0445\u043D\u0435\u0442\u0435 \u0432 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u043D\u044B\u0439 \u0431\u0438\u0442\u0440\u0435\u0439\u0442, +TrTab2.44=\n\u0442\u0435\u043C \u0441\u0438\u043B\u044C\u043D\u0435\u0435 \u0431\u0443\u0434\u0435\u0442 \u0433\u0440\u0443\u0437\u0438\u0442\u044C\u0441\u044F \u0432\u0430\u0448 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u043E\u0440\! \u041D\u0435 \u043F\u044B\u0442\u0430\u0439\u0442\u0435\u0441\u044C \u0432\u043F\u0438\u0445\u043D\u0443\u0442\u044C \u0431\u043E\u0435\u0432\u0438\u043A \u0432 1080p \u0432 15Mbps \u0432 \u043B\u0443\u0447\u0448\u0435\u043C \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435\! :p +TrTab2.50=\u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043A\u0430\u043D\u0430\u043B\u043E\u0432 \u0430\u0443\u0434\u0438\u043E \u0434\u043B\u044F AC-3 \u043F\u0435\u0440\u0435\u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F: +TrTab2.51=\u041F\u043E\u043B\u043D\u043E\u0441\u0442\u044C\u044E \u043E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0441\u0443\u0431\u0442\u0438\u0442\u0440\u044B +TrTab2.52=\u0413\u043B\u0430\u0432\u044B \u0432 \u043F\u0430\u043F\u043A\u0443 #Transcode# (\u0418\u043D\u0442\u0435\u0440\u0432\u0430\u043B \u0432 \u043C\u0438\u043D\u0443\u0442\u0430\u0445) +TracesTab.3=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C +TreeNodeSettings.4=\u042D\u0442\u043E\u0442 \u0434\u0432\u0438\u0436\u043E\u043A \u043D\u0435 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_sl.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_sl.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_sl.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_sl.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,199 @@ +DLNAMediaDatabase.0=Za bolj\u0161o podporo in izbolj\u0161anje aplikacije,\nje potrebno medijsko knji\u017Enico podatkovne baze ponovno inicializirati. \nOprostite zaradi neprijetnosti \! +FFMpegDVRMSRemux.0=Nadomestna pot FFmpeg: +FFMpegDVRMSRemux.1=Nastavitve za premultipleksiranje DVR-MS +FFMpegVideo.0=Nastavitve kodiranja za krmilnik AviSynth/FFmpeg (Priporo\u010Deno AVISYNTH/MENCODER) +FoldTab.0= +FoldTab.1=Mo\u017Enosti skupne rabe +FoldTab.2=Prei\u0161\u010Di vse mape v skupni rabi +FoldTab.3=Preglejujem vse mape v skupni rabi, lahko traja precej \u010Dasa \!\n +FoldTab.4=Ali ste prepri\u010Dani, da \u017Eelite zagnati pregledovanje?\n\n +FoldTab.5=Skrij kon\u010Dnice datotek +FoldTab.6=Skrij \#Video nastavitve\# Mapa +FoldTab.7=Mape skupne rabe +FoldTab.8=Skrij imena prekodirnih krmilnikov +FoldTab.9=Dodaj imenik +FoldTab.10=Ali \u017Eelite ustaviti skeniranje?\n\n +FoldTab.11=Omogo\u010Di prekodirano video kopijo na PS3 (Previdno, datoteke nimajo fiksne velikosti !) +FoldTab.12=Razvrsti mape v skupni rabi +FoldTab.13=Sli\u010Dice +FoldTab.14=Uporabi Mplayer za video sli\u010Dice +FoldTab.15=Privzeto +FoldTab.16=Pogostej\u0161e najprej +FoldTab.18=Na\u010Din sortiranja datotek: +FoldTab.23=Prenesi iz Amazon.com +FoldTab.24=Prenesi iz discogs.com +FoldTab.26=Prikaz avdio sli\u010Dic: +FoldTab.27=Mapa nadomestnih video ovitkov +FoldTab.28=Izberi mapo +FontFileFilter.3=Pisave TrueType +LinksTab.5=Koristne povezave: +LooksFrame.5=Kon\u010Daj +LooksFrame.6=Glavna konzola +LooksFrame.9=Shrani +LooksFrame.12=Ponovni zagon Stre\u017Enika +LooksFrame.18=Stanje +LooksFrame.19=Sledenja +LooksFrame.20=Splo\u0161na konfiguracija +LooksFrame.21=Nastavitve prekodiranja +LooksFrame.22=Nastavitve Navigacije/Skupne rabe +LooksFrame.24=Pomo\u010D +LooksFrame.25=Vizitka +MEncoderAviSynth.2=Nastavitve video dekoderja za krmilnik AviSynth +MEncoderAviSynth.3=Omogo\u010Di spremembo AviSynth spremenljivo hitrost okvirjev v konstantno hitrost okvirjev (convertfps=true) +MEncoderVideo.0=Presko\u010Di ponavljajo\u010Di se deblokirni filter za H.264. LAHKO ZMANJ\u0160A KVALITETO +MEncoderVideo.1=video/Avdio dekoder nastavitve za krmilnik MEncoder +MEncoderVideo.2=Alternativni na\u010Din A/V sync +MEncoderVideo.3=Uporabi privzete aplikacijske parametre kodekov (Priporo\u010Deno!) +MEncoderVideo.4=Vsili hitrost okvirjev raz\u010Dlenjenih iz FFmpeg +MEncoderVideo.5=Tukaj lahko dodate specifi\u010Dne mo\u017Enosti, kot je filter za zmanj\u0161anje \u0161uma, npr:-vf hqdn3d +MEncoderVideo.6=Mo\u017Enosti po meri: +MEncoderVideo.7=Prioritete avdio jezika: +MEncoderVideo.8=Nastavitve podnapisov +MEncoderVideo.9=Prioritea jezika podnapisov: +MEncoderVideo.10=Prioriteta jezika Avdio/podnapisi (na primer: en,off;eng,off) +MEncoderVideo.11=Kodna stran podnapisov: +MEncoderVideo.12=Nastavitve pisav ASS: Umerjanje pisave +MEncoderVideo.13=Obris pisave +MEncoderVideo.14=Senca pisave +MEncoderVideo.15=Pisavno podobrobje +MEncoderVideo.16=Privzete nastavitve pisave: Umerjanje pisave +MEncoderVideo.17=Obris pisave +MEncoderVideo.18=Zabris pisave +MEncoderVideo.19=Pisavno podobrobje +MEncoderVideo.20=Podnapisi ASS/SSA +MEncoderVideo.21=Fontconfig/Vgrajene pisave +MEncoderVideo.22=Avtomatsko nalaganje podnapisov *.srt/*.sub z istim imenom datoteke +MEncoderVideo.24=Specifi\u010Dne pisave TrueType (za azijske jezike): +MEncoderVideo.25=Izberite pisavo TrueType +MEncoderVideo.26=Filter neprepletenosti +MEncoderVideo.27=Uporabi umerilnik videa +MEncoderVideo.28=\u0160irina +MEncoderVideo.29=Napredne nastavitve: Specifi\u010Dni parametri kodekov +MEncoderVideo.30=vi\u0161ina +MEncoderVideo.32=Premultipleksiraj, \u010De je avdio sled AC-3 (ni ponovnega zakodiranja) +MEncoderVideo.33=Parametri po meri: +MEncoderVideo.34=Uredi specifi\u010Dne parametre kodekov +MEncoderVideo.35=Izbolj\u0161ana ve\u010Djederna podpora +MEncoderVideo.36=Uporabi privzeti slog ASS +MEncoderVideo.37=Nadomestna mapa podnapisov +MEncoderVideo.68=\#Tukaj lahko vnesete specifi\u010Dne parametre za nekatere kombinacije kodekov.\n +MEncoderVideo.69=\#Se uporablja ve\u010Dinoma za te\u017Eave sinhronizacije A/V, vendar se lahko uporabi tudi za karkoli drugega\n +MEncoderVideo.70=\#Smatrajte to kot napredne nastavitve, vendar tega ne uporabljajte, \u010De ne veste to\u010Dno kaj delate\n +MEncoderVideo.71=\#Sintaksa je {java pogoj} :: {MEncoder mo\u017Enosti} ; lahko zdru\u017Eite ve\u010D mo\u017Enosti\n +MEncoderVideo.72=\#Avtorizirani \u017Eetoni: ime_datoteke srtfile zabojnik vcodec acodec hitrost_vzorca hitrost_okvirja \u0161irina vi\u0161ina kanali trajanje\n +MEncoderVideo.73=\#Previdno, vsaka nepravilna vrstica bo izlo\u010Dena\n +MEncoderVideo.75=\#Posebne mo\u017Enosti:\n +MEncoderVideo.76=\# -noass: vsekakor onemogo\u010Di podnapise ASS/SSA saj lahko desinhronizirajo A/V\n +MEncoderVideo.77=\# -nosync: vsekakor onemogo\u010Di alternativno metodo A/V Sync za to stanje (-mc bo storijo enako)\n +MEncoderVideo.78=\# -quality: obidi nastavitve kvalitete videa\n +MEncoderVideo.79=\# -mt: vsili uporabo ve\u010Djederne razli\u010Dice MEncoder-ja (eksperimentalno, lahko je nestabilna)\n +MEncoderVideo.80=\#Ta seznam bo s \u010Dasom izbolj\u0161an: Prilagajanje/Odzivi na razli\u010Dne kodeke/datoteke so vedno dobrodo\u0161li\n +MEncoderVideo.87=\#Zdaj lahko vstavite svoje pogoje/mo\u017Enosti ! Nekaj primerov: za vklop ve\u010Djederne razli\u010Dice MEncoder-ja\n +MEncoderVideo.88=\#za katerokoli vesbino HD 264 (nadomestna z glavno mo\u017Enostjo): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#za odstranitev tresljajev 24p na 50Hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#remux ko je video MPEG-2 in ni podnapisov: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=jezik [potreben ponovni zagon aplikacije]: +NetworkTab.1=Brskanje po datotekah .RAR / .ZIP / .CBR +NetworkTab.2=Generiranje sli\u010Dice +NetworkTab.3=Za\u010Dni minimizirano +NetworkTab.4=Namesti kot storitev Windows +NetworkTab.5=Splo\u0161ne nastavitve +NetworkTab.6=Maksimalna velikost prekodirnega medpomnilnika v megabajtih (najve\u010D: MAX_BUFFER_SIZE): +NetworkTab.7=\u0160tevilo jeder, ki se uporabljajo za prekodiranje (zdi se, da imate %d): +NetworkTab.11=Namestili ste kot storitev Windows \! Za uporabo je potrebno zaklju\u010Diti to aplikacijo,\n +NetworkTab.12=nato za\u017Eenite (in konfigurirajte) storitev iz upraviteljske plo\u0161\u010De Windows.\n\n +NetworkTab.13=Medijska knji\u017Enica bo ponovno inicializirana \!\n +NetworkTab.14=Napaka pri namestitvi kot storitev sistema Widnows!\n +NetworkTab.15=Navigacija/Raz\u010Dlenjevanje nastavitev +NetworkTab.16=Polo\u017Eaj iskanja sli\u010Dice (v sekundah): +NetworkTab.17=Omogo\u010Di medijsko knji\u017Enico +NetworkTab.18=Ponastavi medijsko knji\u017Enico +NetworkTab.19=Ali ste prepri\u010Dani? +NetworkTab.20=Vsili omre\u017Eevanje na vmesniku: +NetworkTab.22=Omre\u017Ene nastavitve, spreminjajte samo \u010De so te\u017Eave +NetworkTab.23=Vsili IP stre\u017Enika: +NetworkTab.24=Vsili vrata stre\u017Enika (5001 so privzeta): +NetworkTab.25=Nastavitve PS3 +NetworkTab.26=Znakovno kodiranje imen datotek va\u0161ega PS3 (glej XMB->System settings->Charset): +NetworkTab.27=Neuporabljene nastavitve, katerih ne uporabljati: p +NetworkTab.28=Turbo na\u010Din (omogo\u010Di tcp_nodelay) / previdno, nisem prepri\u010Dan, \u010De je prav, da se to uporablja +NetworkTab.29=Zavrni prihajajo\u010De zahtevke za isto datoteko iz PS3, ko je za\u010Deto prekodiranje +NetworkTab.30=Uporabi filter IP: +NetworkTab.35=Najve\u010Dja pasovna \u0161irina v Mb/s (0 pomeni brez omejitve): +PMS.0=PS3 ni bilo mogo\u010De najti. Je vklopljen? Lahko pa tudi preverite sledi in/ali konfiguracijo, ter datoteko debug.log +PMS.1=Avdio +PMS.2=\#- Medijska knji\u017Enica -\# +PMS.3=Alternativen na\u010Din A/V Sync +PMS.4=Filter neprepletenosti +PMS.5=PS3 je najden\! +PMS.6=Avtomatsko nalaganje podnapisov .srt/.sub +PMS.7=SkipLoopFilter za dekodiranje H.264 [lahko zmanj\u0161a kvaliteto] +PMS.8=Podnapisi +PMS.9=Vsi avdio seznami predvajanja +PMS.10=Definitivno onemogo\u010Di podnapise +PMS.11=Vse avdio sledi +PMS.12=Po datumu +PMS.13=S Po izvajalcu +PMS.16=Po albumu +PMS.19=Po \u017Eanru +PMS.21=Po modelu kamere +PMS.22=Po izvajalcu/albumu +PMS.25=Po nastavitvah ISO +PMS.26=Po \u017Eanru/izvajalcu/albumu +PMS.31=Fotografija +PMS.32=Vse fotografije +PMS.34=Video +PMS.35=Vsi videji +PMS.36=HD Videji +PMS.37=\#- Video Nastavitve -\# +PMS.39=SD Videji +PMS.41=(Ponovno) name\u0161\u010Danje storitve Win32 +PMS.130=Kontaktiram PS3 ... +StatusTab.2=Stanje +StatusTab.3=\u010Cakam ... +StatusTab.5=Prazno +StatusTab.6=Stanje prekodirnega medpomnilnika: +StatusTab.7=Statistika I/O: +StatusTab.8=Trenutni bitna hitrost: +StatusTab.10=Najvi\u0161ja bitna hitrost: +TSMuxerVideo.0=Demultipleksiraj z MEncoder-jem in kodiraj vse audio sledi v AC-3 +TSMuxerVideo.1=Demultipleksiraj z MEncoder-jem in Kodiraj avdio sledi DTS/FLAC v LPCM [Previdno, iskanje \u0161e ne dela] +TSMuxerVideo.2=vsili FPS raz\u010Dlenjen iz FFmpeg v meta datoteki +TSMuxerVideo.3=Video dekoder nastavitve za krmilnik TsMuxer +TSMuxerVideo.19=Multipleksiraj vse avdio sledi +TrTab2.0=Omogo\u010Di/onemogo\u010Di prekodirni krmilnik +TrTab2.1=Trenutno brez nastavitev +TrTab2.2=Video nastavitve kodirnika za naslednje krmilnike: MEncoder/AviSynth/FFmpeg +TrTab2.3=Avdio nastavitve veljajo za naslednje dekodirnike: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=Nastavitve kakovosti videa +TrTab2.5=Splo\u0161ne prekodirne nastavitve +TrTab2.6=Sortiraj seznam krmilnikov prekodiranja. Prvi bo naveden v izvirni mapi Video +TrTab2.7=Razli\u010Dne mo\u017Enosti +TrTab2.8=Presko\u010Di prekodiranje za naslednje raz\u0161iritve (pika je lo\u010Dilo): +TrTab2.9=Vsili prekodiranje za naslednje raz\u0161iritve (pika je lo\u010Dilo): +TrTab2.10=Omogo\u010Da, da po\u0161iljate DTS neposredno na va\u0161 sprejemnik.\nPrevidno, mo\u017Een je stati\u010Den zvok. Nekaj nasvetov:\n- Imeti morate sprejemnik, ki podpira DTS ,priklju\u010Den preko TOSLINK ali HDMI\n- Ikona za glasnost v XMB mora biti na 'Normal'\n- Ikona za kanale v XMB mora biti na 'Left + Right'\n +TrTab2.11=Krmilniki +TrTab2.12=Splo\u0161ne nastavitve dekodirnika +TrTab2.13=Splo\u0161ne nastavitve kodirnika +TrTab2.14=Krmilniki video datotek +TrTab2.15=Krmilniki avdio datotek +TrTab2.16=Krmilniki spletnega pretakanja videa +TrTab2.17=Krmilniki spletnega pretakanja avdia +TrTab2.18=Razli\u010Dni krmilniki +TrTab2.19=Povdarjen krmilnik bo imel prednost +TrTab2.20=in bo nadomestil izvirni video +TrTab2.21=[AviSynth ni podprt] +TrTab2.27=DTS/FLAC -> LPCM premultipleksiranje (Potreben sprejemnik HDMI za pretakanje LPCM 5.1 \! Povpre\u010Dna bitna hitrost = 4.6Mbps) +TrTab2.28=Obdr\u017Ei DTS audio v struji (zdru\u017Eljivo z opti\u010Dnim izhodom) -> Pazi, majn\u0161i prese\u017Eki bitne hitrosti ! +TrTab2.29=Bitna hitrost AC-3 Avdio (v Kbits/s) (npr.: 384, 576, 640): +TrTab2.32=MPEG-2 kakovosti videa: +TrTab2.39=video se samodejno prekodira in multipleksira v MPEG-PS / AC-3 avdio (zelo zdru\u017Eljiv z PS3) +TrTab2.40=\nLahko preizku\u0161ate parametre vqscale, vqmin in keyint za dosego dobre, tudi skoraj brez izgub, prekodirne kvalitete. +TrTab2.41=\nSlabost tega je bitna hitrost VBR, ki lahko v\u010Dasih prese\u017Ee va\u0161o maksimalno zmogljivost omre\u017Eja. +TrTab2.42=\nZato lahko nastavite tudi pasovno \u0161irino, \u010De ste preko WiFi, CPL, itd. Vendar pa je prekodirna kvaliteta +TrTab2.43=\nravnovesje med omre\u017Eno hitrostjo in zmogljivostjo cpu: \u010Dim ve\u010Djo kvaliteto boste supstili preko omejene bitne hitrost, +TrTab2.44=\ntem ve\u010D bo va\u0161 cpu trpel\! Prav tako ne pri\u010Dakujte, da boste akcijski film v 1080p v najbolj\u0161i kakovosti predvajali s 15Mbps:p +TrTab2.50=\u0160tevilo avdio kanalov: +TrTab2.51=Definitivno onemogo\u010Di podnapise +TracesTab.3=Po\u010Disti +TreeNodeSettings.4=Krmilnik ni nalo\u017Een\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_sv.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_sv.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_sv.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_sv.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,213 @@ +DLNAMediaDatabase.0=F\u00F6r att f\u00F6rb\u00E4ttra prestanda och funktionalitet\n beh\u00F6ver mediabiblioteket \u00E5terst\u00E4llas.\nBeklagar det intr\u00E4ffade\! +FFMpegDVRMSRemux.0=FFmpeg alternativ s\u00F6kv\u00E4g: +FFMpegDVRMSRemux.1=DVR-MS muxningsinst\u00E4llningar +FFMpegVideo.0=AviSynth/FFmpeg konverteringsinst\u00E4llningar +FoldTab.0= +FoldTab.1=Utdelningsinst\u00E4llningar +FoldTab.2=Indexera alla utdelade kataloger +FoldTab.3=Indexering av alla utdelade kataloger kan kr\u00E4va l\u00E5ng tid\!\n +FoldTab.4=Skall indexeringen p\u00E5b\u00F6rjas?\n\n +FoldTab.5=D\u00F6lj fil\u00E4ndelser (t.ex. .avi, .mkv etc.) +FoldTab.6=D\u00F6lj \#Video Inst\u00E4llningar\# i PS3 XMB +FoldTab.7=Utdelade kataloger +FoldTab.8=D\u00F6lj konverteringsmetod i PS3 XMB +FoldTab.9=L\u00E4gg till katalog +FoldTab.10=Skall indexeringen avbrytas?\n\n +FoldTab.11=Aktivera filkopiering till PS3 (OBS\! Filerna konverteras och har ingen fast storlek) +FoldTab.12=Sortera utdelade kataloger +FoldTab.13=Miniatyrbilder +FoldTab.14=Anv\u00E4nd Mplayer f\u00F6r videominiatyrbilder +FoldTab.15=Standard +FoldTab.16=Efter datum +FoldTab.18=Filsortering: +FoldTab.19=DVD ISO miniatyrbild +FoldTab.23=Ladda ner fr\u00E5n amazon.com +FoldTab.24=Ladda ner fr\u00E5n discogs.com +FoldTab.26=Ljudfilsminiatyrbilder: +FoldTab.27=Alternativ mediaomslags katalog +FoldTab.28=V\u00E4lj en katalog +FoldTab.29=Visa iPhoto bibliotek +FoldTab.30=Visa iTunes bibiliotek +FoldTab.31=D\u00F6lj tomma/ej multimedia kataloger (OBS: orsakar l\u00E5ngsammare bl\u00E4ddring) +FoldTab.32=D\u00F6lj mediabibliotek katalogen +FoldTab.33=D\u00F6lj \#Transcode\# katalogen +FoldTab.34=Visa aperture bibliotek +FontFileFilter.3=Truetype typsnitt +LinksTab.5=Hj\u00E4lpfulla l\u00E4nkar: +LooksFrame.5=Avsluta +LooksFrame.6=Huvudpanel +LooksFrame.9=Verkst\u00E4ll +LooksFrame.12=Omstart av Server +LooksFrame.18=Status +LooksFrame.19=Logg +LooksFrame.20=Inst\u00E4llningar +LooksFrame.21=Konverteringsinst\u00E4llningar +LooksFrame.22=Navigations/Utdelningsinst\u00E4llningar +LooksFrame.24=Hj\u00E4lp +LooksFrame.25=Om PMS +MEncoderAviSynth.2=AviSynth videoavkodningsinst\u00E4llningar +MEncoderAviSynth.3=Aktivera AviSynth variabel till konstant framerate (convertfps=true) +MEncoderVideo.0=Avaktivera loop filter deblocking f\u00F6r H.264 (f\u00F6r \u00E4ldre CPU) +MEncoderVideo.1=MEncoder video- och ljudavkodningsinst\u00E4llningar +MEncoderVideo.2=A/V synk. +MEncoderVideo.3=Anv\u00E4nd programmets standard codec parametrar (rekommenderas\!) +MEncoderVideo.4=Tvinga framerate utl\u00E4st fr\u00E5n FFmpeg +MEncoderVideo.5=Valfria inst\u00E4llningar, t.ex ett denoise filter: -vf hqdn3d +MEncoderVideo.6=Valfria inst\u00E4llningar: +MEncoderVideo.7=Ljudsp\u00E5rs spr\u00E5kprioritet: +MEncoderVideo.8=Undertextinst\u00E4llningar +MEncoderVideo.9=Undertext spr\u00E5kprioritering: +MEncoderVideo.10=Ljudsp\u00E5r/undertext spr\u00E5kprioritering (ex. swe,off;eng,swe) +MEncoderVideo.11=Teckenkodning av undertexter: +MEncoderVideo.12=ASS undertextinst\u00E4llningar: Storlek +MEncoderVideo.13=Outline +MEncoderVideo.14=Skugga +MEncoderVideo.15=Marginal +MEncoderVideo.16=\u00D6vriga undertextinst\u00E4llningar: Storlek +MEncoderVideo.17=Outline +MEncoderVideo.18=Skugga +MEncoderVideo.19=Marginal +MEncoderVideo.20=ASS/SSA Undertexter +MEncoderVideo.21=Fontconfig/Inbakade typsnitt +MEncoderVideo.22=Autoladda *.srt/*.sub undertexter med samma filnamn +MEncoderVideo.24=Specifikt TrueType typsnitt (f\u00F6r asiatiska spr\u00E5k): +MEncoderVideo.25=V\u00E4lj ett TrueType typsnitt +MEncoderVideo.26=Deinterlace filter +MEncoderVideo.27=Anv\u00E4nd videouppskalning +MEncoderVideo.28=Bredd +MEncoderVideo.29=Avancerade Inst\u00E4llningar: Codec specifika parametrar +MEncoderVideo.30=H\u00F6jd +MEncoderVideo.32=AC-3 muxning enbart (ingen konvertering) +MEncoderVideo.33=Egna parametrar: +MEncoderVideo.34=Modifiera codec specifika parametrar +MEncoderVideo.35=Optimerat flerk\u00E4rnigt st\u00F6d +MEncoderVideo.36=Anv\u00E4nd ASS standard formatering +MEncoderVideo.37=Alternativ undertextkatalog +MEncoderVideo.68=\#H\u00E4r kan specifika codec parametrar st\u00E4llas in.\n +MEncoderVideo.69=\#Syftet \u00E4r mestadels f\u00F6r A/V synkroniseringsproblem, men kan \u00E4ven anv\u00E4ndas f\u00F6r andra \u00E4ndam\u00E5l\n +MEncoderVideo.70=\#Avancerade inst\u00E4llningar som ej b\u00F6r modifieras utan ing\u00E5ende kunskap\n +MEncoderVideo.71=\#Syntaxen \u00E4r {java condition} :: {MEncoder options} ; Flera inst\u00E4llningar kan kombineras\n +MEncoderVideo.72=\#Accepterade parametrar: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Observera, felaktig syntax ignoreras\n +MEncoderVideo.75=\#Speciella inst\u00E4llningar:\n +MEncoderVideo.76=\# -noass: avaktivera ASS/SSA undertexter (motverka A/V synk. problem)\n +MEncoderVideo.77=\# -nosync: avaktivera A/V synkronisering f\u00F6r denna codec (-mc g\u00F6r samma sak)\n +MEncoderVideo.78=\# -quality: \u00E5sidos\u00E4tt videokvalitetsinst\u00E4llningar\n +MEncoderVideo.79=\# -mt: tvinga anv\u00E4ndning av flerk\u00E4rning MEncoder (beta, kan vara instabilt)\n +MEncoderVideo.80=\#Denna lista kommer att v\u00E4xa med tiden: f\u00F6rslag/finjusteringar avseende olika codecar tas tacksamt emot\n +MEncoderVideo.87=\#Nedanf\u00F6r finns utrymme f\u00F6r egna inst\u00E4llningar/kombinationer\! N\u00E5gra exempel: f\u00F6r att aktivera flerk\u00E4rning MEncoder\n +MEncoderVideo.88=\#f\u00F6r all H.264 video: vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#f\u00F6r att eliminera 24p judder p\u00E5 en 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#f\u00F6r att remuxa n\u00E4r video \u00E4r MPEG-2 utan undertext: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +NetworkTab.0=Spr\u00E5k [kr\u00E4ver program omstart]: +NetworkTab.1=Bl\u00E4ddra i .RAR/.ZIP/.CBR arkiv +NetworkTab.2=Generering av miniatyrbilder +NetworkTab.3=Starta minimerat (aktivitetsf\u00E4lt) +NetworkTab.4=Installera som Windows service +NetworkTab.5=Generella Inst\u00E4llningar +NetworkTab.6=Konverteringsbuffer max. storlek i megabytes (max. 600): +NetworkTab.7=Antal k\u00E4rnor f\u00F6r konvertering (programmet har uppt\u00E4ckt %d): +NetworkTab.11=Windows service har installerats\! F\u00F6r att anv\u00E4nda den, avsluta programmet,\n +NetworkTab.12=d\u00E4refter starta (och konfigurera) servicen via Windows kontrollpanel.\n\n +NetworkTab.13=Mediabiblioteket kommer att \u00E5terst\u00E4llas\!\n +NetworkTab.14=Ett fel uppstod under installation av Windows service\n\!\n +NetworkTab.15=Navigations/mediebibilioteksinst\u00E4llningar +NetworkTab.16=Miniatyrbilds position (i sekunder): +NetworkTab.17=Aktivera Mediabiblioteket +NetworkTab.18=Nollst\u00E4ll Mediabiblioteket +NetworkTab.19=\u00C4r du s\u00E4ker? +NetworkTab.20=Anv\u00E4nd f\u00F6ljande n\u00E4tverkskort: +NetworkTab.22=N\u00E4tverksinst\u00E4llningar (\u00E4ndra enbart vid problem) +NetworkTab.23=Tvinga server IP: +NetworkTab.24=Tvinga serverport (5001 som standard): +NetworkTab.25=PS3 Inst\u00E4llningar +NetworkTab.26=Teckenkodning av PS3 filnamn (se XMB->Systeminst\u00E4llningar->Teckenkodning): +NetworkTab.27=Oanv\u00E4nda inst\u00E4llningar +NetworkTab.28=Turbo l\u00E4ge (aktivera tcp_nodelay) / ej testat och utv\u00E4rderat +NetworkTab.29=Blockera inkommande beg\u00E4ran f\u00F6r samma fil fr\u00E5n PS3 under konvertering +NetworkTab.30=Anv\u00E4nd IP-filter: +NetworkTab.31=Avancerade HTTP- och systeminst\u00E4llningar +NetworkTab.32=HTTP Motor V2 +NetworkTab.33=Hindra OS fr\u00E5n vilol\u00E4ge under uppspelning +NetworkTab.34=Plugins +NetworkTab.35=Maximal bandbredd i Mb/s (0 inneb\u00E4r ingen begr\u00E4nsning): +PMS.0=PS3 har ej uppt\u00E4ckts. \u00C4r konsollen p\u00E5slagen? Du kan ocks\u00E5 kolla loggen och/eller konfigurationen, alternativt filen debug.log. +PMS.1=Ljud +PMS.2=\#- Mediabibiliotek -\# +PMS.3=A/V synk. +PMS.4=Deinterlace Filter +PMS.5=PS3 har hittats\! +PMS.6=Autoladda .srt/.sub undertexter +PMS.7=SkipLoopFilter f\u00F6r H.264 avkodning [f\u00F6r \u00E4ldre CPU] +PMS.8=Undertexter +PMS.9=Alla Musikspellistor +PMS.10=Avaktivera alla undertexter +PMS.11=All Musik +PMS.12=Efter Datum +PMS.13=Efter Artist +PMS.16=Efter Album +PMS.19=Efter Genre +PMS.21=Efter kameramodell +PMS.22=Efter Artist/Album +PMS.25=Efter ISO parametrar +PMS.26=Efter Genre/Artist/Album +PMS.27=Spara konfiguration +PMS.31=Foton +PMS.32=Alla Foton +PMS.34=Film +PMS.35=All Film +PMS.36=HD Film +PMS.37=\#- Film Inst\u00E4llningar -\# +PMS.39=SD Film +PMS.41=(Om)installerar Windows service +PMS.130=S\u00F6ker efter PS3... +StatusTab.2=Status +StatusTab.3=V\u00E4ntar... +StatusTab.5=Tomt +StatusTab.6=Konverteringsbuffer: +StatusTab.7=I/O statistik: +StatusTab.8=Aktuell bitrate: +StatusTab.9=Uppt\u00E4ckta mediaspelare +StatusTab.10=Max. bitrate: +TSMuxerVideo.0=Tvinga AC-3 muxning av allt ljud +TSMuxerVideo.1=Tvinga PCM muxning av DTS/FLAC ljud (kr\u00E4ver HDMI receiver) +TSMuxerVideo.2=Tvinga FPS utl\u00E4st fr\u00E5n FFmpeg i metafilen +TSMuxerVideo.3=TsMuxer videomuxninginst\u00E4llningar +TSMuxerVideo.19=Muxa alla ljudsp\u00E5r +TrTab2.0=Aktivera/avaktivera en konverteringsmetod +TrTab2.1=Inga inst\u00E4llningar f\u00F6rn\u00E4rvarande +TrTab2.2=MEncoder/AviSynth/FFmpeg videokonverteringsinst\u00E4llningar +TrTab2.3=MEncoder/AviSynth/FFmpeg/tsMuxeR ljudinst\u00E4llningar +TrTab2.4=Videokvalit\u00E9inst\u00E4llningar +TrTab2.5=Generella konverteringsinst\u00E4llningar +TrTab2.6=Sortera listan \u00F6ver konverteringsmetoder. Valet h\u00F6gst upp kommer att ers\u00E4tta inkompatibel fil +TrTab2.7=\u00D6vriga inst\u00E4llningar +TrTab2.8=Undvik konvertering av f\u00F6ljande fil\u00E4ndelser (komma separerat): +TrTab2.9=Tvinga konvertering av f\u00F6ljande fil\u00E4ndelser (komma separerat): +TrTab2.10=Till\u00E5ter realtime streaming av DTS till kompatibel receiver.\nVar uppm\u00E4rksam, ljudet kan \u00E5terskapas felaktigt. H\u00E4r f\u00F6ljer n\u00E5gra tips:\n- En DTS-kompatibel receiver kr\u00E4vs, ansluten via Toslink eller HDMI\n- Volym i PS3 XMB m\u00E5ste vara i l\u00E4ge 'Normal'\n- Kanalinst\u00E4llningen i PS3 XMB m\u00E5ste vara i l\u00E4ge 'V\u00E4nster+H\u00F6ger'\n +TrTab2.11=Konverteringsmetoder +TrTab2.12=Generella avkodningsinst\u00E4llningar +TrTab2.13=Generella konverteringsinst\u00E4llningar +TrTab2.14=Video konverteringsmetoder +TrTab2.15=Audio konverteringsmetoder +TrTab2.16=Str\u00F6mmande videokonverteringsmetoder +TrTab2.17=Str\u00F6mmande ljudkonverteringsmetoder +TrTab2.18=\u00D6vriga konverteringsmetoder +TrTab2.19=Konverteringsmetod i fetstilt \u00E4r standard +TrTab2.20=och kommer ers\u00E4tta ej kompatibla filer +TrTab2.21=[AviSynth ej kompatibelt] +TrTab2.27=DTS/FLAC -> LPCM muxning (Du beh\u00F6ver en HDMI receiver f\u00F6r LPCM 5.1\! Genomsnittlig bitrate = 4.6Mbps) +TrTab2.28=Beh\u00E5ll DTS format (kompatibelt med Toslink/HDMI) -> OBS\! En viss bitrate \u00F6kning uppst\u00E5r\! +TrTab2.29=AC-3 Ljud bitrate (i Kbit/s) (ex: 384, 576, 640): +TrTab2.32=MPEG-2 profil: +TrTab2.39=Videon konverteras automatiskt till MPEG-PS / AC-3 video och ljud format (PS3 kompatibelt) +TrTab2.40=\nDu kan modifiera vqscale, vqmin och keyint parametrarna f\u00F6r att \u00E5stadkomma god, tom. f\u00F6rlustfri konvertering. +TrTab2.41=\nNackdelen med detta \u00E4r VBR bitraten som stundvis kan sticka \u00F6ver tillg\u00E4nglig bandbredd. +TrTab2.42=\nD\u00E4rf\u00F6r kan du ange en maximal bandbredd f\u00F6r tex WLAN, observera dock +TrTab2.43=\natt erh\u00E5llen kvalit\u00E9 \u00E4r en balans mellan bandbredd och CPU kraft: ju h\u00F6gre kvalit\u00E9tsprofil du v\u00E4ljer och ju mer du begr\u00E4nsar bandbredden, +TrTab2.44=\ndesto mer m\u00E5ste CPU arbeta\! F\u00F6rv\u00E4nta dig d\u00E4rf\u00F6r inga under, en 1080p HD video p\u00E5 t.ex 15Mbps \u00E4r inget som rekommenderas\! +TrTab2.50=Antal ljudkanaler: +TrTab2.51=Avaktivera undertexter +TrTab2.52=Kapitelgenerering (intervall i minuter): +TracesTab.3=Rensa +TreeNodeSettings.4=Denna konverteringsmetod \u00E4r ej aktiverad\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_tr.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_tr.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_tr.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_tr.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,236 @@ +DLNAMediaDatabase.0=Bellek veritaban\u0131n\u0131n yeniden ba\u015Flat\u0131lmas\u0131 gerekiyor.\nRahats\u0131zl\u0131k verdi\u011Fim i\u00E7in \u00FCzg\u00FCn\u00FCm \! +FFMpegDVRMSRemux.0=Alternatif FFmpeg Yolu: +FFMpegDVRMSRemux.1=DVR-MS remuxing i\u00E7in ayarlar +FFMpegVideo.0=Sadece AviSynth/FFmpeg motoru i\u00E7in enkoder ayarlar\u0131 (AviSynth/MEncoder tercihi yap\u0131n) +FoldTab.0= +FoldTab.1=Payla\u015F\u0131m se\u00E7enekleri +FoldTab.2=Payla\u015F\u0131lan t\u00FCm klas\u00F6rleri tara +FoldTab.3=Payla\u015F\u0131lan t\u00FCm klas\u00F6rleri taramak uzun zaman alabilir\!\n +FoldTab.4=Taramay\u0131 ba\u015Flatmak istedi\u011Finizden emin misiniz?\n\n +FoldTab.5=Dosya uzant\u0131lar\u0131n\u0131 gizle +FoldTab.6=\#Video Settings\# klas\u00F6r\u00FCn\u00FC gizle +FoldTab.7=Payla\u015F\u0131lan klas\u00F6rler +FoldTab.8=Transcode motoru isimlerini gizle +FoldTab.9=Dizin ekle +FoldTab.10=Taramay\u0131 durdurmak istiyor musunuz?\n\n +FoldTab.11=Transcode i\u015Flemi yap\u0131lm\u0131\u015F g\u00F6r\u00FCnt\u00FC dosyas\u0131n\u0131 PS3'e kopyala (Dikkat, dosyalar\u0131n b\u00FCy\u00FCkl\u00FC\u011F\u00FC sabit de\u011Fildir\!) +FoldTab.12=Payla\u015F\u0131lan klas\u00F6rleri s\u0131rala +FoldTab.13=\u00D6nizleme resmileri +FoldTab.14=G\u00F6r\u00FCnt\u00FC dosyas\u0131n\u0131n \u00F6nizleme resimleri i\u00E7in MPlayer kullan +FoldTab.15=Alfabetik (A-Z) +FoldTab.16=Tarihe g\u00F6re, yeniden eskiye +FoldTab.17=Tarihe g\u00F6re, eskiden yeniye +FoldTab.18=Dosya s\u0131ralmas\u0131: +FoldTab.19=DVD ISO \u00F6nizleme resimleri +FoldTab.20=ASCIIbetical +FoldTab.21=Resim doyalar\u0131n\u0131n \u00F6nizleme resimleri +FoldTab.22=Alfan\u00FCmerik +FoldTab.23=amazon.com \u00FCzerinden indir +FoldTab.24=discogs.com \u00FCzerinden indir +FoldTab.26=Ses dosyalar\u0131n\u0131n \u00F6nizleme resmi g\u00F6r\u00FCn\u00FCm\u00FC: +FoldTab.27=G\u00F6r\u00FCnt\u00FC dosyalar\u0131n\u0131n alternatif kapak resmi klas\u00F6r\u00FC +FoldTab.28=Bir klas\u00F6r se\u00E7in +FoldTab.29=iPhoto k\u00FCt\u00FCphanesini g\u00F6ster +FoldTab.30=iTunes k\u00FCt\u00FCphanesini g\u00F6ster +FoldTab.31=Bo\u015F/medya bulunmayan klas\u00F6rleri gizle (Dikkat: daha yava\u015F gezinme) +FoldTab.32=Cache klas\u00F6r\u00FCn\u00FC gizle +FoldTab.33=\#Transcode\# klas\u00F6r\u00FCn\u00FC gizle +FoldTab.34=Aperture klas\u00F6r\u00FCn\u00FC g\u00F6ster +FontFileFilter.3=TrueType Fontlar\u0131 +LinksTab.5=Yard\u0131mc\u0131 linkler: +LooksFrame.5=\u00C7\u0131k\u0131\u015F +LooksFrame.6=Ana Ekran +LooksFrame.9=Kaydet +LooksFrame.12=Sunucuyu Yeniden Ba\u015Flat +LooksFrame.13=Yap\u0131land\u0131rma de\u011Fi\u015Fikli\u011Fi nedeniyle sunucunun yeniden ba\u015Flat\u0131lmas\u0131 gerekir +LooksFrame.18=Durum +LooksFrame.19=\u0130zler +LooksFrame.20=Genel Ayarlar +LooksFrame.21=Transcode Ayarlar\u0131 +LooksFrame.22=Navigasyon/Payla\u015F\u0131m Ayarlar\u0131 +LooksFrame.24=Yard\u0131m +LooksFrame.25=Hakk\u0131nda +MEncoderAviSynth.2=Sadece AviSynth motoru i\u00E7in g\u00F6r\u00FCnt\u00FC dekoder ayarlar\u0131 +MEncoderAviSynth.3=AviSynth de\u011Fi\u015Fken kare h\u0131z\u0131n\u0131 sabit kare h\u0131z\u0131na de\u011Fi\u015Ftir (convertfps=true) +MEncoderVideo.0=H.264 i\u00E7in deblocking filtresini ge\u00E7. Kaliteyi d\u00FC\u015F\u00FCrebilir. +MEncoderVideo.1=Sadece MEncoder motoru i\u00E7in ses/g\u00F6r\u00FCnt\u00FC \u00E7\u00F6z\u00FCc\u00FCs\u00FC ayarlar\u0131 +MEncoderVideo.2=Alternatif A/V senkronlama y\u00F6ntemi +MEncoderVideo.3=Uygulaman\u0131n varsay\u0131lan kodek ayarlar\u0131n\u0131 kullan (\u00D6nerilen\!) +MEncoderVideo.4=Kare h\u0131z\u0131n\u0131n FFmpeg'den ayr\u0131\u015Ft\u0131r\u0131lmas\u0131na zorla +MEncoderVideo.5=Buraya \u00F6zel se\u00E7eneklerinizi ekleyebilirsiniz, \u00F6rnek olarak denoise filtresi: -vf hqdn3d +MEncoderVideo.6=\u00D6zel se\u00E7enekler: +MEncoderVideo.7=Ses dili \u00F6nceli\u011Fi: +MEncoderVideo.8=Altyaz\u0131 ayarlar\u0131 +MEncoderVideo.9=Altyaz\u0131 dili \u00F6nceli\u011Fi: +MEncoderVideo.10=Ses/altyaz\u0131 dili \u00F6nceli\u011Fi (\u00F6rn: en,off;jpn,eng) +MEncoderVideo.11=Altyaz\u0131 codepage: +MEncoderVideo.12=ASS i\u00E7in yaz\u0131tipi ayarlar\u0131: B\u00FCy\u00FCkl\u00FCk +MEncoderVideo.13=D\u0131\u015F \u00E7izgi +MEncoderVideo.14=G\u00F6lge +MEncoderVideo.15=Alt bo\u015Fluk +MEncoderVideo.16=Varsay\u0131lan yaz\u0131tipi ayarlar\u0131: B\u00FCy\u00FCkl\u00FCk +MEncoderVideo.17=D\u0131\u015F \u00E7izgi +MEncoderVideo.18=Donukluk +MEncoderVideo.19=Alt bo\u015Fluk +MEncoderVideo.20=ASS/SSA Altyaz\u0131lar\u0131 +MEncoderVideo.21=Fontconfig/G\u00F6m\u00FCl\u00FC yaz\u0131tipleri +MEncoderVideo.22=Dosya ismi ayn\u0131 olan *.srt/*.sub altyaz\u0131 dosyalar\u0131n\u0131 otomatik y\u00FCkle +MEncoderVideo.23=FriBiDi modu +MEncoderVideo.24=\u00D6zel TrueType yaz\u0131tipi (Asya dilleri i\u00E7in): +MEncoderVideo.25=Bir TrueType yaz\u0131tipi se\u00E7in +MEncoderVideo.26=Deinterlace filtresi +MEncoderVideo.27=G\u00F6r\u00FCnt\u00FC \u00F6l\u00E7ekleyici kullan +MEncoderVideo.28=Geni\u015Flik +MEncoderVideo.29=Uzman ayarlar\u0131 : \u00D6zel kodek parametreleri +MEncoderVideo.30=Y\u00FCkseklik +MEncoderVideo.31=Altyaz\u0131 rengi +MEncoderVideo.32=Ses izi AC-3 oldu\u011Funda remux yap (Re-encode yok) +MEncoderVideo.33=\u00D6zel parametreler: +MEncoderVideo.34=Kodeklerin \u00F6zel ayarlar\u0131n\u0131 d\u00FCzenle +MEncoderVideo.35=\u0130\u015Flemcinin b\u00FCt\u00FCn \u00E7ekirdeklerini kullan +MEncoderVideo.36=Varsay\u0131lan ASS stilini kullan +MEncoderVideo.37=Alternatif Altyaz\u0131 Klas\u00F6r\u00FC +MEncoderVideo.39=DVD ISO g\u00F6r\u00FCnt\u00FC izine Remux i\u015Flemi yap (Re-encode yok) +MEncoderVideo.68=\#Buraya baz\u0131 kodek kombinasyonlar\u0131 i\u00E7in \u00F6zel parametreler ekleyebilirsiniz.\n +MEncoderVideo.69=\#Daha \u00E7ok A/V senkronlama i\u015Flemleri i\u00E7in, fakat ba\u015Fka i\u015Flemler i\u00E7in de kullan\u0131labilir.\n +MEncoderVideo.70=\#Ne yapt\u0131\u011F\u0131n\u0131z\u0131 bilmiyorsan\u0131z kullan\u0131lmamas\u0131 gereken uzman ayarlar\u0131 olarak say\u0131n.\n +MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; Birka\u00E7 se\u00E7ene\u011Fi birle\u015Ftirebilirsiniz.\n +MEncoderVideo.72=\#Yetkilendirilen i\u015Faretler: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Dikkat, bozuk s\u0131ra t\u00FCm\u00FCyle silinecektir.\n +MEncoderVideo.75=\#\u00D6zel se\u00E7enekler:\n +MEncoderVideo.76=\# -noass: ASS/SSA altyaz\u0131lar\u0131n\u0131 t\u00FCm\u00FCyle devre d\u0131\u015F\u0131 b\u0131rak.\n +MEncoderVideo.77=\# -nosync: bu durum i\u00E7in alternatif A/V e\u015Fle\u015Ftirme y\u00F6ntemini devre d\u0131\u015F\u0131 b\u0131rak (-mc ayn\u0131s\u0131n\u0131 yapar)\n +MEncoderVideo.78=\# -quality: g\u00F6r\u00FCnt\u00FC kalitesi ayarlar\u0131n\u0131 ge\u00E7ersiz k\u0131l \n +MEncoderVideo.79=\# -mt: Multithread MEncoder s\u00FCr\u00FCm\u00FCn\u00FC kullanmaya zorla\n +MEncoderVideo.80=\#Bu liste zamanla geli\u015Ftirilecektir: \u00E7e\u015Fitli kodek/dosya ayarlar\u0131/geri bildirimleri her zaman ho\u015F kar\u015F\u0131lan\u0131r.\n +MEncoderVideo.87=\#\u015Eimdi buraya kendi durumunuzu/se\u00E7eneklerinizi koyabilirsiniz\! Birka\u00E7 \u00F6rnek: \u00F6rne\u011Fin, H.264 HD i\u00E7erik i\u00E7in\n +MEncoderVideo.88=\#MEncoder mt s\u00FCr\u00FCm\u00FCn\u00FC etkinle\u015Ftir (ana se\u00E7enekle gereksiz): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#50hz TV'de 24p titremesini kald\u0131rmak i\u00E7in: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#G\u00F6r\u00FCnt\u00FC dosyas\u0131 MPEG-2 ise ve altyaz\u0131 yoksa remux i\u015Flemi yapmak i\u00E7in: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=DVD/VOBsub altyaz\u0131 kalitesi (0-4) (Rakam b\u00FCy\u00FCd\u00FCk\u00E7e kalite artar): +MEncoderVideo.93=Overscan kar\u015F\u0131l\u0131\u011F\u0131 i\u00E7in kenar ekle: +MEncoderVideo.94=Altyaz\u0131lar\u0131 zorla: +MEncoderVideo.95=Etiketleri zorla: +NetworkTab.0=Dil [Yeniden ba\u015Flatma gerekir]: +NetworkTab.1=S\u0131k\u0131\u015Ft\u0131r\u0131lm\u0131\u015F ar\u015Fivleri gez (.rar/.zip/.cbr) +NetworkTab.2=\u00D6nizleme resmi olu\u015Ftur +NetworkTab.3=K\u00FC\u00E7\u00FClt\u00FClm\u00FC\u015F durumda ba\u015Flat +NetworkTab.4=Windows hizmeti olarak y\u00FCkle +NetworkTab.5=Genel ayarlar +NetworkTab.6=Transcode i\u00E7in azami tampon boyutu, megabyte olarak (azami: MAX_BUFFER_SIZE): +NetworkTab.7=Transcode i\u00E7in kullan\u0131lacak \u00E7ekirdek say\u0131s\u0131 (Sizde mevcut olan %d): +NetworkTab.8=G\u00FCncellemeleri denetle +NetworkTab.9=Otomatik denetle +NetworkTab.11=Windows hizmetini y\u00FCklediniz \! Kullanmak i\u00E7in, uygulamadan \u00E7\u0131kmal\u0131,\n +NetworkTab.12=daha sonra windows y\u00F6netim panelinden hizmeti ba\u015Flatmal\u0131s\u0131n\u0131z/yap\u0131land\u0131rmal\u0131s\u0131n\u0131z.\n\n +NetworkTab.13=\u00D6nbellek yeniden ba\u015Flat\u0131lacak \!\n +NetworkTab.14=Windows hizmeti y\u00FCklenirken hata olu\u015Ftu\!\n +NetworkTab.15=Navigasyon/Ayr\u0131\u015Ft\u0131rma ayarlar\u0131 +NetworkTab.16=\u00D6nizleme resmi bulma konumu (saniyelerle): +NetworkTab.17=\u00D6nbelle\u011Fi etkinle\u015Ftir +NetworkTab.18=\u00D6nbelle\u011Fi s\u0131f\u0131rla +NetworkTab.19=Emin misiniz? +NetworkTab.20=A\u011F aray\u00FCz\u00FCn\u00FC kullan: +NetworkTab.22=A\u011F ayarlar\u0131 (geli\u015Fmi\u015F) +NetworkTab.23=Sunucunun IP adresi: +NetworkTab.24=Sunucunun port'u (Varsay\u0131lan 5001): +NetworkTab.25=PS3 ayarlar\u0131 +NetworkTab.26=PS3 dosya adlar\u0131 karakter kodlamas\u0131 (Bknz. XMB->System settings->Charset): +NetworkTab.27=Kullanmaman\u0131z gereken yepyeni ayarlar :p +NetworkTab.28=Turbo mode (tcp_nodelay etkinle\u015Ftir) / Dikkat, ne yapt\u0131\u011F\u0131n\u0131zdan emin de\u011Filseniz kullanmay\u0131n +NetworkTab.29=Transcode ba\u015Flad\u0131\u011F\u0131nda PS3'den ayn\u0131 dosya i\u00E7in gelen istekleri engelle +NetworkTab.30=IP filter : +NetworkTab.31=Geli\u015Fmi\u015F HTTP ve sistem ayarlar\u0131 +NetworkTab.32=HTTP Engine V2 +NetworkTab.33=Dosya sunumu yap\u0131l\u0131yorken sistemin uykuya ge\u00E7mesini engelle +NetworkTab.34=Eklentiler +NetworkTab.35=Azami bant geni\u015Fli\u011Fi Mb/s olarak (0 s\u0131n\u0131rs\u0131z anlam\u0131na gelir): +PMS.0=Ayg\u0131t bulunamad\u0131 +PMS.1=Ses +PMS.2=\#- Cache -\# +PMS.3=Alternatif A/V senkron y\u00F6ntemi +PMS.4=Deinterlace Filtresi +PMS.5=PS3'e ba\u011Fland\u0131 +PMS.6=.srt/.sub altyaz\u0131lar\u0131n\u0131 otomatik y\u00FCkle +PMS.7=H.264 \u00E7\u00F6z\u00FCmlemesi i\u00E7in SkipLoopFiltresi (Kaliteyi d\u00FC\u015F\u00FCrebilir) +PMS.8=Altyaz\u0131lar +PMS.9=T\u00FCm Ses \u00C7alma Listeleri +PMS.10=Atyaz\u0131lar\u0131 tamamen devre d\u0131\u015F\u0131 b\u0131rak +PMS.11=T\u00FCm Ses \u0130zleri +PMS.12=Tarihe G\u00F6re +PMS.13=Artiste G\u00F6re +PMS.16=Alb\u00FCme G\u00F6re +PMS.17=Bilinmeyen Ayg\u0131t +PMS.18=Ba\u011Fland\u0131 +PMS.19=T\u00FCre G\u00F6re +PMS.21=Kamera modeline g\u00F6re +PMS.22=Artist/Alb\u00FCm'e g\u00F6re +PMS.25=ISO ayarlar\u0131na g\u00F6re +PMS.26=T\u00FCr/Artist/Alb\u00FCm'e g\u00F6re +PMS.27=Yap\u0131land\u0131rmay\u0131 kaydet +PMS.31=Foto\u011Fraf +PMS.32=T\u00FCm Foto\u011Fraflar +PMS.34=G\u00F6r\u00FCnt\u00FC +PMS.35=T\u00FCm G\u00F6r\u00FCnt\u00FCler +PMS.36=HD G\u00F6r\u00FCnt\u00FCler +PMS.37=\#- Video Settings -\# +PMS.39=SD G\u00F6r\u00FCnt\u00FCler +PMS.41=Win32 hizmeti yeniden y\u00FCkleniyor +PMS.130=Ayg\u0131t aran\u0131yor... +ProfileChooser.1=PS3 Medya Sunucusu Profil Se\u00E7im Yard\u0131mc\u0131s\u0131 +ProfileChooser.2=Se\u00E7iniz +ProfileChooser.3=Profil dosyas\u0131 (.conf) ya da klas\u00F6r\u00FC +StatusTab.2=Durum +StatusTab.3=Beklemede... +StatusTab.5=Bo\u015Fta +StatusTab.6=Transcode i\u015Fleminin tampon durumu: +StatusTab.7=I/O istatistikleri: +StatusTab.8=\u015Eu anki ak\u0131\u015F h\u0131z\u0131: +StatusTab.9=Bulunan medya ayg\u0131tlar\u0131 +StatusTab.10=En y\u00FCksek ak\u0131\u015F h\u0131z\u0131: +StatusTab.11=Mb/s +TSMuxerVideo.0=MEncoder ile demux yap ve t\u00FCm ses izlerini AC-3 olarak kodla +TSMuxerVideo.1=MEncoder ile demux yap ve DTS/FLAC olan ses izlerini LPCM olarak kodla [Dikkat, tarama hen\u00FCz \u00E7al\u0131\u015Fm\u0131yor] +TSMuxerVideo.2=FFmpeg meta dosyas\u0131ndan ayr\u0131\u015Ft\u0131r\u0131lm\u0131\u015F FPS'yi kullan +TSMuxerVideo.3=Sadece tsMuxer motoru i\u00E7in g\u00F6r\u00FCnt\u00FC dekoderi ayarlar\u0131 +TSMuxerVideo.19=T\u00FCm ses izlerine mux i\u015Flemi yap +TrTab2.0=Bir transcode motorunu etkinle\u015Ftir/devre d\u0131\u015F\u0131 b\u0131rak +TrTab2.1=\u015Eimdilik bir ayar yok +TrTab2.2=MEncoder/AviSynth/FFmpeg motorlar\u0131 i\u00E7in g\u00F6r\u00FCnt\u00FC dosyalar\u0131 i\u00E7in enkoder ayarlar\u0131 +TrTab2.3=MEncoder/AviSynth/FFmpeg/tsMuxeR motorlar\u0131 i\u00E7in uygulanacak dekoder ayarlar\u0131 +TrTab2.4=G\u00F6r\u00FCnt\u00FC kalitesi ayarlar\u0131 +TrTab2.5=Genel transcode ayarlar\u0131 +TrTab2.6=Transcode motoru listesini s\u0131rala. \u0130lk s\u0131radaki orjinal g\u00F6r\u00FCnt\u00FC klas\u00F6r\u00FCnde g\u00F6z\u00FCkecektir +TrTab2.7=\u00C7e\u015Fitli ayarlar +TrTab2.8=Bu uzant\u0131lar i\u00E7in transcode i\u015Flemini ge\u00E7 (virg\u00FCl ile ay\u0131r\u0131n): +TrTab2.9=Bu uzant\u0131lar i\u00E7in transcode i\u015Flemi yap (virg\u00FCl ile ay\u0131r\u0131n): +TrTab2.10=Do\u011Frudan DTS olarak al\u0131c\u0131n\u0131za g\u00F6ndermenize izin verir.\nDikkatli olun, Ses parazitli olabilir. Notlar:\n- DTS uyumlu, TOSLINK veya HDMI ile +ba\u011Flanm\u0131\u015F bir al\u0131c\u0131n\u0131z\u0131n olmas\u0131 gerekir\n- XMD'deki ses simgesi "Normal" konumunda olmal\u0131d\u0131r'\n- XMB'deki kanallar simgesi 'Left+Right' konumunda +olmal\u0131d\u0131r.\n +TrTab2.11=Motorlar +TrTab2.12=Genel dekoder ayarlar\u0131 +TrTab2.13=Genel enkoder ayarlar\u0131 +TrTab2.14=G\u00F6r\u00FCnt\u00FC Dosyalar\u0131 Motorlar\u0131 +TrTab2.15=Ses Dosyalar\u0131 Motorlar\u0131 +TrTab2.16=Web Video Streaming Motorlar\u0131 +TrTab2.17=Web Audio Streaming Motorlar\u0131 +TrTab2.18=\u00C7e\u015Fitli Motorlar +TrTab2.19=Motorlar\u0131n azalma +TrTab2.20=s\u0131ras\u0131; en y\u00FCksek olan ilk +TrTab2.21=(AviSynth desteklenmiyor) +TrTab2.22=Otomatik 44.1 ya da 48 kHz resample i\u015Flemi uygula +TrTab2.27=DTS/FLAC'dan LPCM d\u00F6n\u00FC\u015F\u00FCm\u00FC (LPCM 5.1 stream i\u00E7in HDMI al\u0131c\u0131 gerekir) +TrTab2.28=DTS sesi ak\u0131\u015F\u0131n i\u00E7inde tut (Optic \u00E7\u0131k\u0131\u015F ile uyumlu) +TrTab2.29=AC-3 ses ak\u0131\u015F h\u0131z\u0131 (Kb/s olarak) (\u00F6r: 384, 576, 640): +TrTab2.32=MPEG-2 se\u00E7enekleri: +TrTab2.39=Bu g\u00F6r\u00FCnt\u00FCye otomatik olarak MPEG-PS / AC-3 kodekleri kullan\u0131larak transcode ve mux i\u015Flemi yap\u0131ld\u0131 (PS3 ile tam uyum) +TrTab2.40=\nVqscale, vqmin and keyint parametreleri ile iyi bir oynat\u0131m sa\u011Flayabilirsiniz, hatta neredeyse transcode i\u015Fleminde kalite kayb\u0131 olmaz. +TrTab2.41=\nBazen a\u011F\u0131n\u0131z\u0131n azami h\u0131z kapasitesini a\u015Fabilen VBR ak\u0131\u015F h\u0131z\u0131n\u0131 geriye \u00E7ekin. +TrTab2.42=\nBu y\u00FCzden e\u011Fer WiFi, CPL, vb. kullan\u0131yorsan\u0131z bant geni\u015Fli\u011Fini sabitleyebilirsiniz. Zaten, transcode kalitesi +TrTab2.43=\na\u011F h\u0131z\u0131 ve i\u015Flemci g\u00FCc\u00FCyle dengededir: daha fazla kalite i\u00E7in ak\u0131\u015F h\u0131z\u0131n\u0131 daha fazla zorlayacak, +TrTab2.44=\ni\u015Flemciniz daha fazla ac\u0131 \u00E7ekecek\! Ayr\u0131ca, 1080p aksiyon filminin en temiz g\u00F6r\u00FCnt\u00FC kalitesi ile 15Mbps'ye s\u0131\u011Fmas\u0131n\u0131 beklemeyin.:p +TrTab2.50=Ses \u00E7\u0131k\u0131\u015F\u0131 i\u00E7in azami kanal say\u0131s\u0131: +TrTab2.51=Altyaz\u0131lar\u0131 t\u00FCm\u00FCyle devre d\u0131\u015F\u0131 b\u0131rak +TrTab2.52=\#Transcode\# klas\u00F6r\u00FCnde b\u00F6l\u00FCm deste\u011Fi / Dakika aral\u0131\u011F\u0131: +TracesTab.3=Temizle +TreeNodeSettings.4=Bu motor ba\u015Flat\u0131lmad\u0131\! diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_zhs.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_zhs.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_zhs.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_zhs.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,313 @@ +Dialog.Confirm=\u786e\u8ba4 +Dialog.Error=\u9519\u8bef +Dialog.Information=\u4fe1\u606f +Dialog.Options=\u9009\u9879 +Dialog.Question=\u7591\u95ee +DLNAMediaDatabase.0=\u9700\u8981\u91cd\u65b0\u521b\u5efa\u7f13\u5b58\u6570\u636e\u5e93\u3002\n\u62b1\u6b49\u7ed9\u60a8\u5e26\u6765\u4e0d\u4fbf\! +DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z +DLNAMediaDatabase.2=\u6e05\u7406\u6570\u636e\u5e93... +DLNAMediaDatabase.3=\u538b\u7f29\u6570\u636e\u5e93... +DLNAMediaDatabase.4=\u626b\u63cf\u6587\u4ef6\u5939: +DLNAMediaDatabase.5=\u635f\u574f\u7684\u7f13\u5b58\u5df2\u88ab\u5220\u9664\u4f46\u662f\u7a0b\u5e8f\u5c1a\u65e0\u6cd5\u81ea\u5df1\u89e3\u51b3.\n\u505c\u6b62\u7a0b\u5e8f\u5e76\u624b\u52a8\u5220\u9664 %s \u6587\u4ef6\u5939. +DLNAResource.0=\u5916\u90e8\u5b57\u5e55 +DLNAResource.1=\u4e0d\u7f16\u7801 +DLNAResource.2=No Enc. +DLNAResource.3=[%E] {Audio: %c/%A (%b)} {Sub: %t/%S (%u)} +DLNAResource.4=%F - %d [%E] {%x} {Sub: %t/%S (%u)} +FFMpegDVRMSRemux.0=\u53ef\u9009 FFmpeg \u8def\u5f84: +FFMpegDVRMSRemux.1=\u7528\u4e8e DVR-MS \u91cd\u5c01\u88c5\u7684\u8bbe\u5b9a +FFMpegVideo.0=\u4ec5\u7528\u4e8e AviSynth/FFmpeg \u5f15\u64ce\u7684\u7f16\u7801\u5668\u8bbe\u5b9a(\u9996\u9009 AviSynth/MEncoder) +FFMpegVideo.1=\u7528\u4e8e FFmpeg \u5f15\u64ce\u7684\u7f16\u7801\u5668\u8bbe\u5b9a +FoldTab.0= +FoldTab.1=\u5171\u4eab\u9009\u9879 +FoldTab.2=\u626b\u63cf\u6240\u6709\u5171\u4eab\u6587\u4ef6\u5939 +FoldTab.3=\u626b\u63cf\u5168\u90e8\u5171\u4eab\u6587\u4ef6\u5939\u9700\u8981\u5927\u91cf\u65f6\u95f4\!\n +FoldTab.4=\u60a8\u786e\u5b9a\u8981\u542f\u52a8\u626b\u63cf?\n\n +FoldTab.5=\u9690\u85cf\u6587\u4ef6\u6269\u5c55\u540d +FoldTab.6=\u9690\u85cf \#Video Settings\# \u6587\u4ef6\u5939 +FoldTab.7=\u5171\u4eab\u6587\u4ef6\u5939 +FoldTab.8=\u9690\u85cf\u8f6c\u7801\u5f15\u64ce\u540d +FoldTab.9=\u6dfb\u52a0\u76ee\u5f55 +FoldTab.10=\u60a8\u60f3\u8981\u505c\u6b62\u626b\u63cf\u5417?\n\n +FoldTab.11=\u542f\u7528\u5411 PS3 \u590d\u5236\u8f6c\u7801\u8fc7\u7684\u89c6\u9891 (\u6ce8\u610f, \u6587\u4ef6\u6ca1\u6709\u56fa\u5b9a\u5c3a\u5bf8!\uff09 +FoldTab.12=\u6392\u5e8f\u5171\u4eab\u6587\u4ef6\u5939 +FoldTab.13=\u7f29\u7565\u56fe +FoldTab.14=\u4f7f\u7528 MPlayer \u751f\u6210\u89c6\u9891\u7f29\u7565\u56fe +FoldTab.15=\u5b57\u6bcd\u987a\u5e8f (A-Z) +FoldTab.16=\u6309\u7167\u65e5\u671f, \u6700\u65b0\u5728\u524d +FoldTab.17=\u6309\u7167\u65e5\u671f, \u6700\u8001\u5728\u524d +FoldTab.18=\u6587\u4ef6\u987a\u5e8f: +FoldTab.19=DVD ISO \u7f29\u7565\u56fe +FoldTab.20=ASCII \u987a\u5e8f +FoldTab.21=\u56fe\u50cf\u7f29\u7565\u56fe +FoldTab.22=\u5b57\u6bcd\u6570\u5b57\u987a\u5e8f +FoldTab.23=\u4ece amazon.com \u4e0b\u8f7d +FoldTab.24=\u4ece discogs.com \u4e0b\u8f7d +FoldTab.26=\u97f3\u9891\u7f29\u7565\u56fe\u5bfc\u5165: +FoldTab.27=\u53ef\u9009\u89c6\u9891\u5c01\u9762\u56fe\u6587\u4ef6\u5939 +FoldTab.28=\u9009\u62e9\u4e00\u4e2a\u6587\u4ef6\u5939 +FoldTab.29=\u663e\u793a iPhoto \u76f8\u7247\u5e93 +FoldTab.30=\u663e\u793a iTunes \u5a92\u4f53\u5e93 +FoldTab.31=\u9690\u85cf\u7a7a\u7684\u6216\u65e0\u5a92\u4f53\u6587\u4ef6\u5939 (\u6ce8\u610f: \u51cf\u6162\u6d4f\u89c8\u901f\u5ea6) +FoldTab.32=\u9690\u85cf\u7f13\u5b58\u6587\u4ef6\u5939 +FoldTab.33=\u9690\u85cf \#Transcode\# \u6587\u4ef6\u5939 +FoldTab.34=\u663e\u793a aperture \u5e93 +FoldTab.35=\u65e0 +FontFileFilter.3=TrueType \u5b57\u4f53 +LinksTab.5=\u5e2e\u52a9\u94fe\u63a5: +LinksTab.6=\u6784\u5efa: +LooksFrame.5=\u9000\u51fa +LooksFrame.6=\u4e3b\u9762\u677f +LooksFrame.9=\u4fdd\u5b58 +LooksFrame.12=\u91cd\u542f\u670d\u52a1\u5668 +LooksFrame.13=\u7531\u4e8e\u914d\u7f6e\u53d8\u66f4\u5fc5\u987b\u91cd\u542f\u670d\u52a1\u5668 +LooksFrame.18=\u72b6\u6001 +LooksFrame.19=\u8ffd\u6eaf +LooksFrame.20=\u5e38\u7528\u914d\u7f6e +LooksFrame.21=\u8f6c\u7801\u8bbe\u5b9a +LooksFrame.22=\u6d4f\u89c8/\u5171\u4eab\u8bbe\u5b9a +LooksFrame.24=\u5e2e\u52a9 +LooksFrame.25=\u5173\u4e8e +LooksFrame.26=\u4ec5\u7528\u4e8e\u6d4b\u8bd5\uff0c\u53ef\u80fd\u4e0d\u7a33\u5b9a +MEncoderAviSynth.2=\u4ec5\u9002\u7528\u4e8e AviSynth \u5f15\u64ce\u7684\u89c6\u9891\u89e3\u7801\u8bbe\u5b9a +MEncoderAviSynth.3=Enable AviSynth variable framerate change into a constant framerate (convertfps=true) +MEncoderAviSynth.4=# AviSynth script is now fully customisable\n +MEncoderAviSynth.5=# The following variables are available:\n +MEncoderAviSynth.6=# : The complete DirectShowSource instruction, e.g. DirectShowSource(filename, convertfps)\n +MEncoderAviSynth.7=# : The complete subtitle instruction if there's any detected (SRT/SUB/IDX/ASS/SSA)\n +MEncoderAviSynth.8=# : The video filename for if you want to do all this by yourself\n +MEncoderAviSynth.10=\n +MEncoderAviSynth.11=\n +MEncoderVideo.0=\u8df3\u8fc7 H.264 \u73af\u5185\u53bb\u5757\u6ee4\u955c. \u4f1a\u964d\u4f4e\u8d28\u91cf. +MEncoderVideo.1=\u4ec5\u9002\u7528\u4e8e MEncoder \u5f15\u64ce\u7684\u89c6\u9891\u97f3\u9891\u89e3\u7801\u8bbe\u5b9a +MEncoderVideo.2=\u97f3\u89c6\u9891\u540c\u6b65\u53ef\u9009\u65b9\u6cd5 +MEncoderVideo.3=\u4f7f\u7528\u7a0b\u5e8f\u9ed8\u8ba4\u7f16\u7801\u5668\u53c2\u6570 (\u63a8\u8350!) +MEncoderVideo.4=\u5f3a\u5236\u4f7f\u7528\u4ece FFmpeg \u4f20\u9012\u6765\u7684\u5e27\u7387 +MEncoderVideo.5=\u60a8\u53ef\u4ee5\u5728\u8fd9\u91cc\u6dfb\u52a0\u7279\u522b\u9009\u9879, \u6bd4\u5982\u964d\u566a\u6ee4\u955c: -vf hqdn3d +MEncoderVideo.6=\u81ea\u5b9a\u4e49\u9009\u9879: +MEncoderVideo.7=\u97f3\u9891\u8bed\u8a00\u4f18\u5148\u7ea7: +MEncoderVideo.8=\u5b57\u5e55\u8bbe\u5b9a +MEncoderVideo.9=\u5b57\u5e55\u8bed\u8a00\u4f18\u5148\u7ea7: +MEncoderVideo.10=\u97f3\u9891\u6216\u5b57\u5e55\u8bed\u8a00\u4f18\u5148\u7ea7 (\u4e3e\u4f8b: en,off;jpn,eng) +MEncoderVideo.11=\u5b57\u5e55\u5b57\u7b26\u96c6: +MEncoderVideo.12=\u8986\u76d6\u6837\u5f0f\u5b57\u5e55\u8bbe\u5b9a: \u5b57\u4f53\u7f29\u653e +MEncoderVideo.13=\u5b57\u4f53\u5916\u5f62 +MEncoderVideo.14=\u5b57\u4f53\u9634\u5f71 +MEncoderVideo.15=\u5b50\u8fb9\u8ddd (px) +MEncoderVideo.16=\u7eaf\u6587\u672c\u5b57\u5e55\u8bbe\u5b9a: \u5b57\u4f53\u7f29\u653e +MEncoderVideo.17=\u5b57\u4f53\u5916\u5f62 +MEncoderVideo.18=\u5b57\u4f53\u6a21\u7cca +MEncoderVideo.19=\u5b50\u8fb9\u8ddd (%) +MEncoderVideo.20=\u4f7f\u7528 ASS/SSA \u5b57\u5e55\u6837\u5f0f +MEncoderVideo.21=Fontconfig/\u5d4c\u5165\u5f0f \u5b57\u4f53 +MEncoderVideo.22=\u81ea\u52a8\u52a0\u8f7d\u5177\u6709\u76f8\u540c\u6587\u4ef6\u540d\u7684 *.srt/*.sub \u5b57\u5e55 +MEncoderVideo.23=FriBiDi \u6a21\u5f0f +MEncoderVideo.24=\u6307\u5b9a TrueType \u5b57\u4f53 (\u7528\u4e8e\u5b57\u5e55): +MEncoderVideo.25=\u9009\u62e9\u4e00\u6b3e TrueType \u5b57\u4f53 +MEncoderVideo.26=\u9010\u884c\u626b\u63cf\u7b5b\u9009\u5668 +MEncoderVideo.27=\u4f7f\u7528\u89c6\u9891\u7f29\u653e\u5668 +MEncoderVideo.28=\u5bbd\u5ea6 +MEncoderVideo.29=\u4e13\u5bb6\u8bbe\u5b9a : \u7f16\u7801\u5668\u7279\u5b9a\u53c2\u6570 +MEncoderVideo.30=\u9ad8\u5ea6 +MEncoderVideo.31=\u5b50\u8272\u5f69 +MEncoderVideo.32=\u4fdd\u7559 AC-3 \u97f3\u8f68 (\u4e0d\u91cd\u65b0\u7f16\u7801, \u53ef\u80fd\u5bfc\u81f4\u5bf9\u8bdd\u65e0\u58f0\u6216\u8005\u97f3\u89c6\u9891\u540c\u6b65\u95ee\u9898) +MEncoderVideo.33=\u81ea\u5b9a\u4e49\u53c2\u6570: +MEncoderVideo.34=\u7f16\u8f91\u7f16\u7801\u5668\u7279\u5b9a\u53c2\u6570 +MEncoderVideo.35=\u4f7f\u7528\u591a\u6838 CPU +MEncoderVideo.36=\u9009\u62e9\u5d4c\u5165\u6837\u5f0f +MEncoderVideo.37=\u53ef\u9009\u5b57\u5e55\u6587\u4ef6\u5939 +MEncoderVideo.39=\u91cd\u65b0\u5c01\u88c5 DVD ISO \u89c6\u9891\u8f68 (\u65e0\u91cd\u7f16\u7801) +MEncoderVideo.68=\#Here you can put specific parameters for some codec combinations.\n +MEncoderVideo.69=\#It's mostly for A/V synchronization issues, but it can be used for anything else as well\n +MEncoderVideo.70=\#Consider it like expert settings as this shouldn't be used if you don't know exactly what you're doing\n +MEncoderVideo.71=\#Syntax is {java condition} :: {MEncoder options} ; You can cumulate several options\n +MEncoderVideo.72=\#Tokens authorized: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#Careful, any malformed line will be wiped out\n +MEncoderVideo.75=\#Special options:\n +MEncoderVideo.76=\# -noass: definitely disable ASS/SSA subtitles as they can mess up A/V sync\n +MEncoderVideo.77=\# -nosync: definitely disable A/V sync alternative method for this condition (-mc will do the same)\n +MEncoderVideo.78=\# -quality: override video quality settings\n +MEncoderVideo.79=\# -mt: force usage of the multithreaded MEncoder build\n +MEncoderVideo.80=\#This list will improve with time: tweaks/feedbacks on various codecs/files are always welcome\n +MEncoderVideo.87=\#You can now put your own conditions/options ! Here some examples: for example, to enable the mt build of MEncoder\n +MEncoderVideo.88=\#for any H.264 HD content (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#to remove 24p judder on a 50hz TV: framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles: vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=DVD/VOBsub \u5b57\u5e55\u8d28\u91cf (0-4) (\u8d8a\u9ad8\u8d8a\u597d): +MEncoderVideo.93=\u4e3a\u8fc7\u8865\u507f\u589e\u52a0\u8fb9\u6846: +MEncoderVideo.94=\u5f3a\u5236\u5b57\u5e55: +MEncoderVideo.95=\u5f3a\u5236\u6807\u7b7e: +MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ +MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ +MEncoderVideo.98=cp1252 /* Windows - Western Europe */ +MEncoderVideo.99=cp1253 /* Windows - Greek */ +MEncoderVideo.100=cp1254 /* Windows - Turkish */ +MEncoderVideo.101=cp1255 /* Windows - Hebrew */ +MEncoderVideo.102=cp1256 /* Windows - Arabic */ +MEncoderVideo.103=cp1257 /* Windows - Baltic */ +MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ +MEncoderVideo.105=ISO-8859-1 /* Western Europe */ +MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ +MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ +MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ +MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ +MEncoderVideo.110=ISO-8859-6 /* Arabic */ +MEncoderVideo.111=ISO-8859-7 /* Greek */ +MEncoderVideo.112=ISO-8859-8 /* Hebrew */ +MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ +MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ +MEncoderVideo.115=ISO-8859-11 /* Thai */ +MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ +MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ +MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ +MEncoderVideo.119=ISO-8859-16 /* Central European languages */ +MEncoderVideo.120=cp932 /* \u65e5\u8bed */ +MEncoderVideo.121=cp936 /* \u7b80\u4f53\u4e2d\u6587 */ +MEncoderVideo.122=cp949 /* \u97e9\u8bed */ +MEncoderVideo.123=cp950 /* Big5, \u53f0\u6e7e\u8bdd, \u7ca4\u8bed */ +MEncoderVideo.124=UTF-8 /* Unicode */ +MEncoderVideo.125=\u9009\u62e9\u5b57\u5e55\u989c\u8272 +MEncoderVideo.126=cht,tw,chi,chs +MEncoderVideo.127=cht,tw,chi,chs +MEncoderVideo.128=*,* +MEncoderVideo.129=/* \u81ea\u52a8 */ +MEncoderVideo.130=enca:ru:cp1251 /* Russian (auto) */ +MEncoderVideo.131=enca:pl:cp1250 /* Eastern Europe (auto) */ +MEncoderVideo.132=enca:zh:big5 /* \u4e2d\u6587 (\u81ea\u52a8) */ +NetworkTab.0=\u8bed\u8a00 [\u9700\u8981\u91cd\u542f\u7a0b\u5e8f]: +NetworkTab.1=\u6d4f\u89c8\u538b\u7f29\u6863\u6848 (.rar/.zip/.cbr) +NetworkTab.2=\u751f\u6210\u7f29\u7565\u56fe +NetworkTab.3=\u542f\u52a8\u540e\u6700\u5c0f\u5316 +NetworkTab.4=\u5b89\u88c5\u4e3a Windows \u670d\u52a1 +NetworkTab.5=\u5e38\u7528\u8bbe\u5b9a +NetworkTab.6=\u8f6c\u7801\u7f13\u5b58\u6700\u5927\u5c3a\u5bf8, \u4ee5\u5146\u5b57\u8282\u4e3a\u5355\u4f4d (\u6700\u5927\u503c: MAX_BUFFER_SIZE): +NetworkTab.7=\u7528\u4e8e\u8f6c\u7801\u7684\u6838\u5fc3\u6570 (\u60a8\u4f3c\u4e4e\u6709 %d): +NetworkTab.8=\u68c0\u67e5\u66f4\u65b0 +NetworkTab.9=\u81ea\u52a8\u68c0\u67e5 +NetworkTab.11=\u60a8\u5df2\u7ecf\u5b89\u88c5\u4e3a Windows \u670d\u52a1 \! \u8981\u4f7f\u7528\u5b83, \u60a8\u5fc5\u987b\u9000\u51fa\u8be5\u5e94\u7528\u7a0b\u5e8f,\n +NetworkTab.12=\u7136\u540e\u4ece windows \u7ba1\u7406\u9762\u677f\u4e2d\u542f\u52a8 (\u5e76\u914d\u7f6e) \u670d\u52a1.\n\n +NetworkTab.13=\u5c06\u91cd\u65b0\u521d\u59cb\u5316\u7f13\u5b58 \!\n +NetworkTab.14=\u5b89\u88c5\u4e3a Windows \u670d\u52a1\u65f6\u51fa\u9519!\n +NetworkTab.15=\u6d4f\u89c8/\u4f20\u9012\u8bbe\u5b9a +NetworkTab.16=\u7f29\u7565\u56fe\u5bfb\u627e\u4f4d\u7f6e (\u6309\u79d2\u8ba1\u7b97): +NetworkTab.17=\u542f\u7528\u7f13\u5b58 +NetworkTab.18=\u91cd\u7f6e\u7f13\u5b58 +NetworkTab.19=\u60a8\u786e\u5b9a\u5417? +NetworkTab.20=\u5f3a\u884c\u6307\u5b9a\u7f51\u7edc\u63a5\u53e3: +NetworkTab.22=\u7f51\u7edc\u8bbe\u5b9a (\u9ad8\u7ea7) +NetworkTab.23=\u5f3a\u884c\u6307\u5b9a\u670d\u52a1\u5668 IP: +NetworkTab.24=\u5f3a\u884c\u6307\u5b9a\u670d\u52a1\u5668\u7aef\u53e3 (\u9ed8\u8ba4\u4e3a 5001): +NetworkTab.25=PS3 \u8bbe\u5b9a +NetworkTab.26=\u60a8 PS3 \u6587\u4ef6\u540d\u7684\u5b57\u7b26\u96c6 (\u5728 XMB->\u4e3b\u673a\u8bbe\u5b9a->\u5b57\u7b26\u96c6): +NetworkTab.27=\u60a8\u4e0d\u8be5\u4f7f\u7528\u7684\u672a\u7528\u8bbe\u5b9a :p +NetworkTab.28=Turbo \u6a21\u5f0f (enable tcp_nodelay) / \u6ce8\u610f, \u4e0d\u786e\u5b9a\u662f\u5426\u53ef\u7528 +NetworkTab.29=\u5f53\u8f6c\u7801\u5f00\u59cb\u540e\u963b\u6b62\u6765\u81ea PS3 \u5bf9\u540c\u4e00\u6587\u4ef6\u7684\u8bf7\u6c42 +NetworkTab.30=\u4f7f\u7528 IP \u8fc7\u6ee4\u5668: +NetworkTab.31=\u9ad8\u7ea7 HTTP \u548c\u7cfb\u7edf\u8bbe\u5b9a +NetworkTab.32=HTTP \u5f15\u64ce V2 +NetworkTab.33=\u5728\u6d41\u5a92\u4f53\u65f6\u963b\u6b62\u64cd\u4f5c\u7cfb\u7edf\u4f11\u7720 +NetworkTab.34=\u63d2\u4ef6 +NetworkTab.35=\u4ee5 Mb/s \u4e3a\u5355\u4f4d\u6700\u5927\u5e26\u5bbd(0 \u4ee3\u8868\u4e0d\u9650\u5236): +NetworkTab.36=\u82e5\u81ea\u52a8\u68c0\u6d4b\u5931\u8d25\u7684\u9ed8\u8ba4\u6e32\u67d3\u5668: +NetworkTab.37=\u672a\u77e5\u6e32\u67d3\u5668 +NetworkTab.38=\u5f3a\u884c\u4f7f\u7528\u9ed8\u8ba4\u6e32\u67d3\u5668 (\u7981\u7528\u81ea\u52a8\u68c0\u6d4b) +PMS.0=\u672a\u53d1\u73b0\u6e32\u67d3\u5668 +PMS.1=\u97f3\u9891 +PMS.2=\#- Cache -\# +PMS.3=\u97f3\u89c6\u9891\u540c\u6b65\u53ef\u9009\u65b9\u6cd5 +PMS.4=\u9010\u884c\u626b\u63cf\u7b5b\u9009\u5668 +PMS.5=\u5df2\u8fde\u63a5\u81f3 PS3 +PMS.6=\u81ea\u52a8\u52a0\u8f7d .srt/.sub \u5b57\u5e55 +PMS.7=\u8df3\u8fc7 H.264 \u89e3\u7801\u73af\u5185\u53bb\u5757\u6ee4\u955c (\u4f1a\u964d\u4f4e\u8d28\u91cf) +PMS.8=\u5b57\u5e55 +PMS.9=\u5168\u90e8\u97f3\u9891\u64ad\u653e\u5217\u8868 +PMS.10=\u5b8c\u5168\u7981\u7528\u5b57\u5e55 +PMS.11=\u6240\u6709\u97f3\u9891\u8f68\u9053 +PMS.12=\u6309\u65e5\u671f +PMS.13=\u6309\u827a\u672f\u5bb6 +PMS.16=\u6309\u4e13\u8f91 +PMS.17=\u672a\u77e5\u6e32\u67d3\u5668 +PMS.18=\u5df2\u8fde\u63a5 +PMS.19=\u6309\u98ce\u683c +PMS.21=\u6309\u76f8\u673a\u578b\u53f7 +PMS.22=\u6309\u827a\u672f\u5bb6/\u4e13\u8f91 +PMS.25=\u6309 ISO \u8bbe\u5b9a +PMS.26=\u6309\u98ce\u683c/\u827a\u672f\u5bb6/\u4e13\u8f91 +PMS.27=\u4fdd\u5b58\u914d\u7f6e +PMS.28=\u6309\u5b57\u6bcd/\u827a\u672f\u5bb6/\u4e13\u8f91 +PMS.31=\u7167\u7247 +PMS.32=\u6240\u6709\u7167\u7247 +PMS.34=\u89c6\u9891 +PMS.35=\u6240\u6709\u89c6\u9891 +PMS.36=\u9ad8\u6e05\u89c6\u9891 +PMS.37=\#- Video Settings -\# +PMS.39=\u6807\u6e05\u89c6\u9891 +PMS.40=DVD \u955c\u50cf +PMS.41=(\u91cd)\u5b89\u88c5 Win32 \u670d\u52a1 +PMS.42=\u521d\u59cb\u5316 PMS \u9519\u8bef! +PMS.130=\u641c\u7d22\u6e32\u67d3\u5668... +ProfileChooser.1=PS3 \u5a92\u4f53\u670d\u52a1\u5668\u914d\u7f6e\u6587\u4ef6\u9009\u62e9\u5668 +ProfileChooser.2=\u9009\u62e9 +ProfileChooser.3=\u914d\u7f6e\u6587\u4ef6 (.conf) \u6216\u76ee\u5f55 +StatusTab.2=\u72b6\u6001 +StatusTab.3=\u7b49\u5f85... +StatusTab.5=\u7a7a +StatusTab.6=\u8f6c\u7801\u7f13\u5b58\u72b6\u6001: +StatusTab.7=I/O \u7edf\u8ba1: +StatusTab.8=\u5f53\u524d\u6bd4\u7279\u7387: +StatusTab.9=\u76d1\u6d4b\u5230\u5a92\u4f53\u6e32\u67d3\u5668 +StatusTab.10=\u5cf0\u503c\u6bd4\u7279\u7387Peak bitrate: +StatusTab.11=Mb/s +StatusTab.12=MB +TracesTab.3=\u6e05\u9664 +TranscodeVirtualFolder.0=\#--TRANSCODE--\# +TreeNodeSettings.4=\u8be5\u5f15\u64ce\u672a\u8f7d\u5165\! +TrTab2.0=\u542f\u7528/\u7981\u7528\u4e00\u4e2a\u8f6c\u7801\u5f15\u64ce +TrTab2.1=\u73b0\u5728\u6ca1\u6709\u8bbe\u5b9a +TrTab2.2=\u9002\u7528\u4e8e\u4e0b\u5217\u5f15\u64ce\u7684\u89c6\u9891\u7f16\u7801\u5668\u8bbe\u5b9a: MEncoder/AviSynth/FFmpeg +TrTab2.3=\u5e94\u7528\u4e8e\u4e0b\u5217\u89e3\u7801\u5668\u7684\u97f3\u9891\u8bbe\u5b9a: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=\u89c6\u9891\u8d28\u91cf\u8bbe\u5b9a +TrTab2.5=\u5e38\u7528\u8f6c\u7801\u8bbe\u5b9a +TrTab2.6=\u6392\u5e8f\u8f6c\u7801\u5f15\u64ce\u5217\u8868. \u9996\u4e2a\u5c06\u51fa\u73b0\u5728\u539f\u59cb\u89c6\u9891\u6587\u4ef6\u5939 +TrTab2.7=\u6742\u9879 +TrTab2.8=\u8df3\u8fc7\u4ee5\u4e0b\u6269\u5c55\u540d\u7684\u8f6c\u7801 (\u9017\u53f7\u5206\u5272): +TrTab2.9=\u5f3a\u5236\u5bf9\u4ee5\u4e0b\u6269\u5c55\u540d\u7684\u8f6c\u7801 (\u9017\u53f7\u5206\u5272): +TrTab2.10=\u5141\u8bb8\u76f4\u63a5\u4f20\u8f93 DTS \u5230\u63a5\u6536\u5668\u4e0a.\n\u6ce8\u610f\u6709\u53ef\u80fd\u5f97\u5230\u9759\u6b62\u7684\u58f0\u97f3. \u5907\u6ce8:\n- \u60a8\u5fc5\u987b\u62e5\u6709 DTS \u517c\u5bb9\u7684\u63a5\u6536\u5668, \u4ee5\u5149\u7ea4\u6570\u5b57\u63a5\u53e3\u6216 HDMI \u8fde\u63a5\n- \u5728 XMB \u4e2d\u7684\u97f3\u91cf\u5fc5\u987b\u4e3a '\u6b63\u5e38'\n- \u5728 XMB \u4e2d\u7684\u58f0\u9053\u5fc5\u987b\u4e3a '\u5de6+\u53f3'\n +TrTab2.11=\u5f15\u64ce +TrTab2.12=\u5e38\u7528\u89e3\u7801\u5668\u8bbe\u5b9a +TrTab2.13=\u5e38\u7528\u7f16\u7801\u5668\u8bbe\u5b9a +TrTab2.14=\u89c6\u9891\u6587\u4ef6\u5f15\u64ce +TrTab2.15=\u97f3\u9891\u6587\u4ef6\u5f15\u64ce +TrTab2.16=\u7f51\u7edc\u89c6\u9891\u6d41\u5f15\u64ce +TrTab2.17=\u7f51\u7edc\u97f3\u9891\u6d41\u5f15\u64ce +TrTab2.18=\u6742\u9879\u5f15\u64ce +TrTab2.19=\u5f15\u64ce\u6309\u7167\u964d\u5e8f +TrTab2.20=\u6392\u5217; \u6700\u9ad8\u7684\u4e3a\u9996\u4e2a +TrTab2.21=(\u4e0d\u652f\u6301 AviSynth ) +TrTab2.22=\u97f3\u9891\u81ea\u52a8\u91cd\u91c7\u6837\u81f3 44.1 \u6216 48 kHz +TrTab2.27=\u4f7f\u7528 LPCM \u97f3\u9891(\u65e0\u9700\u91cd\u7f16\u7801) +TrTab2.28=\u4fdd\u6301 DTS \u97f3\u8f68 (\u65e0\u9700\u91cd\u7f16\u7801, \u517c\u5bb9\u5177\u5907\u5149\u7ea4\u6216 HDMI \u8f93\u51fa\u7684\u97f3\u89c6\u9891\u63a5\u6536\u5668) +TrTab2.29=AC-3 \u97f3\u9891\u91cd\u7f16\u7801\u6bd4\u7279\u7387 (in Kibit/s) (\u4f8b\u5982: 576, 640): +TrTab2.32=MPEG-2 \u9009\u9879: +TrTab2.39=\u89c6\u9891\u5c06\u4f1a\u88ab\u81ea\u52a8\u8f6c\u7801\u5e76\u5c01\u88c5\u6210 MPEG-PS / AC-3 (\u9ad8\u5ea6\u517c\u5bb9 PS3) +TrTab2.40=\n\u60a8\u53ef\u4ee5\u5c1d\u8bd5\u8c03\u6574 vqscale, vqmin \u548c keyint \u53c2\u6570\u6765\u5b9e\u73b0\u4f18\u79c0\u751a\u81f3\u51e0\u4e4e\u65e0\u635f\u7684\u8f6c\u7801\u8d28\u91cf. +TrTab2.41=\n\u5f0a\u7aef\u662f\u53ef\u53d8\u6bd4\u7279\u7387\u5bfc\u81f4\u6709\u65f6\u5cf0\u503c\u4f1a\u8d85\u8fc7\u60a8\u7684\u6700\u5927\u7f51\u7edc\u5e26\u5bbdy. +TrTab2.42=\n\u8fd9\u5c31\u662f\u4e3a\u4f55\u60a8\u8fd8\u53ef\u4ee5\u5728\u65e0\u7ebf\u548c CPL \u7b49\u6761\u4ef6\u4e0b\u8bbe\u5b9a\u5e26\u5bbd\u7684\u539f\u56e0. \u4f46\u662f, \u8f6c\u7801\u8d28\u91cf +TrTab2.43=\n\u662f\u7f51\u7edc\u901f\u5ea6\u548c CPU \u6027\u80fd\u4e4b\u95f4\u7684\u5e73\u8861: \u60a8\u8d8a\u589e\u52a0\u56fa\u5b9a\u6bd4\u7279\u7387\u4ee5\u63d0\u5347\u8d28\u91cf, +TrTab2.44=\n\u60a8\u7684 CPU \u8d1f\u8f7d\u8d8a\u5927\! \u4f46\u662f, \u4e0d\u8981\u671f\u671b\u80fd\u5728 15Mbps \u6761\u4ef6\u4e0b\u8ba9 1080p \u7684\u52a8\u4f5c\u7535\u5f71\u53d6\u5f97\u5b8c\u7f8e\u8d28\u91cf :p +TrTab2.50=\u9002\u7528\u4e8e AC-3 \u91cd\u7f16\u7801\u7684\u6700\u5927\u97f3\u9891\u58f0\u9053\u6570: +TrTab2.51=\u5b8c\u5168\u7981\u7528\u5b57\u5e55 +TrTab2.52=\u7ae0\u8282 \#Transcode\# \u6587\u4ef6\u5939\u652f\u6301 / \u95f4\u9694\uff0c\u5355\u4f4d\u4e3a\u5206\u949f: +TrTab2.55=2 \u58f0\u9053 (\u7acb\u4f53\u58f0) +TrTab2.56=6 \u58f0\u9053 (5.1) +TrTab2.60=\u4f18\u79c0 +TrTab2.61=\u65e0\u635f +TrTab2.62=\u826f\u597d +TrTab2.63=\u826f\u597d, \u9002\u7528\u4e8e\u9ad8\u6e05\u65e0\u7ebf\u7f51\u7edc\u8f6c\u7801 +TrTab2.64=\u4e2d\u7b49, \u9002\u7528\u4e8e\u9ad8\u6e05\u65e0\u7ebf\u7f51\u7edc\u8f6c\u7801 +TrTab2.65=\u4f4e\u8d28, \u4f4e\u7aef CPU \u6216\u9ad8\u6e05\u65e0\u7ebf\u7f51\u7edc\u8f6c\u7801 +TSMuxerVideo.0=\u4f7f\u7528 MEncoder \u5206\u79bb\u5e76\u7f16\u7801\u6240\u6709\u97f3\u8f68\u4e3a AC-3 +TSMuxerVideo.1=\u4f7f\u7528 MEncoder \u5206\u79bb\u5e76\u7f16\u7801 DTS/FLAC \u97f3\u8f68\u4e3a LPCM [\u6ce8\u610f, \u8df3\u88c5\u5c1a\u4e0d\u53ef\u7528] +TSMuxerVideo.2=\u5728\u5143\u6570\u636e\u6587\u4ef6\u4e2d\u5f3a\u5236\u4f7f\u7528\u6765\u81ea FFmpeg \u7684 FPS \u5206\u6790\u7ed3\u679c +TSMuxerVideo.3=\u4ec5\u9002\u7528\u4e8e tsMuxeR \u5f15\u64ce\u7684\u89c6\u9891\u89e3\u7801\u8bbe\u5b9a +TSMuxerVideo.19=\u5c01\u88c5\u6240\u6709\u97f3\u8f68 diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_zht.properties ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_zht.properties --- ps3mediaserver-1.71.0+mencoder35005/src/main/resources/i18n/messages_zht.properties 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/main/resources/i18n/messages_zht.properties 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,301 @@ +DLNAMediaDatabase.0=\u9700\u8981\u91CD\u65B0\u5EFA\u7ACB\u66AB\u5B58\u8CC7\u6599\u5EAB\u3002\n\u62B1\u6B49\u7D66\u60A8\u5E36\u4F86\u4E0D\u4FBF\! +DLNAMediaDatabase.1=A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z +DLNAMediaDatabase.2=\u6E05\u7406\u8CC7\u6599\u5EAB... +DLNAMediaDatabase.3=\u58D3\u7E2E\u8CC7\u6599\u5EAB... +DLNAMediaDatabase.4=\u6383\u7784\u8CC7\u6599\u593E\uFF1A +FFMpegDVRMSRemux.0=\u53EF\u9078 FFmpeg \u8DEF\u5F91: +FFMpegDVRMSRemux.1=\u7528\u65BC DVR-MS \u91CD\u5C01\u88DD\u7684\u8A2D\u5B9A +FFMpegVideo.0=AviSynth/FFmpeg \u5F15\u64CE\u7684\u7DE8\u78BC\u5668\u8A2D\u5B9A(\u5EFA\u8B70\u4F7F\u7528 AviSynth/MEncoder) +FFMpegVideo.1=FFmpeg \u5F15\u64CE\u7684\u7DE8\u78BC\u5668\u8A2D\u5B9A +FoldTab.0=<\u6240\u6709\u786C\u789F> +FoldTab.1=\u5171\u4EAB\u9078\u9805 +FoldTab.2=\u6383\u7784\u6240\u6709\u5171\u4EAB\u8CC7\u6599\u593E +FoldTab.3=\u6383\u7784\u5168\u90E8\u5171\u4EAB\u8CC7\u6599\u593E\u9700\u8981\u5927\u91CF\u6642\u9593\!\n +FoldTab.4=\u60A8\u78BA\u5B9A\u8981\u555F\u52D5\u6383\u7784?\n\n +FoldTab.5=\u96B1\u85CF\u6A94\u6848\u526F\u6A94\u540D +FoldTab.6=\u96B1\u85CF \#Video Settings\# \u8CC7\u6599\u593E +FoldTab.7=\u5171\u4EAB\u8CC7\u6599\u593E +FoldTab.8=\u96B1\u85CF\u8F49\u78BC\u5F15\u64CE\u540D\u7A31 +FoldTab.9=\u65B0\u589E\u8CC7\u6599\u593E +FoldTab.10=\u60A8\u60F3\u8981\u505C\u6B62\u6383\u7784\u55CE?\n\n +FoldTab.11=\u5411 PS3 \u50B3\u9001\u8F49\u78BC\u904E\u7684\u5F71\u50CF (\u6CE8\u610F, \u6A94\u6848\u6C92\u6709\u56FA\u5B9A\u7684\u5927\u5C0F!\uFF09 +FoldTab.12=\u6392\u5E8F\u5171\u4EAB\u8CC7\u6599\u593E +FoldTab.13=\u7E2E\u5716 +FoldTab.14=\u4F7F\u7528 MPlayer \u751F\u6210\u5F71\u7247\u7E2E\u5716 +FoldTab.15=\u5B57\u6BCD\u9806\u5E8F (A-Z) +FoldTab.16=\u6309\u7167\u65E5\u671F, \u65B0\u7684\u5728\u524D +FoldTab.17=\u6309\u7167\u65E5\u671F, \u820A\u7684\u5728\u524D +FoldTab.18=\u6A94\u6848\u9806\u5E8F: +FoldTab.19=DVD ISO \u7E2E\u5716 +FoldTab.20=ASCII \u9806\u5E8F +FoldTab.21=\u5716\u7247\u7E2E\u5716 +FoldTab.22=\u5B57\u6BCD\u6578\u5B57\u9806\u5E8F +FoldTab.23=\u5F9E amazon.com \u4E0B\u8F09 +FoldTab.24=\u5F9E discogs.com \u4E0B\u8F09 +FoldTab.26=\u97F3\u6A02\u7E2E\u5716\u5C0E\u5165: +FoldTab.27=\u5099\u7528\u5F71\u7247\u5C01\u9762\u5716\u8CC7\u6599\u593E +FoldTab.28=\u9078\u64C7\u4E00\u500B\u8CC7\u6599\u593E +FoldTab.29=\u986F\u793A iPhoto \u76F8\u7247\u5EAB +FoldTab.30=\u986F\u793A iTunes \u5A92\u9AD4\u5EAB +FoldTab.31=\u96B1\u85CF\u7A7A\u6216\u7121\u5A92\u9AD4\u8CC7\u6599\u593E (\u6CE8\u610F: \u700F\u89BD\u901F\u5EA6\u6703\u8B8A\u6162) +FoldTab.32=\u96B1\u85CF\u66AB\u5B58\u8CC7\u6599\u593E +FoldTab.33=\u96B1\u85CF \#Transcode\# \u8CC7\u6599\u593E +FoldTab.34=\u986F\u793A aperture \u8CC7\u6599\u5EAB +FoldTab.35=\u7121 +FontFileFilter.3=TrueType \u5B57\u578B +LinksTab.5=\u5E6B\u52A9\u9023\u7D50: +LinksTab.6=\u69CB\u5EFA: +LooksFrame.5=\u9000\u51FA +LooksFrame.6=\u4E3B\u9762\u677F +LooksFrame.9=\u5132\u5B58 +LooksFrame.12=\u91CD\u555F\u4F3A\u670D\u5668 +LooksFrame.13=\u7531\u65BC\u8A2D\u5B9A\u8B8A\u66F4\u5FC5\u9808\u91CD\u555F\u4F3A\u670D\u5668 +LooksFrame.18=\u72C0\u614B +LooksFrame.19=\u7D00\u9304\u6A94 +LooksFrame.20=\u4E00\u822C\u8A2D\u5B9A +LooksFrame.21=\u8F49\u78BC\u8A2D\u5B9A +LooksFrame.22=\u700F\u89BD/\u5171\u4EAB\u8A2D\u5B9A +LooksFrame.24=\u5E6B\u52A9 +LooksFrame.25=\u95DC\u65BC +LooksFrame.26=\u50C5\u7528\u65BC\u6E2C\u8A66\uFF0C\u53EF\u80FD\u4E0D\u7A69\u5B9A!! +MEncoderAviSynth.2=\u7528\u65BC AviSynth \u5F15\u64CE\u7684\u5F71\u50CF\u89E3\u78BC\u8A2D\u5B9A +MEncoderAviSynth.3=\u555F\u7528 AviSynth \u8F49\u63DB\u8B8A\u52D5\u4F4D\u5143\u7387\u70BA\u56FA\u5B9A\u4F4D\u5143\u7387\u53C3\u6578 (convertfps=true) +MEncoderAviSynth.4=# AviSynth \u8173\u672C\u73FE\u5728\u53EF\u4EE5\u5B8C\u5168\u81EA\u8A02\n +MEncoderAviSynth.5=# \u4EE5\u4E0B\u662F\u53EF\u4F7F\u7528\u7684\u8B8A\u6578:\n +MEncoderAviSynth.6=# : DirectShowSource \u6307\u4EE4, \u4F8B. DirectShowSource(filename, convertfps)\n +MEncoderAviSynth.7=# : \u5047\u5982\u5075\u6E2C\u5230(SRT/SUB/IDX/ASS/SSA)\u7B49\u5B57\u5E55\u7684\u8A71\uFF0C\u5B57\u5E55\u6307\u4EE4\n +MEncoderAviSynth.8=# : \u5F71\u7247\u6A94\u6848\u540D\uFF0C\u5982\u679C\u60A8\u60F3\u81EA\u5DF1\u4FEE\u6539\u8A2D\u5B9A\u6642\u4F7F\u7528\n +MEncoderAviSynth.10=\n +MEncoderAviSynth.11=\n +MEncoderVideo.0=\u8DF3\u904E H.264 \u74B0\u5167\u53BB\u584A\u6FFE\u93E1. \u53EF\u80FD\u6703\u964D\u4F4E\u54C1\u8CEA. +MEncoderVideo.1=\u7528\u65BC MEncoder \u5F15\u64CE\u7684\u5F71\u50CF\u97F3\u6548\u89E3\u78BC\u8A2D\u5B9A +MEncoderVideo.2=\u4F7F\u7528\u5099\u7528\u8072\u97F3\u5F71\u50CF\u540C\u6B65\u65B9\u6CD5 +MEncoderVideo.3=\u4F7F\u7528\u7A0B\u5F0F\u9810\u8A2D\u7DE8\u78BC\u5668\u53C3\u6578 (\u63A8\u85A6!) +MEncoderVideo.4=\u5F37\u5236\u4F7F\u7528\u5F9E FFmpeg \u50B3\u905E\u4F86\u7684\u5E40\u7387 +MEncoderVideo.5=\u60A8\u53EF\u4EE5\u5728\u9019\u88E1\u65B0\u589E\u7279\u5225\u9078\u9805, \u6BD4\u5982\u964D\u566A\u6FFE\u93E1: -vf hqdn3d +MEncoderVideo.6=\u81EA\u5B9A\u9078\u9805: +MEncoderVideo.7=\u97F3\u6548\u8A9E\u8A00\u512A\u5148\u7D1A: +MEncoderVideo.8=\u5B57\u5E55\u8A2D\u5B9A +MEncoderVideo.9=\u5B57\u5E55\u8A9E\u8A00\u512A\u5148\u7D1A: +MEncoderVideo.10=\u97F3\u6548\u6216\u5B57\u5E55\u8A9E\u8A00\u512A\u5148\u7D1A (\u8209\u4F8B: en,off;jpn,eng) +MEncoderVideo.11=\u5B57\u5E55\u5B57\u5143\u96C6: +MEncoderVideo.12=\u8986\u84CB\u6A23\u5F0F\u5B57\u5E55\u8A2D\u5B9A: \u5B57\u578B\u7E2E\u653E +MEncoderVideo.13=\u5B57\u578B\u5916\u5F62 +MEncoderVideo.14=\u5B57\u578B\u9670\u5F71 +MEncoderVideo.15=\u5B57\u5E55\u908A\u8DDD (px) +MEncoderVideo.16=\u7D14\u6587\u5B57\u5B57\u5E55\u8A2D\u5B9A: \u5B57\u578B\u7E2E\u653E +MEncoderVideo.17=\u5B57\u578B\u5916\u5F62 +MEncoderVideo.18=\u5B57\u578B\u6A21\u7CCA +MEncoderVideo.19=\u5B57\u5E55\u908A\u8DDD (%) +MEncoderVideo.20=\u4F7F\u7528 ASS/SSA \u5B57\u5E55\u6A23\u5F0F +MEncoderVideo.21=Fontconfig/\u5D4C\u5165\u5F0F \u5B57\u578B +MEncoderVideo.22=\u81EA\u52D5\u8F09\u5165\u5177\u6709\u76F8\u540C\u6A94\u6848\u540D\u7684 *.srt/*.sub \u5B57\u5E55 +MEncoderVideo.23=FriBiDi \u6A21\u5F0F(\u7531\u53F3\u5411\u5DE6\u8A9E\u8A00) +MEncoderVideo.24=\u6307\u5B9A TrueType \u5B57\u578B (\u7528\u65BC\u5B57\u5E55): +MEncoderVideo.25=\u9078\u64C7\u4E00\u6B3E TrueType \u5B57\u578B +MEncoderVideo.26=\u9010\u884C\u6383\u7784\u7BE9\u9078\u5668 +MEncoderVideo.27=\u4F7F\u7528\u5F71\u50CF\u7E2E\u653E\u5668 +MEncoderVideo.28=\u5BEC\u5EA6 +MEncoderVideo.29=\u5C08\u5BB6\u8A2D\u5B9A : \u7DE8\u78BC\u5668\u7279\u5B9A\u53C3\u6578 +MEncoderVideo.30=\u9AD8\u5EA6 +MEncoderVideo.31=\u5B57\u5E55\u984F\u8272 +MEncoderVideo.32=\u4FDD\u7559 AC3 \u97F3\u8ECC (\u4E0D\u91CD\u65B0\u7DE8\u78BC, \u53EF\u80FD\u5C0E\u81F4\u5C0D\u8A71\u7121\u8072\u6216\u8005\u8072\u97F3\u5F71\u50CF\u540C\u6B65\u554F\u984C) +MEncoderVideo.33=\u81EA\u5B9A\u7FA9\u53C3\u6578: +MEncoderVideo.34=\u7DE8\u8F2F\u7DE8\u78BC\u5668\u7279\u5B9A\u53C3\u6578 +MEncoderVideo.35=\u555F\u7528\u591A\u6838 CPU \u652F\u63F4 +MEncoderVideo.36=\u4F7F\u7528\u5D4C\u5165\u6A23\u5F0F +MEncoderVideo.37=\u5099\u7528\u5B57\u5E55\u8CC7\u6599\u593E +MEncoderVideo.39=\u91CD\u65B0\u5C01\u88DD DVD ISO \u5F71\u50CF\u8ECC (\u7121\u91CD\u7DE8\u78BC) +MEncoderVideo.68=\#\u4F60\u53EF\u4EE5\u70BA\u5404\u7A2E\u7DE8\u78BC\u6307\u5B9A\u7279\u5225\u7684\u53C3\u6578.\n +MEncoderVideo.69=\#\u9019\u4E3B\u8981\u662F\u70BA\u4E86\u89E3\u6C7A\u5F71\u97F3\u540C\u6B65\u554F\u984C\uFF0C\u4F46\u4F60\u4E5F\u53EF\u4EE5\u4F7F\u7528\u65BC\u5176\u4ED6\u76EE\u7684\n +MEncoderVideo.70=\#\u56E0\u70BA\u9019\u662F\u6BD4\u8F03\u5C08\u696D\u7684\u8A2D\u5B9A\u6240\u4EE5\u5982\u679C\u4F60\u4E0D\u77E5\u9053\u4F60\u5728\u505A\u4EC0\u9EBC\u8A71\u8ACB\u4E0D\u8981\u4F7F\u7528\n +MEncoderVideo.71=\#\u8A9E\u6CD5\u70BA {java \u689D\u4EF6} :: {MEncoder \u9078\u9805} ; \u4F60\u53EF\u4EE5\u4F7F\u7528\u591A\u500B\u9078\u9805\n +MEncoderVideo.72=\#\u5141\u8A31\u7684\u53C3\u6578: filename srtfile container vcodec acodec samplerate framerate width height channels duration\n +MEncoderVideo.73=\#\u6CE8\u610F, \u4EFB\u4F55\u932F\u8AA4\u7684\u884C\u6703\u88AB\u6E05\u9664\n +MEncoderVideo.75=\#\u7279\u5225\u53C3\u6578:\n +MEncoderVideo.76=\# -noass: \u5B8C\u5168\u505C\u7528 ASS/SSA \u5B57\u5E55\u56E0\u5F71\u97F3\u4E0D\u540C\u6B65\n +MEncoderVideo.77=\# -nosync: \u5B8C\u5168\u505C\u7528\u505C\u7528\u5099\u7528\u5F71\u97F3\u540C\u6B65\u65B9\u6CD5 (-mc \u6709\u540C\u6A23\u7684\u6548\u679C)\n +MEncoderVideo.78=\# -quality: \u8986\u84CB\u5F71\u7247\u54C1\u8CEA\u8A2D\u5B9A\n +MEncoderVideo.79=\# -mt: \u5F37\u5236\u4F7F\u7528\u591A\u57F7\u884C\u5E8F MEncoder \u7248\u672C\n +MEncoderVideo.80=\#\u6B64\u6E05\u55AE\u6703\u56E0\u70BA\u6642\u9593\u800C\u8B8A\u52D5: t\u5C0D\u65BC\u7DE8\u78BC\u5668\u6216\u6A94\u6848\u7684\u53C3\u6578\u6539\u9032\u8207\u610F\u898B\u662F\u59CB\u7D42\u6B61\u8FCE\u7684\n +MEncoderVideo.87=\#\u5E95\u4E0B\u4F60\u53EF\u4EE5\u65B0\u589E\u4F60\u81EA\u5DF1\u7684\u689D\u4EF6\u8207\u9078\u9805 ! \u9019\u88E1\u6709\u4E00\u4E9B\u4F8B\u5B50: for example, to enable the mt build of MEncoder\n +MEncoderVideo.88=\#\u5C0D\u65BC\u4EFB\u4F55 H.264 HD \u5167\u5BB9 (redundant with the main option): vcodec == h264 && width >= 1280 :: -mt -lavdopts fast\n +MEncoderVideo.89=\#to remove 24p judder on a 50hz TV:framerate == 23.976 :: -speed 1.042709376 -ofps 25\n +MEncoderVideo.91=\#to remux when video is MPEG-2 and there's no subtitles:vcodec == mpeg2 && srtfile == null :: -ovc copy -nosync +MEncoderVideo.92=DVD/VOBsub \u5B57\u5E55\u54C1\u8CEA (0-4) (\u8D8A\u9AD8\u8D8A\u597D): +MEncoderVideo.93=\u70BA\u904E\u88DC\u511F\u589E\u52A0\u908A\u6846: +MEncoderVideo.94=\u5F37\u5236\u5B57\u5E55: +MEncoderVideo.95=\u5F37\u5236\u6A19\u7C64: +MEncoderVideo.96=cp1250 /* Windows - Eastern Europe */ +MEncoderVideo.97=cp1251 /* Windows - Cyrillic */ +MEncoderVideo.98=cp1252 /* Windows - Western Europe */ +MEncoderVideo.99=cp1253 /* Windows - Greek */ +MEncoderVideo.100=cp1254 /* Windows - Turkish */ +MEncoderVideo.101=cp1255 /* Windows - Hebrew */ +MEncoderVideo.102=cp1256 /* Windows - Arabic */ +MEncoderVideo.103=cp1257 /* Windows - Baltic */ +MEncoderVideo.104=cp1258 /* Windows - Vietnamese */ +MEncoderVideo.105=ISO-8859-1 /* Western Europe */ +MEncoderVideo.106=ISO-8859-2 /* Western and Central Europe */ +MEncoderVideo.107=ISO-8859-3 /* Western Europe and South European */ +MEncoderVideo.108=ISO-8859-4 /* Western Europe and Baltic countries */ +MEncoderVideo.109=ISO-8859-5 /* Cyrillic alphabet */ +MEncoderVideo.110=ISO-8859-6 /* Arabic */ +MEncoderVideo.111=ISO-8859-7 /* Greek */ +MEncoderVideo.112=ISO-8859-8 /* Hebrew */ +MEncoderVideo.113=ISO-8859-9 /* Western Europe with amended Turkish */ +MEncoderVideo.114=ISO-8859-10 /* Western Europe with Nordic languages */ +MEncoderVideo.115=ISO-8859-11 /* Thai */ +MEncoderVideo.116=ISO-8859-13 /* Baltic languages plus Polish */ +MEncoderVideo.117=ISO-8859-14 /* Celtic languages */ +MEncoderVideo.118=ISO-8859-15 /* Added the Euro sign */ +MEncoderVideo.119=ISO-8859-16 /* Central European languages */ +MEncoderVideo.120=cp932 /* \u65E5\u6587 */ +MEncoderVideo.121=cp936 /* \u7C21\u9AD4\u4E2D\u6587 */ +MEncoderVideo.122=cp949 /* \u97D3\u6587 */ +MEncoderVideo.123=cp950 /* Big5, \u6B63\u9AD4\u4E2D\u6587, \u7CB5\u8A9E */ +MEncoderVideo.124=UTF-8 /* Unicode */ +MEncoderVideo.125=\u9078\u64C7\u5B57\u5E55\u984F\u8272 +MEncoderVideo.126=cht,tw,chi,chs +MEncoderVideo.127=cht,tw,chi,chs +MEncoderVideo.128=*,cht;*,tw;*,chi;*,* +MEncoderVideo.129=/* \u81EA\u52D5 */ +MEncoderVideo.130=enca:ru:cp1251 /* Russian (auto) */ +MEncoderVideo.131=enca:pl:cp1250 /* Eastern Europe (auto) */ +MEncoderVideo.132=enca:zh:big5 /* Chinese (auto) */ +NetworkTab.0=\u8A9E\u8A00 [\u9700\u8981\u91CD\u555F\u7A0B\u5F0F]: +NetworkTab.1=\u700F\u89BD\u58D3\u7E2E\u6A94\u6848 (.rar/.zip/.cbr) +NetworkTab.2=\u751F\u6210\u7E2E\u5716 +NetworkTab.3=\u555F\u52D5\u5F8C\u6700\u5C0F\u5316 +NetworkTab.4=\u5B89\u88DD\u70BA Windows \u670D\u52D9 +NetworkTab.5=\u5E38\u7528\u8A2D\u5B9A +NetworkTab.6=\u8F49\u78BC\u66AB\u5B58\u6700\u5927\u5C3A\u5BF8, \u4EE5MB\u70BA\u55AE\u4F4D (\u6700\u5927\u503C: MAX_BUFFER_SIZE): +NetworkTab.7=\u7528\u65BC\u8F49\u78BC\u7684\u6838\u5FC3\u6578 (\u60A8\u4F3C\u4E4E\u6709 %d): +NetworkTab.8=\u6AA2\u67E5\u66F4\u65B0 +NetworkTab.9=\u81EA\u52D5\u6AA2\u67E5 +NetworkTab.11=\u60A8\u5DF2\u7D93\u5B89\u88DD\u70BA Windows \u670D\u52D9 \! \u8981\u4F7F\u7528\u5B83, \u60A8\u5FC5\u9808\u9000\u51FA\u8A72\u61C9\u7528\u7A0B\u5F0F,\n +NetworkTab.12=\u7136\u5F8C\u5F9E windows \u7BA1\u7406\u9762\u677F\u4E2D\u555F\u52D5 (\u4E26\u8A2D\u5B9A) \u670D\u52D9.\n\n +NetworkTab.13=\u5C07\u91CD\u65B0\u521D\u59CB\u5316\u66AB\u5B58 \!\n +NetworkTab.14=\u5B89\u88DD\u70BA Windows \u670D\u52D9\u6642\u51FA\u932F!\n +NetworkTab.15=\u700F\u89BD/\u50B3\u905E\u8A2D\u5B9A +NetworkTab.16=\u7E2E\u5716\u5C0B\u627E\u4F4D\u7F6E (\u6309\u79D2\u8A08\u7B97): +NetworkTab.17=\u555F\u7528\u66AB\u5B58 +NetworkTab.18=\u91CD\u7F6E\u66AB\u5B58 +NetworkTab.19=\u60A8\u78BA\u5B9A\u55CE? +NetworkTab.20=\u5F37\u884C\u6307\u5B9A\u7DB2\u8DEF\u63A5\u53E3: +NetworkTab.22=\u7DB2\u8DEF\u8A2D\u5B9A (\u9AD8\u7D1A) +NetworkTab.23=\u5F37\u884C\u6307\u5B9A\u4F3A\u670D\u5668 IP: +NetworkTab.24=\u5F37\u884C\u6307\u5B9A\u4F3A\u670D\u5668\u7AEF\u53E3 (\u9810\u8A2D\u70BA 5001): +NetworkTab.25=PS3 \u8A2D\u5B9A +NetworkTab.26=\u60A8 PS3 \u6A94\u6848\u540D\u7684\u5B57\u5143\u96C6 (\u5728 XMB->\u4E3B\u6A5F\u8A2D\u5B9A->\u5B57\u5143\u96C6): +NetworkTab.27=\u60A8\u4E0D\u8A72\u4F7F\u7528\u7684\u672A\u7528\u8A2D\u5B9A :p +NetworkTab.28=Turbo \u6A21\u5F0F (enable tcp_nodelay) / \u6CE8\u610F, \u4E0D\u78BA\u5B9A\u662F\u5426\u53EF\u7528 +NetworkTab.29=\u7576\u8F49\u78BC\u958B\u59CB\u5F8C\u963B\u6B62\u4F86\u81EA PS3 \u5C0D\u540C\u4E00\u6A94\u6848\u7684\u8ACB\u6C42 +NetworkTab.30=\u4F7F\u7528 IP \u904E\u6FFE\u5668: +NetworkTab.31=\u9AD8\u7D1A HTTP \u548C\u7CFB\u7D71\u8A2D\u5B9A +NetworkTab.32=HTTP \u5F15\u64CE V2 +NetworkTab.33=\u5728\u4E32\u6D41\u5A92\u9AD4\u6642\u963B\u6B62\u64CD\u4F5C\u7CFB\u7D71\u4F11\u7720 +NetworkTab.34=\u63D2\u4EF6 +NetworkTab.35=\u4EE5 Mb/s \u70BA\u55AE\u4F4D\u6700\u5927\u983B\u5BEC(0 \u4EE3\u8868\u4E0D\u9650\u5236): +NetworkTab.36=\u82E5\u81EA\u52D5\u6AA2\u6E2C\u5931\u6557\u7684\u9810\u8A2D\u6E32\u67D3\u5668: +NetworkTab.37=\u672A\u77E5\u6E32\u67D3\u5668 +NetworkTab.38=\u5F37\u5236\u4F7F\u7528\u9810\u8A2D\u6E32\u67D3\u5668 (\u505C\u7528\u81EA\u52D5\u6AA2\u6E2C) +PMS.0=\u672A\u767C\u73FE\u6E32\u67D3\u5668 +PMS.1=\u97F3\u6548 +PMS.2=\#- \u66AB\u5B58 -\# +PMS.3=\u8072\u97F3\u5F71\u50CF\u540C\u6B65\u53EF\u9078\u65B9\u6CD5 +PMS.4=\u9010\u884C\u6383\u7784\u7BE9\u9078\u5668 +PMS.5=\u5DF2\u9023\u63A5\u81F3 PS3 +PMS.6=\u81EA\u52D5\u8F09\u5165 .srt/.sub \u5B57\u5E55 +PMS.7=\u8DF3\u904E H.264 \u89E3\u78BC\u74B0\u5167\u53BB\u584A\u6FFE\u93E1 (\u6703\u964D\u4F4E\u54C1\u8CEA) +PMS.8=\u5B57\u5E55 +PMS.9=\u5168\u90E8\u97F3\u6548\u64AD\u653E\u6E05\u55AE +PMS.10=\u5B8C\u5168\u505C\u7528\u5B57\u5E55 +PMS.11=\u6240\u6709\u97F3\u6548\u8ECC\u9053 +PMS.12=\u6309\u65E5\u671F +PMS.13=\u6309\u85DD\u8853\u5BB6 +PMS.16=\u6309\u5C08\u8F2F +PMS.17=\u672A\u77E5\u6E32\u67D3\u5668 +PMS.18=\u5DF2\u9023\u63A5 +PMS.19=\u6309\u98A8\u683C +PMS.21=\u6309\u76F8\u6A5F\u578B\u865F +PMS.22=\u6309\u85DD\u8853\u5BB6/\u5C08\u8F2F +PMS.25=\u6309 ISO \u8A2D\u5B9A +PMS.26=\u6309\u98A8\u683C/\u85DD\u8853\u5BB6/\u5C08\u8F2F +PMS.27=\u5132\u5B58\u8A2D\u5B9A +PMS.28=\u6309\u5B57\u6BCD/\u85DD\u8853\u5BB6/\u5C08\u8F2F +PMS.31=\u7167\u7247 +PMS.32=\u6240\u6709\u7167\u7247 +PMS.34=\u5F71\u50CF +PMS.35=\u6240\u6709\u5F71\u50CF +PMS.36=\u9AD8\u756B\u8CEA\u5F71\u50CF +PMS.37=\#- \u5F71\u50CF\u8A2D\u5B9A -\# +PMS.39=\u666E\u901A\u756B\u8CEA\u5F71\u50CF +PMS.40=DVD \u93E1\u50CF +PMS.41=(\u91CD)\u5B89\u88DD Win32 \u670D\u52D9 +PMS.130=\u641C\u5C0B\u6E32\u67D3\u5668... +ProfileChooser.1=PS3 \u5A92\u9AD4\u4F3A\u670D\u5668\u8A2D\u5B9A\u6A94\u6848\u9078\u64C7\u5668 +ProfileChooser.2=\u9078\u64C7 +ProfileChooser.3=\u8A2D\u5B9A\u6A94\u6848 (.conf) \u6216\u8CC7\u6599\u593E +StatusTab.2=\u72C0\u614B +StatusTab.3=\u7B49\u5F85... +StatusTab.5=\u7A7A +StatusTab.6=\u8F49\u78BC\u66AB\u5B58\u72C0\u614B: +StatusTab.7=I/O \u7D71\u8A08: +StatusTab.8=\u76EE\u524D\u4F4D\u5143\u7387: +StatusTab.9=\u76E3\u6E2C\u5230\u5A92\u9AD4\u6E32\u67D3\u5668 +StatusTab.10=\u5CF0\u503C\u4F4D\u5143\u7387: +StatusTab.11=Mb/s +StatusTab.12=MB +TSMuxerVideo.0=\u4F7F\u7528 MEncoder \u5206\u96E2\u4E26\u7DE8\u78BC\u6240\u6709\u97F3\u8ECC\u70BA AC3 +TSMuxerVideo.1=\u4F7F\u7528 MEncoder \u5206\u96E2\u4E26\u7DE8\u78BC DTS/FLAC \u97F3\u8ECC\u70BA LPCM [\u6CE8\u610F, \u8DF3\u88DD\u5C1A\u4E0D\u53EF\u7528] +TSMuxerVideo.2=\u5728\u5143\u8CC7\u6599\u6A94\u6848\u4E2D\u5F37\u5236\u4F7F\u7528\u4F86\u81EA FFmpeg \u7684 FPS \u5206\u6790\u7D50\u679C +TSMuxerVideo.3=\u50C5\u9069\u7528\u65BC tsMuxeR \u5F15\u64CE\u7684\u5F71\u50CF\u89E3\u78BC\u8A2D\u5B9A +TSMuxerVideo.19=\u5C01\u88DD\u6240\u6709\u97F3\u8ECC +TrTab2.0=\u555F\u7528/\u505C\u7528\u4E00\u500B\u8F49\u78BC\u5F15\u64CE +TrTab2.1=\u73FE\u5728\u6C92\u6709\u8A2D\u5B9A +TrTab2.2=\u7528\u65BC\u4E0B\u5217\u5F15\u64CE\u7684\u5F71\u50CF\u7DE8\u78BC\u5668\u8A2D\u5B9A: MEncoder/AviSynth/FFmpeg +TrTab2.3=\u7528\u65BC\u4E0B\u5217\u89E3\u78BC\u5668\u7684\u97F3\u6548\u8A2D\u5B9A: MEncoder/AviSynth/FFmpeg/tsMuxeR +TrTab2.4=\u5F71\u50CF\u54C1\u8CEA\u8A2D\u5B9A +TrTab2.5=\u5E38\u7528\u8F49\u78BC\u8A2D\u5B9A +TrTab2.6=\u6392\u5E8F\u8F49\u78BC\u5F15\u64CE\u6E05\u55AE. \u9996\u500B\u5C07\u51FA\u73FE\u5728\u539F\u59CB\u5F71\u50CF\u8CC7\u6599\u593E +TrTab2.7=\u96DC\u9805 +TrTab2.8=\u8DF3\u904E\u4EE5\u4E0B\u526F\u6A94\u540D\u7684\u8F49\u78BC (\u9017\u865F\u5206\u5272): +TrTab2.9=\u5F37\u5236\u5C0D\u4EE5\u4E0B\u526F\u6A94\u540D\u7684\u8F49\u78BC (\u9017\u865F\u5206\u5272): +TrTab2.10=\u5141\u8A31\u76F4\u63A5\u50B3\u8F38 DTS \u5230\u63A5\u6536\u5668\u4E0A.\n\u6CE8\u610F\u6709\u53EF\u80FD\u5F97\u5230\u975C\u6B62\u7684\u8072\u97F3. \u5099\u8A3B:\n- \u60A8\u5FC5\u9808\u64C1\u6709 DTS \u76F8\u5BB9\u7684\u63A5\u6536\u5668, \u4EE5\u5149\u7E96\u6578\u4F4D\u63A5\u53E3\u6216 HDMI \u9023\u63A5\n- \u5728 XMB \u4E2D\u7684\u97F3\u91CF\u5FC5\u9808\u70BA '\u6B63\u5E38'\n- \u5728 XMB \u4E2D\u7684\u8072\u9053\u5FC5\u9808\u70BA '\u5DE6+\u53F3'\n +TrTab2.11=\u5F15\u64CE +TrTab2.12=\u5E38\u7528\u89E3\u78BC\u5668\u8A2D\u5B9A +TrTab2.13=\u5E38\u7528\u7DE8\u78BC\u5668\u8A2D\u5B9A +TrTab2.14=\u5F71\u50CF\u6A94\u6848\u5F15\u64CE +TrTab2.15=\u97F3\u6548\u6A94\u6848\u5F15\u64CE +TrTab2.16=\u7DB2\u8DEF\u5F71\u50CF\u6D41\u5F15\u64CE +TrTab2.17=\u7DB2\u8DEF\u97F3\u6548\u6D41\u5F15\u64CE +TrTab2.18=\u96DC\u9805\u5F15\u64CE +TrTab2.19=\u5F15\u64CE\u6309\u7167\u964D\u5E8F +TrTab2.20=\u6392\u5217; \u6700\u9AD8\u7684\u70BA\u9996\u500B +TrTab2.21=(\u4E0D\u652F\u63F4 AviSynth ) +TrTab2.22=\u97F3\u6548\u81EA\u52D5\u91CD\u63A1\u6A23\u81F3 44.1 \u6216 48 kHz +TrTab2.27=\u4F7F\u7528 LPCM \u97F3\u6548(\u7121\u9700\u91CD\u7DE8\u78BC) +TrTab2.28=\u4FDD\u6301 DTS \u97F3\u8ECC (\u7121\u9700\u91CD\u7DE8\u78BC, \u76F8\u5BB9\u5177\u5099\u5149\u7E96\u6216 HDMI \u8F38\u51FA\u7684\u8072\u97F3\u5F71\u50CF\u63A5\u6536\u5668) +TrTab2.29=AC3 \u97F3\u6548\u91CD\u7DE8\u78BC\u4F4D\u5143\u7387 (in Kibit/s) (\u4F8B\u5982: 576, 640): +TrTab2.32=MPEG-2 \u9078\u9805: +TrTab2.39=\u5F71\u50CF\u5C07\u6703\u88AB\u81EA\u52D5\u8F49\u78BC\u4E26\u5C01\u88DD\u6210 MPEG-PS / AC3 (\u9AD8\u5EA6\u76F8\u5BB9 PS3) +TrTab2.40=\n\u60A8\u53EF\u4EE5\u5617\u8A66\u8ABF\u6574 vqscale, vqmin \u548C keyint \u53C3\u6578\u4F86\u5BE6\u73FE\u512A\u79C0\u751A\u81F3\u5E7E\u4E4E\u7121\u640D\u7684\u8F49\u78BC\u54C1\u8CEA. +TrTab2.41=\n\u5F0A\u7AEF\u662F\u53EF\u8B8A\u4F4D\u5143\u7387\u5C0E\u81F4\u6709\u6642\u5CF0\u503C\u6703\u8D85\u904E\u60A8\u7684\u6700\u5927\u7DB2\u8DEF\u983B\u5BECy. +TrTab2.42=\n\u9019\u5C31\u662F\u70BA\u4F55\u60A8\u9084\u53EF\u4EE5\u5728\u7121\u7DDA\u548C CPL \u7B49\u689D\u4EF6\u4E0B\u8A2D\u5B9A\u983B\u5BEC\u7684\u539F\u56E0. \u4F46\u662F, \u8F49\u78BC\u54C1\u8CEA +TrTab2.43=\n\u662F\u7DB2\u8DEF\u901F\u5EA6\u548C CPU \u6027\u80FD\u4E4B\u9593\u7684\u5E73\u8861: \u60A8\u8D8A\u589E\u52A0\u56FA\u5B9A\u4F4D\u5143\u7387\u4EE5\u63D0\u5347\u54C1\u8CEA, +TrTab2.44=\n\u60A8\u7684 CPU \u8CA0\u8F09\u8D8A\u5927\! \u4F46\u662F, \u4E0D\u8981\u671F\u671B\u80FD\u5728 15Mbps \u689D\u4EF6\u4E0B\u8B93 1080p \u7684\u52D5\u4F5C\u96FB\u5F71\u53D6\u5F97\u5B8C\u7F8E\u54C1\u8CEA :p +TrTab2.50=\u9069\u7528\u65BC AC3 \u91CD\u7DE8\u78BC\u7684\u6700\u5927\u97F3\u6548\u8072\u9053\u6578: +TrTab2.51=\u5B8C\u5168\u505C\u7528\u5B57\u5E55 +TrTab2.52=\u7AE0\u7BC0 \#Transcode\# \u8CC7\u6599\u593E\u652F\u63F4 / \u9593\u9694\uFF0C\u55AE\u4F4D\u70BA\u5206\u9418: +TrTab2.55=2 \u8072\u9053 (\u7ACB\u9AD4\u8072) +TrTab2.56=6 \u8072\u9053 (5.1) +TrTab2.60=\u512A\u79C0 +TrTab2.61=\u7121\u640D +TrTab2.62=\u826F\u597D +TrTab2.63=\u826F\u597D, \u9069\u7528\u65BC\u9AD8\u756B\u8CEA\u7121\u7DDA\u7DB2\u8DEF\u8F49\u78BC +TrTab2.64=\u4E2D\u7B49, \u9069\u7528\u65BC\u9AD8\u756B\u8CEA\u7121\u7DDA\u7DB2\u8DEF\u8F49\u78BC +TrTab2.65=\u4F4E\u8CEA, \u4F4E\u7AEF CPU \u6216\u9AD8\u756B\u8CEA\u7121\u7DDA\u7DB2\u8DEF\u8F49\u78BC +TracesTab.3=\u6E05\u9664 +TreeNodeSettings.4=\u8A72\u5F15\u64CE\u672A\u8F09\u5165\! +TranscodeVirtualFolder.0=\#--\u8F49\u78BC--\# Binary files /tmp/en5krMflC9/ps3mediaserver-1.71.0+mencoder35005/src/main/resources/images/clients/bravia-hx.png and /tmp/9DH4_whDMk/ps3mediaserver-1.81.0+mencoder35005/src/main/resources/images/clients/bravia-hx.png differ diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/test/java/net/pms/configuration/RendererConfigurationTest.java ps3mediaserver-1.81.0+mencoder35005/src/test/java/net/pms/configuration/RendererConfigurationTest.java --- ps3mediaserver-1.71.0+mencoder35005/src/test/java/net/pms/configuration/RendererConfigurationTest.java 1970-01-01 00:00:00.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/test/java/net/pms/configuration/RendererConfigurationTest.java 2013-04-22 19:41:39.000000000 +0000 @@ -0,0 +1,250 @@ +/* + * PS3 Media Server, for streaming any medias to your PS3. + * Copyright (C) 2008 A.Brochard + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; version 2 + * of the License only. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package net.pms.configuration; + +import static net.pms.configuration.RendererConfiguration.getRendererConfigurationByUA; +import static net.pms.configuration.RendererConfiguration.getRendererConfigurationByUAAHH; +import static net.pms.configuration.RendererConfiguration.loadRendererConfigurations; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.apache.commons.configuration.ConfigurationException; +import org.junit.Before; +import org.junit.Test; +import org.slf4j.LoggerFactory; + +import ch.qos.logback.classic.LoggerContext; + + +/** + * Test the RendererConfiguration class + */ +public class RendererConfigurationTest { + private final Map testCases = new HashMap(); + + @Before + public void setUp() { + // Silence all log messages from the PMS code that is being tested + LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); + context.reset(); + + // Set locale to EN to ignore translations for renderers + Locale.setDefault(Locale.ENGLISH); + + // Cases that are too generic should not match anything + testCases.put("User-Agent: UPnP/1.0 DLNADOC/1.50", null); + testCases.put("User-Agent: Unknown Renderer", null); + testCases.put("X-Unknown-Header: Unknown Content", null); + + // From AirPlayer.conf: + testCases.put("User-Agent: AirPlayer/1.0.09 CFNetwork/485.13.9 Darwin/11.0.0", "AirPlayer"); + testCases.put("User-Agent: Lavf52.54.0", "AirPlayer"); + + // From BraviaEX.conf: + testCases.put("X-AV-Client-Info: av=5.0; cn=\"Sony Corporation\"; mn=\"BRAVIA KDL-32CX520\"; mv=\"1.7\";", "Sony Bravia EX"); + + // From BraviaHX.conf: + testCases.put("X-AV-Client-Info: av=5.0; cn=\"Sony Corporation\"; mn=\"BRAVIA KDL-55HX750\"; mv=\"1.7\";", "Sony Bravia HX"); + + // From Dlink510.conf: + testCases.put("User-Agent: DLNADOC/1.50 INTEL_NMPR/2.1", "D-Link DSM-510"); + + // From iPad-iPhone.conf: + testCases.put("User-Agent: 8player lite 2.2.3 (iPad; iPhone OS 5.0.1; nl_NL)", "iPad / iPhone"); + testCases.put("User-Agent: yxplayer2%20lite/1.2.7 CFNetwork/485.13.9 Darwin/11.0.0", "iPad / iPhone"); + testCases.put("User-Agent: MPlayer 1.0rc4-4.2.1", "iPad / iPhone"); + testCases.put("User-Agent: NSPlayer/4.1.0.3856", "iPad / iPhone"); + + // From Philips.conf: + testCases.put("User-Agent: Allegro-Software-WebClient/4.61 DLNADOC/1.00", "Philips Aurea"); + + // From PhilipsPFL.conf: + testCases.put("User-Agent: Windows2000/0.0 UPnP/1.0 PhilipsIntelSDK/1.4 DLNADOC/1.50", "Philips TV"); + + // From PS3.conf: + testCases.put("User-Agent: PLAYSTATION 3", "Playstation 3"); + testCases.put("X-AV-Client-Info: av=5.0; cn=\"Sony Computer Entertainment Inc.\"; mn=\"PLAYSTATION 3\"; mv=\"1.0\"", "Playstation 3"); + + // From Realtek.conf: + // FIXME: Actual conflict here! Popcorn Hour is returned... + //testCases.put("User-Agent: POSIX UPnP/1.0 Intel MicroStack/1.0.2718, RealtekMediaCenter, DLNADOC/1.50", "Realtek"); + testCases.put("User-Agent: RealtekVOD neon/0.27.2", "Realtek"); + + // From SamsungAllShare.conf: + testCases.put("User-Agent: SEC_HHP_[HT]D5500/1.0", "Samsung AllShare"); + testCases.put("User-Agent: SEC_HHP_[TV]UE32D5000/1.0", "Samsung AllShare"); + testCases.put("User-Agent: SEC_HHP_ Family TV/1.0", "Samsung AllShare"); + testCases.put("User-Agent: SEC_HHP_[TV]PS51D6900/1.0", "Samsung AllShare"); + testCases.put("User-Agent: DLNADOC/1.50 SEC_HHP_[TV]UE32D5000/1.0", "Samsung AllShare"); + testCases.put("User-Agent: DLNADOC/1.50 SEC_HHP_[TV]UN55D6050/1.0", "Samsung AllShare"); + testCases.put("User-Agent: DLNADOC/1.50 SEC_HHP_ Family TV/1.0", "Samsung AllShare"); + + // From Samsung-SMT-G7400.conf: + testCases.put("User-Agent: Linux/2.6.35 UPnP/1.0 NDS_MHF DLNADOC/1.50", "Samsung SMT-G7400"); + + // From WDTVLive.conf: + testCases.put("User-Agent: INTEL_NMPR/2.1 DLNADOC/1.50 Intel MicroStack/1.0.1423", "WD TV Live"); + + // From XBMC.conf: + testCases.put("User-Agent: XBMC/10.0 r35648 (Mac OS X; 11.2.0 x86_64; http://www.xbmc.org)", "XBMC"); + testCases.put("User-Agent: Platinum/0.5.3.0, DLNADOC/1.50", "XBMC"); + } + + /** + * Test the RendererConfiguration class and the consistency of the renderer + * .conf files it reads. This is done by feeding it known headers and + * checking whether it recognizes the correct renderer. + */ + @Test + public void testKnownHeaders() { + PmsConfiguration pmsConf = null; + + try { + pmsConf = new PmsConfiguration(false); + } catch (IOException e) { + // This should be impossible since no configuration file will be loaded. + } catch (ConfigurationException e) { + // This should be impossible since no configuration file will be loaded. + } + + // Initialize the RendererConfiguration + loadRendererConfigurations(pmsConf); + + // Test all header test cases + Set> set = testCases.entrySet(); + Iterator> i = set.iterator(); + + while (i.hasNext()) { + Entry entry = (Entry) i.next(); + testHeader(entry.getKey(), entry.getValue()); + } + } + + /** + * Test recognition with a forced default renderer configured. + */ + @Test + public void testForcedDefault() { + PmsConfiguration pmsConf = null; + + try { + pmsConf = new PmsConfiguration(false); + } catch (IOException e) { + // This should be impossible since no configuration file will be loaded. + } catch (ConfigurationException e) { + // This should be impossible since no configuration file will be loaded. + } + + // Set default to Playstation 3 + pmsConf.setRendererDefault("Playstation 3"); + pmsConf.setRendererForceDefault(true); + + // Initialize the RendererConfiguration + loadRendererConfigurations(pmsConf); + + // Known and unknown renderers should always return default + testHeader("User-Agent: AirPlayer/1.0.09 CFNetwork/485.13.9 Darwin/11.0.0", "Playstation 3"); + testHeader("User-Agent: Unknown Renderer", "Playstation 3"); + testHeader("X-Unknown-Header: Unknown Content", "Playstation 3"); + } + + /** + * Test recognition with a forced bogus default renderer configured. + */ + @Test + public void testBogusDefault() { + PmsConfiguration pmsConf = null; + + try { + pmsConf = new PmsConfiguration(false); + } catch (IOException e) { + // This should be impossible since no configuration file will be loaded. + } catch (ConfigurationException e) { + // This should be impossible since no configuration file will be loaded. + } + + // Set default to non existent renderer + pmsConf.setRendererDefault("Bogus Renderer"); + pmsConf.setRendererForceDefault(true); + + // Initialize the RendererConfiguration + loadRendererConfigurations(pmsConf); + + // Known and unknown renderers should return "Unknown renderer" + testHeader("User-Agent: AirPlayer/1.0.09 CFNetwork/485.13.9 Darwin/11.0.0", "Unknown renderer"); + testHeader("User-Agent: Unknown Renderer", "Unknown renderer"); + testHeader("X-Unknown-Header: Unknown Content", "Unknown renderer"); + } + + /** + * Test one particular header line to see if it returns the correct + * renderer. Set the correct renderer name to null to require + * that nothing matches at all. + * + * @param headerLine + * The header line to recognize. + * @param correctRendererName + * The name of the renderer. + */ + private void testHeader(String headerLine, String correctRendererName) { + if (correctRendererName != null) { + // Header is supposed to match a particular renderer + if (headerLine != null && headerLine.toLowerCase().startsWith("user-agent")) { + // Match by User-Agent + RendererConfiguration rc = getRendererConfigurationByUA(headerLine); + assertNotNull("Recognized renderer for header \"" + headerLine + "\"", rc); + assertEquals("Expected renderer \"" + correctRendererName + "\", " + + "instead renderer \"" + rc.getRendererName() + "\" was returned for header \"" + + headerLine + "\"", correctRendererName, rc.getRendererName()); + } else { + // Match by additional header + RendererConfiguration rc = getRendererConfigurationByUAAHH(headerLine); + assertNotNull("Recognized renderer for header \"" + headerLine + "\"", rc); + assertEquals("Expected renderer \"" + correctRendererName + "\" to be recognized, " + + "instead renderer \"" + rc.getRendererName() + "\" was returned for header \"" + + headerLine + "\"", correctRendererName, rc.getRendererName()); + } + } else { + // Header is supposed to match no renderer at all + if (headerLine != null && headerLine.toLowerCase().startsWith("user-agent")) { + // Match by User-Agent + RendererConfiguration rc = getRendererConfigurationByUA(headerLine); + assertEquals("Expected no matching renderer to be found for header \"" + headerLine + + "\", instead renderer \"" + (rc != null ? rc.getRendererName() : "") + + "\" was recognized.", null, + rc); + } else { + // Match by additional header + RendererConfiguration rc = getRendererConfigurationByUAAHH(headerLine); + assertEquals("Expected no matching renderer to be found for header \"" + headerLine + + "\", instead renderer \"" + (rc != null ? rc.getRendererName() : "") + + "\" was recognized.", null, rc); + } + } + } +} diff -Nru ps3mediaserver-1.71.0+mencoder35005/src/test/java/net/pms/test/RendererConfigurationTest.java ps3mediaserver-1.81.0+mencoder35005/src/test/java/net/pms/test/RendererConfigurationTest.java --- ps3mediaserver-1.71.0+mencoder35005/src/test/java/net/pms/test/RendererConfigurationTest.java 2012-11-10 21:58:46.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/src/test/java/net/pms/test/RendererConfigurationTest.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,242 +0,0 @@ -/* - * PS3 Media Server, for streaming any medias to your PS3. - * Copyright (C) 2008 A.Brochard - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; version 2 - * of the License only. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -package net.pms.test; - -import ch.qos.logback.classic.LoggerContext; -import net.pms.configuration.PmsConfiguration; -import net.pms.configuration.RendererConfiguration; -import org.apache.commons.configuration.ConfigurationException; -import org.junit.Before; -import org.junit.Test; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.util.*; -import java.util.Map.Entry; - -import static net.pms.configuration.RendererConfiguration.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - - -/** - * Test the RendererConfiguration class - */ -public class RendererConfigurationTest { - private final Map testCases = new HashMap(); - - @Before - public void setUp() { - // Silence all log messages from the PMS code that is being tested - LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - context.reset(); - - // Set locale to EN to ignore translations for renderers - Locale.setDefault(Locale.ENGLISH); - - // Cases that are too generic should not match anything - testCases.put("User-Agent: UPnP/1.0 DLNADOC/1.50", null); - testCases.put("User-Agent: Unknown Renderer", null); - testCases.put("X-Unknown-Header: Unknown Content", null); - - // From AirPlayer.conf: - testCases.put("User-Agent: AirPlayer/1.0.09 CFNetwork/485.13.9 Darwin/11.0.0", "AirPlayer"); - testCases.put("User-Agent: Lavf52.54.0", "AirPlayer"); - - // From BraviaEX.conf: - testCases.put("X-AV-Client-Info: av=5.0; cn=\"Sony Corporation\"; mn=\"BRAVIA KDL-32CX520\"; mv=\"1.7\";", "Sony Bravia EX"); - - // From Dlink510.conf: - testCases.put("User-Agent: DLNADOC/1.50 INTEL_NMPR/2.1", "D-Link DSM-510"); - - // From iPad-iPhone.conf: - testCases.put("User-Agent: 8player lite 2.2.3 (iPad; iPhone OS 5.0.1; nl_NL)", "iPad / iPhone"); - testCases.put("User-Agent: yxplayer2%20lite/1.2.7 CFNetwork/485.13.9 Darwin/11.0.0", "iPad / iPhone"); - testCases.put("User-Agent: MPlayer 1.0rc4-4.2.1", "iPad / iPhone"); - testCases.put("User-Agent: NSPlayer/4.1.0.3856", "iPad / iPhone"); - - // From Philips.conf: - testCases.put("User-Agent: Allegro-Software-WebClient/4.61 DLNADOC/1.00", "Philips Aurea"); - - // From PhilipsPFL.conf: - testCases.put("User-Agent: Windows2000/0.0 UPnP/1.0 PhilipsIntelSDK/1.4 DLNADOC/1.50", "Philips TV"); - - // From PS3.conf: - testCases.put("User-Agent: PLAYSTATION 3", "Playstation 3"); - testCases.put("X-AV-Client-Info: av=5.0; cn=\"Sony Computer Entertainment Inc.\"; mn=\"PLAYSTATION 3\"; mv=\"1.0\"", "Playstation 3"); - - // From Realtek.conf: - // FIXME: Actual conflict here! Popcorn Hour is returned... - //testCases.put("User-Agent: POSIX UPnP/1.0 Intel MicroStack/1.0.2718, RealtekMediaCenter, DLNADOC/1.50", "Realtek"); - testCases.put("User-Agent: RealtekVOD neon/0.27.2", "Realtek"); - - // From SamsungAllShare.conf: - testCases.put("User-Agent: SEC_HHP_[HT]D5500/1.0", "Samsung AllShare"); - testCases.put("User-Agent: SEC_HHP_[TV]UE32D5000/1.0", "Samsung AllShare"); - testCases.put("User-Agent: SEC_HHP_ Family TV/1.0", "Samsung AllShare"); - testCases.put("User-Agent: SEC_HHP_[TV]PS51D6900/1.0", "Samsung AllShare"); - testCases.put("User-Agent: DLNADOC/1.50 SEC_HHP_[TV]UE32D5000/1.0", "Samsung AllShare"); - testCases.put("User-Agent: DLNADOC/1.50 SEC_HHP_[TV]UN55D6050/1.0", "Samsung AllShare"); - testCases.put("User-Agent: DLNADOC/1.50 SEC_HHP_ Family TV/1.0", "Samsung AllShare"); - - // From Samsung-SMT-G7400.conf: - testCases.put("User-Agent: Linux/2.6.35 UPnP/1.0 NDS_MHF DLNADOC/1.50", "Samsung SMT-G7400"); - - // From WDTVLive.conf: - testCases.put("User-Agent: INTEL_NMPR/2.1 DLNADOC/1.50 Intel MicroStack/1.0.1423", "WD TV Live"); - - // From XBMC.conf: - testCases.put("User-Agent: XBMC/10.0 r35648 (Mac OS X; 11.2.0 x86_64; http://www.xbmc.org)", "XBMC"); - testCases.put("User-Agent: Platinum/0.5.3.0, DLNADOC/1.50", "XBMC"); - } - - /** - * Test the RendererConfiguration class and the consistency of the renderer - * .conf files it reads. This is done by feeding it known headers and - * checking whether it recognizes the correct renderer. - */ - @Test - public void testKnownHeaders() { - PmsConfiguration pmsConf = null; - - try { - pmsConf = new PmsConfiguration(false); - } catch (IOException e) { - // This should be impossible since no configuration file will be loaded. - } catch (ConfigurationException e) { - // This should be impossible since no configuration file will be loaded. - } - - // Initialize the RendererConfiguration - loadRendererConfigurations(pmsConf); - - // Test all header test cases - Set> set = testCases.entrySet(); - Iterator> i = set.iterator(); - - while (i.hasNext()) { - Entry entry = (Entry) i.next(); - testHeader(entry.getKey(), entry.getValue()); - } - } - - /** - * Test recognition with a forced default renderer configured. - */ - @Test - public void testForcedDefault() { - PmsConfiguration pmsConf = null; - - try { - pmsConf = new PmsConfiguration(false); - } catch (IOException e) { - // This should be impossible since no configuration file will be loaded. - } catch (ConfigurationException e) { - // This should be impossible since no configuration file will be loaded. - } - - // Set default to Playstation 3 - pmsConf.setRendererDefault("Playstation 3"); - pmsConf.setRendererForceDefault(true); - - // Initialize the RendererConfiguration - loadRendererConfigurations(pmsConf); - - // Known and unknown renderers should always return default - testHeader("User-Agent: AirPlayer/1.0.09 CFNetwork/485.13.9 Darwin/11.0.0", "Playstation 3"); - testHeader("User-Agent: Unknown Renderer", "Playstation 3"); - testHeader("X-Unknown-Header: Unknown Content", "Playstation 3"); - } - - /** - * Test recognition with a forced bogus default renderer configured. - */ - @Test - public void testBogusDefault() { - PmsConfiguration pmsConf = null; - - try { - pmsConf = new PmsConfiguration(false); - } catch (IOException e) { - // This should be impossible since no configuration file will be loaded. - } catch (ConfigurationException e) { - // This should be impossible since no configuration file will be loaded. - } - - // Set default to non existent renderer - pmsConf.setRendererDefault("Bogus Renderer"); - pmsConf.setRendererForceDefault(true); - - // Initialize the RendererConfiguration - loadRendererConfigurations(pmsConf); - - // Known and unknown renderers should return "Unknown renderer" - testHeader("User-Agent: AirPlayer/1.0.09 CFNetwork/485.13.9 Darwin/11.0.0", "Unknown renderer"); - testHeader("User-Agent: Unknown Renderer", "Unknown renderer"); - testHeader("X-Unknown-Header: Unknown Content", "Unknown renderer"); - } - - /** - * Test one particular header line to see if it returns the correct - * renderer. Set the correct renderer name to null to require - * that nothing matches at all. - * - * @param headerLine - * The header line to recognize. - * @param correctRendererName - * The name of the renderer. - */ - private void testHeader(String headerLine, String correctRendererName) { - if (correctRendererName != null) { - // Header is supposed to match a particular renderer - if (headerLine != null && headerLine.toLowerCase().startsWith("user-agent")) { - // Match by User-Agent - RendererConfiguration rc = getRendererConfigurationByUA(headerLine); - assertNotNull("Recognized renderer for header \"" + headerLine + "\"", rc); - assertEquals("Expected renderer \"" + correctRendererName + "\", " - + "instead renderer \"" + rc.getRendererName() + "\" was returned for header \"" - + headerLine + "\"", correctRendererName, rc.getRendererName()); - } else { - // Match by additional header - RendererConfiguration rc = getRendererConfigurationByUAAHH(headerLine); - assertNotNull("Recognized renderer for header \"" + headerLine + "\"", rc); - assertEquals("Expected renderer \"" + correctRendererName + "\" to be recognized, " - + "instead renderer \"" + rc.getRendererName() + "\" was returned for header \"" - + headerLine + "\"", correctRendererName, rc.getRendererName()); - } - } else { - // Header is supposed to match no renderer at all - if (headerLine != null && headerLine.toLowerCase().startsWith("user-agent")) { - // Match by User-Agent - RendererConfiguration rc = getRendererConfigurationByUA(headerLine); - assertEquals("Expected no matching renderer to be found for header \"" + headerLine - + "\", instead renderer \"" + (rc != null ? rc.getRendererName() : "") - + "\" was recognized.", null, - rc); - } else { - // Match by additional header - RendererConfiguration rc = getRendererConfigurationByUAAHH(headerLine); - assertEquals("Expected no matching renderer to be found for header \"" + headerLine - + "\", instead renderer \"" + (rc != null ? rc.getRendererName() : "") - + "\" was recognized.", null, rc); - } - } - } -} Binary files /tmp/en5krMflC9/ps3mediaserver-1.71.0+mencoder35005/target/ant-dependencies/net/java/dev/jai-imageio/jai-imageio-core-standalone/1.2-pre-dr-b04-2011-07-04/jai-imageio-core-standalone-1.2-pre-dr-b04-2011-07-04.jar and /tmp/9DH4_whDMk/ps3mediaserver-1.81.0+mencoder35005/target/ant-dependencies/net/java/dev/jai-imageio/jai-imageio-core-standalone/1.2-pre-dr-b04-2011-07-04/jai-imageio-core-standalone-1.2-pre-dr-b04-2011-07-04.jar differ diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav/dvdnav.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav/dvdnav.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav/dvdnav.h 2011-02-26 20:32:32.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav/dvdnav.h 2012-12-09 21:39:37.000000000 +0000 @@ -281,7 +281,7 @@ /* * Plays the specified title, starting from the specified program */ -dvdnav_status_t dvdnav_program_play(dvdnav_t *this, int32_t title, int32_t pgcn, int32_t pgn); +dvdnav_status_t dvdnav_program_play(dvdnav_t *self, int32_t title, int32_t pgcn, int32_t pgn); /* * Stores in *times an array (that the application *must* free) of diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav.c 2010-07-30 23:34:11.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav.c 2012-12-09 21:45:02.000000000 +0000 @@ -336,8 +336,9 @@ dvdnav_angle_change(this, 1); } #endif - - if(num_angle != 0) { + /* only use ILVU information if we are at the last vobunit in ILVU */ + /* otherwise we will miss nav packets from vobunits inbetween */ + if(num_angle != 0 && (nav_dsi->sml_pbi.category & DSI_ILVU_MASK) == (DSI_ILVU_BLOCK | DSI_ILVU_LAST)) { if((next = nav_pci->nsml_agli.nsml_agl_dsta[angle-1]) != 0) { if((next & 0x3fffffff) != 0) { @@ -1162,7 +1163,7 @@ union { user_ops_t ops_struct; uint32_t ops_int; - } ops; + } ops, tmp; ops.ops_int = 0; @@ -1172,10 +1173,12 @@ } pthread_mutex_lock(&this->vm_lock); - ops.ops_int |= *(uint32_t*)&this->pci.pci_gi.vobu_uop_ctl; + ops.ops_struct = this->pci.pci_gi.vobu_uop_ctl; - if(this->vm && this->vm->state.pgc) - ops.ops_int |= *(uint32_t*)&this->vm->state.pgc->prohibited_ops; + if(this->vm && this->vm->state.pgc) { + tmp.ops_struct = this->vm->state.pgc->prohibited_ops; + ops.ops_int |= tmp.ops_int; + } pthread_mutex_unlock(&this->vm_lock); return ops.ops_struct; diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav_internal.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav_internal.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav_internal.h 2010-06-01 10:02:38.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/dvdnav_internal.h 2012-12-09 21:22:15.000000000 +0000 @@ -76,6 +76,14 @@ #define DVD_VIDEO_LB_LEN 2048 #endif +typedef enum { + DSI_ILVU_PRE = 1 << 15, /* set during the last 3 VOBU preceeding an interleaved block. */ + DSI_ILVU_BLOCK = 1 << 14, /* set for all VOBU in an interleaved block */ + DSI_ILVU_FIRST = 1 << 13, /* set for the first VOBU for a given angle or scene within a ILVU, or the first VOBU in the preparation (PREU) sequence */ + DSI_ILVU_LAST = 1 << 12, /* set for the last VOBU for a given angle or scene within a ILVU, or the last VOBU in the preparation (PREU) sequence */ + DSI_ILVU_MASK = 0xf000 +} DSI_ILVU; + typedef struct read_cache_s read_cache_t; /* diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/remap.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/remap.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/remap.c 2011-06-11 15:42:20.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/remap.c 2013-03-17 14:06:49.000000000 +0000 @@ -22,6 +22,7 @@ #include #include +#include #include #ifndef _MSC_VER diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/vm/vm.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/vm/vm.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/vm/vm.c 2010-11-21 23:59:43.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdnav/vm/vm.c 2013-02-05 21:25:29.000000000 +0000 @@ -1762,7 +1762,8 @@ pgcit_t *pgcit; pgcit = get_PGCIT(vm); - assert(pgcit != NULL); /* ?? Make this return -1 instead */ + if (pgcit == NULL) + return 0; if(pgcN < 1 || pgcN > pgcit->nr_of_pgci_srp) { #ifdef TRACE diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_input.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_input.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_input.c 2009-06-08 22:02:37.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_input.c 2013-03-21 19:23:12.000000000 +0000 @@ -43,7 +43,6 @@ #define DVDcss_open(a) dvdcss_open((char*)(a)) #define DVDcss_close dvdcss_close #define DVDcss_seek dvdcss_seek -#define DVDcss_title dvdcss_title #define DVDcss_read dvdcss_read #define DVDcss_error dvdcss_error #else @@ -56,19 +55,18 @@ #include "../../msvc/contrib/dlfcn.c" #endif -typedef struct dvdcss_s *dvdcss_handle; -static dvdcss_handle (*DVDcss_open) (const char *); -static int (*DVDcss_close) (dvdcss_handle); -static int (*DVDcss_seek) (dvdcss_handle, int, int); -static int (*DVDcss_title) (dvdcss_handle, int); -static int (*DVDcss_read) (dvdcss_handle, void *, int, int); -static char * (*DVDcss_error) (dvdcss_handle); +typedef struct dvdcss_s *dvdcss_t; +static dvdcss_t (*DVDcss_open) (const char *); +static int (*DVDcss_close) (dvdcss_t); +static int (*DVDcss_seek) (dvdcss_t, int, int); +static int (*DVDcss_read) (dvdcss_t, void *, int, int); +static char * (*DVDcss_error) (dvdcss_t); #endif /* The DVDinput handle, add stuff here for new input methods. */ struct dvd_input_s { /* libdvdcss handle */ - dvdcss_handle dvdcss; + dvdcss_t dvdcss; /* dummy file input */ int fd; @@ -122,7 +120,7 @@ */ static int css_title(dvd_input_t dev, int block) { - return DVDcss_title(dev->dvdcss, block); + return DVDcss_seek(dev->dvdcss, block, DVDCSS_SEEK_KEY); } /** @@ -272,13 +270,10 @@ int dvdinput_setup(void) { void *dvdcss_library = NULL; - char **dvdcss_version = NULL; #ifdef HAVE_DVDCSS_DVDCSS_H /* linking to libdvdcss */ dvdcss_library = &dvdcss_library; /* Give it some value != NULL */ - /* the DVDcss_* functions have been #defined at the top */ - dvdcss_version = &dvdcss_interface_2; #else /* dlopening libdvdcss */ @@ -300,21 +295,17 @@ #else #define U_S #endif - DVDcss_open = (dvdcss_handle (*)(const char*)) + DVDcss_open = (dvdcss_t (*)(const char*)) dlsym(dvdcss_library, U_S "dvdcss_open"); - DVDcss_close = (int (*)(dvdcss_handle)) + DVDcss_close = (int (*)(dvdcss_t)) dlsym(dvdcss_library, U_S "dvdcss_close"); - DVDcss_title = (int (*)(dvdcss_handle, int)) - dlsym(dvdcss_library, U_S "dvdcss_title"); - DVDcss_seek = (int (*)(dvdcss_handle, int, int)) + DVDcss_seek = (int (*)(dvdcss_t, int, int)) dlsym(dvdcss_library, U_S "dvdcss_seek"); - DVDcss_read = (int (*)(dvdcss_handle, void*, int, int)) + DVDcss_read = (int (*)(dvdcss_t, void*, int, int)) dlsym(dvdcss_library, U_S "dvdcss_read"); - DVDcss_error = (char* (*)(dvdcss_handle)) + DVDcss_error = (char* (*)(dvdcss_t)) dlsym(dvdcss_library, U_S "dvdcss_error"); - dvdcss_version = (char **)dlsym(dvdcss_library, U_S "dvdcss_interface_2"); - if(dlsym(dvdcss_library, U_S "dvdcss_crack")) { fprintf(stderr, "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n" @@ -322,8 +313,8 @@ "http://www.videolan.org/\n" ); dlclose(dvdcss_library); dvdcss_library = NULL; - } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek - || !DVDcss_read || !DVDcss_error || !dvdcss_version) { + } else if(!DVDcss_open || !DVDcss_close || !DVDcss_seek + || !DVDcss_read || !DVDcss_error) { fprintf(stderr, "libdvdread: Missing symbols in %s, " "this shouldn't happen !\n", CSS_LIB); dlclose(dvdcss_library); @@ -338,8 +329,6 @@ fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method); fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); */ - fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", - dvdcss_version ? *dvdcss_version : ""); /* libdvdcss wrapper functions */ dvdinput_open = css_open; diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_reader.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_reader.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_reader.c 2011-06-15 18:09:15.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_reader.c 2013-03-17 14:08:05.000000000 +0000 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_udf.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_udf.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_udf.c 2011-10-06 12:10:01.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvd_udf.c 2013-03-17 14:08:05.000000000 +0000 @@ -31,6 +31,7 @@ #include #include #include +#include #include #include diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvdread/ifo_types.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvdread/ifo_types.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvdread/ifo_types.h 2011-01-30 23:44:13.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/dvdread/ifo_types.h 2012-12-09 21:07:59.000000000 +0000 @@ -301,6 +301,7 @@ pgc_program_map_t *program_map; cell_playback_t *cell_playback; cell_position_t *cell_position; + int ref_count; } ATTRIBUTE_PACKED pgc_t; #define PGC_SIZE 236U @@ -326,6 +327,7 @@ uint16_t zero_1; uint32_t last_byte; pgci_srp_t *pgci_srp; + int ref_count; } ATTRIBUTE_PACKED pgcit_t; #define PGCIT_SIZE 8U diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/ifo_read.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/ifo_read.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/ifo_read.c 2011-10-07 16:56:02.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/mplayer/libdvdread4/ifo_read.c 2012-12-12 14:21:16.000000000 +0000 @@ -87,9 +87,9 @@ static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit, unsigned int offset); -static void ifoFree_PGC(pgc_t *pgc); +static void ifoFree_PGC(pgc_t **pgc); static void ifoFree_PGC_COMMAND_TBL(pgc_command_tbl_t *cmd_tbl); -static void ifoFree_PGCIT_internal(pgcit_t *pgcit); +static void ifoFree_PGCIT_internal(pgcit_t **pgcit); static inline int DVDFileSeekForce_( dvd_file_t *dvd_file, uint32_t offset, int force_size ) { return (DVDFileSeekForce(dvd_file, (int)offset, force_size) == (int)offset); @@ -923,7 +923,6 @@ if(!ifoRead_PGC_COMMAND_TBL(ifofile, pgc->command_tbl, offset + pgc->command_tbl_offset)) { - free(pgc->command_tbl); return 0; } } else { @@ -933,13 +932,10 @@ if(pgc->program_map_offset != 0 && pgc->nr_of_programs>0) { pgc->program_map = malloc(pgc->nr_of_programs * sizeof(pgc_program_map_t)); if(!pgc->program_map) { - ifoFree_PGC_COMMAND_TBL(pgc->command_tbl); return 0; } if(!ifoRead_PGC_PROGRAM_MAP(ifofile, pgc->program_map,pgc->nr_of_programs, offset + pgc->program_map_offset)) { - ifoFree_PGC_COMMAND_TBL(pgc->command_tbl); - free(pgc->program_map); return 0; } } else { @@ -949,18 +945,11 @@ if(pgc->cell_playback_offset != 0 && pgc->nr_of_cells>0) { pgc->cell_playback = malloc(pgc->nr_of_cells * sizeof(cell_playback_t)); if(!pgc->cell_playback) { - ifoFree_PGC_COMMAND_TBL(pgc->command_tbl); - if(pgc->program_map) - free(pgc->program_map); return 0; } if(!ifoRead_CELL_PLAYBACK_TBL(ifofile, pgc->cell_playback, pgc->nr_of_cells, offset + pgc->cell_playback_offset)) { - ifoFree_PGC_COMMAND_TBL(pgc->command_tbl); - if(pgc->program_map) - free(pgc->program_map); - free(pgc->cell_playback); return 0; } } else { @@ -970,13 +959,11 @@ if(pgc->cell_position_offset != 0 && pgc->nr_of_cells>0) { pgc->cell_position = malloc(pgc->nr_of_cells * sizeof(cell_position_t)); if(!pgc->cell_position) { - ifoFree_PGC(pgc); return 0; } if(!ifoRead_CELL_POSITION_TBL(ifofile, pgc->cell_position, pgc->nr_of_cells, offset + pgc->cell_position_offset)) { - ifoFree_PGC(pgc); return 0; } } else { @@ -999,29 +986,33 @@ if(ifofile->vmgi_mat->first_play_pgc == 0) return 1; - ifofile->first_play_pgc = (pgc_t *)malloc(sizeof(pgc_t)); + ifofile->first_play_pgc = (pgc_t *)calloc(1, sizeof(pgc_t)); if(!ifofile->first_play_pgc) return 0; + ifofile->first_play_pgc->ref_count = 1; if(!ifoRead_PGC(ifofile, ifofile->first_play_pgc, ifofile->vmgi_mat->first_play_pgc)) { - free(ifofile->first_play_pgc); - ifofile->first_play_pgc = 0; + ifoFree_PGC(&ifofile->first_play_pgc); return 0; } return 1; } -static void ifoFree_PGC(pgc_t *pgc) { - if(pgc) { - ifoFree_PGC_COMMAND_TBL(pgc->command_tbl); - if(pgc->program_map) - free(pgc->program_map); - if(pgc->cell_playback) - free(pgc->cell_playback); - if(pgc->cell_position) - free(pgc->cell_position); +static void ifoFree_PGC(pgc_t **pgc) { + if(pgc && *pgc && (--(*pgc)->ref_count) <= 0) { + ifoFree_PGC_COMMAND_TBL((*pgc)->command_tbl); + if((*pgc)->program_map) + free((*pgc)->program_map); + if((*pgc)->cell_playback) + free((*pgc)->cell_playback); + if((*pgc)->cell_position) + free((*pgc)->cell_position); + free(*pgc); + } + if (pgc) { + *pgc = NULL; } } @@ -1030,9 +1021,7 @@ return; if(ifofile->first_play_pgc) { - ifoFree_PGC(ifofile->first_play_pgc); - free(ifofile->first_play_pgc); - ifofile->first_play_pgc = 0; + ifoFree_PGC(&ifofile->first_play_pgc); } } @@ -1082,6 +1071,12 @@ return 0; } + if(tt_srpt->nr_of_srpts>info_length/sizeof(title_info_t)){ + fprintf(stderr,"libdvdread: data mismatch: info_length (%ld)!= nr_of_srpts (%d). Truncating.\n", + info_length/sizeof(title_info_t),tt_srpt->nr_of_srpts); + tt_srpt->nr_of_srpts=info_length/sizeof(title_info_t); + } + for(i = 0; i < tt_srpt->nr_of_srpts; i++) { B2N_16(tt_srpt->title[i].nr_of_ptts); B2N_16(tt_srpt->title[i].parental_id); @@ -1250,6 +1245,13 @@ CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgcn < 1000); /* ?? */ CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn != 0); CHECK_VALUE(vts_ptt_srpt->title[i].ptt[j].pgn < 100); /* ?? */ + if (vts_ptt_srpt->title[i].ptt[j].pgcn == 0 || + vts_ptt_srpt->title[i].ptt[j].pgcn >= 1000 || + vts_ptt_srpt->title[i].ptt[j].pgn == 0 || + vts_ptt_srpt->title[i].ptt[j].pgn >= 100) { + return 0; + } + } } @@ -1434,7 +1436,6 @@ if(ifofile->vtsi_mat->vts_tmapt == 0) { /* optional(?) */ ifofile->vts_tmapt = NULL; - fprintf(stderr,"Please send bug report - no VTS_TMAPT ?? \n"); return 1; } @@ -1818,10 +1819,11 @@ if(ifofile->vtsi_mat->vts_pgcit == 0) /* mandatory */ return 0; - ifofile->vts_pgcit = (pgcit_t *)malloc(sizeof(pgcit_t)); + ifofile->vts_pgcit = (pgcit_t *)calloc(1, sizeof(pgcit_t)); if(!ifofile->vts_pgcit) return 0; + ifofile->vts_pgcit->ref_count = 1; if(!ifoRead_PGCIT_internal(ifofile, ifofile->vts_pgcit, ifofile->vtsi_mat->vts_pgcit * DVD_BLOCK_LEN)) { free(ifofile->vts_pgcit); @@ -1832,6 +1834,17 @@ return 1; } +static int find_dup_pgc(pgci_srp_t *pgci_srp, uint32_t start_byte, int count) { + int i; + + for(i = 0; i < count; i++) { + if(pgci_srp[i].pgc_start_byte == start_byte) { + return i; + } + } + return -1; +} + static int ifoRead_PGCIT_internal(ifo_handle_t *ifofile, pgcit_t *pgcit, unsigned int offset) { int i, info_length; @@ -1880,21 +1893,26 @@ CHECK_VALUE(pgcit->pgci_srp[i].pgc_start_byte + PGC_SIZE <= pgcit->last_byte+1); for(i = 0; i < pgcit->nr_of_pgci_srp; i++) { - pgcit->pgci_srp[i].pgc = malloc(sizeof(pgc_t)); + int dup; + if((dup = find_dup_pgc(pgcit->pgci_srp, pgcit->pgci_srp[i].pgc_start_byte, i)) >= 0) { + pgcit->pgci_srp[i].pgc = pgcit->pgci_srp[dup].pgc; + pgcit->pgci_srp[i].pgc->ref_count++; + continue; + } + pgcit->pgci_srp[i].pgc = calloc(1, sizeof(pgc_t)); if(!pgcit->pgci_srp[i].pgc) { int j; for(j = 0; j < i; j++) { - ifoFree_PGC(pgcit->pgci_srp[j].pgc); - free(pgcit->pgci_srp[j].pgc); + ifoFree_PGC(&pgcit->pgci_srp[j].pgc); } goto fail; } + pgcit->pgci_srp[i].pgc->ref_count = 1; if(!ifoRead_PGC(ifofile, pgcit->pgci_srp[i].pgc, offset + pgcit->pgci_srp[i].pgc_start_byte)) { int j; - for(j = 0; j < i; j++) { - ifoFree_PGC(pgcit->pgci_srp[j].pgc); - free(pgcit->pgci_srp[j].pgc); + for(j = 0; j <= i; j++) { + ifoFree_PGC(&pgcit->pgci_srp[j].pgc); } free(pgcit->pgci_srp[i].pgc); goto fail; @@ -1908,16 +1926,18 @@ return 0; } -static void ifoFree_PGCIT_internal(pgcit_t *pgcit) { - if(pgcit) { +static void ifoFree_PGCIT_internal(pgcit_t **pgcit) { + if(pgcit && *pgcit && (--(*pgcit)->ref_count <= 0)) { int i; - for(i = 0; i < pgcit->nr_of_pgci_srp; i++) + for(i = 0; i < (*pgcit)->nr_of_pgci_srp; i++) { - ifoFree_PGC(pgcit->pgci_srp[i].pgc); - free(pgcit->pgci_srp[i].pgc); + ifoFree_PGC(&(*pgcit)->pgci_srp[i].pgc); } - free(pgcit->pgci_srp); + free((*pgcit)->pgci_srp); + free(*pgcit); } + if (pgcit) + *pgcit = NULL; } void ifoFree_PGCIT(ifo_handle_t *ifofile) { @@ -1925,12 +1945,20 @@ return; if(ifofile->vts_pgcit) { - ifoFree_PGCIT_internal(ifofile->vts_pgcit); - free(ifofile->vts_pgcit); - ifofile->vts_pgcit = 0; + ifoFree_PGCIT_internal(&ifofile->vts_pgcit); } } +static int find_dup_lut(pgci_lu_t *lu, uint32_t start_byte, int count) { + int i; + + for(i = 0; i < count; i++) { + if(lu[i].lang_start_byte == start_byte) { + return i; + } + } + return -1; +} int ifoRead_PGCI_UT(ifo_handle_t *ifofile) { pgci_ut_t *pgci_ut; @@ -2024,27 +2052,31 @@ } for(i = 0; i < pgci_ut->nr_of_lus; i++) { + int dup; + if((dup = find_dup_lut(pgci_ut->lu, pgci_ut->lu[i].lang_start_byte, i)) >= 0) { + pgci_ut->lu[i].pgcit = pgci_ut->lu[dup].pgcit; + pgci_ut->lu[i].pgcit->ref_count++; + continue; + } pgci_ut->lu[i].pgcit = malloc(sizeof(pgcit_t)); if(!pgci_ut->lu[i].pgcit) { unsigned int j; for(j = 0; j < i; j++) { - ifoFree_PGCIT_internal(pgci_ut->lu[j].pgcit); - free(pgci_ut->lu[j].pgcit); + ifoFree_PGCIT_internal(&pgci_ut->lu[j].pgcit); } free(pgci_ut->lu); free(pgci_ut); ifofile->pgci_ut = 0; return 0; } + pgci_ut->lu[i].pgcit->ref_count = 1; if(!ifoRead_PGCIT_internal(ifofile, pgci_ut->lu[i].pgcit, sector * DVD_BLOCK_LEN + pgci_ut->lu[i].lang_start_byte)) { unsigned int j; - for(j = 0; j < i; j++) { - ifoFree_PGCIT_internal(pgci_ut->lu[j].pgcit); - free(pgci_ut->lu[j].pgcit); + for(j = 0; j <= i; j++) { + ifoFree_PGCIT_internal(&pgci_ut->lu[j].pgcit); } - free(pgci_ut->lu[i].pgcit); free(pgci_ut->lu); free(pgci_ut); ifofile->pgci_ut = 0; @@ -2066,8 +2098,7 @@ if(ifofile->pgci_ut) { for(i = 0; i < ifofile->pgci_ut->nr_of_lus; i++) { - ifoFree_PGCIT_internal(ifofile->pgci_ut->lu[i].pgcit); - free(ifofile->pgci_ut->lu[i].pgcit); + ifoFree_PGCIT_internal(&ifofile->pgci_ut->lu[i].pgcit); } free(ifofile->pgci_ut->lu); free(ifofile->pgci_ut); diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/asm.S ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/asm.S --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/asm.S 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/asm.S 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * asm.S: arm utility macros ***************************************************************************** - * Copyright (C) 2008-2012 x264 project + * Copyright (C) 2008-2013 x264 project * * Authors: Mans Rullgard * David Conrad diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/cpu-a.S ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/cpu-a.S --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/cpu-a.S 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/cpu-a.S 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * cpu-a.S: arm cpu detection ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/dct-a.S ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/dct-a.S --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/dct-a.S 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/dct-a.S 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /**************************************************************************** * dct-a.S: arm transform and zigzag ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/dct.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/dct.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/dct.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/dct.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * dct.h: arm transform and zigzag ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/deblock-a.S ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/deblock-a.S --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/deblock-a.S 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/deblock-a.S 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * deblock.S: arm deblocking ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: Mans Rullgard * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc-a.S ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc-a.S --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc-a.S 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc-a.S 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc.S: arm motion compensation ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * Mans Rullgard diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc-c.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc-c.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc-c.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc-c.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc-c.c: arm motion compensation ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/mc.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc.h: arm motion compensation ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/pixel-a.S ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/pixel-a.S --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/pixel-a.S 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/pixel-a.S 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.S: arm pixel metrics ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * @@ -68,45 +68,45 @@ .macro SAD_START_4 align:vararg - vld1.32 {d1[]}, [r2 \align], r3 + vld1.32 {d1[]}, [r2\align], r3 vld1.32 {d0[]}, [r0,:32], r1 vabdl.u8 q8, d0, d1 .endm .macro SAD_4 align:vararg - vld1.32 {d1[]}, [r2 \align], r3 + vld1.32 {d1[]}, [r2\align], r3 vld1.32 {d0[]}, [r0,:32], r1 vabal.u8 q8, d0, d1 .endm .macro SAD_START_8 align:vararg - vld1.64 {d1}, [r2 \align], r3 + vld1.64 {d1}, [r2\align], r3 vld1.64 {d0}, [r0,:64], r1 vabdl.u8 q8, d0, d1 .endm .macro SAD_8 align:vararg - vld1.64 {d1}, [r2 \align], r3 + vld1.64 {d1}, [r2\align], r3 vld1.64 {d0}, [r0,:64], r1 vabal.u8 q8, d0, d1 .endm .macro SAD_START_16 align:vararg - vld1.64 {d2-d3}, [r2 \align], r3 + vld1.64 {d2-d3}, [r2\align], r3 vld1.64 {d0-d1}, [r0,:128], r1 vabdl.u8 q8, d0, d2 - vld1.64 {d6-d7}, [r2 \align], r3 + vld1.64 {d6-d7}, [r2\align], r3 vabdl.u8 q9, d1, d3 vld1.64 {d4-d5}, [r0,:128], r1 .endm .macro SAD_16 align:vararg vabal.u8 q8, d4, d6 - vld1.64 {d2-d3}, [r2 \align], r3 + vld1.64 {d2-d3}, [r2\align], r3 vabal.u8 q9, d5, d7 vld1.64 {d0-d1}, [r0,:128], r1 vabal.u8 q8, d0, d2 - vld1.64 {d6-d7}, [r2 \align], r3 + vld1.64 {d6-d7}, [r2\align], r3 vabal.u8 q9, d1, d3 vld1.64 {d4-d5}, [r0,:128], r1 .endm diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/pixel.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/pixel.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/pixel.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/pixel.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: arm pixel metrics ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict-a.S ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict-a.S --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict-a.S 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict-a.S 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict.S: arm intra prediction ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * Mans Rullgard diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict-c.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict-c.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict-c.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict-c.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict.c: arm intra prediction ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/predict.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict.h: arm intra prediction ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/quant-a.S ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/quant-a.S --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/quant-a.S 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/quant-a.S 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /**************************************************************************** * quant.S: arm quantization and level-run ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/quant.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/quant.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/arm/quant.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/arm/quant.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * quant.h: arm quantization and level-run ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: David Conrad * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/bitstream.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/bitstream.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/bitstream.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/bitstream.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * bitstream.c: bitstream writing ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/bitstream.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/bitstream.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/bitstream.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/bitstream.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * bitstream.h: bitstream writing ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/cabac.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/cabac.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/cabac.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/cabac.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * cabac.c: arithmetic coder ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/cabac.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/cabac.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/cabac.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/cabac.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * cabac.h: arithmetic coder ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/common.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/common.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/common.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/common.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * common.c: misc common functions ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/common.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/common.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/common.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/common.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * common.h: misc common functions ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/cpu.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/cpu.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/cpu.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/cpu.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * cpu.c: cpu detection ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar @@ -402,7 +402,7 @@ #elif SYS_WINDOWS return x264_pthread_num_processors_np(); -#elif SYS_CYGWIN +#elif SYS_CYGWIN || SYS_SunOS return sysconf( _SC_NPROCESSORS_ONLN ); #elif SYS_LINUX diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/cpu.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/cpu.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/cpu.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/cpu.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * cpu.h: cpu detection ***************************************************************************** - * Copyright (C) 2004-2012 x264 project + * Copyright (C) 2004-2013 x264 project * * Authors: Loren Merritt * @@ -46,6 +46,7 @@ #endif #define x264_sfence x264_cpu_sfence void x264_cpu_mask_misalign_sse( void ); +void x264_safe_intel_cpu_indicator_init( void ); /* kluge: * gcc can't give variables any greater alignment than the stack frame has. diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/dct.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/dct.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/dct.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/dct.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * dct.c: transform and zigzag ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/dct.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/dct.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/dct.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/dct.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * dct.h: transform and zigzag ***************************************************************************** - * Copyright (C) 2004-2012 x264 project + * Copyright (C) 2004-2013 x264 project * * Authors: Loren Merritt * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/deblock.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/deblock.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/deblock.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/deblock.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * deblock.c: deblocking ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -779,13 +779,13 @@ pf->deblock_h_chroma_422 = x264_deblock_h_chroma_422_sse2; pf->deblock_h_chroma_422_intra = x264_deblock_h_chroma_422_intra_sse2; pf->deblock_chroma_420_mbaff = x264_deblock_h_chroma_mbaff_sse2; + pf->deblock_luma[1] = x264_deblock_v_luma_sse2; + pf->deblock_luma[0] = x264_deblock_h_luma_sse2; + pf->deblock_luma_intra[1] = x264_deblock_v_luma_intra_sse2; + pf->deblock_luma_intra[0] = x264_deblock_h_luma_intra_sse2; if( !(cpu&X264_CPU_STACK_MOD4) ) { - pf->deblock_luma[1] = x264_deblock_v_luma_sse2; - pf->deblock_luma[0] = x264_deblock_h_luma_sse2; pf->deblock_chroma[1] = x264_deblock_v_chroma_sse2; - pf->deblock_luma_intra[1] = x264_deblock_v_luma_intra_sse2; - pf->deblock_luma_intra[0] = x264_deblock_h_luma_intra_sse2; pf->deblock_chroma_intra[1] = x264_deblock_v_chroma_intra_sse2; pf->deblock_h_chroma_420_intra = x264_deblock_h_chroma_intra_sse2; #if HIGH_BIT_DEPTH @@ -801,13 +801,13 @@ pf->deblock_h_chroma_420 = x264_deblock_h_chroma_avx; pf->deblock_h_chroma_422 = x264_deblock_h_chroma_422_avx; pf->deblock_h_chroma_422_intra = x264_deblock_h_chroma_422_intra_avx; + pf->deblock_luma[1] = x264_deblock_v_luma_avx; + pf->deblock_luma[0] = x264_deblock_h_luma_avx; + pf->deblock_luma_intra[1] = x264_deblock_v_luma_intra_avx; + pf->deblock_luma_intra[0] = x264_deblock_h_luma_intra_avx; if( !(cpu&X264_CPU_STACK_MOD4) ) { - pf->deblock_luma[1] = x264_deblock_v_luma_avx; - pf->deblock_luma[0] = x264_deblock_h_luma_avx; pf->deblock_chroma[1] = x264_deblock_v_chroma_avx; - pf->deblock_luma_intra[1] = x264_deblock_v_luma_intra_avx; - pf->deblock_luma_intra[0] = x264_deblock_h_luma_intra_avx; pf->deblock_chroma_intra[1] = x264_deblock_v_chroma_intra_avx; pf->deblock_h_chroma_420_intra = x264_deblock_h_chroma_intra_avx; #if HIGH_BIT_DEPTH diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/display-x11.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/display-x11.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/display-x11.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/display-x11.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * display-x11.c: x11 interface ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Tuukka Toivonen * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/display.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/display.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/display.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/display.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * display.h: x11 visualization interface ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Tuukka Toivonen * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/frame.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/frame.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/frame.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/frame.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * frame.c: frame handling ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/frame.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/frame.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/frame.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/frame.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * frame.h: frame handling ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/macroblock.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/macroblock.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/macroblock.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/macroblock.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * macroblock.c: macroblock common functions ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Jason Garrett-Glaser * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/macroblock.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/macroblock.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/macroblock.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/macroblock.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * macroblock.h: macroblock common functions ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/mc.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/mc.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/mc.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/mc.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc.c: motion compensation ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/mc.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/mc.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/mc.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/mc.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc.h: motion compensation ***************************************************************************** - * Copyright (C) 2004-2012 x264 project + * Copyright (C) 2004-2013 x264 project * * Authors: Loren Merritt * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/mvpred.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/mvpred.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/mvpred.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/mvpred.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mvpred.c: motion vector prediction ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/osdep.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/osdep.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/osdep.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/osdep.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * osdep.c: platform-specific code ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Steven Walters * Laurent Aimar @@ -90,6 +90,7 @@ } #endif +#if HAVE_MMX #ifdef __INTEL_COMPILER /* Agner's patch to Intel's CPU dispatcher from pages 131-132 of * http://agner.org/optimize/optimizing_cpp.pdf (2011-01-30) @@ -98,7 +99,7 @@ // Global variable indicating cpu int __intel_cpu_indicator = 0; // CPU dispatcher function -void __intel_cpu_indicator_init( void ) +void x264_intel_cpu_indicator_init( void ) { unsigned int cpu = x264_cpu_detect(); if( cpu&X264_CPU_AVX ) @@ -120,4 +121,16 @@ else __intel_cpu_indicator = 1; } + +/* __intel_cpu_indicator_init appears to have a non-standard calling convention that + * assumes certain registers aren't preserved, so we'll route it through a function + * that backs up all the registers. */ +void __intel_cpu_indicator_init( void ) +{ + x264_safe_intel_cpu_indicator_init(); +} +#else +void x264_intel_cpu_indicator_init( void ) +{} +#endif #endif diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/osdep.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/osdep.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/osdep.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/osdep.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * osdep.h: platform-specific code ***************************************************************************** - * Copyright (C) 2007-2012 x264 project + * Copyright (C) 2007-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar @@ -149,7 +149,7 @@ return 0; } #define x264_pthread_join(t,s) { long tmp; \ - wait_for_thread(t,(s)?(long*)(*(s)):&tmp); } + wait_for_thread(t,(s)?(long*)(s):&tmp); } #elif HAVE_POSIXTHREAD #include diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/pixel.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/pixel.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/pixel.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/pixel.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.c: pixel metrics ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/pixel.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/pixel.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/pixel.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/pixel.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.c: pixel metrics ***************************************************************************** - * Copyright (C) 2004-2012 x264 project + * Copyright (C) 2004-2013 x264 project * * Authors: Loren Merritt * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/dct.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/dct.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/dct.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/dct.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * dct.c: ppc transform and zigzag ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Guillaume Poirier * Eric Petit diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/dct.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/dct.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/dct.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/dct.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * dct.h: ppc transform and zigzag ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Eric Petit * Guillaume Poirier diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/deblock.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/deblock.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/deblock.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/deblock.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * deblock.c: ppc deblocking ***************************************************************************** - * Copyright (C) 2007-2012 x264 project + * Copyright (C) 2007-2013 x264 project * * Authors: Guillaume Poirier * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/mc.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/mc.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/mc.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/mc.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc.c: ppc motion compensation ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Eric Petit * Guillaume Poirier diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/mc.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/mc.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/mc.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/mc.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc.h: ppc motion compensation ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Eric Petit * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/pixel.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/pixel.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/pixel.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/pixel.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.c: ppc pixel metrics ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Eric Petit * Guillaume Poirier diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/pixel.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/pixel.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/pixel.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/pixel.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: ppc pixel metrics ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Eric Petit * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/ppccommon.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/ppccommon.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/ppccommon.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/ppccommon.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * ppccommon.h: ppc utility macros ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Eric Petit * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/predict.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/predict.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/predict.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/predict.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict.c: ppc intra prediction ***************************************************************************** - * Copyright (C) 2007-2012 x264 project + * Copyright (C) 2007-2013 x264 project * * Authors: Guillaume Poirier * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/predict.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/predict.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/predict.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/predict.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict.h: ppc intra prediction ***************************************************************************** - * Copyright (C) 2007-2012 x264 project + * Copyright (C) 2007-2013 x264 project * * Authors: Guillaume Poirier * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/quant.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/quant.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/quant.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/quant.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * quant.c: ppc quantization ***************************************************************************** - * Copyright (C) 2007-2012 x264 project + * Copyright (C) 2007-2013 x264 project * * Authors: Guillaume Poirier * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/quant.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/quant.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/ppc/quant.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/ppc/quant.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * quant.c: ppc quantization ***************************************************************************** - * Copyright (C) 2007-2012 x264 project + * Copyright (C) 2007-2013 x264 project * * Authors: Guillaume Poirier * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/predict.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/predict.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/predict.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/predict.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict.c: intra prediction ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/predict.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/predict.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/predict.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/predict.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict.h: intra prediction ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/quant.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/quant.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/quant.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/quant.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * quant.c: quantization and level-run ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Loren Merritt * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/quant.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/quant.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/quant.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/quant.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * quant.h: quantization and level-run ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Loren Merritt * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/rectangle.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/rectangle.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/rectangle.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/rectangle.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * rectangle.c: rectangle filling ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Jason Garrett-Glaser * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/rectangle.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/rectangle.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/rectangle.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/rectangle.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * rectangle.h: rectangle filling ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Jason Garrett-Glaser * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/set.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/set.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/set.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/set.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * set.c: quantization init ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Loren Merritt * @@ -241,7 +241,7 @@ if( !h->mb.b_lossless ) { - while( h->chroma_qp_table[h->param.rc.i_qp_min] <= max_chroma_qp_err ) + while( h->chroma_qp_table[SPEC_QP(h->param.rc.i_qp_min)] <= max_chroma_qp_err ) h->param.rc.i_qp_min++; if( min_qp_err <= h->param.rc.i_qp_max ) h->param.rc.i_qp_max = min_qp_err-1; diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/set.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/set.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/set.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/set.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * set.h: quantization init ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/sparc/pixel.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/sparc/pixel.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/sparc/pixel.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/sparc/pixel.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.asm: sparc pixel metrics ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Phil Jensen * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/sparc/pixel.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/sparc/pixel.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/sparc/pixel.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/sparc/pixel.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: sparc pixel metrics ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Phil Jensen * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/threadpool.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/threadpool.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/threadpool.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/threadpool.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * threadpool.c: thread pooling ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * @@ -47,7 +47,7 @@ x264_sync_frame_list_t done; /* list of jobs that have finished processing */ }; -static void x264_threadpool_thread( x264_threadpool_t *pool ) +static void *x264_threadpool_thread( x264_threadpool_t *pool ) { if( pool->init_func ) pool->init_func( pool->init_arg ); @@ -69,6 +69,7 @@ job->ret = (void*)x264_stack_align( job->func, job->arg ); /* execute the function */ x264_sync_frame_list_push( &pool->done, (void*)job ); } + return NULL; } int x264_threadpool_init( x264_threadpool_t **p_pool, int threads, diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/threadpool.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/threadpool.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/threadpool.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/threadpool.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * threadpool.h: thread pooling ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/visualize.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/visualize.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/visualize.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/visualize.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * visualize.c: visualization ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Tuukka Toivonen * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/visualize.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/visualize.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/visualize.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/visualize.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * visualize.h: visualization ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Tuukka Toivonen * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/vlc.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/vlc.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/vlc.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/vlc.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * vlc.c : vlc tables ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/win32thread.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/win32thread.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/win32thread.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/win32thread.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * win32thread.c: windows threading ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * Pegasys Inc. @@ -62,7 +62,7 @@ static unsigned __stdcall x264_win32thread_worker( void *arg ) { x264_pthread_t *h = arg; - h->ret = h->func( h->arg ); + *h->p_ret = h->func( h->arg ); return 0; } @@ -71,6 +71,8 @@ { thread->func = start_routine; thread->arg = arg; + thread->p_ret = &thread->ret; + thread->ret = NULL; thread->handle = (void*)_beginthreadex( NULL, 0, x264_win32thread_worker, thread, 0, NULL ); return !thread->handle; } @@ -81,7 +83,7 @@ if( ret != WAIT_OBJECT_0 ) return -1; if( value_ptr ) - *value_ptr = thread.ret; + *value_ptr = *thread.p_ret; CloseHandle( thread.handle ); return 0; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/win32thread.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/win32thread.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/win32thread.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/win32thread.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * win32thread.h: windows threading ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * @@ -36,6 +36,7 @@ void *handle; void *(*func)( void* arg ); void *arg; + void **p_ret; void *ret; } x264_pthread_t; #define x264_pthread_attr_t int diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/bitstream-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/bitstream-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/bitstream-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/bitstream-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* bitstream-a.asm: x86 bitstream functions ;***************************************************************************** -;* Copyright (C) 2010-2012 x264 project +;* Copyright (C) 2010-2013 x264 project ;* ;* Authors: Jason Garrett-Glaser ;* Henrik Gramner diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/cabac-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/cabac-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/cabac-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/cabac-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* cabac-a.asm: x86 cabac ;***************************************************************************** -;* Copyright (C) 2008-2012 x264 project +;* Copyright (C) 2008-2013 x264 project ;* ;* Authors: Loren Merritt ;* Jason Garrett-Glaser @@ -139,13 +139,13 @@ ; can only be 0 or 1 and is zero over 99% of the time. test dword [t0+cb.range], 0x100 je .renorm - REP_RET + RET .renorm: shl dword [t0+cb.low], 1 shl dword [t0+cb.range], 1 inc dword [t0+cb.queue] jge .putbyte - REP_RET + RET .putbyte: PROLOGUE 0,7 mov t3d, [t0+cb.queue] diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/const-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/const-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/const-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/const-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* const-a.asm: x86 global constants ;***************************************************************************** -;* Copyright (C) 2010-2012 x264 project +;* Copyright (C) 2010-2013 x264 project ;* ;* Authors: Loren Merritt ;* Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/cpu-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/cpu-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/cpu-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/cpu-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* cpu-a.asm: x86 cpu utilities ;***************************************************************************** -;* Copyright (C) 2003-2012 x264 project +;* Copyright (C) 2003-2013 x264 project ;* ;* Authors: Laurent Aimar ;* Loren Merritt @@ -139,3 +139,53 @@ ldmxcsr [rsp] add rsp, 4 ret + +cextern intel_cpu_indicator_init + +;----------------------------------------------------------------------------- +; void safe_intel_cpu_indicator_init( void ); +;----------------------------------------------------------------------------- +cglobal safe_intel_cpu_indicator_init + push r0 + push r1 + push r2 + push r3 + push r4 + push r5 + push r6 +%if ARCH_X86_64 + push r7 + push r8 + push r9 + push r10 + push r11 + push r12 + push r13 + push r14 +%endif + push rbp + mov rbp, rsp +%if WIN64 + sub rsp, 32 ; shadow space +%endif + and rsp, ~15 + call intel_cpu_indicator_init + leave +%if ARCH_X86_64 + pop r14 + pop r13 + pop r12 + pop r11 + pop r10 + pop r9 + pop r8 + pop r7 +%endif + pop r6 + pop r5 + pop r4 + pop r3 + pop r2 + pop r1 + pop r0 + ret diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-32.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-32.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-32.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-32.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* dct-32.asm: x86_32 transform and zigzag ;***************************************************************************** -;* Copyright (C) 2003-2012 x264 project +;* Copyright (C) 2003-2013 x264 project ;* ;* Authors: Loren Merritt ;* Holger Lubitz diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-64.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-64.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-64.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-64.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* dct-64.asm: x86_64 transform and zigzag ;***************************************************************************** -;* Copyright (C) 2003-2012 x264 project +;* Copyright (C) 2003-2013 x264 project ;* ;* Authors: Loren Merritt ;* Holger Lubitz diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* dct-a.asm: x86 transform and zigzag ;***************************************************************************** -;* Copyright (C) 2003-2012 x264 project +;* Copyright (C) 2003-2013 x264 project ;* ;* Authors: Holger Lubitz ;* Loren Merritt @@ -555,7 +555,7 @@ add r0, 4*FDEC_STRIDEB dec r2 jg .loop - REP_RET + RET %endmacro ; ADD_IDCT_DC INIT_XMM sse2 @@ -664,7 +664,7 @@ add r0, FDEC_STRIDE*4 dec r2 jg .loop - REP_RET + RET INIT_XMM sse2 cglobal add16x16_idct_dc, 2,2,8 @@ -1274,7 +1274,7 @@ mova m1, [r1+ 4*SIZEOF_DCTCOEF] ; 07 06 05 04 mova m2, [r1+ 8*SIZEOF_DCTCOEF] ; 11 10 09 08 pshuf%1 m3, m0, q3333 ; 03 03 03 03 - movd r2, m2 ; 09 08 + movd r2d, m2 ; 09 08 pshuf%1 m2, m2, q0321 ; 08 11 10 09 punpckl%2 m3, m1 ; 05 03 04 03 pinsr%1 m0, r2d, 3 ; 08 02 01 00 diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/dct.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * dct.h: x86 transform and zigzag ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/deblock-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/deblock-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/deblock-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/deblock-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* deblock-a.asm: x86 deblocking ;***************************************************************************** -;* Copyright (C) 2005-2012 x264 project +;* Copyright (C) 2005-2013 x264 project ;* ;* Authors: Loren Merritt ;* Jason Garrett-Glaser @@ -171,7 +171,7 @@ %define bm [rsp+mmsize*4] SUB rsp, pad add r1, r1 - LOAD_AB m4, m5, r2, r3 + LOAD_AB m4, m5, r2d, r3d mov r3, 32/mmsize mov r2, r0 sub r0, r1 @@ -227,7 +227,7 @@ %define bm [rsp+mmsize*6] SUB rsp, pad add r1, r1 - LOAD_AB m4, m5, r2, r3 + LOAD_AB m4, m5, r2d, r3d mov r3, r1 mova am, m4 add r3, r1 @@ -355,7 +355,7 @@ %define mask1 m10 %define mask2 m11 add r1, r1 - LOAD_AB m12, m13, r2, r3 + LOAD_AB m12, m13, r2d, r3d mov r2, r0 sub r0, r1 sub r0, r1 @@ -378,11 +378,11 @@ add r4, 2 dec r3 jg .loop - REP_RET + RET cglobal deblock_h_luma, 5,7,15 add r1, r1 - LOAD_AB m12, m13, r2, r3 + LOAD_AB m12, m13, r2d, r3d mov r2, r1 add r2, r1 add r2, r1 @@ -416,7 +416,7 @@ lea r5, [r5+r1*8] dec r6 jg .loop - REP_RET + RET %endmacro INIT_XMM sse2 @@ -650,7 +650,7 @@ add r4, mmsize dec r6 jg .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void deblock_h_luma_intra( uint16_t *pix, intptr_t stride, int alpha, int beta ) @@ -1205,20 +1205,18 @@ ;----------------------------------------------------------------------------- ; void deblock_v8_luma( uint8_t *pix, intptr_t stride, int alpha, int beta, int8_t *tc0 ) ;----------------------------------------------------------------------------- -cglobal deblock_%1_luma, 5,5 +cglobal deblock_%1_luma, 5,5,8,2*%2 lea r4, [r1*3] dec r2 ; alpha-1 neg r4 dec r3 ; beta-1 add r4, r0 ; pix-3*stride - %assign pad 2*%2+12-(stack_offset&15) - SUB esp, pad mova m0, [r4+r1] ; p1 mova m1, [r4+2*r1] ; p0 mova m2, [r0] ; q0 mova m3, [r0+r1] ; q1 - LOAD_MASK r2, r3 + LOAD_MASK r2d, r3d mov r3, r4mp movd m4, [r3] ; tc0 @@ -1251,22 +1249,19 @@ DEBLOCK_P0_Q0 mova [r4+2*r1], m1 mova [r0], m2 - ADD esp, pad RET ;----------------------------------------------------------------------------- ; void deblock_h_luma( uint8_t *pix, intptr_t stride, int alpha, int beta, int8_t *tc0 ) ;----------------------------------------------------------------------------- INIT_MMX cpuname -cglobal deblock_h_luma, 0,5 +cglobal deblock_h_luma, 0,5,8,0x60+HAVE_ALIGNED_STACK*12 mov r0, r0mp mov r3, r1m lea r4, [r3*3] sub r0, 4 lea r1, [r0+r4] - %assign pad 0x78-(stack_offset&15) - SUB esp, pad -%define pix_tmp esp+12 + %define pix_tmp esp+12*HAVE_ALIGNED_STACK ; transpose 6x16 -> tmp space TRANSPOSE6x8_MEM PASS8ROWS(r0, r1, r3, r4), pix_tmp @@ -1308,7 +1303,6 @@ movq m3, [pix_tmp+0x48] TRANSPOSE8x4B_STORE PASS8ROWS(r0, r1, r3, r4) - ADD esp, pad RET %endmacro ; DEBLOCK_LUMA @@ -1435,11 +1429,15 @@ %define t5 m11 %define mask0 m12 %define mask1p m13 +%if WIN64 + %define mask1q [rsp] +%else %define mask1q [rsp-24] +%endif %define mpb_0 m14 %define mpb_1 m15 %else - %define spill(x) [esp+16*x+((stack_offset+4)&15)] + %define spill(x) [esp+16*x] %define p2 [r4+r1] %define q2 [r0+2*r1] %define t4 spill(0) @@ -1454,10 +1452,7 @@ ;----------------------------------------------------------------------------- ; void deblock_v_luma_intra( uint8_t *pix, intptr_t stride, int alpha, int beta ) ;----------------------------------------------------------------------------- -cglobal deblock_%1_luma_intra, 4,6,16 -%if ARCH_X86_64 == 0 - sub esp, 0x60 -%endif +cglobal deblock_%1_luma_intra, 4,6,16,0-(1-ARCH_X86_64)*0x50-WIN64*0x10 lea r4, [r1*4] lea r5, [r1*3] ; 3*stride dec r2d ; alpha-1 @@ -1506,10 +1501,7 @@ LUMA_INTRA_SWAP_PQ LUMA_INTRA_P012 [r0], [r0+r1], [r0+2*r1], [r0+r5] .end: -%if ARCH_X86_64 == 0 - add esp, 0x60 -%endif - RET + REP_RET INIT_MMX cpuname %if ARCH_X86_64 @@ -1545,12 +1537,10 @@ add rsp, 0x88 RET %else -cglobal deblock_h_luma_intra, 2,4 +cglobal deblock_h_luma_intra, 2,4,8,0x80 lea r3, [r1*3] sub r0, 4 lea r2, [r0+r3] -%assign pad 0x8c-(stack_offset&15) - SUB rsp, pad %define pix_tmp rsp ; transpose 8x16 -> tmp space @@ -1581,7 +1571,6 @@ lea r0, [r0+r1*8] lea r2, [r2+r1*8] TRANSPOSE8x8_MEM PASS8ROWS(pix_tmp+8, pix_tmp+0x38, 0x10, 0x30), PASS8ROWS(r0, r2, r1, r3) - ADD rsp, pad RET %endif ; ARCH_X86_64 %endmacro ; DEBLOCK_LUMA_INTRA @@ -1675,7 +1664,7 @@ %macro DEBLOCK_CHROMA 0 cglobal deblock_inter_body - LOAD_AB m4, m5, r2, r3 + LOAD_AB m4, m5, r2d, r3d LOAD_MASK m0, m1, m2, m3, m4, m5, m7, m6, m4 pxor m4, m4 LOAD_TC m6, r4 @@ -1702,7 +1691,7 @@ add r4, mmsize/8 dec r6 jg .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void deblock_h_chroma( uint16_t *pix, intptr_t stride, int alpha, int beta, int8_t *tc0 ) @@ -1721,11 +1710,11 @@ add r4, mmsize/8 dec r5 jg .loop - REP_RET + RET cglobal deblock_intra_body - LOAD_AB m4, m5, r2, r3 + LOAD_AB m4, m5, r2d, r3d LOAD_MASK m0, m1, m2, m3, m4, m5, m7, m6, m4 CHROMA_DEBLOCK_P0_Q0_INTRA m1, m2, m0, m3, m7, m5, m6 ret @@ -1736,7 +1725,7 @@ cglobal deblock_v_chroma_intra, 4,6,8 add r1, r1 mov r5, 32/mmsize - movd m5, r3 + movd m5, r3d mov r4, r0 sub r0, r1 sub r0, r1 @@ -1749,7 +1738,7 @@ add r4, mmsize dec r5 jg .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void deblock_h_chroma_intra( uint16_t *pix, intptr_t stride, int alpha, int beta ) @@ -1767,7 +1756,7 @@ lea r0, [r0+r1*(mmsize/4)] dec r4 jg .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void deblock_h_chroma_intra_mbaff( uint16_t *pix, intptr_t stride, int alpha, int beta ) @@ -1781,7 +1770,7 @@ lea r5, [r1*3] %endif CHROMA_H_LOAD r5 - LOAD_AB m4, m5, r2, r3 + LOAD_AB m4, m5, r2d, r3d LOAD_MASK m0, m1, m2, m3, m4, m5, m7, m6, m4 CHROMA_DEBLOCK_P0_Q0_INTRA m1, m2, m0, m3, m7, m5, m6 CHROMA_H_STORE r5 @@ -1790,7 +1779,7 @@ dec r4 jg .loop %endif - REP_RET + RET ;----------------------------------------------------------------------------- ; void deblock_h_chroma_mbaff( uint16_t *pix, intptr_t stride, int alpha, int beta, int8_t *tc0 ) @@ -1803,7 +1792,7 @@ .loop: %endif CHROMA_H_LOAD r6 - LOAD_AB m4, m5, r2, r3 + LOAD_AB m4, m5, r2d, r3d LOAD_MASK m0, m1, m2, m3, m4, m5, m7, m6, m4 movd m6, [r4] punpcklbw m6, m6 @@ -1818,7 +1807,7 @@ dec r5 jg .loop %endif - REP_RET + RET ;----------------------------------------------------------------------------- ; void deblock_h_chroma_422_intra( uint16_t *pix, intptr_t stride, int alpha, int beta ) @@ -1836,7 +1825,7 @@ lea r0, [r0+r1*(mmsize/4)] dec r4 jg .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void deblock_h_chroma_422( uint16_t *pix, intptr_t stride, int alpha, int beta, int8_t *tc0 ) @@ -1847,7 +1836,7 @@ lea r6, [r1*3] .loop: CHROMA_H_LOAD r6 - LOAD_AB m4, m5, r2m, r3 + LOAD_AB m4, m5, r2m, r3d LOAD_MASK m0, m1, m2, m3, m4, m5, m7, m6, m4 pxor m4, m4 movd m6, [r4-1] @@ -1867,7 +1856,7 @@ %endif dec r5 jg .loop - REP_RET + RET %endmacro ; DEBLOCK_CHROMA %if ARCH_X86_64 == 0 @@ -2035,7 +2024,7 @@ add r4, mmsize/8 dec cntr jg .loop - REP_RET + RET %endmacro INIT_MMX mmx2 @@ -2116,7 +2105,7 @@ lea t5, [t5+r1*(mmsize/2)] dec r6d jg .loop - REP_RET + RET %endmacro ; DEBLOCK_CHROMA_INTRA INIT_XMM sse2 diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* mc-a.asm: x86 motion compensation ;***************************************************************************** -;* Copyright (C) 2003-2012 x264 project +;* Copyright (C) 2003-2013 x264 project ;* ;* Authors: Loren Merritt ;* Jason Garrett-Glaser @@ -87,7 +87,7 @@ lea t0, [t0+t1*2*SIZEOF_PIXEL] sub eax, 2 jg .height_loop - REP_RET + RET %endmacro %if HIGH_BIT_DEPTH @@ -415,7 +415,7 @@ lea r2, [r2+r3*2] sub r5d, 2 jg .loop - REP_RET + RET %endmacro INIT_MMX mmx2 @@ -495,7 +495,7 @@ lea r2, [r2+r3*2] sub r5d, 2 jg .loop - REP_RET + RET %endmacro %macro OFFSETPN 1 @@ -672,7 +672,7 @@ lea r0, [r0+r1*4] sub r5d, 2 jg .height_loop - REP_RET + RET %endmacro %macro AVG2_W_TWO 3 @@ -707,7 +707,7 @@ lea r0, [r0+r1*4] sub r5d, 2 jg .height_loop - REP_RET + RET %endmacro INIT_MMX mmx2 @@ -745,7 +745,7 @@ lea r0, [r0+r1*2*2] sub r5d, 2 jg .height_loop - REP_RET + RET cglobal pixel_avg2_w16_mmx2, 6,7 sub r4, r2 @@ -779,7 +779,7 @@ lea r0, [r0+r1*2*2] sub r5d, 2 jg .height_loop - REP_RET + RET cglobal pixel_avg2_w18_mmx2, 6,7 sub r4, r2 @@ -803,7 +803,7 @@ lea r0, [r0+r1*2] dec r5d jg .height_loop - REP_RET + RET INIT_XMM cglobal pixel_avg2_w18_sse2, 6,7,6 @@ -825,7 +825,7 @@ lea r0, [r0+r1*2] dec r5d jg .height_loop - REP_RET + RET %endif ; HIGH_BIT_DEPTH %if HIGH_BIT_DEPTH == 0 @@ -849,7 +849,7 @@ lea r0, [r0+r1*2] sub r5d, 2 jg .height_loop - REP_RET + RET %endmacro INIT_MMX @@ -877,7 +877,7 @@ lea r0, [r0+r1*2] sub r5d, 2 jg .height_loop - REP_RET + RET %endmacro AVG2_W16 12, movd @@ -909,7 +909,7 @@ lea r0, [r0+r1*2] sub r5d, 2 jg .height_loop - REP_RET + RET cglobal pixel_avg2_w16_sse2, 6,7 sub r4, r2 @@ -927,7 +927,7 @@ lea r0, [r0+r1*2] sub r5d, 2 jg .height_loop - REP_RET + RET %macro AVG2_W20 1 cglobal pixel_avg2_w20_%1, 6,7 @@ -959,7 +959,7 @@ lea r0, [r0+r1*2] sub r5d, 2 jg .height_loop - REP_RET + RET %endmacro AVG2_W20 sse2 @@ -1022,7 +1022,7 @@ add r0, r1 dec r5d jg .height_loop - REP_RET + RET %endmacro %macro AVG_CACHELINE_CHECK 3 ; width, cacheline, instruction set @@ -1226,7 +1226,7 @@ lea r0, [r0+r1*4] sub r4d, 4 jg .height_loop - REP_RET + RET %endif %endmacro @@ -1506,7 +1506,7 @@ add r1, r2 dec r5d jg .loop2 - REP_RET + RET %if mmsize==8 .width4: @@ -1514,7 +1514,11 @@ mov t0, r0 mov t1, r1 mov t2, r3 +%if WIN64 + %define multy0 r4m +%else %define multy0 [rsp-8] +%endif mova multy0, m5 %else mov r3m, r3 @@ -1626,11 +1630,11 @@ dec r5d jg .loop4 %if mmsize!=8 - REP_RET + RET %else sub dword r7m, 4 jg .width8 - REP_RET + RET .width8: %if ARCH_X86_64 lea r3, [t2+8*SIZEOF_PIXEL] @@ -1766,7 +1770,7 @@ add r1, r2 dec r5d jg .loop1d_w4 - REP_RET + RET .mc1d_w8: sub r2, 4*SIZEOF_PIXEL sub r4, 8*SIZEOF_PIXEL @@ -1848,7 +1852,7 @@ lea r1, [r1+r2*2] sub r5d, 2 jg .loop4 - REP_RET + RET .width8: movu m0, [r3] @@ -1909,7 +1913,7 @@ lea r1, [r1+r2*2] sub r5d, 2 jg .loop8 - REP_RET + RET %endmacro %if HIGH_BIT_DEPTH diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-a2.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-a2.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-a2.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-a2.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* mc-a2.asm: x86 motion compensation ;***************************************************************************** -;* Copyright (C) 2005-2012 x264 project +;* Copyright (C) 2005-2013 x264 project ;* ;* Authors: Loren Merritt ;* Jason Garrett-Glaser @@ -210,7 +210,7 @@ mova [r0+r4+mmsize], m4 add r4, 2*mmsize jl .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void hpel_filter_c( uint16_t *dst, int16_t *buf, intptr_t width ); @@ -259,7 +259,7 @@ mova [r0+r2], m1 add r2, mmsize jl .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void hpel_filter_h( uint16_t *dst, uint16_t *src, intptr_t width ); @@ -302,7 +302,7 @@ mova [r0+r2+mmsize], m4 add r2, mmsize*2 jl .loop - REP_RET + RET %endmacro ; HPEL_FILTER INIT_MMX mmx2 @@ -365,7 +365,7 @@ add r5, mmsize add r4, mmsize jl .loop - REP_RET + RET %endmacro ;----------------------------------------------------------------------------- @@ -396,7 +396,7 @@ movntq [r0+r2], m1 add r2, 8 jl .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void hpel_filter_h( uint8_t *dst, uint8_t *src, intptr_t width ); @@ -440,7 +440,7 @@ movntq [r0+r2], m1 add r2, 8 jl .loop - REP_RET + RET INIT_XMM @@ -510,7 +510,7 @@ movntps [r0+r2], m4 add r2, 16 jl .loop - REP_RET + RET %endmacro ;----------------------------------------------------------------------------- @@ -559,7 +559,7 @@ movntps [r0+r2], m1 add r2, 16 jl .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void hpel_filter_h( uint8_t *dst, uint8_t *src, intptr_t width ); @@ -600,7 +600,7 @@ movntps [r0+r2], m3 add r2, 16 jl .loop - REP_RET + RET %endmacro INIT_MMX mmx2 @@ -1026,7 +1026,7 @@ lea r0, [r0+r1*2] sub r4d, 2 jg .loop - REP_RET + RET %endmacro ; PLANE_INTERLEAVE %macro DEINTERLEAVE_START 0 @@ -1068,7 +1068,7 @@ add r4, r5 dec dword r7m jg .loopy - REP_RET + RET ;----------------------------------------------------------------------------- ; void load_deinterleave_chroma_fenc( pixel *dst, pixel *src, intptr_t i_src, int height ) @@ -1083,7 +1083,7 @@ lea r1, [r1+r2*2] sub r3d, 2 jg .loop - REP_RET + RET ;----------------------------------------------------------------------------- ; void load_deinterleave_chroma_fdec( pixel *dst, pixel *src, intptr_t i_src, int height ) @@ -1098,7 +1098,7 @@ lea r1, [r1+r2*2] sub r3d, 2 jg .loop - REP_RET + RET %endmacro ; PLANE_DEINTERLEAVE %if HIGH_BIT_DEPTH @@ -1155,7 +1155,7 @@ sub r2d, 32 jg .copy32 .ret - REP_RET + RET ;----------------------------------------------------------------------------- ; void *memcpy_aligned( void *dst, const void *src, size_t n ); @@ -1207,7 +1207,7 @@ %endrep add r1, mmsize*8 jl .loop - REP_RET + RET %endmacro INIT_MMX mmx @@ -1239,7 +1239,7 @@ movdqa [r3+r2*2+16], m1 add r2, 16 jl .loop - REP_RET + RET %macro INTEGRAL_INIT8H 0 cglobal integral_init8h, 3,4 @@ -1263,7 +1263,7 @@ movdqa [r3+r2*2+16], m1 add r2, 16 jl .loop - REP_RET + RET %endmacro INIT_XMM sse4 @@ -1290,7 +1290,7 @@ mova [r0+r1+mmsize], m1 add r1, 2*mmsize jl .loop - REP_RET + RET %endmacro INIT_MMX mmx @@ -1321,7 +1321,7 @@ mova [r1+r2-8], m3 sub r2, 8 jge .loop - REP_RET + RET INIT_XMM cglobal integral_init4v_sse2, 3,5 @@ -1347,7 +1347,7 @@ mova [r1+r2], m3 add r2, 16 jl .loop - REP_RET + RET cglobal integral_init4v_ssse3, 3,5 shl r2, 1 @@ -1372,7 +1372,7 @@ mova [r1+r2], m3 add r2, 16 jl .loop - REP_RET + RET %macro FILT8x4 7 mova %3, [r0+%7] @@ -1702,7 +1702,7 @@ %if cpuflag(fma4) cvtdq2ps xmm0, xmm0 cvtdq2ps xmm1, xmm1 - vfmaddps xmm0, xmm0, xmm6, xmm1 + fmaddps xmm0, xmm0, xmm6, xmm1 cvtdq2ps xmm1, xmm2 psubd xmm2, xmm3 cvtdq2ps xmm2, xmm2 @@ -1710,7 +1710,7 @@ mulps xmm1, xmm3 mulps xmm0, xmm2 addps xmm2, xmm3, xmm3 - vfnmaddps xmm3, xmm1, xmm3, xmm2 + fnmaddps xmm3, xmm1, xmm3, xmm2 mulps xmm0, xmm3 %else cvtdq2ps xmm0, xmm0 @@ -1732,7 +1732,7 @@ movdqa [r0+r6*2], xmm0 add r6, 8 jl .loop - REP_RET + RET %endmacro INIT_XMM sse2 @@ -1742,14 +1742,18 @@ MBTREE %macro INT16_TO_FLOAT 1 +%if cpuflag(avx2) + vpmovzxwd ymm%1, xmm%1 +%else vpunpckhwd xmm4, xmm%1, xmm7 vpunpcklwd xmm%1, xmm7 vinsertf128 ymm%1, ymm%1, xmm4, 1 +%endif vcvtdq2ps ymm%1, ymm%1 %endmacro ; FIXME: align loads/stores to 16 bytes -INIT_YMM avx +%macro MBTREE_AVX 0 cglobal mbtree_propagate_cost, 7,7,8 add r6d, r6d lea r0, [r0+r6*2] @@ -1761,7 +1765,9 @@ vmovdqa xmm5, [pw_3fff] vbroadcastss ymm6, [r5] vmulps ymm6, ymm6, [pf_inv256] +%if notcpuflag(avx2) vpxor xmm7, xmm7 +%endif .loop: vmovdqu xmm0, [r2+r6] ; intra vmovdqu xmm1, [r4+r6] ; invq @@ -1771,6 +1777,17 @@ INT16_TO_FLOAT 1 INT16_TO_FLOAT 2 INT16_TO_FLOAT 3 +%if cpuflag(fma3) + vmulps ymm1, ymm1, ymm0 + vsubps ymm4, ymm0, ymm3 + fmaddps ymm1, ymm1, ymm6, ymm2 + vrcpps ymm3, ymm0 + vmulps ymm2, ymm0, ymm3 + vmulps ymm1, ymm1, ymm4 + vaddps ymm4, ymm3, ymm3 + fnmaddps ymm4, ymm2, ymm3, ymm4 + vmulps ymm1, ymm1, ymm4 +%else vmulps ymm1, ymm1, ymm0 vsubps ymm4, ymm0, ymm3 vmulps ymm1, ymm1, ymm6 ; intra*invq*fps_factor>>8 @@ -1782,8 +1799,15 @@ vaddps ymm3, ymm3, ymm3 ; 2 * (1/intra 1st approx) vsubps ymm3, ymm3, ymm2 ; 2nd approximation for 1/intra vmulps ymm1, ymm1, ymm3 ; / intra +%endif vcvtps2dq ymm1, ymm1 vmovdqu [r0+r6*2], ymm1 add r6, 16 jl .loop - REP_RET + RET +%endmacro + +INIT_YMM avx +MBTREE_AVX +INIT_YMM avx2,fma3 +MBTREE_AVX diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-c.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-c.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-c.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc-c.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc-c.c: x86 motion compensation ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -139,6 +139,8 @@ uint16_t *inter_costs, uint16_t *inv_qscales, float *fps_factor, int len ); void x264_mbtree_propagate_cost_fma4( int *dst, uint16_t *propagate_in, uint16_t *intra_costs, uint16_t *inter_costs, uint16_t *inv_qscales, float *fps_factor, int len ); +void x264_mbtree_propagate_cost_avx2_fma3( int *dst, uint16_t *propagate_in, uint16_t *intra_costs, + uint16_t *inter_costs, uint16_t *inv_qscales, float *fps_factor, int len ); #define MC_CHROMA(cpu)\ void x264_mc_chroma_##cpu( pixel *dstu, pixel *dstv, intptr_t i_dst, pixel *src, intptr_t i_src,\ @@ -754,7 +756,12 @@ return; pf->mbtree_propagate_cost = x264_mbtree_propagate_cost_avx; - if( !(cpu&X264_CPU_FMA4) ) + if( cpu&X264_CPU_FMA4 ) + pf->mbtree_propagate_cost = x264_mbtree_propagate_cost_fma4; + + if( !(cpu&X264_CPU_AVX2) ) return; - pf->mbtree_propagate_cost = x264_mbtree_propagate_cost_fma4; + + if( cpu&X264_CPU_FMA3 ) + pf->mbtree_propagate_cost = x264_mbtree_propagate_cost_avx2_fma3; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/mc.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mc.h: x86 motion compensation ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel-32.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel-32.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel-32.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel-32.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* pixel-32.asm: x86_32 pixel metrics ;***************************************************************************** -;* Copyright (C) 2003-2012 x264 project +;* Copyright (C) 2003-2013 x264 project ;* ;* Authors: Loren Merritt ;* Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* pixel.asm: x86 pixel metrics ;***************************************************************************** -;* Copyright (C) 2003-2012 x264 project +;* Copyright (C) 2003-2013 x264 project ;* ;* Authors: Loren Merritt ;* Holger Lubitz @@ -1913,15 +1913,16 @@ ; void intra_satd_x3_4x4( uint8_t *fenc, uint8_t *fdec, int *res ) ;----------------------------------------------------------------------------- cglobal intra_satd_x3_4x4, 3,3 -%if ARCH_X86_64 +%if UNIX64 ; stack is 16 byte aligned because abi says so %define top_1d rsp-8 ; size 8 %define left_1d rsp-16 ; size 8 %else - ; stack is 16 byte aligned at least in gcc, and we've pushed 3 regs + return address, so it's still aligned - SUB esp, 16 - %define top_1d esp+8 - %define left_1d esp + ; WIN64: stack is 16 byte aligned because abi says so + ; X86_32: stack is 16 byte aligned at least in gcc, and we've pushed 3 regs + return address, so it's still aligned + SUB rsp, 16 + %define top_1d rsp+8 + %define left_1d rsp %endif call hadamard_load @@ -1943,8 +1944,8 @@ movd [r2+0], m0 ; i4x4_v satd movd [r2+4], m4 ; i4x4_h satd movd [r2+8], m5 ; i4x4_dc satd -%if ARCH_X86_64 == 0 - ADD esp, 16 +%if UNIX64 == 0 + ADD rsp, 16 %endif RET diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/pixel.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * pixel.h: x86 pixel metrics ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* predict-a.asm: x86 intra prediction ;***************************************************************************** -;* Copyright (C) 2005-2012 x264 project +;* Copyright (C) 2005-2013 x264 project ;* ;* Authors: Loren Merritt ;* Holger Lubitz @@ -807,7 +807,7 @@ psrlw m0, 4 SPLATW m0, m0 STORE8x8 m0, m0 - REP_RET + RET %else ; !HIGH_BIT_DEPTH INIT_MMX mmx2 @@ -1103,7 +1103,7 @@ add r0, FDEC_STRIDE dec r1d jg .loop - REP_RET + RET %endmacro ; PREDICT_CHROMA_P_MMX INIT_MMX mmx2 @@ -1140,7 +1140,7 @@ add r0, FDEC_STRIDEB dec r1d jg .loop - REP_RET + RET %else ; !HIGH_BIT_DEPTH cglobal predict_8x%1c_p_core, 1,2 movd m0, r1m @@ -1225,7 +1225,7 @@ add r0, FDEC_STRIDE dec r1d jg .loop - REP_RET + RET %endif ; !ARCH_X86_64 %macro PREDICT_16x16_P 0 @@ -1282,7 +1282,7 @@ dec r1d jg .loop %endif ; !HIGH_BIT_DEPTH - REP_RET + RET %endmacro ; PREDICT_16x16_P INIT_XMM sse2 @@ -1996,20 +1996,20 @@ mova m2, [r0 - FDEC_STRIDEB+16] mova m3, [r0 - FDEC_STRIDEB+24] STORE16x16 m0, m1, m2, m3 - REP_RET + RET INIT_XMM cglobal predict_16x16_v_sse2, 2,2 mova m0, [r0 - FDEC_STRIDEB+ 0] mova m1, [r0 - FDEC_STRIDEB+16] STORE16x16_SSE2 m0, m1 - REP_RET + RET %else ; !HIGH_BIT_DEPTH INIT_MMX cglobal predict_16x16_v_mmx2, 1,2 movq m0, [r0 - FDEC_STRIDE + 0] movq m1, [r0 - FDEC_STRIDE + 8] STORE16x16 m0, m1 - REP_RET + RET INIT_XMM cglobal predict_16x16_v_sse2, 1,1 movdqa xmm0, [r0 - FDEC_STRIDE] @@ -2055,7 +2055,7 @@ %endif ; HIGH_BIT_DEPTH sub r1, 4*FDEC_STRIDEB jge .vloop - REP_RET + RET %endmacro INIT_MMX mmx2 @@ -2106,12 +2106,12 @@ %else PRED16x16_DC r1m, 5 %endif - REP_RET + RET INIT_MMX mmx2 cglobal predict_16x16_dc_top, 1,2 PRED16x16_DC [pw_8], 4 - REP_RET + RET INIT_MMX mmx2 %if HIGH_BIT_DEPTH @@ -2119,14 +2119,14 @@ movd m0, r1m SPLATW m0, m0 STORE16x16 m0, m0, m0, m0 - REP_RET + RET %else ; !HIGH_BIT_DEPTH cglobal predict_16x16_dc_left_core, 1,1 movd m0, r1m pshufw m0, m0, 0 packuswb m0, m0 STORE16x16 m0, m0 - REP_RET + RET %endif ;----------------------------------------------------------------------------- @@ -2159,11 +2159,11 @@ cglobal predict_16x16_dc_core, 2,2,4 movd m3, r1m PRED16x16_DC_SSE2 m3, 5 - REP_RET + RET cglobal predict_16x16_dc_top, 1,2 PRED16x16_DC_SSE2 [pw_8], 4 - REP_RET + RET INIT_XMM sse2 %if HIGH_BIT_DEPTH @@ -2171,7 +2171,7 @@ movd m0, r1m SPLATW m0, m0 STORE16x16_SSE2 m0, m0 - REP_RET + RET %else ; !HIGH_BIT_DEPTH cglobal predict_16x16_dc_left_core, 1,1 movd m0, r1m diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict-c.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict-c.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict-c.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict-c.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict-c.c: intra prediction ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/predict.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * predict.h: x86 intra prediction ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/quant-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/quant-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/quant-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/quant-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* quant-a.asm: x86 quantization and level-run ;***************************************************************************** -;* Copyright (C) 2005-2012 x264 project +;* Copyright (C) 2005-2013 x264 project ;* ;* Authors: Loren Merritt ;* Jason Garrett-Glaser @@ -416,7 +416,7 @@ %1 [r0+(t0+8*%3)*SIZEOF_PIXEL], [r1+t0*2+16*%3], [r1+t0*2+24*%3] sub t0d, 16*%3 jge %%loop - REP_RET + RET %else %1 [r0+(8*%3)*SIZEOF_PIXEL], [r1+16*%3], [r1+24*%3] %1 [r0+(0 )*SIZEOF_PIXEL], [r1+0 ], [r1+ 8*%3] @@ -738,7 +738,7 @@ PSIGND m5, m2, m1 test t3d, t3d jnz .outer_loop_0 - REP_RET + RET %endmacro %if HIGH_BIT_DEPTH == 0 @@ -783,7 +783,7 @@ mova [r1+r3*4-1*mmsize], m5 sub r3, mmsize/2 jg .loop - REP_RET + RET %endmacro %if ARCH_X86_64 == 0 @@ -831,7 +831,7 @@ mova [r1+r3*4-1*mmsize], m1 sub r3, mmsize jg .loop - REP_RET + RET %endmacro %if ARCH_X86_64 == 0 @@ -954,7 +954,7 @@ jne .loop %endif .ret: - RET + REP_RET .ret9: mov eax, 9 RET @@ -1066,7 +1066,7 @@ .tryret: xor r4, -1 jne .cont - REP_RET + RET .ret9: mov eax, 9 RET @@ -1077,7 +1077,7 @@ shr r3, cl shr r3, 1 jne .loop - REP_RET + RET %endif ; ARCH %endmacro @@ -1381,7 +1381,7 @@ inc t6d sub t4d, t3d jge .loop - REP_RET + RET %endmacro INIT_MMX mmx2 diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/quant.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/quant.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/quant.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/quant.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * quant.h: x86 quantization and level-run ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Loren Merritt * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/sad-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/sad-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/sad-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/sad-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* sad-a.asm: x86 sad functions ;***************************************************************************** -;* Copyright (C) 2003-2012 x264 project +;* Copyright (C) 2003-2013 x264 project ;* ;* Authors: Loren Merritt ;* Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/sad16-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/sad16-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/sad16-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/sad16-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* sad16-a.asm: x86 high depth sad functions ;***************************************************************************** -;* Copyright (C) 2010-2012 x264 project +;* Copyright (C) 2010-2013 x264 project ;* ;* Authors: Oskar Arvidsson ;* diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/trellis-64.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/trellis-64.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/trellis-64.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/trellis-64.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* trellis-64.asm: x86_64 trellis quantization ;***************************************************************************** -;* Copyright (C) 2012 x264 project +;* Copyright (C) 2012-2013 x264 project ;* ;* Authors: Loren Merritt ;* diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/util.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/util.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/util.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/util.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * util.h: x86 inline asm ***************************************************************************** - * Copyright (C) 2008-2012 x264 project + * Copyright (C) 2008-2013 x264 project * * Authors: Jason Garrett-Glaser * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/x86inc.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/x86inc.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/x86inc.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/x86inc.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* x86inc.asm: x264asm abstraction layer ;***************************************************************************** -;* Copyright (C) 2005-2012 x264 project +;* Copyright (C) 2005-2013 x264 project ;* ;* Authors: Loren Merritt ;* Anton Mitrofanov @@ -34,7 +34,9 @@ ; as this feature might be useful for others as well. Send patches or ideas ; to x264-devel@videolan.org . -%define program_name x264 +%ifndef program_name + %define program_name x264 +%endif %define WIN64 0 %define UNIX64 0 @@ -103,7 +105,12 @@ ; %1 = number of arguments. loads them from stack if needed. ; %2 = number of registers used. pushes callee-saved regs if needed. ; %3 = number of xmm registers used. pushes callee-saved xmm regs if needed. -; %4 = list of names to define to registers +; %4 = (optional) stack size to be allocated. If not aligned (x86-32 ICC 10.x, +; MSVC or YMM), the stack will be manually aligned (to 16 or 32 bytes), +; and an extra register will be allocated to hold the original stack +; pointer (to not invalidate r0m etc.). To prevent the use of an extra +; register as stack pointer, request a negative stack size. +; %4+/%5+ = list of names to define to registers ; PROLOGUE can also be invoked by adding the same options to cglobal ; e.g. @@ -118,8 +125,7 @@ ; Pops anything that was pushed by PROLOGUE, and returns. ; REP_RET: -; Same, but if it doesn't pop anything it becomes a 2-byte ret, for athlons -; which are slow when a normal ret follows a branch. +; Use this instead of RET if it's a branch target. ; registers: ; rN and rNq are the native-size register holding function argument N @@ -138,11 +144,11 @@ %define r%1m %2d %define r%1mp %2 %elif ARCH_X86_64 ; memory - %define r%1m [rsp + stack_offset + %3] - %define r%1mp qword r %+ %1m + %define r%1m [rstk + stack_offset + %3] + %define r%1mp qword r %+ %1 %+ m %else - %define r%1m [esp + stack_offset + %3] - %define r%1mp dword r %+ %1m + %define r%1m [rstk + stack_offset + %3] + %define r%1mp dword r %+ %1 %+ m %endif %define r%1 %2 %endmacro @@ -203,12 +209,16 @@ %macro PUSH 1 push %1 - %assign stack_offset stack_offset+gprsize + %ifidn rstk, rsp + %assign stack_offset stack_offset+gprsize + %endif %endmacro %macro POP 1 pop %1 - %assign stack_offset stack_offset-gprsize + %ifidn rstk, rsp + %assign stack_offset stack_offset-gprsize + %endif %endmacro %macro PUSH_IF_USED 1-* @@ -240,14 +250,14 @@ %macro SUB 2 sub %1, %2 - %ifidn %1, rsp + %ifidn %1, rstk %assign stack_offset stack_offset+(%2) %endif %endmacro %macro ADD 2 add %1, %2 - %ifidn %1, rsp + %ifidn %1, rstk %assign stack_offset stack_offset-(%2) %endif %endmacro @@ -305,6 +315,79 @@ %assign n_arg_names %0 %endmacro +%macro ALLOC_STACK 1-2 0 ; stack_size, n_xmm_regs (for win64 only) + %ifnum %1 + %if %1 != 0 + %assign %%stack_alignment ((mmsize + 15) & ~15) + %assign stack_size %1 + %if stack_size < 0 + %assign stack_size -stack_size + %endif + %if mmsize != 8 + %assign xmm_regs_used %2 + %endif + %if mmsize <= 16 && HAVE_ALIGNED_STACK + %assign stack_size_padded stack_size + %%stack_alignment - gprsize - (stack_offset & (%%stack_alignment - 1)) + %if xmm_regs_used > 6 + %assign stack_size_padded stack_size_padded + (xmm_regs_used - 6) * 16 + %endif + SUB rsp, stack_size_padded + %else + %assign %%reg_num (regs_used - 1) + %xdefine rstk r %+ %%reg_num + ; align stack, and save original stack location directly above + ; it, i.e. in [rsp+stack_size_padded], so we can restore the + ; stack in a single instruction (i.e. mov rsp, rstk or mov + ; rsp, [rsp+stack_size_padded]) + mov rstk, rsp + %assign stack_size_padded stack_size + %if xmm_regs_used > 6 + %assign stack_size_padded stack_size_padded + (xmm_regs_used - 6) * 16 + %if mmsize == 32 && xmm_regs_used & 1 + ; re-align to 32 bytes + %assign stack_size_padded (stack_size_padded + 16) + %endif + %endif + %if %1 < 0 ; need to store rsp on stack + sub rsp, gprsize+stack_size_padded + and rsp, ~(%%stack_alignment-1) + %xdefine rstkm [rsp+stack_size_padded] + mov rstkm, rstk + %else ; can keep rsp in rstk during whole function + sub rsp, stack_size_padded + and rsp, ~(%%stack_alignment-1) + %xdefine rstkm rstk + %endif + %endif + %if xmm_regs_used > 6 + WIN64_PUSH_XMM + %endif + %endif + %endif +%endmacro + +%macro SETUP_STACK_POINTER 1 + %ifnum %1 + %if %1 != 0 && (HAVE_ALIGNED_STACK == 0 || mmsize == 32) + %if %1 > 0 + %assign regs_used (regs_used + 1) + %elif ARCH_X86_64 && regs_used == num_args && num_args <= 4 + UNIX64 * 2 + %warning "Stack pointer will overwrite register argument" + %endif + %endif + %endif +%endmacro + +%macro DEFINE_ARGS_INTERNAL 3+ + %ifnum %2 + DEFINE_ARGS %3 + %elif %1 == 4 + DEFINE_ARGS %2 + %elif %1 > 4 + DEFINE_ARGS %2, %3 + %endif +%endmacro + %if WIN64 ; Windows x64 ;================================================= DECLARE_REG 0, rcx @@ -323,19 +406,27 @@ DECLARE_REG 13, R14, 112 DECLARE_REG 14, R15, 120 -%macro PROLOGUE 2-4+ 0 ; #args, #regs, #xmm_regs, arg_names... +%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names... %assign num_args %1 %assign regs_used %2 ASSERT regs_used >= num_args + SETUP_STACK_POINTER %4 ASSERT regs_used <= 15 PUSH_IF_USED 7, 8, 9, 10, 11, 12, 13, 14 - %if mmsize == 8 - %assign xmm_regs_used 0 - %else + ALLOC_STACK %4, %3 + %if mmsize != 8 && stack_size == 0 WIN64_SPILL_XMM %3 %endif LOAD_IF_USED 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 - DEFINE_ARGS %4 + DEFINE_ARGS_INTERNAL %0, %4, %5 +%endmacro + +%macro WIN64_PUSH_XMM 0 + %assign %%i xmm_regs_used + %rep (xmm_regs_used-6) + %assign %%i %%i-1 + movdqa [rsp + (%%i-6)*16 + stack_size + (~stack_offset&8)], xmm %+ %%i + %endrep %endmacro %macro WIN64_SPILL_XMM 1 @@ -343,11 +434,7 @@ ASSERT xmm_regs_used <= 16 %if xmm_regs_used > 6 SUB rsp, (xmm_regs_used-6)*16+16 - %assign %%i xmm_regs_used - %rep (xmm_regs_used-6) - %assign %%i %%i-1 - movdqa [rsp + (%%i-6)*16+(~stack_offset&8)], xmm %+ %%i - %endrep + WIN64_PUSH_XMM %endif %endmacro @@ -356,19 +443,28 @@ %assign %%i xmm_regs_used %rep (xmm_regs_used-6) %assign %%i %%i-1 - movdqa xmm %+ %%i, [%1 + (%%i-6)*16+(~stack_offset&8)] + movdqa xmm %+ %%i, [%1 + (%%i-6)*16+stack_size+(~stack_offset&8)] %endrep - add %1, (xmm_regs_used-6)*16+16 + %if stack_size_padded == 0 + add %1, (xmm_regs_used-6)*16+16 + %endif + %endif + %if stack_size_padded > 0 + %if stack_size > 0 && (mmsize == 32 || HAVE_ALIGNED_STACK == 0) + mov rsp, rstkm + %else + add %1, stack_size_padded + %endif %endif %endmacro %macro WIN64_RESTORE_XMM 1 WIN64_RESTORE_XMM_INTERNAL %1 - %assign stack_offset stack_offset-(xmm_regs_used-6)*16+16 + %assign stack_offset (stack_offset-stack_size_padded) %assign xmm_regs_used 0 %endmacro -%define has_epilogue regs_used > 7 || xmm_regs_used > 6 || mmsize == 32 +%define has_epilogue regs_used > 7 || xmm_regs_used > 6 || mmsize == 32 || stack_size > 0 %macro RET 0 WIN64_RESTORE_XMM_INTERNAL rsp @@ -376,7 +472,7 @@ %if mmsize == 32 vzeroupper %endif - ret + AUTO_REP_RET %endmacro %elif ARCH_X86_64 ; *nix x64 ;============================================= @@ -397,24 +493,33 @@ DECLARE_REG 13, R14, 64 DECLARE_REG 14, R15, 72 -%macro PROLOGUE 2-4+ ; #args, #regs, #xmm_regs, arg_names... +%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names... %assign num_args %1 %assign regs_used %2 ASSERT regs_used >= num_args + SETUP_STACK_POINTER %4 ASSERT regs_used <= 15 PUSH_IF_USED 9, 10, 11, 12, 13, 14 + ALLOC_STACK %4 LOAD_IF_USED 6, 7, 8, 9, 10, 11, 12, 13, 14 - DEFINE_ARGS %4 + DEFINE_ARGS_INTERNAL %0, %4, %5 %endmacro -%define has_epilogue regs_used > 9 || mmsize == 32 +%define has_epilogue regs_used > 9 || mmsize == 32 || stack_size > 0 %macro RET 0 +%if stack_size_padded > 0 +%if mmsize == 32 || HAVE_ALIGNED_STACK == 0 + mov rsp, rstkm +%else + add rsp, stack_size_padded +%endif +%endif POP_IF_USED 14, 13, 12, 11, 10, 9 %if mmsize == 32 vzeroupper %endif - ret + AUTO_REP_RET %endmacro %else ; X86_32 ;============================================================== @@ -430,7 +535,7 @@ %macro DECLARE_ARG 1-* %rep %0 - %define r%1m [esp + stack_offset + 4*%1 + 4] + %define r%1m [rstk + stack_offset + 4*%1 + 4] %define r%1mp dword r%1m %rotate 1 %endrep @@ -438,26 +543,39 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 -%macro PROLOGUE 2-4+ ; #args, #regs, #xmm_regs, arg_names... +%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names... %assign num_args %1 %assign regs_used %2 + ASSERT regs_used >= num_args + %if num_args > 7 + %assign num_args 7 + %endif %if regs_used > 7 %assign regs_used 7 %endif - ASSERT regs_used >= num_args + SETUP_STACK_POINTER %4 + ASSERT regs_used <= 7 PUSH_IF_USED 3, 4, 5, 6 + ALLOC_STACK %4 LOAD_IF_USED 0, 1, 2, 3, 4, 5, 6 - DEFINE_ARGS %4 + DEFINE_ARGS_INTERNAL %0, %4, %5 %endmacro -%define has_epilogue regs_used > 3 || mmsize == 32 +%define has_epilogue regs_used > 3 || mmsize == 32 || stack_size > 0 %macro RET 0 +%if stack_size_padded > 0 +%if mmsize == 32 || HAVE_ALIGNED_STACK == 0 + mov rsp, rstkm +%else + add rsp, stack_size_padded +%endif +%endif POP_IF_USED 6, 5, 4, 3 %if mmsize == 32 vzeroupper %endif - ret + AUTO_REP_RET %endmacro %endif ;====================================================================== @@ -467,8 +585,14 @@ %endmacro %macro WIN64_RESTORE_XMM 1 %endmacro +%macro WIN64_PUSH_XMM 0 +%endmacro %endif +; On AMD cpus <=K10, an ordinary ret is slow if it immediately follows either +; a branch or a branch target. So switch to a 2-byte form of ret in that case. +; We can automatically detect "follows a branch", but not a branch target. +; (SSSE3 is a sufficient condition to know that your cpu doesn't have this problem.) %macro REP_RET 0 %if has_epilogue RET @@ -477,6 +601,29 @@ %endif %endmacro +%define last_branch_adr $$ +%macro AUTO_REP_RET 0 + %ifndef cpuflags + times ((last_branch_adr-$)>>31)+1 rep ; times 1 iff $ != last_branch_adr. + %elif notcpuflag(ssse3) + times ((last_branch_adr-$)>>31)+1 rep + %endif + ret +%endmacro + +%macro BRANCH_INSTR 0-* + %rep %0 + %macro %1 1-2 %1 + %2 %1 + %%branch_instr: + %xdefine last_branch_adr %%branch_instr + %endmacro + %rotate 1 + %endrep +%endmacro + +BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, jge, jng, jnge, ja, jae, jna, jnae, jb, jbe, jnb, jnbe, jc, jnc, js, jns, jo, jno, jp, jnp + %macro TAIL_CALL 2 ; callee, is_nonadjacent %if has_epilogue call %1 @@ -496,12 +643,10 @@ ; Applies any symbol mangling needed for C linkage, and sets up a define such that ; subsequent uses of the function name automatically refer to the mangled version. ; Appends cpuflags to the function name if cpuflags has been specified. -%macro cglobal 1-2+ ; name, [PROLOGUE args] -%if %0 == 1 - cglobal_internal %1 %+ SUFFIX -%else +%macro cglobal 1-2+ "" ; name, [PROLOGUE args] + ; the "" is a workaround for nasm, which fails if SUFFIX is empty + ; and we call cglobal_internal with just %1 %+ SUFFIX (without %2) cglobal_internal %1 %+ SUFFIX, %2 -%endif %endmacro %macro cglobal_internal 1-2+ %ifndef cglobaled_%1 @@ -518,8 +663,12 @@ align function_align %1: RESET_MM_PERMUTATION ; not really needed, but makes disassembly somewhat nicer + %xdefine rstk rsp %assign stack_offset 0 - %if %0 > 1 + %assign stack_size 0 + %assign stack_size_padded 0 + %assign xmm_regs_used 0 + %ifnidn %2, "" PROLOGUE %2 %endif %endmacro @@ -554,7 +703,7 @@ %assign cpuflags_mmx (1<<0) %assign cpuflags_mmx2 (1<<1) | cpuflags_mmx %assign cpuflags_3dnow (1<<2) | cpuflags_mmx -%assign cpuflags_3dnow2 (1<<3) | cpuflags_3dnow +%assign cpuflags_3dnowext (1<<3) | cpuflags_3dnow %assign cpuflags_sse (1<<4) | cpuflags_mmx2 %assign cpuflags_sse2 (1<<5) | cpuflags_sse %assign cpuflags_sse2slow (1<<6) | cpuflags_sse2 @@ -586,6 +735,7 @@ ; All subsequent functions (up to the next INIT_CPUFLAGS) is built for the specified cpu. ; You shouldn't need to invoke this macro directly, it's a subroutine for INIT_MMX &co. %macro INIT_CPUFLAGS 0-2 + CPU amdnop %if %0 >= 1 %xdefine cpuname %1 %assign cpuflags cpuflags_%1 @@ -597,7 +747,7 @@ %if cpuflag(avx) %assign avx_enabled 1 %endif - %if mmsize == 16 && notcpuflag(sse2) + %if (mmsize == 16 && notcpuflag(sse2)) || (mmsize == 32 && notcpuflag(avx2)) %define mova movaps %define movu movups %define movnta movntps @@ -607,6 +757,9 @@ %elifidn %1, sse3 %define movu lddqu %endif + %if ARCH_X86_64 == 0 && notcpuflag(sse2) + CPU basicnop + %endif %else %xdefine SUFFIX %undef cpuname @@ -676,10 +829,10 @@ %if ARCH_X86_64 %define num_mmregs 16 %endif - %define mova vmovaps - %define movu vmovups + %define mova movdqa + %define movu movdqu %undef movh - %define movnta vmovntps + %define movnta movntdq %assign %%i 0 %rep num_mmregs CAT_XDEFINE m, %%i, ymm %+ %%i @@ -840,101 +993,107 @@ ;%1 == instruction ;%2 == 1 if float, 0 if int -;%3 == 1 if 4-operand (xmm, xmm, xmm, imm), 0 if 2- or 3-operand (xmm, xmm, xmm) -;%4 == number of operands given +;%3 == 1 if non-destructive or 4-operand (xmm, xmm, xmm, imm), 0 otherwise +;%4 == 1 if commutative (i.e. doesn't matter which src arg is which), 0 if not ;%5+: operands -%macro RUN_AVX_INSTR 6-7+ - %ifid %6 - %define %%sizeofreg sizeof%6 - %elifid %5 - %define %%sizeofreg sizeof%5 +%macro RUN_AVX_INSTR 5-8+ + %ifnum sizeof%6 + %assign %%sizeofreg sizeof%6 + %elifnum sizeof%5 + %assign %%sizeofreg sizeof%5 %else - %define %%sizeofreg mmsize + %assign %%sizeofreg mmsize %endif - %if %%sizeofreg==32 - %if %4>=3 - v%1 %5, %6, %7 - %else - v%1 %5, %6 - %endif + %assign %%emulate_avx 0 + %if avx_enabled && %%sizeofreg >= 16 + %xdefine %%instr v%1 %else - %if %%sizeofreg==8 - %define %%regmov movq - %elif %2 - %define %%regmov movaps - %else - %define %%regmov movdqa + %xdefine %%instr %1 + %if %0 >= 7+%3 + %assign %%emulate_avx 1 %endif + %endif - %if %4>=3+%3 - %ifnidn %5, %6 - %if avx_enabled && %%sizeofreg==16 - v%1 %5, %6, %7 - %else - CHECK_AVX_INSTR_EMU {%1 %5, %6, %7}, %5, %7 - %%regmov %5, %6 - %1 %5, %7 + %if %%emulate_avx + %xdefine %%src1 %6 + %xdefine %%src2 %7 + %ifnidn %5, %6 + %if %0 >= 8 + CHECK_AVX_INSTR_EMU {%1 %5, %6, %7, %8}, %5, %7, %8 + %else + CHECK_AVX_INSTR_EMU {%1 %5, %6, %7}, %5, %7 + %endif + %if %4 && %3 == 0 + %ifnid %7 + ; 3-operand AVX instructions with a memory arg can only have it in src2, + ; whereas SSE emulation prefers to have it in src1 (i.e. the mov). + ; So, if the instruction is commutative with a memory arg, swap them. + %xdefine %%src1 %7 + %xdefine %%src2 %6 %endif + %endif + %if %%sizeofreg == 8 + MOVQ %5, %%src1 + %elif %2 + MOVAPS %5, %%src1 %else - %1 %5, %7 + MOVDQA %5, %%src1 %endif - %elif %4>=3 - %1 %5, %6, %7 - %else - %1 %5, %6 - %endif - %endif -%endmacro - -; 3arg AVX ops with a memory arg can only have it in src2, -; whereas SSE emulation of 3arg prefers to have it in src1 (i.e. the mov). -; So, if the op is symmetric and the wrong one is memory, swap them. -%macro RUN_AVX_INSTR1 8 - %assign %%swap 0 - %if avx_enabled - %ifnid %6 - %assign %%swap 1 %endif - %elifnidn %5, %6 - %ifnid %7 - %assign %%swap 1 + %if %0 >= 8 + %1 %5, %%src2, %8 + %else + %1 %5, %%src2 %endif - %endif - %if %%swap && %3 == 0 && %8 == 1 - RUN_AVX_INSTR %1, %2, %3, %4, %5, %7, %6 + %elif %0 >= 8 + %%instr %5, %6, %7, %8 + %elif %0 == 7 + %%instr %5, %6, %7 + %elif %0 == 6 + %%instr %5, %6 %else - RUN_AVX_INSTR %1, %2, %3, %4, %5, %6, %7 + %%instr %5 %endif %endmacro ;%1 == instruction ;%2 == 1 if float, 0 if int -;%3 == 1 if 4-operand (xmm, xmm, xmm, imm), 0 if 2- or 3-operand (xmm, xmm, xmm) -;%4 == 1 if symmetric (i.e. doesn't matter which src arg is which), 0 if not -%macro AVX_INSTR 4 - %macro %1 2-9 fnord, fnord, fnord, %1, %2, %3, %4 - %ifidn %3, fnord - RUN_AVX_INSTR %6, %7, %8, 2, %1, %2 +;%3 == 1 if non-destructive or 4-operand (xmm, xmm, xmm, imm), 0 otherwise +;%4 == 1 if commutative (i.e. doesn't matter which src arg is which), 0 if not +%macro AVX_INSTR 1-4 0, 1, 0 + %macro %1 1-9 fnord, fnord, fnord, fnord, %1, %2, %3, %4 + %ifidn %2, fnord + RUN_AVX_INSTR %6, %7, %8, %9, %1 + %elifidn %3, fnord + RUN_AVX_INSTR %6, %7, %8, %9, %1, %2 %elifidn %4, fnord - RUN_AVX_INSTR1 %6, %7, %8, 3, %1, %2, %3, %9 + RUN_AVX_INSTR %6, %7, %8, %9, %1, %2, %3 %elifidn %5, fnord - RUN_AVX_INSTR %6, %7, %8, 4, %1, %2, %3, %4 + RUN_AVX_INSTR %6, %7, %8, %9, %1, %2, %3, %4 %else - RUN_AVX_INSTR %6, %7, %8, 5, %1, %2, %3, %4, %5 + RUN_AVX_INSTR %6, %7, %8, %9, %1, %2, %3, %4, %5 %endif %endmacro %endmacro +; Instructions with both VEX and non-VEX encodings +; Non-destructive instructions are written without parameters AVX_INSTR addpd, 1, 0, 1 AVX_INSTR addps, 1, 0, 1 AVX_INSTR addsd, 1, 0, 1 AVX_INSTR addss, 1, 0, 1 AVX_INSTR addsubpd, 1, 0, 0 AVX_INSTR addsubps, 1, 0, 0 -AVX_INSTR andpd, 1, 0, 1 -AVX_INSTR andps, 1, 0, 1 +AVX_INSTR aesdec, 0, 0, 0 +AVX_INSTR aesdeclast, 0, 0, 0 +AVX_INSTR aesenc, 0, 0, 0 +AVX_INSTR aesenclast, 0, 0, 0 +AVX_INSTR aesimc +AVX_INSTR aeskeygenassist AVX_INSTR andnpd, 1, 0, 0 AVX_INSTR andnps, 1, 0, 0 +AVX_INSTR andpd, 1, 0, 1 +AVX_INSTR andps, 1, 0, 1 AVX_INSTR blendpd, 1, 0, 0 AVX_INSTR blendps, 1, 0, 0 AVX_INSTR blendvpd, 1, 0, 0 @@ -943,18 +1102,39 @@ AVX_INSTR cmpps, 1, 0, 0 AVX_INSTR cmpsd, 1, 0, 0 AVX_INSTR cmpss, 1, 0, 0 -AVX_INSTR cvtdq2ps, 1, 0, 0 -AVX_INSTR cvtps2dq, 1, 0, 0 +AVX_INSTR comisd +AVX_INSTR comiss +AVX_INSTR cvtdq2pd +AVX_INSTR cvtdq2ps +AVX_INSTR cvtpd2dq +AVX_INSTR cvtpd2ps +AVX_INSTR cvtps2dq +AVX_INSTR cvtps2pd +AVX_INSTR cvtsd2si +AVX_INSTR cvtsd2ss +AVX_INSTR cvtsi2sd +AVX_INSTR cvtsi2ss +AVX_INSTR cvtss2sd +AVX_INSTR cvtss2si +AVX_INSTR cvttpd2dq +AVX_INSTR cvttps2dq +AVX_INSTR cvttsd2si +AVX_INSTR cvttss2si AVX_INSTR divpd, 1, 0, 0 AVX_INSTR divps, 1, 0, 0 AVX_INSTR divsd, 1, 0, 0 AVX_INSTR divss, 1, 0, 0 AVX_INSTR dppd, 1, 1, 0 AVX_INSTR dpps, 1, 1, 0 +AVX_INSTR extractps AVX_INSTR haddpd, 1, 0, 0 AVX_INSTR haddps, 1, 0, 0 AVX_INSTR hsubpd, 1, 0, 0 AVX_INSTR hsubps, 1, 0, 0 +AVX_INSTR insertps, 1, 1, 0 +AVX_INSTR lddqu +AVX_INSTR ldmxcsr +AVX_INSTR maskmovdqu AVX_INSTR maxpd, 1, 0, 1 AVX_INSTR maxps, 1, 0, 1 AVX_INSTR maxsd, 1, 0, 1 @@ -963,10 +1143,31 @@ AVX_INSTR minps, 1, 0, 1 AVX_INSTR minsd, 1, 0, 1 AVX_INSTR minss, 1, 0, 1 +AVX_INSTR movapd +AVX_INSTR movaps +AVX_INSTR movd +AVX_INSTR movddup +AVX_INSTR movdqa +AVX_INSTR movdqu AVX_INSTR movhlps, 1, 0, 0 +AVX_INSTR movhpd, 1, 0, 0 +AVX_INSTR movhps, 1, 0, 0 AVX_INSTR movlhps, 1, 0, 0 +AVX_INSTR movlpd, 1, 0, 0 +AVX_INSTR movlps, 1, 0, 0 +AVX_INSTR movmskpd +AVX_INSTR movmskps +AVX_INSTR movntdq +AVX_INSTR movntdqa +AVX_INSTR movntpd +AVX_INSTR movntps +AVX_INSTR movq AVX_INSTR movsd, 1, 0, 0 +AVX_INSTR movshdup +AVX_INSTR movsldup AVX_INSTR movss, 1, 0, 0 +AVX_INSTR movupd +AVX_INSTR movups AVX_INSTR mpsadbw, 0, 1, 0 AVX_INSTR mulpd, 1, 0, 1 AVX_INSTR mulps, 1, 0, 1 @@ -974,9 +1175,9 @@ AVX_INSTR mulss, 1, 0, 1 AVX_INSTR orpd, 1, 0, 1 AVX_INSTR orps, 1, 0, 1 -AVX_INSTR pabsb, 0, 0, 0 -AVX_INSTR pabsw, 0, 0, 0 -AVX_INSTR pabsd, 0, 0, 0 +AVX_INSTR pabsb +AVX_INSTR pabsd +AVX_INSTR pabsw AVX_INSTR packsswb, 0, 0, 0 AVX_INSTR packssdw, 0, 0, 0 AVX_INSTR packuswb, 0, 0, 0 @@ -996,10 +1197,11 @@ AVX_INSTR pavgw, 0, 0, 1 AVX_INSTR pblendvb, 0, 0, 0 AVX_INSTR pblendw, 0, 1, 0 -AVX_INSTR pcmpestri, 0, 0, 0 -AVX_INSTR pcmpestrm, 0, 0, 0 -AVX_INSTR pcmpistri, 0, 0, 0 -AVX_INSTR pcmpistrm, 0, 0, 0 +AVX_INSTR pclmulqdq, 0, 1, 0 +AVX_INSTR pcmpestri +AVX_INSTR pcmpestrm +AVX_INSTR pcmpistri +AVX_INSTR pcmpistrm AVX_INSTR pcmpeqb, 0, 0, 1 AVX_INSTR pcmpeqw, 0, 0, 1 AVX_INSTR pcmpeqd, 0, 0, 1 @@ -1008,12 +1210,21 @@ AVX_INSTR pcmpgtw, 0, 0, 0 AVX_INSTR pcmpgtd, 0, 0, 0 AVX_INSTR pcmpgtq, 0, 0, 0 +AVX_INSTR pextrb +AVX_INSTR pextrd +AVX_INSTR pextrq +AVX_INSTR pextrw AVX_INSTR phaddw, 0, 0, 0 AVX_INSTR phaddd, 0, 0, 0 AVX_INSTR phaddsw, 0, 0, 0 +AVX_INSTR phminposuw AVX_INSTR phsubw, 0, 0, 0 AVX_INSTR phsubd, 0, 0, 0 AVX_INSTR phsubsw, 0, 0, 0 +AVX_INSTR pinsrb, 0, 1, 0 +AVX_INSTR pinsrd, 0, 1, 0 +AVX_INSTR pinsrq, 0, 1, 0 +AVX_INSTR pinsrw, 0, 1, 0 AVX_INSTR pmaddwd, 0, 0, 1 AVX_INSTR pmaddubsw, 0, 0, 0 AVX_INSTR pmaxsb, 0, 0, 1 @@ -1028,20 +1239,32 @@ AVX_INSTR pminub, 0, 0, 1 AVX_INSTR pminuw, 0, 0, 1 AVX_INSTR pminud, 0, 0, 1 -AVX_INSTR pmovmskb, 0, 0, 0 -AVX_INSTR pmulhuw, 0, 0, 1 +AVX_INSTR pmovmskb +AVX_INSTR pmovsxbw +AVX_INSTR pmovsxbd +AVX_INSTR pmovsxbq +AVX_INSTR pmovsxwd +AVX_INSTR pmovsxwq +AVX_INSTR pmovsxdq +AVX_INSTR pmovzxbw +AVX_INSTR pmovzxbd +AVX_INSTR pmovzxbq +AVX_INSTR pmovzxwd +AVX_INSTR pmovzxwq +AVX_INSTR pmovzxdq +AVX_INSTR pmuldq, 0, 0, 1 AVX_INSTR pmulhrsw, 0, 0, 1 +AVX_INSTR pmulhuw, 0, 0, 1 AVX_INSTR pmulhw, 0, 0, 1 AVX_INSTR pmullw, 0, 0, 1 AVX_INSTR pmulld, 0, 0, 1 AVX_INSTR pmuludq, 0, 0, 1 -AVX_INSTR pmuldq, 0, 0, 1 AVX_INSTR por, 0, 0, 1 AVX_INSTR psadbw, 0, 0, 1 AVX_INSTR pshufb, 0, 0, 0 -AVX_INSTR pshufd, 0, 1, 0 -AVX_INSTR pshufhw, 0, 1, 0 -AVX_INSTR pshuflw, 0, 1, 0 +AVX_INSTR pshufd +AVX_INSTR pshufhw +AVX_INSTR pshuflw AVX_INSTR psignb, 0, 0, 0 AVX_INSTR psignw, 0, 0, 0 AVX_INSTR psignd, 0, 0, 0 @@ -1063,7 +1286,7 @@ AVX_INSTR psubsw, 0, 0, 0 AVX_INSTR psubusb, 0, 0, 0 AVX_INSTR psubusw, 0, 0, 0 -AVX_INSTR ptest, 0, 0, 0 +AVX_INSTR ptest AVX_INSTR punpckhbw, 0, 0, 0 AVX_INSTR punpckhwd, 0, 0, 0 AVX_INSTR punpckhdq, 0, 0, 0 @@ -1073,11 +1296,27 @@ AVX_INSTR punpckldq, 0, 0, 0 AVX_INSTR punpcklqdq, 0, 0, 0 AVX_INSTR pxor, 0, 0, 1 +AVX_INSTR rcpps, 1, 0, 0 +AVX_INSTR rcpss, 1, 0, 0 +AVX_INSTR roundpd +AVX_INSTR roundps +AVX_INSTR roundsd +AVX_INSTR roundss +AVX_INSTR rsqrtps, 1, 0, 0 +AVX_INSTR rsqrtss, 1, 0, 0 +AVX_INSTR shufpd, 1, 1, 0 AVX_INSTR shufps, 1, 1, 0 +AVX_INSTR sqrtpd, 1, 0, 0 +AVX_INSTR sqrtps, 1, 0, 0 +AVX_INSTR sqrtsd, 1, 0, 0 +AVX_INSTR sqrtss, 1, 0, 0 +AVX_INSTR stmxcsr AVX_INSTR subpd, 1, 0, 0 AVX_INSTR subps, 1, 0, 0 AVX_INSTR subsd, 1, 0, 0 AVX_INSTR subss, 1, 0, 0 +AVX_INSTR ucomisd +AVX_INSTR ucomiss AVX_INSTR unpckhpd, 1, 0, 0 AVX_INSTR unpckhps, 1, 0, 0 AVX_INSTR unpcklpd, 1, 0, 0 @@ -1123,6 +1362,44 @@ FMA_INSTR pmacsww, pmullw, paddw FMA_INSTR pmadcswd, pmaddwd, paddd -; tzcnt is equivalent to "rep bsf" and is backwards-compatible with bsf. -; This lets us use tzcnt without bumping the yasm version requirement yet. -%define tzcnt rep bsf +; convert FMA4 to FMA3 if possible +%macro FMA4_INSTR 4 + %macro %1 4-8 %1, %2, %3, %4 + %if cpuflag(fma4) + v%5 %1, %2, %3, %4 + %elifidn %1, %2 + v%6 %1, %4, %3 ; %1 = %1 * %3 + %4 + %elifidn %1, %3 + v%7 %1, %2, %4 ; %1 = %2 * %1 + %4 + %elifidn %1, %4 + v%8 %1, %2, %3 ; %1 = %2 * %3 + %1 + %else + %error fma3 emulation of ``%5 %1, %2, %3, %4'' is not supported + %endif + %endmacro +%endmacro + +FMA4_INSTR fmaddpd, fmadd132pd, fmadd213pd, fmadd231pd +FMA4_INSTR fmaddps, fmadd132ps, fmadd213ps, fmadd231ps +FMA4_INSTR fmaddsd, fmadd132sd, fmadd213sd, fmadd231sd +FMA4_INSTR fmaddss, fmadd132ss, fmadd213ss, fmadd231ss + +FMA4_INSTR fmaddsubpd, fmaddsub132pd, fmaddsub213pd, fmaddsub231pd +FMA4_INSTR fmaddsubps, fmaddsub132ps, fmaddsub213ps, fmaddsub231ps +FMA4_INSTR fmsubaddpd, fmsubadd132pd, fmsubadd213pd, fmsubadd231pd +FMA4_INSTR fmsubaddps, fmsubadd132ps, fmsubadd213ps, fmsubadd231ps + +FMA4_INSTR fmsubpd, fmsub132pd, fmsub213pd, fmsub231pd +FMA4_INSTR fmsubps, fmsub132ps, fmsub213ps, fmsub231ps +FMA4_INSTR fmsubsd, fmsub132sd, fmsub213sd, fmsub231sd +FMA4_INSTR fmsubss, fmsub132ss, fmsub213ss, fmsub231ss + +FMA4_INSTR fnmaddpd, fnmadd132pd, fnmadd213pd, fnmadd231pd +FMA4_INSTR fnmaddps, fnmadd132ps, fnmadd213ps, fnmadd231ps +FMA4_INSTR fnmaddsd, fnmadd132sd, fnmadd213sd, fnmadd231sd +FMA4_INSTR fnmaddss, fnmadd132ss, fnmadd213ss, fnmadd231ss + +FMA4_INSTR fnmsubpd, fnmsub132pd, fnmsub213pd, fnmsub231pd +FMA4_INSTR fnmsubps, fnmsub132ps, fnmsub213ps, fnmsub231ps +FMA4_INSTR fnmsubsd, fnmsub132sd, fnmsub213sd, fnmsub231sd +FMA4_INSTR fnmsubss, fnmsub132ss, fnmsub213ss, fnmsub231ss diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/x86util.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/x86util.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/common/x86/x86util.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/common/x86/x86util.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* x86util.asm: x86 utility macros ;***************************************************************************** -;* Copyright (C) 2008-2012 x264 project +;* Copyright (C) 2008-2013 x264 project ;* ;* Authors: Holger Lubitz ;* Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/config.guess ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/config.guess --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/config.guess 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/config.guess 2013-04-22 20:02:28.000000000 +0000 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-09-25' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -200,6 +200,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +306,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +805,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -1201,6 +1208,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1256,7 +1266,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1340,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <= 12 defaults to a mod16 stack fi # icl on windows has no mod16 stack support - [ $SYS = WINDOWS ] && define BROKEN_STACK_ALIGNMENT + [ $SYS = WINDOWS ] && define BROKEN_STACK_ALIGNMENT && aligned_stack=0 fi if [ "$SYS" = MACOSX ]; then ASFLAGS="$ASFLAGS -f macho -DPREFIX" @@ -648,6 +650,7 @@ ARCH="$(echo $host_cpu | tr a-z A-Z)" ;; esac +ASFLAGS="$ASFLAGS -DHAVE_ALIGNED_STACK=${aligned_stack}" if [ $SYS = WINDOWS ]; then if ! rc_check "0 RCDATA {0}" ; then @@ -684,10 +687,10 @@ fi if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then - if ! as_check "vpperm xmm0, xmm0, xmm0, xmm0" ; then + if ! as_check "vpmovzxwd ymm0, xmm0" ; then VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1` echo "Found $VER" - echo "Minimum version is yasm-1.0.0" + echo "Minimum version is yasm-1.2.0" echo "If you really want to compile without asm, configure with --disable-asm." exit 1 fi @@ -904,7 +907,7 @@ fi if [ "$gpac" = "yes" ] ; then define HAVE_GPAC - if cc_check gpac/isomedia.h "-Werror $GPAC_LIBS" "gf_malloc(1); gf_free(NULL);" ; then + if cc_check gpac/isomedia.h "-Werror $GPAC_LIBS" "void *p; p = gf_malloc(1); gf_free(p);" ; then define HAVE_GF_MALLOC fi LDFLAGSCLI="$GPAC_LIBS $LDFLAGSCLI" diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/doc/regression_test.txt ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/doc/regression_test.txt --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/doc/regression_test.txt 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/doc/regression_test.txt 2013-04-22 20:02:28.000000000 +0000 @@ -4,7 +4,7 @@ inherently caused by compression. # Install and compile x264 : -svn co svn://svn.videolan.org/x264/trunk x264 +git clone git://git.videolan.org/x264.git x264 cd x264 ./configure make diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/analyse.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/analyse.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/analyse.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/analyse.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * analyse.c: macroblock analysis ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -2922,7 +2922,7 @@ { if( !origcbp ) { - h->mb.i_qp = X264_MAX( h->mb.i_qp - threshold - 1, h->param.rc.i_qp_min ); + h->mb.i_qp = X264_MAX( h->mb.i_qp - threshold - 1, SPEC_QP( h->param.rc.i_qp_min ) ); h->mb.i_chroma_qp = h->chroma_qp_table[h->mb.i_qp]; already_checked_cost = x264_rd_cost_mb( h, a->i_lambda2 ); if( !h->mb.cbp[h->mb.i_mb_xy] ) diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/analyse.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/analyse.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/analyse.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/analyse.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * analyse.h: macroblock analysis ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -34,7 +34,7 @@ void x264_macroblock_analyse( x264_t *h ); void x264_slicetype_decide( x264_t *h ); -void x264_slicetype_analyse( x264_t *h, int keyframe ); +void x264_slicetype_analyse( x264_t *h, int intra_minigop ); int x264_weighted_reference_duplicate( x264_t *h, int i_ref, const x264_weight_t *w ); diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/cabac.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/cabac.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/cabac.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/cabac.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * cabac.c: cabac bitstream writing ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -659,11 +659,12 @@ 227+0, 227+10, 227+20, 227+30, 227+39, 426, 952+0, 952+10, 952+20, 708, 982+0, 982+10, 982+20, 766 }; #if RDO_SKIP_BS -extern const uint8_t x264_significant_coeff_flag_offset_8x8[2][63]; +extern const uint8_t x264_significant_coeff_flag_offset_8x8[2][64]; extern const uint8_t x264_last_coeff_flag_offset_8x8[63]; extern const uint8_t x264_coeff_flag_offset_chroma_422_dc[7]; #else -const uint8_t x264_significant_coeff_flag_offset_8x8[2][63] = +/* Padded to [64] for easier addressing */ +const uint8_t x264_significant_coeff_flag_offset_8x8[2][64] = {{ 0, 1, 2, 3, 4, 5, 5, 4, 4, 3, 3, 4, 4, 4, 5, 5, 4, 4, 4, 4, 3, 3, 6, 7, 7, 7, 8, 9,10, 9, 8, 7, diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/cavlc.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/cavlc.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/cavlc.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/cavlc.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * cavlc.c: cavlc bitstream writing ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/encoder.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/encoder.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/encoder.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/encoder.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * encoder.c: top-level encoder functions ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -2236,14 +2236,11 @@ /* Slice header */ x264_macroblock_thread_init( h ); - /* If this isn't the first slice in the threadslice, set the slice QP - * equal to the last QP in the previous slice for more accurate - * CABAC initialization. */ - if( h->sh.i_first_mb != h->i_threadslice_start * h->mb.i_mb_width ) - { - h->sh.i_qp = h->mb.i_last_qp; - h->sh.i_qp_delta = h->sh.i_qp - h->pps->i_pic_init_qp; - } + /* Set the QP equal to the first QP in the slice for more accurate CABAC initialization. */ + h->mb.i_mb_xy = h->sh.i_first_mb; + h->sh.i_qp = x264_ratecontrol_mb_qp( h ); + h->sh.i_qp = SPEC_QP( h->sh.i_qp ); + h->sh.i_qp_delta = h->sh.i_qp - h->pps->i_pic_init_qp; x264_slice_header_write( &h->out.bs, &h->sh, h->i_nal_ref_idc ); if( h->param.b_cabac ) diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/lookahead.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/lookahead.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/lookahead.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/lookahead.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * lookahead.c: high-level lookahead functions ***************************************************************************** - * Copyright (C) 2010-2012 Avail Media and x264 project + * Copyright (C) 2010-2013 Avail Media and x264 project * * Authors: Michael Kazmier * Alex Giladi @@ -70,23 +70,24 @@ x264_stack_align( x264_slicetype_decide, h ); x264_lookahead_update_last_nonb( h, h->lookahead->next.list[0] ); + int shift_frames = h->lookahead->next.list[0]->i_bframes + 1; x264_pthread_mutex_lock( &h->lookahead->ofbuf.mutex ); while( h->lookahead->ofbuf.i_size == h->lookahead->ofbuf.i_max_size ) x264_pthread_cond_wait( &h->lookahead->ofbuf.cv_empty, &h->lookahead->ofbuf.mutex ); x264_pthread_mutex_lock( &h->lookahead->next.mutex ); - x264_lookahead_shift( &h->lookahead->ofbuf, &h->lookahead->next, h->lookahead->next.list[0]->i_bframes + 1 ); + x264_lookahead_shift( &h->lookahead->ofbuf, &h->lookahead->next, shift_frames ); x264_pthread_mutex_unlock( &h->lookahead->next.mutex ); /* For MB-tree and VBV lookahead, we have to perform propagation analysis on I-frames too. */ if( h->lookahead->b_analyse_keyframe && IS_X264_TYPE_I( h->lookahead->last_nonb->i_type ) ) - x264_stack_align( x264_slicetype_analyse, h, 1 ); + x264_stack_align( x264_slicetype_analyse, h, shift_frames ); x264_pthread_mutex_unlock( &h->lookahead->ofbuf.mutex ); } -static void x264_lookahead_thread( x264_t *h ) +static void *x264_lookahead_thread( x264_t *h ) { int shift; #if HAVE_MMX @@ -123,6 +124,7 @@ h->lookahead->b_thread_active = 0; x264_pthread_cond_broadcast( &h->lookahead->ofbuf.cv_fill ); x264_pthread_mutex_unlock( &h->lookahead->ofbuf.mutex ); + return NULL; } #endif @@ -235,11 +237,12 @@ x264_stack_align( x264_slicetype_decide, h ); x264_lookahead_update_last_nonb( h, h->lookahead->next.list[0] ); - x264_lookahead_shift( &h->lookahead->ofbuf, &h->lookahead->next, h->lookahead->next.list[0]->i_bframes + 1 ); + int shift_frames = h->lookahead->next.list[0]->i_bframes + 1; + x264_lookahead_shift( &h->lookahead->ofbuf, &h->lookahead->next, shift_frames ); /* For MB-tree and VBV lookahead, we have to perform propagation analysis on I-frames too. */ if( h->lookahead->b_analyse_keyframe && IS_X264_TYPE_I( h->lookahead->last_nonb->i_type ) ) - x264_stack_align( x264_slicetype_analyse, h, 1 ); + x264_stack_align( x264_slicetype_analyse, h, shift_frames ); x264_lookahead_encoder_shift( h ); } diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/macroblock.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/macroblock.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/macroblock.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/macroblock.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * macroblock.c: macroblock encoding ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/macroblock.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/macroblock.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/macroblock.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/macroblock.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * macroblock.h: macroblock encoding ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/me.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/me.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/me.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/me.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * me.c: motion estimation ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/me.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/me.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/me.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/me.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * me.h: motion estimation ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/ratecontrol.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/ratecontrol.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/ratecontrol.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/ratecontrol.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * ratecontrol.c: ratecontrol ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Loren Merritt * Michael Niedermayer @@ -1018,6 +1018,7 @@ /* read stats */ p = stats_in; + double total_qp_aq = 0; for( int i = 0; i < rc->num_entries; i++ ) { ratecontrol_entry_t *rce; @@ -1025,7 +1026,7 @@ char pict_type; int e; char *next; - float qp; + float qp_rc, qp_aq; int ref; next= strchr(p, ';'); @@ -1041,8 +1042,8 @@ rce = &rc->entry[frame_number]; rce->direct_mode = 0; - e += sscanf( p, " in:%*d out:%*d type:%c dur:%"SCNd64" cpbdur:%"SCNd64" q:%f tex:%d mv:%d misc:%d imb:%d pmb:%d smb:%d d:%c", - &pict_type, &rce->i_duration, &rce->i_cpb_duration, &qp, &rce->tex_bits, + e += sscanf( p, " in:%*d out:%*d type:%c dur:%"SCNd64" cpbdur:%"SCNd64" q:%f aq:%f tex:%d mv:%d misc:%d imb:%d pmb:%d smb:%d d:%c", + &pict_type, &rce->i_duration, &rce->i_cpb_duration, &qp_rc, &qp_aq, &rce->tex_bits, &rce->mv_bits, &rce->misc_bits, &rce->i_count, &rce->p_count, &rce->s_count, &rce->direct_mode ); rce->tex_bits *= res_factor_bits; @@ -1107,15 +1108,17 @@ break; default: e = -1; break; } - if( e < 12 ) + if( e < 13 ) { parse_error: x264_log( h, X264_LOG_ERROR, "statistics are damaged at line %d, parser out=%d\n", i, e ); return -1; } - rce->qscale = qp2qscale( qp ); + rce->qscale = qp2qscale( qp_rc ); + total_qp_aq += qp_aq; p = next; } + h->pps->i_pic_init_qp = SPEC_QP( (int)(total_qp_aq / rc->num_entries + 0.5) ); x264_free( stats_buf ); @@ -1801,10 +1804,11 @@ dir_avg>0 ? 's' : dir_avg<0 ? 't' : '-' ) : '-'; if( fprintf( rc->p_stat_file_out, - "in:%d out:%d type:%c dur:%"PRId64" cpbdur:%"PRId64" q:%.2f tex:%d mv:%d misc:%d imb:%d pmb:%d smb:%d d:%c ref:", + "in:%d out:%d type:%c dur:%"PRId64" cpbdur:%"PRId64" q:%.2f aq:%.2f tex:%d mv:%d misc:%d imb:%d pmb:%d smb:%d d:%c ref:", h->fenc->i_frame, h->i_frame, c_type, h->fenc->i_duration, - h->fenc->i_cpb_duration, rc->qpa_rc, + h->fenc->i_cpb_duration, + rc->qpa_rc, h->fdec->f_qp_avg_aq, h->stat.frame.i_tex_bits, h->stat.frame.i_mv_bits, h->stat.frame.i_misc_bits, diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/ratecontrol.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/ratecontrol.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/ratecontrol.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/ratecontrol.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * ratecontrol.h: ratecontrol ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/rdo.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/rdo.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/rdo.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/rdo.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * rdo.c: rate-distortion optimization ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Loren Merritt * Jason Garrett-Glaser diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/set.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/set.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/set.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/set.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * set: header writing ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -575,7 +575,7 @@ memcpy( payload, uuid, 16 ); sprintf( payload+16, "x264 - core %d%s - H.264/MPEG-4 AVC codec - " - "Copy%s 2003-2012 - http://www.videolan.org/x264.html - options: %s", + "Copy%s 2003-2013 - http://www.videolan.org/x264.html - options: %s", X264_BUILD, X264_VERSION, HAVE_GPL?"left":"right", opts ); length = strlen(payload)+1; @@ -727,23 +727,23 @@ const x264_level_t x264_levels[] = { - { 10, 1485, 99, 152064, 64, 175, 64, 64, 0, 2, 0, 0, 1 }, - { 9, 1485, 99, 152064, 128, 350, 64, 64, 0, 2, 0, 0, 1 }, /* "1b" */ - { 11, 3000, 396, 345600, 192, 500, 128, 64, 0, 2, 0, 0, 1 }, - { 12, 6000, 396, 912384, 384, 1000, 128, 64, 0, 2, 0, 0, 1 }, - { 13, 11880, 396, 912384, 768, 2000, 128, 64, 0, 2, 0, 0, 1 }, - { 20, 11880, 396, 912384, 2000, 2000, 128, 64, 0, 2, 0, 0, 1 }, - { 21, 19800, 792, 1824768, 4000, 4000, 256, 64, 0, 2, 0, 0, 0 }, - { 22, 20250, 1620, 3110400, 4000, 4000, 256, 64, 0, 2, 0, 0, 0 }, - { 30, 40500, 1620, 3110400, 10000, 10000, 256, 32, 22, 2, 0, 1, 0 }, - { 31, 108000, 3600, 6912000, 14000, 14000, 512, 16, 60, 4, 1, 1, 0 }, - { 32, 216000, 5120, 7864320, 20000, 20000, 512, 16, 60, 4, 1, 1, 0 }, - { 40, 245760, 8192, 12582912, 20000, 25000, 512, 16, 60, 4, 1, 1, 0 }, - { 41, 245760, 8192, 12582912, 50000, 62500, 512, 16, 24, 2, 1, 1, 0 }, - { 42, 522240, 8704, 13369344, 50000, 62500, 512, 16, 24, 2, 1, 1, 1 }, - { 50, 589824, 22080, 42393600, 135000, 135000, 512, 16, 24, 2, 1, 1, 1 }, - { 51, 983040, 36864, 70778880, 240000, 240000, 512, 16, 24, 2, 1, 1, 1 }, - { 52, 2073600, 36864, 70778880, 240000, 240000, 512, 16, 24, 2, 1, 1, 1 }, + { 10, 1485, 99, 396, 64, 175, 64, 64, 0, 2, 0, 0, 1 }, + { 9, 1485, 99, 396, 128, 350, 64, 64, 0, 2, 0, 0, 1 }, /* "1b" */ + { 11, 3000, 396, 900, 192, 500, 128, 64, 0, 2, 0, 0, 1 }, + { 12, 6000, 396, 2376, 384, 1000, 128, 64, 0, 2, 0, 0, 1 }, + { 13, 11880, 396, 2376, 768, 2000, 128, 64, 0, 2, 0, 0, 1 }, + { 20, 11880, 396, 2376, 2000, 2000, 128, 64, 0, 2, 0, 0, 1 }, + { 21, 19800, 792, 4752, 4000, 4000, 256, 64, 0, 2, 0, 0, 0 }, + { 22, 20250, 1620, 8100, 4000, 4000, 256, 64, 0, 2, 0, 0, 0 }, + { 30, 40500, 1620, 8100, 10000, 10000, 256, 32, 22, 2, 0, 1, 0 }, + { 31, 108000, 3600, 18000, 14000, 14000, 512, 16, 60, 4, 1, 1, 0 }, + { 32, 216000, 5120, 20480, 20000, 20000, 512, 16, 60, 4, 1, 1, 0 }, + { 40, 245760, 8192, 32768, 20000, 25000, 512, 16, 60, 4, 1, 1, 0 }, + { 41, 245760, 8192, 32768, 50000, 62500, 512, 16, 24, 2, 1, 1, 0 }, + { 42, 522240, 8704, 34816, 50000, 62500, 512, 16, 24, 2, 1, 1, 1 }, + { 50, 589824, 22080, 110400, 135000, 135000, 512, 16, 24, 2, 1, 1, 1 }, + { 51, 983040, 36864, 184320, 240000, 240000, 512, 16, 24, 2, 1, 1, 1 }, + { 52, 2073600, 36864, 184320, 240000, 240000, 512, 16, 24, 2, 1, 1, 1 }, { 0 } }; @@ -758,7 +758,7 @@ { int ret = 0; int mbs = h->sps->i_mb_width * h->sps->i_mb_height; - int dpb = mbs * 384 * h->sps->vui.i_max_dec_frame_buffering; + int dpb = mbs * h->sps->vui.i_max_dec_frame_buffering; int cbp_factor = h->sps->i_profile_idc>=PROFILE_HIGH422 ? 16 : h->sps->i_profile_idc==PROFILE_HIGH10 ? 12 : h->sps->i_profile_idc==PROFILE_HIGH ? 5 : 4; @@ -773,8 +773,8 @@ ERROR( "frame MB size (%dx%d) > level limit (%d)\n", h->sps->i_mb_width, h->sps->i_mb_height, l->frame_size ); if( dpb > l->dpb ) - ERROR( "DPB size (%d frames, %d bytes) > level limit (%d frames, %d bytes)\n", - h->sps->vui.i_max_dec_frame_buffering, dpb, (int)(l->dpb / (384*mbs)), l->dpb ); + ERROR( "DPB size (%d frames, %d mbs) > level limit (%d frames, %d mbs)\n", + h->sps->vui.i_max_dec_frame_buffering, dpb, l->dpb / mbs, l->dpb ); #define CHECK( name, limit, val ) \ if( (val) > (limit) ) \ diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/set.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/set.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/set.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/set.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * set.h: header writing ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/slicetype.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/slicetype.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/encoder/slicetype.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/encoder/slicetype.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * slicetype.c: lookahead analysis ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Jason Garrett-Glaser * Loren Merritt @@ -1393,7 +1393,7 @@ return scenecut_internal( h, a, frames, p0, p1, real_scenecut ); } -void x264_slicetype_analyse( x264_t *h, int keyframe ) +void x264_slicetype_analyse( x264_t *h, int intra_minigop ) { x264_mb_analysis_t a; x264_frame_t *frames[X264_LOOKAHEAD_MAX+3] = { NULL, }; @@ -1402,8 +1402,13 @@ int cost1p0, cost2p0, cost1b1, cost2p1; int i_max_search = X264_MIN( h->lookahead->next.i_size, X264_LOOKAHEAD_MAX ); int vbv_lookahead = h->param.rc.i_vbv_buffer_size && h->param.rc.i_lookahead; + /* For determinism we should limit the search to the number of frames lookahead has for sure + * in h->lookahead->next.list buffer, except at the end of stream. + * For normal calls with (intra_minigop == 0) that is h->lookahead->i_slicetype_length + 1 frames. + * And for I-frame calls (intra_minigop != 0) we already removed intra_minigop frames from there. */ if( h->param.b_deterministic ) - i_max_search = X264_MIN( i_max_search, h->lookahead->i_slicetype_length + !keyframe ); + i_max_search = X264_MIN( i_max_search, h->lookahead->i_slicetype_length + 1 - intra_minigop ); + int keyframe = !!intra_minigop; assert( h->frames.b_have_lowres ); @@ -1651,7 +1656,10 @@ if( warn && h->param.b_open_gop ) warn &= frm->i_type != X264_TYPE_I; if( warn ) + { x264_log( h, X264_LOG_WARNING, "specified frame type (%d) at %d is not compatible with keyframe interval\n", frm->i_type, frm->i_frame ); + frm->i_type = h->param.b_open_gop && h->lookahead->i_last_keyframe >= 0 ? X264_TYPE_I : X264_TYPE_IDR; + } } if( frm->i_type == X264_TYPE_I && frm->i_frame - h->lookahead->i_last_keyframe >= h->param.i_keyint_min ) { diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/filters.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/filters.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/filters.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/filters.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * filters.c: common filter functions ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Diogo Franco * Steven Walters diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/filters.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/filters.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/filters.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/filters.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * filters.h: common filter functions ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Diogo Franco * Steven Walters diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/cache.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/cache.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/cache.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/cache.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * cache.c: cache video filter ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/crop.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/crop.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/crop.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/crop.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * crop.c: crop video filter ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * James Darnley diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/depth.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/depth.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/depth.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/depth.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * depth.c: bit-depth conversion video filter ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Oskar Arvidsson * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/fix_vfr_pts.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/fix_vfr_pts.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/fix_vfr_pts.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/fix_vfr_pts.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * fix_vfr_pts.c: vfr pts fixing video filter ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/internal.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/internal.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/internal.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/internal.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * internal.c: video filter utilities ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/internal.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/internal.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/internal.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/internal.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * internal.h: video filter utilities ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/resize.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/resize.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/resize.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/resize.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * resize.c: resize video filter ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/select_every.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/select_every.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/select_every.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/select_every.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * select_every.c: select-every video filter ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/source.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/source.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/source.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/source.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * source.c: source video filter ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/video.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/video.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/video.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/video.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * video.c: video filters ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/video.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/video.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/filters/video/video.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/filters/video/video.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * video.h: video filters ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/avs.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/avs.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/avs.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/avs.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * avs.c: avisynth input ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/ffms.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/ffms.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/ffms.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/ffms.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * ffms.c: ffmpegsource input ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: Mike Gurlitz * Steven Walters diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/input.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/input.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/input.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/input.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * input.c: common input functions ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Steven Walters * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/input.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/input.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/input.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/input.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * input.h: file input ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/lavf.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/lavf.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/lavf.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/lavf.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * lavf.c: libavformat input ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: Mike Gurlitz * Steven Walters @@ -28,12 +28,14 @@ #define FAIL_IF_ERROR( cond, ... ) FAIL_IF_ERR( cond, "lavf", __VA_ARGS__ ) #undef DECLARE_ALIGNED #include +#include #include #include typedef struct { AVFormatContext *lavf; + AVFrame *frame; int stream_id; int next_frame; int vfr_input; @@ -80,8 +82,8 @@ AVCodecContext *c = h->lavf->streams[h->stream_id]->codec; AVPacket *pkt = p_pic->opaque; - AVFrame frame; - avcodec_get_frame_defaults( &frame ); + + avcodec_get_frame_defaults( h->frame ); while( i_frame >= h->next_frame ) { @@ -97,7 +99,7 @@ pkt->size = 0; c->reordered_opaque = pkt->pts; - if( avcodec_decode_video2( c, &frame, &finished, pkt ) < 0 ) + if( avcodec_decode_video2( c, h->frame, &finished, pkt ) < 0 ) x264_cli_log( "lavf", X264_LOG_WARNING, "video decoding failed on frame %d\n", h->next_frame ); } /* if the packet successfully decoded but the data from it is not desired, free it */ @@ -111,8 +113,8 @@ h->next_frame++; } - memcpy( p_pic->img.stride, frame.linesize, sizeof(p_pic->img.stride) ); - memcpy( p_pic->img.plane, frame.data, sizeof(p_pic->img.plane) ); + memcpy( p_pic->img.stride, h->frame->linesize, sizeof(p_pic->img.stride) ); + memcpy( p_pic->img.plane, h->frame->data, sizeof(p_pic->img.plane) ); int is_fullrange = 0; p_pic->img.width = c->width; p_pic->img.height = c->height; @@ -121,15 +123,15 @@ if( info ) { info->fullrange = is_fullrange; - info->interlaced = frame.interlaced_frame; - info->tff = frame.top_field_first; + info->interlaced = h->frame->interlaced_frame; + info->tff = h->frame->top_field_first; } if( h->vfr_input ) { p_pic->pts = p_pic->duration = 0; - if( c->has_b_frames && frame.reordered_opaque != AV_NOPTS_VALUE ) - p_pic->pts = frame.reordered_opaque; + if( c->has_b_frames && h->frame->reordered_opaque != AV_NOPTS_VALUE ) + p_pic->pts = h->frame->reordered_opaque; else if( pkt->dts != AV_NOPTS_VALUE ) p_pic->pts = pkt->dts; // for AVI files else if( info ) @@ -151,6 +153,10 @@ if( !strcmp( psz_filename, "-" ) ) psz_filename = "pipe:"; + h->frame = avcodec_alloc_frame(); + if( !h->frame ) + return -1; + /* if resolution was passed in, place it and colorspace into options. this allows raw video support */ AVDictionary *options = NULL; if( opt->resolution ) @@ -246,6 +252,11 @@ lavf_hnd_t *h = handle; avcodec_close( h->lavf->streams[h->stream_id]->codec ); avformat_close_input( &h->lavf ); +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0) + avcodec_free_frame( &h->frame ); +#else + av_freep( &h->frame ); +#endif free( h ); return 0; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/raw.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/raw.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/raw.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/raw.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * raw.c: raw input ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/thread.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/thread.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/thread.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/thread.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * thread.c: threaded input ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/timecode.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/timecode.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/timecode.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/timecode.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * timecode.c: timecode file input ***************************************************************************** - * Copyright (C) 2010-2012 x264 project + * Copyright (C) 2010-2013 x264 project * * Authors: Yusuke Nakamura * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/y4m.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/y4m.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/input/y4m.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/input/y4m.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * y4m.c: y4m input ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -35,6 +35,7 @@ int frame_header_len; uint64_t frame_size; uint64_t plane_size[3]; + int bit_depth; } y4m_hnd_t; #define Y4M_MAGIC "YUV4MPEG2" @@ -42,15 +43,23 @@ #define Y4M_FRAME_MAGIC "FRAME" #define MAX_FRAME_HEADER 80 -static int csp_string_to_int( char *csp_name ) +static int parse_csp_and_depth( char *csp_name, int *bit_depth ) { - int csp = X264_CSP_MAX; + int csp = X264_CSP_MAX; + *bit_depth = 8; + + /* Set colorspace from known variants */ if( !strncmp( "420", csp_name, 3 ) ) csp = X264_CSP_I420; else if( !strncmp( "422", csp_name, 3 ) ) csp = X264_CSP_I422; else if( !strncmp( "444", csp_name, 3 ) && strncmp( "444alpha", csp_name, 8 ) ) // only accept alphaless 4:4:4 csp = X264_CSP_I444; + + /* Set high bit depth from known extensions */ + if( !strncmp( "p", csp_name + 3, 1 ) ) + *bit_depth = strtol( csp_name + 4, NULL, 10 ); + return csp; } @@ -63,6 +72,7 @@ char *tokend, *header_end; int colorspace = X264_CSP_NONE; int alt_colorspace = X264_CSP_NONE; + int alt_bit_depth = 8; if( !h ) return -1; @@ -112,7 +122,7 @@ tokstart=tokend; break; case 'C': /* Color space */ - colorspace = csp_string_to_int( tokstart ); + colorspace = parse_csp_and_depth( tokstart, &h->bit_depth ); tokstart = strchr( tokstart, 0x20 ); break; case 'I': /* Interlace type */ @@ -159,7 +169,7 @@ { /* Older nonstandard pixel format representation */ tokstart += 6; - alt_colorspace = csp_string_to_int( tokstart ); + alt_colorspace = parse_csp_and_depth( tokstart, &alt_bit_depth ); } tokstart = strchr( tokstart, 0x20 ); break; @@ -167,22 +177,37 @@ } if( colorspace == X264_CSP_NONE ) - colorspace = alt_colorspace; + { + colorspace = alt_colorspace; + h->bit_depth = alt_bit_depth; + } - // default to 4:2:0 if nothing is specified + // default to 8bit 4:2:0 if nothing is specified if( colorspace == X264_CSP_NONE ) - colorspace = X264_CSP_I420; + { + colorspace = X264_CSP_I420; + h->bit_depth = 8; + } FAIL_IF_ERROR( colorspace <= X264_CSP_NONE || colorspace >= X264_CSP_MAX, "colorspace unhandled\n" ) + FAIL_IF_ERROR( h->bit_depth < 8 || h->bit_depth > 16, "unsupported bit depth `%d'\n", h->bit_depth ); info->thread_safe = 1; info->num_frames = 0; info->csp = colorspace; h->frame_size = h->frame_header_len; - for( i = 0; i < x264_cli_csps[info->csp].planes; i++ ) + + if( h->bit_depth > 8 ) + info->csp |= X264_CSP_HIGH_DEPTH; + + const x264_cli_csp_t *csp = x264_cli_get_csp( info->csp ); + + for( i = 0; i < csp->planes; i++ ) { h->plane_size[i] = x264_cli_pic_plane_size( info->csp, info->width, info->height, i ); h->frame_size += h->plane_size[i]; + /* x264_cli_pic_plane_size returns the size in bytes, we need the value in pixels from here on */ + h->plane_size[i] /= x264_cli_csp_depth_factor( info->csp ); } /* Most common case: frame_header = "FRAME" */ @@ -202,6 +227,7 @@ static int read_frame_internal( cli_pic_t *pic, y4m_hnd_t *h ) { size_t slen = strlen( Y4M_FRAME_MAGIC ); + int pixel_depth = x264_cli_csp_depth_factor( pic->img.csp ); int i = 0; char header[16]; @@ -222,7 +248,19 @@ int error = 0; for( i = 0; i < pic->img.planes && !error; i++ ) - error |= fread( pic->img.plane[i], h->plane_size[i], 1, h->fh ) <= 0; + { + error |= fread( pic->img.plane[i], pixel_depth, h->plane_size[i], h->fh ) != h->plane_size[i]; + if( h->bit_depth & 7 ) + { + /* upconvert non 16bit high depth planes to 16bit using the same + * algorithm as used in the depth filter. */ + uint16_t *plane = (uint16_t*)pic->img.plane[i]; + uint64_t pixel_count = h->plane_size[i]; + int lshift = 16 - h->bit_depth; + for( uint64_t j = 0; j < pixel_count; j++ ) + plane[j] = plane[j] << lshift; + } + } return error; } diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/flv.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/flv.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/flv.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/flv.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * flv.c: flv muxer ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: Kieran Kunhya * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/flv_bytestream.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/flv_bytestream.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/flv_bytestream.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/flv_bytestream.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * flv_bytestream.c: flv muxer utilities ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: Kieran Kunhya * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/flv_bytestream.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/flv_bytestream.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/flv_bytestream.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/flv_bytestream.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * flv_bytestream.h: flv muxer utilities ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: Kieran Kunhya * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/matroska.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/matroska.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/matroska.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/matroska.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * matroska.c: matroska muxer ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Mike Matsnev * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/matroska_ebml.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/matroska_ebml.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/matroska_ebml.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/matroska_ebml.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * matroska_ebml.c: matroska muxer utilities ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Mike Matsnev * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/matroska_ebml.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/matroska_ebml.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/matroska_ebml.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/matroska_ebml.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * matroska_ebml.h: matroska muxer utilities ***************************************************************************** - * Copyright (C) 2005-2012 x264 project + * Copyright (C) 2005-2013 x264 project * * Authors: Mike Matsnev * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/mp4.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/mp4.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/mp4.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/mp4.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * mp4.c: mp4 muxer ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/output.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/output.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/output.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/output.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * output.h: x264 file output modules ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/raw.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/raw.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/output/raw.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/output/raw.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * raw.c: raw muxer ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/tools/checkasm-a.asm ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/tools/checkasm-a.asm --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/tools/checkasm-a.asm 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/tools/checkasm-a.asm 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ ;***************************************************************************** ;* checkasm-a.asm: assembly check tool ;***************************************************************************** -;* Copyright (C) 2008-2012 x264 project +;* Copyright (C) 2008-2013 x264 project ;* ;* Authors: Loren Merritt ;* Henrik Gramner @@ -199,7 +199,7 @@ mov dword [r1], 0 mov eax, r3 .ok: - RET + REP_RET %endif ; ARCH_X86_64 diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/tools/checkasm.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/tools/checkasm.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/tools/checkasm.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/tools/checkasm.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * checkasm.c: assembly check tool ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar @@ -164,6 +164,7 @@ if( k < j ) continue; printf( "%s_%s%s: %"PRId64"\n", benchs[i].name, + b->cpu&X264_CPU_AVX2 && b->cpu&X264_CPU_FMA3 ? "avx2_fma3" : b->cpu&X264_CPU_AVX2 ? "avx2" : b->cpu&X264_CPU_FMA3 ? "fma3" : b->cpu&X264_CPU_FMA4 ? "fma4" : @@ -2444,11 +2445,6 @@ ret |= add_flags( &cpu0, &cpu1, X264_CPU_FMA4, "FMA4" ); cpu1 &= ~X264_CPU_FMA4; } - if( x264_cpu_detect() & X264_CPU_FMA3 ) - { - ret |= add_flags( &cpu0, &cpu1, X264_CPU_FMA3, "FMA3" ); - cpu1 &= ~X264_CPU_FMA3; - } if( x264_cpu_detect() & X264_CPU_BMI1 ) { ret |= add_flags( &cpu0, &cpu1, X264_CPU_BMI1, "BMI1" ); @@ -2466,6 +2462,11 @@ } if( x264_cpu_detect() & X264_CPU_AVX2 ) ret |= add_flags( &cpu0, &cpu1, X264_CPU_AVX2, "AVX2" ); + if( x264_cpu_detect() & X264_CPU_FMA3 ) + { + ret |= add_flags( &cpu0, &cpu1, X264_CPU_FMA3, "FMA3" ); + cpu1 &= ~X264_CPU_FMA3; + } #elif ARCH_PPC if( x264_cpu_detect() & X264_CPU_ALTIVEC ) { diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * x264: top-level x264cli functions ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Loren Merritt * Laurent Aimar @@ -1616,11 +1616,8 @@ for( int i = 0; x264_levels[i].level_idc != 0; i++ ) if( param->i_level_idc == x264_levels[i].level_idc ) { - while( mbs * 384 * param->i_frame_reference > x264_levels[i].dpb && - param->i_frame_reference > 1 ) - { + while( mbs * param->i_frame_reference > x264_levels[i].dpb && param->i_frame_reference > 1 ) param->i_frame_reference--; - } break; } } diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * x264.h: x264 public header ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -41,7 +41,7 @@ #include "x264_config.h" -#define X264_BUILD 128 +#define X264_BUILD 129 /* Application developers planning to link against a shared library version of * libx264 from a Microsoft Visual Studio or similar development environment @@ -523,7 +523,7 @@ int level_idc; int mbps; /* max macroblock processing rate (macroblocks/sec) */ int frame_size; /* max frame size (macroblocks) */ - int dpb; /* max decoded picture buffer (bytes) */ + int dpb; /* max decoded picture buffer (mbs) */ int bitrate; /* max bitrate (kbit/sec) */ int cpb; /* max vbv buffer (kbit) */ int mv_range; /* max vertical mv component range (pixels) */ diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264cli.h ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264cli.h --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264cli.h 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264cli.h 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * x264cli.h: x264cli common ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2013 x264 project * * Authors: Laurent Aimar * Loren Merritt diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264dll.c ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264dll.c --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264dll.c 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264dll.c 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * x264dll: x264 DLLMain for win32 ***************************************************************************** - * Copyright (C) 2009-2012 x264 project + * Copyright (C) 2009-2013 x264 project * * Authors: Anton Mitrofanov * diff -Nru ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264res.rc ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264res.rc --- ps3mediaserver-1.71.0+mencoder35005/target/bin-tools/src/x264/x264res.rc 2012-11-10 22:12:24.000000000 +0000 +++ ps3mediaserver-1.81.0+mencoder35005/target/bin-tools/src/x264/x264res.rc 2013-04-22 20:02:28.000000000 +0000 @@ -1,7 +1,7 @@ /***************************************************************************** * x264res.rc: windows resource file ***************************************************************************** - * Copyright (C) 2012 x264 project + * Copyright (C) 2012-2013 x264 project * * Authors: Henrik Gramner * @@ -60,7 +60,7 @@ #endif VALUE "FileVersion", X264_POINTVER VALUE "InternalName", "x264" - VALUE "LegalCopyright", "Copyright (C) 2003-2012 x264 project" + VALUE "LegalCopyright", "Copyright (C) 2003-2013 x264 project" #ifdef DLL VALUE "OriginalFilename", "libx264-" xstr(X264_BUILD) ".dll" #else