summaryrefslogtreecommitdiff
path: root/src/video_out
AgeCommit message (Collapse)Author
2008-01-03Replace _x_vo_scale_aspect_ratio_name() function with a string table, all ↵Diego 'Flameeyes' Pettenò
the uses already check for the index not to go over ther expected one.
2008-01-02Make scale_line description constant.Diego 'Flameeyes' Pettenò
Changing this to a character array would be nice, but the 45->64 conversion has a long string.
2008-01-02Make xv_check_capability accept constant strings.Diego 'Flameeyes' Pettenò
2008-01-02The device name is constant.Diego 'Flameeyes' Pettenò
2008-01-02Return value is a constant string.Diego 'Flameeyes' Pettenò
2008-01-01Merge (with adjustment) from 1.1.Darren Salt
--HG-- rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am rename : include/xine.h.in => include/xine.h rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
2008-01-01Avoid potential install-time mislinkage against libxine.so.2.Darren Salt
2008-01-01Merge from 1.1.Darren Salt
--HG-- rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libmpeg2/header.c => src/video_dec/libmpeg2/header.c rename : src/libmpeg2/mpeg2_internal.h => src/video_dec/libmpeg2/mpeg2_internal.h
2007-12-31Build fix: back out the SSA subtitles change from the DirectFB video-out plugin.Darren Salt
2007-12-30Merge from 1.1 (except po/*; translators needed for this).Darren Salt
--HG-- rename : src/video_out/vidix/drivers/mga_vid.c => contrib/vidix/drivers/mga_vid.c rename : src/video_out/vidix/drivers/nvidia_vid.c => contrib/vidix/drivers/nvidia_vid.c rename : src/video_out/vidix/drivers/savage_vid.c => contrib/vidix/drivers/savage_vid.c rename : src/xine-engine/video_out.h => include/xine/video_out.h rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h rename : po/libxine1.pot => po/libxine2.pot rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
2007-12-30Manual port of the color→colour change to 1.2; should make merging easier.Darren Salt
2007-12-23Merge from 1.2 main branch.Diego 'Flameeyes' Pettenò
--HG-- rename : src/xine-utils/xineutils.h => include/xine/xineutils.h rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am rename : src/libxineadec/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c rename : src/libffmpeg/ff_dvdata.h => src/combined/ffmpeg/ff_dvdata.h rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c
2007-12-27Add VO_PROP_OUTPUT_* to some other video output drivers (where trivial).Darren Salt
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-26Correct another color→colour change to a struct member name.Darren Salt
2007-12-26Correct a color→colour change to a struct member name.Darren Salt
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-20Correct some #includes.Darren Salt
2007-12-19Update all the code to the new headers layout.Diego 'Flameeyes' Pettenò
2007-12-14Remove internal FFmpeg reference from build system.Diego 'Flameeyes' Pettenò
2007-12-12Merge from 1.2 main.Diego 'Flameeyes' Pettenò
2007-12-12Replace usage of xine_xmalloc_aligned() with av_mallocz() from libavutil, ↵Diego 'Flameeyes' Pettenò
link plugins needing it to libavutil.
2007-12-12Remove commented out xine_xmalloc_aligned for cleanness.Diego 'Flameeyes' Pettenò
2007-12-12Use av_mallocz from libavutil rather than xine_xmalloc_aligned for ↵Diego 'Flameeyes' Pettenò
allocating memory.
2007-12-12Create a libyuv2rgb.la library to split out the yuv2rgb source files.Diego 'Flameeyes' Pettenò
2007-12-11Bump the interface version for video output plugins.Diego 'Flameeyes' Pettenò
2007-12-11Merge from 1.2 main branch.Diego 'Flameeyes' Pettenò
2007-12-11Don't use the if(foo) free(foo); construct, as free(NULL); is well defined.Diego 'Flameeyes' Pettenò
2007-12-11Don't use two C files to build the two versions of directfb. Just add ↵Diego 'Flameeyes' Pettenò
-DDIRECTFB_X11 to CFLAGS.
2007-12-11Use default_*_class_dispose macro whenever the class dispose function only ↵Diego 'Flameeyes' Pettenò
called free().
2007-12-11Use N_() rather than _(), passing the string just once to gettext().Diego 'Flameeyes' Pettenò
This way the gettext code for description does not need to be repeated by every plugin.
2007-12-11Update all video output plugins to the new identifier/description interface.Diego 'Flameeyes' Pettenò
2007-12-11Update to the new identifier/description interface and call _().Diego 'Flameeyes' Pettenò
2007-11-19add support for GNU/kFreeBSDPetr Salinger ext:(%20)
It changes some "defined (__FreeBSD__)" into "defined (__FreeBSD_kernel__)" and "__FreeBSD_version" into "__FreeBSD_kernel_version". The changes are performed on places, where feature of kernel is tested. On some other places, feature of userland/libc is tested, on them "defined (__FreeBSD__)" remains. As proposed, include/configure.h cause __FreeBSD_kernel__ be defined if __FreeBSD__ is defined. --HG-- extra : transplant_source : %25%96K%05%E4Y%B15%94%60%15%FE1%8Ah%26Xy%8C/
2007-11-11Merge transplanted patches.Darren Salt
2007-11-11Reset the previous screen resolution after switching to fullscreen.Claudio Ciccani
This is because, while in shared mode the default resolution is taken from directfb config, in fullscreen mode the default resolution comes from fbdev configuration.
2007-11-11Reset the previous screen resolution after switching to fullscreen.Claudio Ciccani
This is because, while in shared mode the default resolution is taken from directfb config, in fullscreen mode the default resolution comes from fbdev configuration. (transplanted from 2ce76206b5c10b6f9cfc55a9edb0d883bfb446a2) --HG-- extra : transplant_source : %2C%E7b%06%B5%C1%0Bo%9C%FCU%A9%ED%B0%D8%83%BF%B4F%A2
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-10Merge from 1.1.Darren Salt
--HG-- rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c rename : src/liba52/xine_a52_decoder.c => src/libxineadec/xine_a52_decoder.c rename : src/libdts/xine_dts_decoder.c => src/libxineadec/xine_dts_decoder.c rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c rename : src/libmad/xine_mad_decoder.c => src/libxineadec/xine_mad_decoder.c rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c
2007-11-09Merge FSF address changes from 1.1 branch.Diego 'Flameeyes' Pettenò
--HG-- rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c rename : src/combined/demux_flac.c => src/combined/flac_demuxer.c rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c rename : src/liba52/xine_a52_decoder.c => src/libxineadec/xine_a52_decoder.c rename : src/libdts/xine_dts_decoder.c => src/libxineadec/xine_dts_decoder.c rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c
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-08Revert cheating invalid frame sizes after fixed frame allocation (continued).Reinhard Nißl
These cheats where hiding a frame allocation bug in FFmpeg decoder which was previously fixed.
2007-10-03Merge from 1.1.Darren Salt
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-26Merge from 1.1.Darren Salt
2007-08-26Protect previously shown frame from immediate reuse by decoder.Reinhard Nißl
It happend that the previously shown frame was still on screen while the decoder reused it already and the result was a mixed picture on screen. Protection is easy: just keep a reference to previously shown frame and it cannot be reused by the decoder until a frame duration has passed which should be sufficient to see the current frame on screen. Such referencing has already been implemented although it was not used for deinterlacing. Therefore it had been disabled to get an additional frame for decoding in coping with dropped frames. The change reenables referencing the previously shown frame.
2007-08-26Provide options to control ondemand disabling of bob deinterlacing.Reinhard Nißl
While disabling for progressive frames was ment to improve DVD playback, it turned out that many TV broadcasters set this flag too, although their content is not progressive. Adding an option allows the user now to enable this feature when the watched streams make correct use of this flag. Another option allows to disable bob deinterlacing when a scaled OSD is on screen. As bobbing adds some noise to horizontal lines the OSD quality might be improved by enabling this option.
2007-08-26Protect drawable from beeing changed while drawing.Reinhard Nißl
When xine-ui switches to fullscreen mode or back again, it will change the drawable by sending XINE_GUI_SEND_DRAWABLE_CHANGED. This may lead to BadDrawable X Errors when the video out thread is still using the old drawable for drawing. The changes below block XINE_GUI_SEND_DRAWABLE_CHANGED from changing the drawable while it is used for drawing.
2007-08-16Merge all but the open()/glibc workaround from 1.1.Darren Salt
2007-07-26propagate frame changes in xxmc_do_update_frame() to intercepted framesReinhard Nißl
XXMC doesn't work well with the way how intercepting frames is implemented for postprocessing as xxmc_do_update_frame() may change the native frame's format after the frame has been intercepted. As intercepting XXMC frames didn't work in the past, we can imply that postplugins which will support XXMC do know about this special behaviour. So the idea is to detect any changes on the native frame and propagate these changes to all intercepted frames. At the same time, we check that all intercepted frames still share the same data (which we are about to change) with the native frame and abort otherwise. --HG-- extra : transplant_source : c%D5%13%21jF%1E%D4%AB%D7%DB%22%27%0A%CB%0E%7F%CF%84v