summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/mp_image.c
Commit message (Collapse)AuthorAgeFilesLines
* mp_image: add fields to pass colorspace down the filter chainwm42012-10-281-0/+29
| | | | | | Note that this also adds a RGB colorspace for general symmetry. The frontend (colormatrix property and options) and mp_get_yuv2rgb_coeffs() don't support this.
* Merge branch 'master' into osd_changeswm42012-10-241-1/+6
|\ | | | | | | | | Conflicts: libvo/vo_xv.c
| * VF: remove IMGFMT_MPEGPESwm42012-10-221-1/+1
| | | | | | | | | | | | | | | | | | This wasn't used anymore. Remove the reference to IMGFMT_MJPEG in vf_dlopen as well. Thus format is used as FourCC in the TV code (i.e. it's on the demuxer level, just like raw formats), and never appears in the video filter chain. For starters, vd_ffmpeg can never produce this format.
| * mp_image: add IMGFMT_BGR0/PIX_FMT_BGR0wm42012-10-211-0/+5
| | | | | | | | Needed by ffv1.
* | draw_bmp: fix for yuy2 formatwm42012-10-241-0/+3
| | | | | | | | | | | | | | mp_get_chroma_shift() modifies its argument even if it fails, so we have to restore that. mp_image didn't set chroma shifts for yuy2.
* | mp_image: hack to fix alignment for certain image formatswm42012-10-241-0/+19
| | | | | | | | | | | | | | | | This is to get rid of swscale alignment warnings with the new OSD code. Only image formats used by it are fixed. Solving this generally would require some more effort. (Possibly by using libav's allocation functions plus lots of testing.)
* | mp_image: fix copy_mpi() with 16 bit formats, add helper macrosRudolf Polzer2012-10-241-5/+7
|/ | | | | | | Merged by wm4. copy_mpi() assumed that planar YUV formats always used 1 byte per component, which is not true for 9/10/16 bit YUV formats.
* libmpcodecs: add support for 422P9mplayer-svn2012-08-031-0/+2
| | | | | | | For some reason only 9-bit 422 wasn't added before. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34524 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* mp_image: set chroma_x_shift for 1-plane YUV formatsmplayer-svn2012-08-031-0/+1
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34355 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: reimar
* Merge remote-tracking branch 'origin/master'wm42012-04-011-3/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bstr.c bstr.h etc/input.conf input/input.c input/input.h libao2/ao_pulse.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c libvo/gl_common.c libvo/x11_common.c mixer.c mixer.h mplayer.c
| * cosmetics: misc minor cleanupsUoti Urpala2012-03-251-3/+1
| | | | | | | | | | The deleted ZRM* things were only relevant to vo_zr, which was deleted earlier.
* | libmpcodecs: rename IMGFMT_GBR24P to IMGFMT_GBRPwm42012-03-251-1/+1
| | | | | | | | This is more in line with the ffmpeg/libav names.
* | libmpcodecs: support planar GBR24 decodingcehoyos2012-03-251-1/+6
|/ | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34245 b3059339-0415-0410-9bf9-f77b7e298cf2 Note: ffmpeg first introduced PIX_FMT_GBR24P, which was used in this commit. Later, it was renamed to PIX_FMT_GBRP in ffmpeg and libav. This was updated in revision 34492 in mplayer, but the mplayer specific names (such as IMGFMT_GBR24) were left unchanged.
* video: use talloc for mp_image, abort if out of memorywm42011-11-251-14/+20
| | | | | Make new_mp_image() allocate the struct with talloc and abort() if the av_malloc for image plane data fails.
* vo_gl: don't accept 9/10-bit formats as inputreimar2011-06-291-2/+2
| | | | | | | | | Make mp_get_chroma_shift() simpler/more generic and add an argument to get the per-component bit depth. Use this to check more properly for supported formats in gl and gl2 vos (only 8 and 16 bit are supported, 9 and 10 are not). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33452 b3059339-0415-0410-9bf9-f77b7e298cf2
* video/colorspaces: add new 9/10-bit formats from libavcodecUoti Urpala2011-06-261-0/+10
| | | | | | | Add new internal 9/10-bit IMGFMT values and mappings to the corresponding libav* PIX_FMT_* values. Partially based on a patch from Arne Bochem <arneb.mp@ccan.de>.
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* video: simplify some tests with a new IMGFMT_IS_HWACCEL macroreimar2010-11-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32575 b3059339-0415-0410-9bf9-f77b7e298cf2
* Handle Y8/Y800 formats more similar to other YUV formats.reimar2010-05-091-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31144 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace memalign(x) (x > 8) by av_malloc() to prevent crashes on systemszuxy2010-04-201-5/+6
| | | | | | | lacking memalign(), e.g. Win32. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31045 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move functions that really do not need to be inlined from the headerreimar2010-04-151-0/+105
| | | | | | | to the .c file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31038 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing license headers to all files in the libmpcodecs directory.diego2010-01-301-0/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add support for YUV format with alpha and fix the codecs.conf entry for vp6areimar2009-12-311-3/+5
| | | | | | | | 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
* Deduplicate the mp_image planes allocation code.reimar2009-12-311-24/+34
| | | | | | | | | 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
* Add support for 16-bit per component YUV formats.reimar2009-12-311-6/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
* whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:diego2009-02-171-1/+1
| | | | | | | mem.c:32:5: warning: "HAVE_MALLOC_H" is not defined git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28629 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move alloc_mpi and copy_mpi from libmenu/vf_menu.c to libmpcodecs/mp_image.c.cehoyos2007-08-041-0/+65
Patch by Attila Ötvös. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24014 b3059339-0415-0410-9bf9-f77b7e298cf2