[Commited] [Core] SSA burn-in support

[davidfstr]

My guess is that it's fine.

[davidfstr]

I believe this is ready to be committed. Commit-devs?

[JohnAStebbins]

Build failed on linux. gcc doesn't have -arch flag and gtk ui libs were not updated. Updated patch:
http://handbrake.fr/pastebin/pastebin.php?show=1650

I also added the necessary bits to allow burning SSA with gtk ui. Untested since I have no files with SSA to test with.

[JohnAStebbins]

Of coarse, right after posting that patch, I broke it by committing the ffmpeg bump. Updated:
http://handbrake.fr/pastebin/pastebin.php?show=1651

[JohnAStebbins]

Found an mkv with ssa subs sample to test with. Fixed some issues in the gtk gui.
I also made a change in decssasub.c. David, you were modifying subtitle->format in the cli. The ui's and cli should only set what is in subtitle->config. So I modified the code to use subtitle->config.dest to decide whether to extract to text or render. The contents of the rest of the subtitle struct is information about the source. E.g. the source is a text based format.

http://handbrake.fr/pastebin/pastebin.php?show=1654

[davidfstr]

Build failed on linux. gcc doesn't have -arch flag and gtk ui libs were not updated.

Ah. Yet another virtual machine I need to setup: Fedora

I have reverted two of your comment changes, because they seemed misleading to me. All code changes have been retained. New patch:
http://handbrake.fr/pastebin/pastebin.php?show=1655

Once support for either text burn-in or SSA picture passthru is added, we may want to revisit adding more information to subtitle->config to distinguish these cases.

[Rodeo]

SSA picture passthru is added

You mean SSA -> VOBSUB conversion?

[JohnAStebbins]

One more tweak. The windows gui is going to need to be able to parse out the subtitle type so that it only allows burning of subs that support it. So I added the source to the string that gets printed for each sub.
http://handbrake.fr/pastebin/pastebin.php?show=1658

[Rodeo]

Same patch as 1658, except I made SubSource an API function (becomes hb_subsource_name).

http://handbrake.fr/pastebin/pastebin.php?show=1662

[davidfstr]

SSA picture passthru is added

You mean SSA -> VOBSUB conversion?

I hadn't thought of that. Yet another possibility.

I was thinking MKV-SSA to MKV-SSA. But MKV-SSA to *-VOB also sounds interesting.

Added small tweak to return "UTF-8" instead of "UTF8" for UTF8SUB. This is consistent with the original CLI behavior:
http://handbrake.fr/pastebin/pastebin.php?show=1665

[davidfstr]

So this patch has been tested under all of the supported build environments {mac, linux, mingw}. And on other developers' computers for all of these environments.

Commit?

[Rodeo]

Added small tweak to return "UTF-8" instead of "UTF8" for UTF8SUB. This is consistent with the original CLI behavior:
http://handbrake.fr/pastebin/pastebin.php?show=1665

Hope that was the only change, as this is not a patch. New patch with the change: http://handbrake.fr/pastebin/pastebin.php?show=1677

[davidfstr]

Hope that was the only change, as this is not a patch. New patch with the change: http://handbrake.fr/pastebin/pastebin.php?show=1677

Hmm - no kidding. Must've copy/pasted from the wrong window. Thanks for updating that Rodeo.

[LinBrake]

Is there a special procedure for applying the patches generated here? As far as I can tell the format is a unified diff, but the:

Index: test/test.c
===================================================================
--- test/test.c (revision 3548)
+++ test/test.c (working copy)

portion and similar seem to make the patch command choke on the diff.

[Rodeo]

patch -p0 works for me against trunk.

[LinBrake]

I just pulled the source down from SVN and it looks like it works.

[davidfstr]

Hey John, does this look ready to go in to you?

[LinBrake]

The patch works like a charm. SSA subtitles inside the MKV containers are made into perfect soft subtitles. I've tested this one dozens of files and not one problem.

[Rodeo]

The patch works like a charm. SSA subtitles inside the MKV containers are made into perfect soft subtitles. I've tested this one dozens of files and not one problem.

That's completely unrelated to the patch. This patch is about hard subtitles from ASS/SSA sources.

[JohnAStebbins]

Hey John, does this look ready to go in to you?

Yes, I think it's ready. I have limited time right now though. I'm traveling. So I would like to wait till I get back home. To be on the safe side, I would like to have time to deal with any issues that might come up after it's checked in and gets into the nightlies.
I'll be home next Tue.

[davidfstr]

The patch works like a charm. SSA subtitles inside the MKV containers are made into perfect soft subtitles. I've tested this one dozens of files and not one problem.

That's actually thanks to an older patch of mine, but I'm glad you enjoy it.

This new patch is for burned-in SSA subtitles, with most of the styling information (lacking animated effects like karaoke, fade in/out).

[davidfstr]

Yes, I think it's ready. I have limited time right now though. I'm traveling. So I would like to wait till I get back home. To be on the safe side, I would like to have time to deal with any issues that might come up after it's checked in and gets into the nightlies.
I'll be home next Tue.

Okay. Thanks for the heads-up John.

[psalento]

Patch seems to work.

However there is small issue with lowercase characters (j, p and g). With first two files I have tested those letters shadow is not working correctly. Most letter have black shadow and white text to up-and-left from the shadow. Most of the time those lowercase characters white parts are to down-and-left from the shadow.

I could post pictures but I am not sure whether this is the right thread. The problem might also be with font renderer that is used.

[jamiemlaw]

Would someone mind helping me out? I'm not familiar with applying patches, and I can't seem to get this one to work.

So I did:

Code: Select all

svn co svn://svn.handbrake.fr/HandBrake/trunk handbrake-svn
cd handbrake-svn/

downloaded the diff file (1677.diff) and put it in there also. Then

Code: Select all

patch -p0 < 1677.diff

and

Code: Select all

./configure --launch --launch-jobs=0 ; open build/

then opened up the copy of HandBrake. I imported a MKV file that had some SSA subtitles, selected one of the tracks, but I can't choose to burn it in: the box remains greyed out. What am I doing wrong?

[Rodeo]

Use the CLI or the LinGUI. The other UIs have not been updated to allow SSA burn-in.