[mythtv-commits] [MythTV/mythtv] 9d9e29: Decode external subtitles using FFmpeg instead of ...

[David Hampton]

  Branch: refs/heads/master
  Home:   https://github.com/MythTV/mythtv
  Commit: 9d9e2929ad3ad6236d3caeec4710b833cd8134e6
      https://github.com/MythTV/mythtv/commit/9d9e2929ad3ad6236d3caeec4710b833cd8134e6
  Author: David Hampton <mythtv at love2code.net>
  Date:   2023-05-13 (Sat, 13 May 2023)

  Changed paths:
    M mythtv/libs/libmythtv/captions/textsubtitleparser.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.h
    R mythtv/libs/libmythtv/captions/xine_demux_sputext.cpp
    R mythtv/libs/libmythtv/captions/xine_demux_sputext.h
    M mythtv/libs/libmythtv/libmythtv.pro
    R mythtv/libs/libmythtv/test/test_xine_demux/.gitignore
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/advancedssa.ass
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/aqtitles.aqt.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/jaco.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/microdvd.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/mpl2.mpl.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/mpsub.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/phoenixjapanimationsociety.pjs
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/realtext.txt
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/sami.smi
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/subrip.srt
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/subrip09.srt
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/substationalpha.v3.ssa
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/substationalpha.v4.ssa
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/subviewer.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/subviewer2.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/vplayer.txt
    R mythtv/libs/libmythtv/test/test_xine_demux/test_xine_demux.cpp
    R mythtv/libs/libmythtv/test/test_xine_demux/test_xine_demux.h
    R mythtv/libs/libmythtv/test/test_xine_demux/test_xine_demux.pro

  Log Message:
  -----------
  Decode external subtitles using FFmpeg instead of xine.

MythTV already uses FFmpeg to decode subtitles embedded in a video
file.  It will now use the same code to decode subtitles embedded in
an external file.  This allows removal of code that was copied out of
the xine sources in 2006.


  Commit: f19f26c142535a3451fa63646db5f031311aab48
      https://github.com/MythTV/mythtv/commit/f19f26c142535a3451fa63646db5f031311aab48
  Author: David Hampton <mythtv at love2code.net>
  Date:   2023-05-13 (Sat, 13 May 2023)

  Changed paths:
    M mythtv/libs/libmythtv/captions/subtitlereader.cpp
    M mythtv/libs/libmythtv/captions/subtitlereader.h
    M mythtv/libs/libmythtv/captions/subtitlescreen.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.h

  Log Message:
  -----------
  Make the external parser a full fledged object.

It used to simply be a namespace containing two static functions. Now
its an object that is created and deleted so that per-instance
variables can be kept.


  Commit: 99845a4ad82f6dbf55f6766f633e9a6cbcadd47d
      https://github.com/MythTV/mythtv/commit/99845a4ad82f6dbf55f6766f633e9a6cbcadd47d
  Author: David Hampton <mythtv at love2code.net>
  Date:   2023-05-13 (Sat, 13 May 2023)

  Changed paths:
    M mythtv/libs/libmythtv/captions/textsubtitleparser.cpp

  Log Message:
  -----------
  Keep decoder context from one invocation to the next.


  Commit: ff68aee3321b3339cd1d21318d2696fca6a77a15
      https://github.com/MythTV/mythtv/commit/ff68aee3321b3339cd1d21318d2696fca6a77a15
  Author: David Hampton <mythtv at love2code.net>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M mythtv/libs/libmythtv/captions/subtitlereader.cpp
    M mythtv/libs/libmythtv/captions/subtitlereader.h
    M mythtv/libs/libmythtv/captions/subtitlescreen.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.h
    M mythtv/libs/libmythtv/mythccextractorplayer.cpp
    M mythtv/libs/libmythtv/mythplayer.cpp
    M mythtv/libs/libmythtv/mythplayercaptionsui.cpp

  Log Message:
  -----------
  External subtitles now use the same code path as embedded subtitles.

Read AVSubtitles from the external file and enqueue them directly onto
the AVSubtitle queue.  This is the same queue used for AVSubtitles
embedded directly into in a video file.

External subtitles will no longer appear as white letters on a black
background, but will be styled the same way as embedded subtitles.
The default for this appears to be white letters with a slight drop
shadow overlaid on the picture (without the black background box).

This eliminates a bunch of code that was used to read the text out of
the AVsubtitle, queue it onto a separate text only queue, and prints
it onto the screen.


  Commit: ed3baf3fa1121eef8520417a052386638b5ba3c3
      https://github.com/MythTV/mythtv/commit/ed3baf3fa1121eef8520417a052386638b5ba3c3
  Author: David Hampton <mythtv at love2code.net>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M mythtv/libs/libmythtv/captions/subtitlereader.cpp
    M mythtv/libs/libmythtv/captions/subtitlereader.h
    M mythtv/libs/libmythtv/captions/subtitlescreen.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.h

  Log Message:
  -----------
  Remove code no longer used after text subtitle switch to AVSubtitles.


  Commit: 676fe63fccdd8aaf13ecccb862425f982455bfc2
      https://github.com/MythTV/mythtv/commit/676fe63fccdd8aaf13ecccb862425f982455bfc2
  Author: David Hampton <mythtv at love2code.net>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M mythtv/bindings/perl/MythTV.pm
    M mythtv/bindings/python/MythTV/static.py.in
    M mythtv/libs/libmythbase/mythversion.h.in
    M mythtv/libs/libmythtv/captions/subtitlereader.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.h
    M mythtv/libs/libmythtv/dbcheck.cpp
    M mythtv/programs/mythfrontend/globalsettings.cpp

  Log Message:
  -----------
  Final subtitle changes.


  Commit: 17247e9a403bc55161a6f9ad70dfc1ada4e3c482
      https://github.com/MythTV/mythtv/commit/17247e9a403bc55161a6f9ad70dfc1ada4e3c482
  Author: David Hampton <mythtv at love2code.net>
  Date:   2023-05-14 (Sun, 14 May 2023)

  Changed paths:
    M mythtv/bindings/perl/MythTV.pm
    M mythtv/bindings/python/MythTV/static.py.in
    M mythtv/libs/libmythbase/mythversion.h.in
    M mythtv/libs/libmythtv/captions/subtitlereader.cpp
    M mythtv/libs/libmythtv/captions/subtitlereader.h
    M mythtv/libs/libmythtv/captions/subtitlescreen.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.cpp
    M mythtv/libs/libmythtv/captions/textsubtitleparser.h
    R mythtv/libs/libmythtv/captions/xine_demux_sputext.cpp
    R mythtv/libs/libmythtv/captions/xine_demux_sputext.h
    M mythtv/libs/libmythtv/dbcheck.cpp
    M mythtv/libs/libmythtv/libmythtv.pro
    M mythtv/libs/libmythtv/mythccextractorplayer.cpp
    M mythtv/libs/libmythtv/mythplayer.cpp
    M mythtv/libs/libmythtv/mythplayercaptionsui.cpp
    R mythtv/libs/libmythtv/test/test_xine_demux/.gitignore
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/advancedssa.ass
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/aqtitles.aqt.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/jaco.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/microdvd.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/mpl2.mpl.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/mpsub.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/phoenixjapanimationsociety.pjs
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/realtext.txt
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/sami.smi
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/subrip.srt
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/subrip09.srt
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/substationalpha.v3.ssa
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/substationalpha.v4.ssa
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/subviewer.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/subviewer2.sub
    R mythtv/libs/libmythtv/test/test_xine_demux/samples/vplayer.txt
    R mythtv/libs/libmythtv/test/test_xine_demux/test_xine_demux.cpp
    R mythtv/libs/libmythtv/test/test_xine_demux/test_xine_demux.h
    R mythtv/libs/libmythtv/test/test_xine_demux/test_xine_demux.pro
    M mythtv/programs/mythfrontend/globalsettings.cpp

  Log Message:
  -----------
  Replace subtitle external text parser with FFmpeg parsing.


Compare: https://github.com/MythTV/mythtv/compare/8a09a5551712...17247e9a403b