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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
0c4e65f15a
The xmvc structure member magic_id was renamed to unique_id.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28601 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:35:24 +00:00
b2c338819e
Remove unnecessary #if around forward declaration.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28600 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:29:00 +00:00
de96ea2e01
Restructure get_format so it can easily be extended to handle VDPAU
...
and hardware-acceleration selected via get_format.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28599 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 17:23:05 +00:00
14b1991a42
Reuse the code for the general do_dr1 case to set get_buffer/release_buffer for XvMC.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28598 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 16:57:08 +00:00
c6ae3112f2
Use PIX_FMT_NONE instead of -1
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28595 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 15:27:12 +00:00
2a57385958
Remove apparently unneeded CODEC_FLAG_EMU_EDGE for XvMC
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28594 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 15:24:32 +00:00
c618bdde05
Extend get_buffer to handle the XvMC case and remove mc_get_buffer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28591 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 14:10:47 +00:00
5d21955bb1
Unset MP_IMGFLAG_IN_USE in release_buffer.
...
This is only needed for MPI_IMGTYPE_NUMBERED support and will probably
first be used for VDPAU, but it is still "the right thing to do".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28590 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 13:24:17 +00:00
9275737b40
Merge two checks for mpi != NULL
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28589 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 13:17:04 +00:00
eee0fbd3af
Make the default release_buffer work for XvMC, use it and remove mc_release_buffer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28588 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 13:14:17 +00:00
d1e711b21b
Get rid of mc_render_slice and use the generic draw_slice instead.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28587 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 13:04:57 +00:00
c97692ac9d
Reflect the change of xvmc struct name.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28583 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 08:46:18 +00:00
078091e5de
Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to
...
be duplicated for other systems like VDPAU or VAAPI.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28581 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 08:07:36 +00:00
d999d7652d
Now xvmc struct uses magic_id field
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28578 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-15 02:38:20 +00:00
e41470a32e
Use fmt-conversion.h in vd_ffmpeg.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28562 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:58:33 +00:00
c4854a0ead
Consistently place whitespace around * ( ) and ,
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28560 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-02-14 17:43:06 +00:00
reimar
diego
iive
cehoyos