1
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00
Commit Graph

21 Commits

Author SHA1 Message Date
Francois Cartegnie
9f43ceac0e subpicture: rename confusing option
background is always rendered on region depending on renderer
2015-08-24 22:44:16 +02:00
Francois Cartegnie
22469573e9 subpicture: allow decoders to remove margin
Can't behave well if renderers add their own arbitrary margins
and we have a rows/cols based sub
2015-08-17 17:58:42 +02:00
Hugo Beauzée-Luyssen
f2e43bd7ec Subtitle renderers: Merge RenderText & RenderHTML
The current workflow is often parsing a subtitle format, then convert it
in a common HTML and then push it to the renderer as HTML. The renderer
will reparse the HTML and try to render it. Of course, that means that
only one renderer can do that correctly, and so we bloat the freetype
renderer as much as we can.
It also means that we have 2 render callbacks for subtitles, one for
normal text and one for styled text, and we sometimes reparse the HTML
to remove the tags, for the first.

We now only use a text_segment, with new segments at every style change;
an unique render function and the renderer can decide to honor or not
the style.

It's a big commit, so regressions can arise, but it was tested for most
common cases.
2015-07-28 16:01:33 +02:00
Jean-Baptiste Kempf
9746a8464a subpicture: remove old plaintext member
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2015-07-28 16:01:33 +02:00
Jean-Baptiste Kempf
6b45f45e30 subpicture: replace plain text by text_segment list
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2015-07-28 16:01:33 +02:00
Jean-Baptiste Kempf
19fe6a4cf3 Move subpicture_region_Copy to the core
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2015-07-28 16:01:32 +02:00
Jean-Baptiste Kempf
23c49729b6 subpicture.h: Code cosmetic
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
2015-07-28 16:01:32 +02:00
Rémi Denis-Courmont
d9dd59cdc9 picture: move picture_BlendSubpicture() to subpicture 2015-06-24 20:26:45 +03:00
Rémi Denis-Courmont
4ee1038059 include: improve Doxygen modules
In particular, move \file stanzas inside groups.
2015-06-14 19:04:50 +03:00
Devin Heitmueller
46d2b129d1 Add support for rendering EIA-608 captions with a black background
Place a black background behind caption text.  We cannot use the
existing "background" feature for subdecoders because it fills the
entire subpicture block, and in the case of the EIA-608 decoder
would result in a large square (since we send all lines to
the subpicture decoder even if they are blank).  This approach
allows for rendering of the background even in such cases, while
preserving proper layout of the captions.

Signed-off-by: Rafaël Carré <funman@videolan.org>
2013-01-10 21:58:13 +01:00
Devin Heitmueller
389785860a Add ability to render the subpicture region, but not the text itself
We want to center the subpicture region, but the text itself needs
to be rendered left justified in order to get consistent placement
of captions (e.g. indentation).

Introduce a new alignment type which centers the subpicture, but
not the text it contains within (and enable it for the EIA-608 decoder).

Signed-off-by: Rafaël Carré <funman@videolan.org>
2012-12-31 13:59:20 +01:00
Jean-Baptiste Kempf
36ab287e77 LGPL
Re-license almost all of libVLC and libVLCcore to LGPLv2.1+

This move was authorized by the developers, either:
 - by e-mail,
 - by vote at the VideoLAN Dev Days 2011,
 - on the license website,
 - in a contract, oral or written.
No objection was raised, so far.

The developers agreeing are:
  Justus Piater
  Alexis Ballier
  Alexander Bethke
  Mohammed Adnène Trojette
  Alex Converse
  Alexey Sokolov
  Alexis de Lattre
  Andre Pang
  Anthony Loiseau
  Cyril Deguet
  André Weber
  Boris Dorès
  Brieuc Jeunhomme
  Benjamin Drung
  Hugo Beauzée-Luyssen
  Benoit Steiner
  Benjamin Pracht
  Bernie Purcell
  Przemyslaw Fiala
  Arnaud de Bossoreille de Ribou
  Brad Smith
  Nick Briggs
  Christopher Rath
  Christophe Courtaut
  Christopher Mueller
  Clement Chesnin
  Andres Krapf
  Damien Fouilleul
  David Flynn
  Sebastien Zwickert
  Antoine Cellerier
  Jérôme Decoodt
  Jérome Decoodt
  Dylan Yudaken
  Eduard Babayan
  Eugenio Jarosiewicz
  Elliot Murphy
  Eric Petit
  Erwan Tulou
  Etienne Membrives
  Ludovic Fauvet
  Fabio Ritrovato
  Tobias Güntner
  Jakub Wieczorek
  Frédéric Crozat
  Francois Cartegnie
  Laurent Aimar
  Florian G. Pflug
  Felix Paul Kühne
  Frank Enderle
  Rafaël Carré
  Simon Latapie
  Gildas Bazin
  Geoffroy Couprie
  Julien / Gellule
  Gildas Bazin
  Arnaud Schauly
  Toralf Niebuhr
  Vicente Jimenez Aguilar
  Derk-Jan Hartman
  Henri Fallon
  Ilkka Ollakka
  Olivier Teulière
  Rémi Duraffort
  Jakob Leben
  Jean-Baptiste Kempf
  Jean-Paul Saman
  Jean-Philippe Grimaldi
  Jean-François Massol
  Gaël Hendryckx
  Jakob Leben
  Jean-Marc Dressler
  Jai Menon
  Johan Bilien
  Johann Ransay
  Joris van Rooij
  JP Dinger
  Jean-Philippe André
  Adrien Grand
  Juha Jeronen
  Juho Vähä-Herttua
  Kaarlo Raiha
  Kaarlo Raiha
  Kamil Baldyga
  Keary Griffin
  Ken Self
  KO Myung-Hun
  Pierre Ynard
  Filippo Carone
  Loïc Minier
  Luca Barbato
  Lucas C. Villa Real
  Lukas Durfina
  Adrien Maglo
  Marc Ariberti
  Mark Lee
  Mark Moriarty
  Martin Storsjö
  Christophe Massiot
  Michel Kaempf
  Marian Ďurkovič
  Mirsal Ennaime
  Carlo Calabrò
  Damien Lucas
  Naohiro Koriyama
  Basos G
  Pierre Baillet
  Vincent Penquerc'h
  Olivier Aubert
  Pankaj Yadav
  Paul Corke
  Pierre d'Herbemont
  Philippe Morin
  Antoine Lejeune
  Michael Ploujnikov
  Jean-Marc Dressler
  Michael Hanselmann
  Rafaël Carré
  Ramiro Polla
  Rémi Denis-Courmont
  Renaud Dartus
  Richard Shepherd
  Faustino Osuna
  Arnaud Vallat
  Rob Jonson
  Robert Jedrzejczyk
  Steve Lhomme
  Rocky Bernstein
  Romain Goyet
  Rov Juvano
  Sam Hocevar
  Martin T. H. Sandsmark
  Sebastian Birk
  Sébastien Escudier
  Vincent Seguin
  Fabio Ritrovato
  Sigmund Augdal Helberg
  Casian Andrei
  Srikanth Raju
  Hannes Domani
  Stéphane Borel
  Stephan Krempel
  Stephan Assmus
  Tony Castley
  Pavlov Konstantin
  Eric Petit
  Tanguy Krotoff
  Dennis van Amerongen
  Michel Lespinasse
  Can Wu
  Xavier Marchesini
  Sébastien Toque
  Christophe Mutricy
  Yoann Peronneau
  Yohann Martineau
  Yuval Tze
  Scott Caudle
  Clément Stenac

It is possible, that some minor piece of code was badly tracked, for
some reasons (SVN, mainly) or that some small developers did not answer.
However, as an "œuvre collective", defined as in "CPI 113-2 alinéa 3",
and seeing "Cour. Cass. 17 Mai 1978", and seeing that the editor and
the very vast majority of developers have agreed (> 99.99% of the code,
> 99% of developers), we are fine here.
2011-11-27 22:54:33 +01:00
Rémi Denis-Courmont
6f258887aa Replace VLC_EXPORT macro with a simple prefix, VLC_API
This should help Doxygen parse VLC headers, and generally makes headers
easier to read. LibVLC already uses a similar approach.
2011-05-07 18:43:51 +03:00
Laurent Aimar
77f62d5d99 Moved generic subpicture code to its own file. 2010-06-03 20:49:59 +02:00
Laurent Aimar
d6a118bda1 Splitted out text_style_t and related function to its own header. 2010-05-04 22:25:33 +02:00
Laurent Aimar
08a73f8b33 Simplify the creation of subpicture with dynamic content. 2010-04-29 21:18:43 +02:00
Rémi Duraffort
8939e8f944 Fix padding for picture_t and subpicture_t. 2009-12-28 14:18:28 +01:00
Laurent Aimar
54daead2d0 emoved unused pf_render function in subpicture_t. 2009-07-28 22:03:29 +02:00
Laurent Aimar
5cd2d0765f Removed now unused pf_pre_render in subpicture_t. 2009-07-28 20:35:06 +02:00
Laurent Aimar
07b0512205 Added a subpicture_NewFromPicture helper. 2009-05-31 01:48:48 +02:00
Laurent Aimar
c3fab72311 Split vlc_vout.h into vlc_picture.h and vlc_subpicture.h 2009-05-16 20:22:41 +02:00