Skip to content
This repository has been archived by the owner on Feb 9, 2018. It is now read-only.

Commit

Permalink
Fix OSX compile
Browse files Browse the repository at this point in the history
  • Loading branch information
ps3mediaserver committed Feb 18, 2009
1 parent f0997f9 commit 5144f84
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ps3mediaserver/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ v1.09
Streaming support for DTS / DTS-HD core only (DVD ISOs not supported yet)
New Option: unification of Mencoder/tsMuxer engines, including:
. Dynamic choice between H264 muxing or transcoding, based on AVC Level / ref frames support by ps3
. Remux on the fly of any H264 content from MOV, MP4, and AVI containers (ex: Apple trailers)
. Remux on the fly of any H264 content from MOV, MP4, and AVI containers (ex: Apple HD Trailers)
. Can be disabled via the #Video Settings# virtual menu if anything goes wrong

- Changes / Features : All Platforms
Expand Down
3 changes: 2 additions & 1 deletion ps3mediaserver/net/pms/encoders/AviDemuxerInputStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@ public AviDemuxerInputStream(InputStream fin, final OutputParams params, ArrayLi

aOut = params.output_pipes[1].getOutputStream();
if (params.no_videoencode && params.forceType != null && params.forceType.equals("V_MPEG4/ISO/AVC") && params.header != null) {
// NOT USED RIGHT NOW
PipedOutputStream pout = new PipedOutputStream();
final InputStream pin = new H264AnnexBInputStream(new PipedInputStream(pout, 512*1024), params.header);
final InputStream pin = new H264AnnexBInputStream(new PipedInputStream(pout), params.header);
final OutputStream out = params.output_pipes[0].getOutputStream();
Runnable r = new Runnable() {

Expand Down
4 changes: 2 additions & 2 deletions ps3mediaserver/net/pms/encoders/MEncoderVideo.java
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ public ProcessWrapper launchTranscode(String fileName, DLNAMediaInfo media, Outp

boolean lossless = false; // really need to revamp the media audio code
dts = media != null && media.codecA != null && media.isMuxable(fileName, media.codecA) ;
if ((configuration.isMencoderUsePcm() || configuration.isDTSEmbedInPCM()) && params.aid > -1 && media != null && media.audioCodes != null && media.audioCodes.size() > 0) {
if ((configuration.isMencoderUsePcm() || configuration.isDTSEmbedInPCM()) && params.aid > -1 && media != null && media.audioCodes != null && media.audioCodes.size() > 0 && params.mediaRenderer ==HTTPResource.PS3) {
dts = false;
for(DLNAMediaLang lang:media.audioCodes) {
if (lang.id == params.aid && lang.format != null && media.isLossless(lang.format)) {
Expand All @@ -1006,7 +1006,7 @@ public ProcessWrapper launchTranscode(String fileName, DLNAMediaInfo media, Outp
}
}

if (lossless || (media.losslessaudio && configuration.isMencoderUsePcm())/* || (media.losslessaudio && configuration.isDTSEmbedInPCM())*/) {
if ((lossless || (media.losslessaudio && configuration.isMencoderUsePcm())) && params.mediaRenderer ==HTTPResource.PS3) {
pcm = true;
dts = dts && configuration.isDTSEmbedInPCM();
if (dts)
Expand Down

0 comments on commit 5144f84

Please sign in to comment.