summaryrefslogtreecommitdiff
path: root/src/video_out/video_out_xv.c
AgeCommit message (Collapse)Author
2007-12-27[Subtitles] SSA-tags patchDubois Nicolas
I watch a lot of movies with subtitles and I need "vobsub subtitles" work in xine, then I decide to write this patch. It may support SSA tags for all text subtiles (ssa, ass, srt, ...) This patch : 1. Remove all SSA tags from stream (they are ugly : {\a6}) 2. Handle some of them (b, i, a, an, pos). The other ones control colours, shadow, animation, ... I can't make them work in an easy way. 3. Correct wrap algorithm which have minors bugs (we can see them only with SSA patch...) Modified files : libsputext/demux_sputext.c just remove unneeded code (which remove some of SSA-tags) libsputext/xine_sputext_decoder.c the main modified file. video_out/video_out_xshm.c video_out/video_out_xv.c xine-engine/video_out.h get video output (position and size). See below. 1. Removing SSA tags is done in ogm_render_line_internal() like for html-like tags. (this was done in the previous version of xine) 2. b(bold) and i(italic) are implemented like html-ones, in ogm_render_line_internal(). The other tags this patch support are : aX : alignment in SSA-code anX : alignment in numpad code pos(X,Y) : position, depend on alignment For those ones, I need in first a full-screen OSD, not a five lines one. Then, I need to remember where the last subtitle was drawn, in order to erase it. At last, I need a translation function to convert subtitle coordinates in screen coordinates. For this last point, I first write a full-screen translation (don't care about blacks borders), but it's not really good: the 'pos' tag is sometime used to point out something in the video. (Moreover, ASS spec say we have to draw subtitle on the video) For doing this, I need the real video output size and position, which are only know by the video output driver! Then I had 4 VO properties (in xine-engine/video_out.h) for video driver could give us those informations. I implement it only in xshm and xv drivers (I can't test other ones). If video driver can't give us those informations, the patch fallback in a full-screen translation. 3. there was 3 problem with the wrap algorithm : 1. It was in double: exactly the same, twice. Look like a merge problem. I remove one and all work fine. 2. It want to cut string in equivalent display length but it cut it in equivalent byte length. In most cases, this is the same, but if we have UTF-8 chars or long SSA-tags (which will not be displayed) the result is strange. 3. If we have a too-long part (in bytes) of the string without spaces (bad subtitle file or long SSA-code), the algorithm don't know what to do. (this case is not handled) I re-write the wrap algorithm to correct those problems. Note that my version is slower than previous one : working with bytes is really faster than computing text-length. Maybe I should had to propose an other patch for this part...
2007-12-24Consistently use "colour", "colour key", "colour space" in output.Darren Salt
Some instances of "key colour" remain; ffmpeg is unmodified. This change has caused two strings with two translations to collide (the strings have become identical since some instances already used "colour"). I have therefore arbitrarily dropped the first of the differing translations, the one for the string at src/video_out/video_out_directfb.c:1365.
2007-11-10Delete most of the CVS $Id$/$Log$ lines.Darren Salt
--HG-- extra : transplant_source : %E0%D0%C5%8B%BEU%DD%24%5D7%1F%ADV%AD%EB%23%CBU%80%EB
2007-11-09Update FSF address on non-contributed code and COPYING files.Diego 'Flameeyes' Pettenò
For contributed code, leave whatever the version we last synced for is using to make simpler future syncs.
2007-10-01Revert cheating invalid frame sizes after fixed frame allocation.Reinhard Nißl
These cheats where hiding a frame allocation bug in FFmpeg decoder which was previously fixed.
2007-08-12Add a few missing "\n"s.Darren Salt
2007-05-02[PATCH] Enhance logging in demux_ts, input_dvb and video_out_xvSimon Farnsworth
The three attached patches (against 1.1.6) each increase the amount of debug logging in their respective components. We've found the extra logging useful when trying to track down faults. I've split this into three patches to make it easier to apply only some of our changes. -- Comments welcome, Simon Farnsworth
2007-05-04[PATCH] Fix deinterlacing in video_out_xv.cSimon Farnsworth
Xv drivers are permitted to return a bigger image than we asked for, to work around hardware constraints. If this happens, 1.1.6's video_out_xv cannot deinterlace properly. Fix this by deinterlacing based on the width of the Xv image; the Xv driver will discard the extra horizontal data. Without this patch, you get a barber-pole effect if the input video is interlaced *and* the Xv driver chooses to round up the width of the requested image. -- Simon Farnsworth
2007-04-14Remove #ifdef wrappers from the Xv & XcbXv plugins. Allows XcbXv to be built.Darren Salt
2007-03-29Reorder to fill hole.Diego 'Flameeyes' Pettenò
CVS patchset: 8770 CVS date: 2007/03/29 18:58:21
2007-03-25Create at least a 1×1 shared image when the first frame is skipped (and ↵Diego 'Flameeyes' Pettenò
thus reported as 0×0), to avoid disabling shared memory for all others. Patch by Reinhard Nissl. CVS patchset: 8748 CVS date: 2007/03/25 23:13:53
2007-02-15Properly repaint the whole surface during expose events. Patch by Christoph ↵Diego 'Flameeyes' Pettenò
Pfister. CVS patchset: 8596 CVS date: 2007/02/15 18:26:55
2006-12-25 * Fix disposing of image buffers in video_out_xv when SHM get disabled byDiego 'Flameeyes' Pettenò
exhaustion of memory; patch by Matthias Drochner. [bug #1620339] CVS patchset: 8439 CVS date: 2006/12/25 15:19:51
2006-10-28Christoph Pfister's patch to support XINE_VISUAL_TYPE_X11_2 with XVMiguel Freitas
CVS patchset: 8351 CVS date: 2006/10/28 18:51:08
2006-07-10Implement visibility support, available on GCC 4.0 and later and on some 3.4 ↵Diego 'Flameeyes' Pettenò
(through backports), to avoid exporting unneeded internal symbols, making plugins' loading faster and use of internal copies of libraries more solid. It should automatically fall back to the old way in GCCs that does not support -fvisibility=hidden, but has to be tested carefully. No issues were found in the months of testing in Gentoo, but this requires special attention anyway. CVS patchset: 8101 CVS date: 2006/07/10 22:08:12
2006-06-02Various static/const fixes from Gentoo.Darren Salt
CVS patchset: 8009 CVS date: 2006/06/02 22:18:56
2006-05-03Make various arrays and structures (mainly xine_plugin_info) const.Darren Salt
(Diego Pettenò) CVS patchset: 7985 CVS date: 2006/05/03 19:46:06
2006-05-02Fix a null dereference which occurs if enabling deinterlacing whenDarren Salt
onefield_xv is selected and no frames have yet been processed. CVS patchset: 7984 CVS date: 2006/05/02 21:19:32
2006-01-27Adapt the engine to the new list code.Thibaut Mattern
CVS patchset: 7848 CVS date: 2006/01/27 07:46:09
2005-09-25move alphablend to coreMiguel Freitas
CVS patchset: 7745 CVS date: 2005/09/25 00:44:04
2005-09-24- rename all clip_top, clip_left, clip_color... to hili_xxxx. thatMiguel Freitas
"clip" thing has caused too much confusion already since these variables define a highlight area. - add overlay offset support to video_out.c/alphablend/vo drivers - use overlay offset to implement proper croping of frames when vo driver doesn't support it - add clipping checks to alphablend to avoid buffer overflow, buffer "underflow" and wrapping. - increase vo api number - note: dxr3 support is incomplete about overlay offset CVS patchset: 7739 CVS date: 2005/09/24 19:08:26
2005-07-30*BUGFIX*František Dvořák
Let handle inttypes by config.h, sun specific includes moved to os_internal.h. CVS patchset: 7701 CVS date: 2005/07/30 11:26:09
2005-07-29Use our own header for integer defsJames Stembridge
CVS patchset: 7698 CVS date: 2005/07/29 19:25:43
2005-03-06Fixed onefield_xv deinterlace method.Thibaut Mattern
CVS patchset: 7431 CVS date: 2005/03/06 09:55:35
2004-12-20- Don't try to second guess the front-end when it tells us we have an exposeBastien Nocera
event, fixes fullscreen with pause "white bits" using Totem, or xine-ui when paused. CVS patchset: 7290 CVS date: 2004/12/20 23:09:20
2004-12-12huge patch ahead: reorganizing config entries with automatic conversionMichael Roitzsch
and backwards compatible translation Sorry, I got a litte tired proof-reading the patch, so their might be bugs lurking around. I will give it some further examination and (as necessary) fixing tomorrow. CVS patchset: 7233 CVS date: 2004/12/12 22:00:47
2004-12-08XSync after restoring xv settingsMiguel Freitas
CVS patchset: 7211 CVS date: 2004/12/08 22:40:32
2004-11-24patch to further improve overlay blending and to elimiate static variablesMichael Roitzsch
in alphablend.c; XShm subtitles work now, Xv works as well, other output plugins untested CVS patchset: 7156 CVS date: 2004/11/24 16:11:02
2004-09-22- added cropping capability (thanks James Stembridge)Miguel Freitas
- some vo drivers support cropping natively. (only xv and xvmc have been tested) - add software crop fallback to video_out.c - skip yuv2rgb processing at xshm for not yet cropped frames (these frames are never shown) - libmpeg2 and ffmpeg now may use crop support - bump vo api. (changes to xvmc/xxmc will follow) CVS patchset: 6991 CVS date: 2004/09/22 20:29:13
2004-07-19restore initial xv port attributes on exitMiguel Freitas
CVS patchset: 6816 CVS date: 2004/07/19 22:07:41
2004-07-17embarrassing memory leak when shm is not availableMiguel Freitas
CVS patchset: 6803 CVS date: 2004/07/17 20:22:42
2004-06-27calling XInitThreads() is definitely the frontend's job, because it hasMichael Roitzsch
to call Xlib functions before xine to properly fill x11_visual_t CVS patchset: 6755 CVS date: 2004/06/27 11:16:20
2004-06-26patch from Stefan Kristiansson (slightly modified) to move Xv initializationMichael Roitzsch
from class to plugin context CVS patchset: 6750 CVS date: 2004/06/26 14:47:34
2004-06-26mark the old deinterlace setting as deprecatedMichael Roitzsch
CVS patchset: 6749 CVS date: 2004/06/26 13:52:20
2004-05-09some more colorkey fixes and cleanupsMiguel Freitas
CVS patchset: 6506 CVS date: 2004/05/09 21:05:34
2004-05-06implement proper x11osd resize support. that should fix problems with rc4Miguel Freitas
where parts of the image were not shown under certain circunstances. XV_AUTOPAINT_COLORKEY is now disabled by default. that will permit using colorkey overlays by default with more cards (eg. nvidia). CVS patchset: 6491 CVS date: 2004/05/06 03:09:32
2004-04-26help strings added for all remaining config entries (so I hope)Michael Roitzsch
please everybody watch out for spelling (and other) errors CVS patchset: 6442 CVS date: 2004/04/26 17:50:06
2004-04-10colorkey unscaled overlay support by Yann VernierMiguel Freitas
CVS patchset: 6381 CVS date: 2004/04/10 15:31:10
2004-04-09on FreeBSD alpha, sys/types.h is needed before machine/param.hMichael Roitzsch
patch by Klaus Robert Suetterlin <robert@mpe.mpg.de> CVS patchset: 6364 CVS date: 2004/04/09 15:29:33
2004-04-07+\nPhilipp Hahn
CVS patchset: 6344 CVS date: 2004/04/07 19:35:38
2004-03-23Fix thread safety of XINE_GUI_SEND_DRAWABLE_CHANGEDEwald Snel
CVS patchset: 6303 CVS date: 2004/03/23 09:46:11
2004-03-16ignore the hue setting on NVidia cards using the Xv video output as both the ↵Bastien Nocera
XFree86 and the proprietary driver are broken CVS patchset: 6273 CVS date: 2004/03/16 18:50:33
2004-03-03use the _x_abort() macro instead of abort, since it prints some debug infoMichael Roitzsch
before aborting CVS patchset: 6211 CVS date: 2004/03/03 20:09:11
2004-02-28- Do not repaint the whole video output area in black when an expose event s ↵Thibaut Mattern
raised. This reduce flickering when resizing/moving the output window (and it's a bit faster). - Recompute output coordinates before repainting the output window, it fixes some errors when resizing the xine logo. CVS patchset: 6189 CVS date: 2004/02/28 15:09:01
2003-12-30get property generates too much noise with subtitles activeMiguel Freitas
CVS patchset: 5961 CVS date: 2003/12/30 02:14:07
2003-12-14API version bounceSiggi Langauf
CVS patchset: 5912 CVS date: 2003/12/14 22:13:22
2003-12-13fix few memleaksDaniel Caujolle-Bert
CVS patchset: 5898 CVS date: 2003/12/13 00:55:11
2003-12-05cleanup phase II. use xprintf when it's relevant, use xine_xmalloc when it's ↵Daniel Caujolle-Bert
relevant too. Small other little fix (can't remember). Change few internal function prototype because it xine_t pointer need to be used if some xine's internal sections. NOTE: libdvd{nav,read} is still too noisy, i will take a look to made it quit, without invasive changes. To be continued... CVS patchset: 5844 CVS date: 2003/12/05 15:54:56
2003-11-26xprintf clean pass. xprintf now log into new XINE_LOG_TRACE log buffer. ↵Daniel Caujolle-Bert
scratch buffer enhancement (thanks Thibaut for the malloc tips), enlarge log buffer from 25 lines (very useless), to 150 (better). CVS patchset: 5801 CVS date: 2003/11/26 23:44:08
2003-11-26lprintf cleanup, pass I.Daniel Caujolle-Bert
CVS patchset: 5796 CVS date: 2003/11/26 19:43:26
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 22:47:26 +0000