Commit Graph
2101 Commits
Author SHA1 Message Date
Uoti Urpala 92f0cba26b Merge svn changes up to r27281 2008-07-15 02:59:27 +03:00
reimar cf8d381255 Try to keep decoded audio buffer aligned.
Seems to be enough to avoid crashes (due to unaligned SSE2) with FFmpeg vorbis decoding for now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27281 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-14 16:38:58 +00:00
reimar 422c92e314 Simplify and clamp coefficient index for MS ADPCM
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27270 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 10:08:40 +00:00
reimar c83dca172f 100l, fix MS ADPCM decoding for e.g. http://samples.mplayerhq.hu/mov/qtaudio/surge-2-16-L-ms02.mov
First coefficient array must be unsigned to fit in 8 bits


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27269 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 09:23:14 +00:00
reimar ed0edb61cb Make really sure channels can only be 1 or 2 for imaadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27262 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:29:41 +00:00
reimar ca588e6a9f Simplify imaadpcm return statement
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27261 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:28:22 +00:00
reimar 792dc55d19 Check length of input buffer for msadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27260 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:27:35 +00:00
reimar ffc22175d3 Add a comment on shift vs. division
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27259 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 19:00:49 +00:00
reimar 68e6f22bbc Scale msadpcm coefficients to fit into 8 bits
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27258 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:59:03 +00:00
reimar 4366cc211c Simplify ad_msadpmc.c: Use AV_RL16, merge sign extension into LE_16 read and
use (int16_t) to let the compiler do the sign extension.
Reduces code size on x86_64, gcc 4.3.1 by 248 bytes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27257 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:51:12 +00:00
reimar 05deb158cf Copy macro simplification from imaadpcm to msadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27256 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:36:21 +00:00
reimar 796e4a53ca Remove useless comments from ad_msadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27255 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:14:16 +00:00
reimar f5ead9d0ee Make msadpcm arrays const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27254 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:13:11 +00:00
reimar 0872673a5e Remove unused macros
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27253 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:12:15 +00:00
reimar 57b3cfcea4 Explicitly include inttypes.h in ad_imaadpcm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27252 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-11 18:10:06 +00:00
Uoti Urpala 8ea134bd23 Merge svn changes up to r27202 2008-07-05 02:55:56 +03:00
diego bd6d4ea9cf Remove unused variable.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27185 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-02 23:19:05 +00:00
Uoti Urpala 7de350c673 Merge svn changes up to r27184 2008-07-01 16:18:21 +03:00
reimar c2af943b84 Half size for adpcm_index
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27153 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 09:14:26 +00:00
reimar 9f941c8a00 Simplify predictor updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27152 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 09:10:46 +00:00
reimar 8532066166 Get rid of 16-bit sign extension macro
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27151 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:47:56 +00:00
reimar 6767061f8b Simplify some imaadpcm macros
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27150 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:42:53 +00:00
reimar 5e97c2f960 Directly pass arrays into decode_nibbles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27149 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:35:27 +00:00
reimar fe3548c668 Use smaller types for tables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27148 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:27:52 +00:00
reimar 64478f25d6 Make imaadpcm tables const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27147 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:22:47 +00:00
reimar 8666dab4f0 Simplify code to read index/predictor
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27146 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:20:42 +00:00
reimar 2f1ffb093b Add a few size checks to IMA decoder. The code is still a mess though,
but bug # 1114 is probably fixed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27145 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 08:08:51 +00:00
reimar 15a54da104 Simplify ad_imaadpcm decode_audio function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27144 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-29 07:55:44 +00:00
Uoti Urpala a232f564d3 Create a context struct for OSD state
This commit creates the struct and passes it to some functions that
needs to access OSD state but does not yet move much data from globals
to it.

vf_expand accesses the OSD state for rendering purposes outside of the
normal OSD draw time. The way this currently works is suboptimal, but
I did not attempt to clean it up now. To keep things working the same
way vf_expand needs to know the address of the state object to be able
to access the data even in the functions that should normally not need
it. For that purpose this commit adds a VFCTRL to tell vf_expand the
address of the object.
2008-06-24 01:53:58 +03:00
Uoti Urpala af3fcdf2de Merge svn changes up to r27025
Conflicts:

	command.c
	libvo/vosub_vidix.c
	libvo/vosub_vidix.h
	mplayer.c
2008-06-07 19:57:57 +03:00
ulion 7b17a4e2c4 Fix channel order for libvorbis decoder, original patched by Nicolas George.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27020 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 13:04:53 +00:00
ulion 2e7dc8d9fb rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-07 12:57:36 +00:00
Uoti Urpala d5c868325c Merge svn changes up to r26979
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
2008-06-04 08:10:48 +03:00
reimar 6ab8ece718 Properly free memory allocate by liba52.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26955 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-01 16:40:56 +00:00
iive 08ec85ba4b Revert commit r26897.
XviD is the correct spelling of the codec. 
You can see it written in the codec own 
documentation and header files.

Prefered name capitalization confirmed 
in conversation with XviD developer (prunedtree).



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26915 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-28 23:04:41 +00:00
diego 8ac2b7bbf5 cosmetics: XviD --> Xvid
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-27 12:41:27 +00:00
diego e53887b234 Add missing MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26793 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-17 10:12:07 +00:00
diego c1f5c9bd3f cosmetics: Remove pointless parentheses from return calls.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-16 00:23:02 +00:00
Uoti Urpala a41db36b22 Merge svn changes up to r26783
Conflicts:

	Makefile
	common.mak
	configure
	libmpcodecs/vd_ffmpeg.c
	libmpdemux/demux_mkv.c
	libvo/vo_xv.c
	mplayer.c
2008-05-15 21:19:35 +03:00
diego 47ef593617 Use standard license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26759 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-13 10:16:20 +00:00
michael 5f5225d0b8 Factorize "int i".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 12:37:04 +00:00
diego def3ee8ac7 cosmetics: Fix unknow vs. unknowN typo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26733 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-11 11:57:05 +00:00
michael 16aa40b6f8 Reformat very ugly code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26726 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:15:57 +00:00
michael ea56b3061c AVOption support for video encoders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26725 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 19:07:26 +00:00
michael 5d0b576f70 AVOptions support for libavcodec based video decoders.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26724 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-10 18:55:31 +00:00
ulion d915b7fc97 Reindent for last commit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26694 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-08 16:05:49 +00:00
ulion 30f7fb8c69 Distinguish between ac3 and dts by format tag.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26693 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-08 15:55:21 +00:00
Uoti Urpala 267a3f4c9c Merge svn changes up to r26680
Conflicts:

	Makefile
	configure
	osdep/timer-darwin.c
2008-05-07 13:15:37 +03:00
diego e9de5ea8df Relicense file as GPL v2+; bero granted permission on IRC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26679 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-07 07:49:35 +00:00
diego 7e9a5ca50a Enable Alpha/ARM optimizations in libmpeg2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26626 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-01 12:30:29 +00:00