Commit Graph

2210 Commits

Author SHA1 Message Date
diego aa169c6fe3 Replace glibc-specific __WORDSIZE preprocessor check with HAVE_FAST_64BIT.
The latter is properly set by configure.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29237 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-25 19:09:54 +00:00
diego b8ef364ae0 Remove reference to outdated documentation file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29209 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 15:24:47 +00:00
diego 7c0e777db0 Add algorithm flag (SWS_POINT) to sws_getContext call to avoid a crash.
patch by Alexander Strange, astrange ithinksw com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29205 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-20 12:07:08 +00:00
rik a0bd74f06d follow renaming of pbBufPtr() to put_bits_ptr() by stefano
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29178 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-13 21:43:57 +00:00
diego 77546eb754 Fix E-AC-3 channel ordering. E-AC-3 needs to use the same ordering as AC-3,
not the standard ordering.
patch by Andrew de Quincey, adq_dvb lidskialf net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29173 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-12 21:28:45 +00:00
diego 2e903f7c75 Remove unnecessary malloc.h #includes and related #ifdeffery.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29126 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-04-02 09:20:48 +00:00
reimar 49e2373fe7 Consistently use MP_MAX_PLANES as size for plane pointer/stride arrays in libmpcodecs.
This might avoid some issues since sws_scale in some cases assumes these
have at least 4 valid entries.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29103 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 14:46:59 +00:00
reimar 22b2f80efb Use MP_MAX_PLANES as size of arrays passed to mpcodecs_draw_slice.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29098 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-29 14:15:09 +00:00
reimar 255bca1ecd Use x86_reg instead of long in several video filters to fix compilation on MinGW64.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29077 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-27 20:34:55 +00:00
cehoyos 115bfb9762 Allow to use vdpau temporal deinterlacers with hardware accelerated decoding.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28991 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-18 17:02:29 +00:00
reimar ad95e046c2 Support FFmpeg codecs that decode to other formats than S16.
Double format is currently not supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28990 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-18 12:50:17 +00:00
reimar 093fc5508b Avoid ridiculously small decode_buffer_size (e.g. 4 with acodec=pcm_s16le)
that can make -oac lavc unusable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28963 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 16:37:06 +00:00
diego a21feef029 cosmetics: Remove file names from file header, it only causes trouble.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28959 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-15 12:45:16 +00:00
reimar 1f1b999cb9 Check for HAVE_EBX_AVAILABLE before enabling MMX code that needs the EBX register.
Makes things a bit simpler for everyone who insists on compiling MPlayer as PIE-code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28942 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-13 17:12:40 +00:00
reimar f9f40364d7 Use the same code as in vf_decimate to select diff_MMX
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28941 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-13 17:09:39 +00:00
reimar 2af2550175 Add missing ecx clobber in diff_MMX code (yes, that function is duplicated).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28940 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-13 17:02:15 +00:00
reimar 8c5b570b50 Get rid of nuppelvideo.h and its ugly packed struct and instead write the
frame header directly in nuv encoder.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28914 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 15:01:12 +00:00
reimar f10bffc6f8 Fix type of zlen, fixes crashes on 64 bit systems.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28912 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 14:40:55 +00:00
reimar 78383383f7 Do not calculate the same value twice
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28911 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 14:32:19 +00:00
reimar c9872edafe Allocate buffer for lzo compression correctly also for large frame sizes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28910 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 14:30:41 +00:00
reimar 77195cf5c4 nuv encoder 64 bit fix: avoid using long/sizeof(long)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28909 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 13:37:55 +00:00
reimar 276a73e2f2 Remove internal NuppelVideo decoder, the code in libavcodec can decode
those files and some more and is far more maintainable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28888 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:32:42 +00:00
reimar 624d8ff171 Get rid of pointless debugging code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28887 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:21:00 +00:00
reimar 7903f65ee8 Remove the grayscale and 4:2:2 RTjpeg code, it is neither used nor is there
anything special about to to justify preserving it for documentation purposes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28886 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:17:18 +00:00
reimar 735c81a0f5 Remove colourspace-conversion stuff from rtjpeg, we have functions to do that
better and it doesn't belong in that file anyway.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28885 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:10:21 +00:00
reimar 6d367acbdd Mark everything not used outside the file as "static"
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28884 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:08:22 +00:00
reimar 04702afb84 Remove functions not used by MPlayer from header
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28883 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 13:02:44 +00:00
reimar 8afafb8c2e Remove useless "extern" in function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28882 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-08 12:57:53 +00:00
reimar 6cf4aafa36 Add some "const" to mpcodecs_vd_drivers
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28861 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 20:20:12 +00:00
reimar 3be5ebde87 Swap order of VFCTRL_DRAW_EOSD and VFCTRL_DRAW_OSD so that the EOSD is drawn
below the OSD and document possible issues when this is changed.
Patch by Uoti (though originally intended for a different issue) with extra comment by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28841 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-06 10:45:49 +00:00
reimar 0f43db1769 Add another hack to work-around the currently completely inconsistent way in
which libavcodec sets AVCodecContext::pix_fmt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28801 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-03 13:38:33 +00:00
reimar aacd081579 10l, replace a tab that slipped in.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28767 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 09:09:49 +00:00
reimar 1002389056 Create a set_format_params function that sets all the special options needed
for XvMC/VDPAU acceleration in a single place.
This should get closer to working with selecting acceleration via pix_fmt instead
of via a special codec for each method.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28766 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-01 09:03:01 +00:00
diego 35fc0ebf3f Set time_base to 1/samplerate, like FFmpeg does, instead of leaving it at the
default 0/1. This is not required by a lot of codecs, but at least by libvorbis.
patch by Nicolas George, nicolas.george normalesup org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28695 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-21 21:03:57 +00:00
diego b92e910e7a Remove unused and unreachable code hunk that was surrounded by a misspelled
preprocessor condition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28663 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-19 10:06:43 +00:00
iive c73f0e18bd Return PIX_FMT_NONE if the video system refuses all other formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28662 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-19 09:21:46 +00:00
reimar 60fa5a134d Add VOCAP_NOSLICES and use it to allow vo_vdpau to not support slices for
YV12 - since VDPAU only has functions to upload the full frame at once
there is no sense in supporting draw_slice for that.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28646 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-18 12:30:15 +00:00
reimar 0248741426 Handle mpcodecs_get_image returning NULL, FFmpeg most of the time handles
it correctly (VDPAU and probably H.264 currently don't, MPEG1/2 does etc.).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28643 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-18 07:52:17 +00:00
reimar 4f9a9ae44f Make it possible for mpcodecs_get_image to return NULL as the
documentation says it should instead of crashing.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28638 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 19:01:29 +00:00
reimar bdfef5ff39 Print an error and return NULL in vf_get_image if we try to allocate
a format with bpp == 0, since this can not work.
This way at least we crash earlier and print an error message.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28637 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 18:59:47 +00:00
reimar 8e5edec13e Set avctx->opaque already at init instead of decode so it can be used in
get_format and get_buffer would not crash if called during avcodec_open.
Patch by Gwenole Beauchesne [gbeauchesne splitted-desktop com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28636 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 16:40:50 +00:00
diego 687655ff2f cosmetics: Remove stray empty lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28630 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 11:29:43 +00:00
diego be8c67909b Convert HAVE_MALLOC_H into a 0/1 definition, fixes the warning:
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
2009-02-17 11:16:19 +00:00
diego b14c70b8f5 Use FFmpeg instead of MPlayer MANGLE macro, they are equivalent in this
particular case. Avoids the warning:
In file included from libmpcodecs/vf_fspp.c:693:
./mangle.h:34:1: warning: "MANGLE" redefined
In file included from libmpcodecs/vf_fspp.c:46:
./libavutil/internal.h:113:1: warning: this is the location of the previous definition


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28624 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 03:20:40 +00:00
diego 53067187b8 Move FFmpeg #includes below all others so that they do not override
system functions and cause the warning:
In file included from libmpcodecs/vf_fspp.c:57:
libmpcodecs/mp_image.h: In function 'new_mp_image':
libmpcodecs/mp_image.h:214: warning: implicit declaration of function 'please_use_av_malloc'
libmpcodecs/mp_image.h: In function 'free_mp_image':
libmpcodecs/mp_image.h:226: warning: implicit declaration of function 'please_use_av_free'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28623 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-17 03:15:10 +00:00
cehoyos 288f25d8d9 Fix #endif comment.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28619 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 23:56:19 +00:00
reimar 7e9fd9351c Add support for VDPAU video out, including hardware decoding.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28617 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-16 20:58:13 +00:00
diego a452d22384 The AV_XVMC_RENDER_MAGIC constant was renamed to AV_XVMC_ID in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28608 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 22:02:24 +00:00
iive 33f7ff9403 Reflect ffmpeg change of xvmc struct field to xvmc_id.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28607 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 20:29:29 +00:00
diego d274cbbbb5 The xvmc_pixfmt_render structure was renamed to xvmc_pix_fmt in FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28603 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:49:42 +00:00