Commit Graph

30120 Commits

Author SHA1 Message Date
reimar 6450271656 Make YUV->RGB conversion coefficients selectable for -vo gl.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30161 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 12:47:43 +00:00
reimar 17c214c820 Do not needlessly use the BP register in x86_64-specific code, there are
enough other registers available that are less likely to cause issues.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30160 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 09:46:24 +00:00
reimar 0eb6b9aa95 One more fix for -vf scale with alpha.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30159 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 01:25:35 +00:00
reimar c0cae7b327 Also pass alpha plane to swscale, avoids crashes when converting between
YUV with alpha and some other format supporting alpha.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30158 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-01 01:06:34 +00:00
reimar 8afc25d710 Add support for YUV format with alpha and fix the codecs.conf entry for vp6a
to use it.
Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30157 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:45:07 +00:00
reimar c07dec1a4a Also pass the 4th plane for planar formats on to libavcodec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30156 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:39:21 +00:00
reimar 0ff930da82 Try to put the list of output formats for vf_scale in a more sensible
order.
While the 16-bit yuv formats should not be preferred over the 8-bit ones,
it seems reasonable to probe them directly after the equivalent 8-bit formats.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30155 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:25:21 +00:00
reimar a994808e31 Deduplicate the mp_image planes allocation code.
The code in vf.c and mp_image.c is almost the same, though the one in vf.c
is more up-to-date/has more bug fixes and thus is used as the basis
(which is why the diff is so big).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30154 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 23:09:35 +00:00
reimar 2150bddc74 Add support for FFmpeg's ffv210 codec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30153 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 22:53:51 +00:00
reimar a326622304 Add support for 16-bit per component YUV formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 22:53:25 +00:00
reimar 498ad7ba57 First steps to supporting different YUV->RGB conversion definitions.
The numbers are possibly still wrong though.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30151 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 19:59:58 +00:00
reimar 0ecf324ac5 Extract functions to generate yuv->rgb matrices and lookup tables into a
separate file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30150 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:25:35 +00:00
reimar c4c806a9d7 Put the colourspace-related variables into a separate struct to ease
extracting the code and sharing with other vos.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30149 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 18:07:37 +00:00
reimar 8fb7d45abd Make code slightly more readable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30148 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 16:47:53 +00:00
reimar b78313acd8 Fix crash if http reply contains neither "Accept-Ranges" nor "Server" fields.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30147 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 16:46:44 +00:00
reimar 54e6b786f4 More readable fourcc for ffflac
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30146 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-31 11:29:21 +00:00
reimar c97d19eb49 Add a hack for broken youtube servers not returning Accept-Ranges.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30145 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 20:50:03 +00:00
compn e25e6ec309 add tm2x / tm2a binary decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30144 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 19:37:19 +00:00
reimar 3daa4e73cc Make the ffmpeg decoders for DTS and AC3 the default.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30143 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 19:30:06 +00:00
reimar 22c0b2ed57 Support 440P in scale filter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30142 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 12:06:09 +00:00
reimar 1eb19f0a16 FFmpeg JPEG codecs can output 440p format.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30141 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 12:03:53 +00:00
reimar cc46a64a26 Add support for 440p colorspace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30140 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 12:03:17 +00:00
reimar 8e35068138 Support all planar YUV formats in OpenGL vos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30139 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 11:32:24 +00:00
reimar 92f20f876f Add a helper function to get the chroma scale shift and use to simplify mpi setup.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30138 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-30 11:08:44 +00:00
gpoirier 427039acff sync w/r30135 (up to date at last!)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30137 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-29 22:16:28 +00:00
diego 3e8f2815c1 cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30136 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-29 18:09:07 +00:00
compn d47cd2aa67 change bandwidth value to bandwidth bytes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30135 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-29 13:43:03 +00:00
cehoyos ed4dbd3cbd Do not use correct-pts for mpeg-ts and matroska: It breaks PAFF samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30134 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 13:49:08 +00:00
cehoyos d79daa2736 Revert r30100: It breaks some mov and asf samples.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30133 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 13:39:26 +00:00
diego f20cd805ec Remove unused variable, fixes the warning:
libswscale/swscale_template.c:2575: warning: unused variable ‘srcFormat’


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30132 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-28 12:05:20 +00:00
compn 0c6287921f add lavc yuv rawcodecs to codecs.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30131 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 20:57:03 +00:00
reimar ca2af2d0e7 Add support for parsing audio streams (though should be easy to extend to video)
via libavcodec.
Parsing can be done at the demuxer stage (currently disabled) or at the decoder
(ad_ffmpeg, enabled).
Should allow using the libavcodec AAC, DTS, ... decoders independent of container
format.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30130 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 15:28:01 +00:00
reimar bcda7b2f99 Remove currently unneeded members accidentally added in the last revision.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30129 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:42:37 +00:00
reimar 52dab179cb Introduce a sh_common struct that contains the parts in common by the audio, video
and sub "stream headers".
One reason for this is to help avoid/make more obvious things like members with
the same function but different name (extradata vs. codecdata etc.), or members
with the same name but different semantics (pts for audio vs. pts for video).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30128 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:40:56 +00:00
reimar 4fbcbaacbc Remove one more incorrect direct ass.h include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30127 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:35:09 +00:00
reimar 51e55db62e Move do_render_osd function to avoid a forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:31:13 +00:00
reimar a5ee26b559 vo_x11_classhint name argument should be const, since we pass string constants there.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30125 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:19:48 +00:00
reimar 467013ecdc Return the actually playing audio/video id for get_property, not the one
selected e.g. via commandline (which resulted in -1 being returned most of
the time).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30124 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:13:06 +00:00
kostya 96a73a2d7d lavc Interplay Video decoder now supports 16-bit mode too
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30123 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:09:38 +00:00
reimar eac140b748 Subtitle are now also available without video, so remove that
check from the subtitle property handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30122 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:07:29 +00:00
reimar 97ed05be95 Use the same condition to decide if the audio/video id property is
not available for all commands (get, set and print).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30121 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:06:47 +00:00
reimar ea54d1771f When setting audio or video track make sure we will not try to
dereference a NULL pointer, e.g. because there is no video stream.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30120 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 14:02:20 +00:00
reimar 6838445737 Print a ANS_ERROR reply if one of the *_property slave command fails.
Based on patch by Adrian Stutz [adrian sttz ch].


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30119 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-27 13:56:51 +00:00
reimar 3241bdffd6 Set some freed pointers to NULL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30118 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 12:07:14 +00:00
reimar 487ddca70c Free playtree_iter upon exiting MPlayer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30117 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 12:04:48 +00:00
reimar afc5a627d8 Support mp_image with allocated palette.
Fixes playback and a memory leak for FFmpeg codecs which use reget_buffer
with paletted data, e.g. cdgraphics.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30116 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 11:51:19 +00:00
reimar bd06a94738 Remove only use if MP_IMGFLAG_RGB_PALETTE to allow giving the flag a slightly
different meaning.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30115 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 11:33:45 +00:00
reimar 929a159f69 Restore the old value of planes[1] in vf_palette at the end to ensure
we do not call free() on the fixed gray_pal array.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30114 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 11:11:41 +00:00
jrash 48b88b30e0 sync with en/mplayer.1 r30075
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30113 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-26 02:35:36 +00:00
reimar e0423842de Fix grammar/missing verb in description.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30112 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-25 09:03:02 +00:00