Permalink
Browse files

Fixed FFmpeg muxing on non-PS3 renderers

  • Loading branch information...
1 parent 3ec8acf commit aa1cb1329858a2b69a277e5a9cde3b37e815a6e6 @SubJunk SubJunk committed Jul 18, 2013
Showing with 27 additions and 15 deletions.
  1. +27 −15 src/main/java/net/pms/dlna/DLNAResource.java
@@ -1418,11 +1418,22 @@ public final String toString(RendererConfiguration mediaRenderer) {
dlnaspec = "DLNA.ORG_PN=" + getMPEG_PS_PALLocalizedValue(c);
if (getPlayer() != null) {
- // Do we have some mpegts to offer?
- boolean mpegTsMux = TsMuxeRVideo.ID.equals(getPlayer().id()) || VideoLanVideoStreaming.ID.equals(getPlayer().id());
+ boolean isFileMPEGTS = TsMuxeRVideo.ID.equals(getPlayer().id()) || VideoLanVideoStreaming.ID.equals(getPlayer().id());
boolean isMuxableResult = getMedia().isMuxable(mediaRenderer);
boolean isBravia = mediaRenderer.isBRAVIA();
- if (!mpegTsMux && configuration.isMencoderMuxWhenCompatible()) {
+ if (
+ !isFileMPEGTS &&
+ (
+ (
+ configuration.isMencoderMuxWhenCompatible() &&
+ MEncoderVideo.ID.equals(getPlayer().id())
+ ) ||
+ (
+ configuration.isFFmpegMuxWhenCompatible() &&
+ FFMpegVideo.ID.equals(getPlayer().id())
+ )
+ )
+ ) {
if (isBravia) {
/**
* Sony Bravia TVs (and possibly other renderers) need ORG_PN to be accurate.
@@ -1654,21 +1665,22 @@ public final String toString(RendererConfiguration mediaRenderer) {
}
}
- mpegTsMux = MEncoderVideo.ID.equals(getPlayer().id()) &&
+ if (
(
- (
- getMediaSubtitle() == null &&
- !isSrtFile() &&
- getMedia() != null &&
- getMedia().getDvdtrack() == 0 &&
- isMuxableResult &&
- mediaRenderer.isMuxH264MpegTS()
- ) ||
- mediaRenderer.isTranscodeToMPEGTSAC3()
- );
+ getMediaSubtitle() == null &&
+ !isSrtFile() &&
+ getMedia() != null &&
+ getMedia().getDvdtrack() == 0 &&
+ isMuxableResult &&
+ mediaRenderer.isMuxH264MpegTS()
+ ) ||
+ mediaRenderer.isTranscodeToMPEGTSAC3()
+ ) {
+ isFileMPEGTS = true;
+ }
}
- if (mpegTsMux) {
+ if (isFileMPEGTS) {
dlnaspec = "DLNA.ORG_PN=" + getMPEG_TS_SD_EU_ISOLocalizedValue(c);
if (
getMedia().isH264() &&

0 comments on commit aa1cb13

Please sign in to comment.