Commits on Jan 29, 2012
  1. Stream the chosen subtitle

    If a subtitle is selected from the #TRANSCODE# folder and skip transcode
    is defined for the subtitle, the correct subtitle will be streamed.
    committed Jan 27, 2012
  2. Pass subtitle stream/transcode decision to player

    Player does not have access to DLNAResource.skipTranscodeExternalSubs().
    A new parameter forceSkipTranscode is sent to the player instead.
    committed Jan 27, 2012
  3. Acquire DLNAMediaSubtitles earlier for ParserV1 renderers

    Subtitles are parsed early on during a resources life-time. For some
    reason, parserV1 will parse early but will not record the DLNAMediaInfo
    for the subtitles until a much later stage in the resources life-time.
    There does not seem to be a good reason for this?
    
    These modifications address the issue by creating DLNAMediaInfo if
    necessary and by storing the subtitles information.
    committed Jan 27, 2012
  4. Extend native subtitle logic to transcode folder

    For the transcode folder, subs will be transcoded by default. If there
    is demand, perhaps seperate resources should be added to the
    transcode folder which allow various options for streamable subtitles.
    committed Jan 19, 2012
  5. Improved subtitle control logic

    Makes use of the newly defined method, class, and renderer configuration
    option to control the decisions of whether video/subtitles should be
    streamed and/or transcoded.
    
    The general logic is to prioritise streaming of both video and
    subtitles. If video is not supported, then both video and subtitles will
    be transcoded.
    
    For external subtitles, it is possible to over-ride the
    transcoding of subtitles (i.e. stream subtitles along with transcoded
    video) through the renderer configuration. Embedded subtitles do not
    offer this feature.
    committed Jan 19, 2012
  6. Tag resources with streamable subtitles

    Resources need to be tagged so that other classes can be notified
    of intentions for external subtitles to be streamed. This is necessary
    to prevent subtitles from being both transcoded and streamed at the same
    time.
    
    Embedded subtitles don't need to be tagged. The decision to stream them
    can be made within DLNAResource.java itself.
    committed Jan 19, 2012
  7. A class for managing subs during a media's life-time

    Extended the idea of ArrayList<DLNAMediaSubtitle> for tracking
    information about the subtitles contained in the list.
    committed Jan 19, 2012
  8. Native sub support conf options

    Add some options for setting native subtitle support and behaviour for
    renderers.
    committed Jan 28, 2012
Commits on Jan 25, 2012
  1. @Raptor399
  2. @Raptor399
  3. @Raptor399
Commits on Jan 22, 2012
  1. @SubJunk
  2. @SubJunk
Commits on Jan 21, 2012
  1. @Raptor399
Commits on Jan 20, 2012
  1. @Raptor399
  2. @Raptor399
  3. @Raptor399

    Merge pull request #9 from Raptor399/iscompatible

    Making streaming and transcoding logic better configurable
    Raptor399 committed Jan 19, 2012
Commits on Jan 18, 2012
  1. @Raptor399

    Fixed issue with filtering corrupting resource binaries.

    Filtering all resources led to some files (like the videos in resources/videos)
    becoming corrupt. The resource entries have been rewritten to only filter
    "propject.properties" where filtering is relevant. All other resources are not
    filtered any more.
    
    Note: you may have to run "mvn clean" once to clean up corrupt resource files
    in the target directory from earlier compilations.
    Raptor399 committed Jan 19, 2012
Commits on Jan 17, 2012
  1. @SubJunk

    Merge branch 'master' of github.com:ps3mediaserver/ps3mediaserver

    Conflicts:
    	contrib/build-pms-binaries.sh
    SubJunk committed Jan 18, 2012
  2. @Raptor399

    Updated patch revision to SB21

    Raptor399 committed Jan 17, 2012
  3. @Raptor399
  4. @SubJunk

    Revert "Updated script to build MPlayer-SB21"

    This reverts commit 485af69.
    SubJunk committed Jan 17, 2012
Commits on Jan 16, 2012
  1. @Raptor399
  2. @SubJunk
Commits on Jan 15, 2012
  1. @Raptor399
  2. @SubJunk
  3. @Raptor399

    Updated FFmpeg build.

    Also improved PMS build instructions.
    Raptor399 committed Jan 15, 2012
  4. @Raptor399
  5. @Raptor399

    Updated CHANGELOG

    Raptor399 committed Jan 15, 2012
  6. @Raptor399
  7. @Raptor399

    Removing skip() override introduced in 562fdb8.

    The method interfered with the correctness of isCompatible() and its
    backwards compatibility with ps3compatible().
    
    On top of that the comment seemed to want to force transcoding, where
    in reality returning true ended up forcing streaming. To remove this
    paradox and to restore control to each individual renderer
    configuration the method has been removed, bringing the code in line
    with all other formats.
    Raptor399 committed Jan 15, 2012
Commits on Jan 14, 2012
  1. @Raptor399
  2. @Raptor399
  3. @Raptor399

    Removed outdated comments

    Raptor399 committed Jan 14, 2012
  4. @Raptor399