summaryrefslogtreecommitdiff
path: root/src/xine-engine
AgeCommit message (Collapse)Author
2007-12-22Merge -headers-reshuffle branch into main.Diego 'Flameeyes' Pettenò
--HG-- rename : src/xine-engine/osd.h => include/xine/osd.h
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-12-19Move code out of osd.h that was present only with __OSD_C__ defined.Diego 'Flameeyes' Pettenò
2007-12-19Mark more arrays as constant.Diego 'Flameeyes' Pettenò
2007-12-19Mark static strings as const.Diego 'Flameeyes' Pettenò
2007-12-19Update all the code to the new headers layout.Diego 'Flameeyes' Pettenò
2007-12-19Consolidate all public include files into include/xine directory.Diego 'Flameeyes' Pettenò
--HG-- rename : src/xine-engine/alphablend.h => include/xine/alphablend.h rename : src/xine-utils/array.h => include/xine/array.h rename : src/xine-utils/attributes.h => include/xine/attributes.h rename : src/xine-engine/audio_decoder.h => include/xine/audio_decoder.h rename : src/xine-engine/audio_out.h => include/xine/audio_out.h rename : src/xine-engine/broadcaster.h => include/xine/broadcaster.h rename : src/xine-engine/buffer.h => include/xine/buffer.h rename : src/xine-utils/compat.h => include/xine/compat.h rename : src/xine-engine/configfile.h => include/xine/configfile.h rename : src/demuxers/demux.h => include/xine/demux.h rename : src/xine-engine/info_helper.h => include/xine/info_helper.h rename : src/input/input_plugin.h => include/xine/input_plugin.h rename : src/xine-engine/io_helper.h => include/xine/io_helper.h rename : src/xine-utils/list.h => include/xine/list.h rename : src/xine-engine/metronom.h => include/xine/metronom.h rename : src/xine-engine/osd.h => include/xine/osd.h rename : src/xine-engine/plugin_catalog.h => include/xine/plugin_catalog.h rename : src/xine-utils/pool.h => include/xine/pool.h rename : src/xine-engine/post.h => include/xine/post.h rename : src/xine-engine/refcounter.h => include/xine/refcounter.h rename : src/xine-engine/resample.h => include/xine/resample.h rename : src/xine-utils/ring_buffer.h => include/xine/ring_buffer.h rename : src/xine-engine/scratch.h => include/xine/scratch.h rename : src/xine-utils/sorted_array.h => include/xine/sorted_array.h rename : src/xine-engine/spu.h => include/xine/spu.h rename : src/xine-engine/spu_decoder.h => include/xine/spu_decoder.h rename : src/xine-engine/video_decoder.h => include/xine/video_decoder.h rename : src/xine-engine/video_out.h => include/xine/video_out.h rename : src/xine-engine/video_overlay.h => include/xine/video_overlay.h rename : src/xine-engine/vo_scale.h => include/xine/vo_scale.h rename : src/xine-utils/xine_buffer.h => include/xine/xine_buffer.h rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h rename : src/xine-engine/xine_plugin.h => include/xine/xine_plugin.h rename : src/xine-engine/xineintl.h => include/xine/xineintl.h rename : src/xine-utils/xineutils.h => include/xine/xineutils.h rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h rename : src/xine-utils/xmlparser.h => include/xine/xmlparser.h
2007-12-19Merge from 1.2 branch.Diego 'Flameeyes' Pettenò
2007-12-18Merge from 1.1.Darren Salt
2007-12-18Don't treat # in MRLs as literals or URI-decode raw filenames. [Bug 1784272]Darren Salt
2007-12-18Use variable-sized arrays rather than allocated buffer.Diego 'Flameeyes' Pettenò
2007-12-18Remove a memset after xine_xmalloc.Diego 'Flameeyes' Pettenò
2007-12-18Remove superfluous include.Diego 'Flameeyes' Pettenò
2007-12-18Fix MRL protocol matching (for demuxer lookup).Darren Salt
2007-12-15Remove a stray semicolon.Darren Salt
2007-12-14Merge from 1.1.Darren Salt
--HG-- rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c
2007-12-14Remove internal FFmpeg reference from build system.Diego 'Flameeyes' Pettenò
2007-12-13Merge changes from 1.2 main.last-internal-ffmpegDiego 'Flameeyes' Pettenò
2007-12-14Fixed a crash that happened when a video output was closedMatthias Kretz
img->stream->video_fifo can be 0
2007-12-13Make _x_io_(file|tcp)_(write|read) accept a void* parameter.Diego 'Flameeyes' Pettenò
2007-12-13Make writing function use a void* parameters to avoid signedness warnings.Diego 'Flameeyes' Pettenò
2007-12-13Make _x_demux_read_header accept a void* as pointer to buffer.Diego 'Flameeyes' Pettenò
Removes some warnings in demuxers.
2007-12-13Use strcasestr rather than converting the mimetypes variables to lowercase.Diego 'Flameeyes' Pettenò
2007-12-12Merge from 1.2 main.Diego 'Flameeyes' Pettenò
2007-12-12Merge with 1.2-plugins-changes.Diego 'Flameeyes' Pettenò
2007-12-12Remove xine_gui_send_vo_data (deprecated).Diego 'Flameeyes' Pettenò
2007-12-12Remove tvmode functions, deprecated for a while now.Diego 'Flameeyes' Pettenò
2007-12-12Remove use of xine_xmalloc_aligned() in libxine, and link it to libavutil.Diego 'Flameeyes' Pettenò
2007-12-11Don't export _x_demux_check_extension, now that plugins don't need it anymore.Diego 'Flameeyes' Pettenò
2007-12-11Check if a dot was found before dereferencing the pointer.Diego 'Flameeyes' Pettenò
2007-12-11Make _x_demux_check_extension check for protocol prefixes too if :/ is in ↵Diego 'Flameeyes' Pettenò
the string.
2007-12-11Rename METHOD_BY_EXTENSION to METHOD_BY_MRL, as it's used to identify ↵Diego 'Flameeyes' Pettenò
protocols too.
2007-12-11Let _x_demux_check_extension() consider empty extensions string as an ↵Diego 'Flameeyes' Pettenò
always-pass.
2007-12-11Remove stray variable.Diego 'Flameeyes' Pettenò
2007-12-11Check if the extension is compatible with the plugin before trying to open it.Diego 'Flameeyes' Pettenò
2007-12-11Update the plugins loader to use the new extensions and mimetypes attributes.Diego 'Flameeyes' Pettenò
2007-12-11Bump the interface version for video decoder plugins.Diego 'Flameeyes' Pettenò
2007-12-11Bump the interface version for audio decoder plugins.Diego 'Flameeyes' Pettenò
2007-12-11Bump the interface version for video output plugins.Diego 'Flameeyes' Pettenò
2007-12-11Bump the interface version for audio output plugins.Diego 'Flameeyes' Pettenò
2007-12-11Bump the interface version for SPU decoders.Diego 'Flameeyes' Pettenò
2007-12-11Define free() as the default dispose function for plugin classes.Diego 'Flameeyes' Pettenò
Most plugin classes in xine define a dispose function simply to call free(), but free() is ABI-compatible with our dispose functions, so add a macro that allows to pass free() directly as dispose function. It's an opt-in so that no extra conditional is needed, and plugin authors won't forget about providing a dispose function (if they need to).
2007-12-11Use dgettext to localise the description string for plugins.Diego 'Flameeyes' Pettenò
2007-12-11Add a textdomain field to allow using a different i18n catalog for the ↵Diego 'Flameeyes' Pettenò
description translation.
2007-12-11Leave to the plugin the call to gettext exactly as before.Diego 'Flameeyes' Pettenò
This way external plugins can use their own gettext catalog for i18n.
2007-12-11Update the code not to use the get_* functions that were removed.Diego 'Flameeyes' Pettenò
2007-12-11Replace get_identifier/get_description functions with strings.Diego 'Flameeyes' Pettenò
This is the start of a new experimental branch, with the first objective being the replacement of the get_description and get_identifier functions with direct-access strings. The reason for this change is to reduce code size and time of execution. By replacing the functions with direct-access strings there is one less call to be done in those cases where the description has to be fetched. The solution is not yet definitive though, there are a couple of problems to take care of: - the use of N_() still makes it easy to internationalise the strings, but it requires for the string to be found on libxine2 catalog, which is not exactly a nice solution for external plugins; - it would be simpler to re-use the id field in plugin_info_t, and then move description there; it should reduce memory usage for the class structures; - I'm not really aware of any reason why get_description and get_identifier were used beside the idea of making i18n simpler. This probably would break a couple of frontends, especially if they have some internal plugins (like post-plugins), so it needs to be reviewed carefully before merging in 1.2 branch. My current goal is to get this in before 1.2 though, rather than waiting for 1.3.
2007-12-09Merge from 1.1.Darren Salt
2007-12-09Enable the WMV VC1 (ffmpeg) codec.Darren Salt
--HG-- extra : transplant_source : %15%CD%0B%2C%F2g%03%B9%25%D4%B2%8BQ%1F%EB%BB%8F%28%9B%C8
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-13 06:57:11 +0000