GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-24 20:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,612 Commits 44 Branches 89 Tags
8ea7eb77fc7ba8bd0b596ea32ee60909a012828f
Commit Graph
2119 Commits
Author SHA1 Message Date
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441 
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
 2008-08-08 02:13:09 +03:00
diego e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and 
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 12:20:50 +00:00
diego 473e2824cb Rename all preprocessor directives related to Apple / Mac OS X. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-06 07:42:26 +00:00
diego 0a749ffdc5 Rename preprocessor directives related to image libraries. 
Change a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-05 08:47:51 +00:00
Uoti Urpala 2ba9df3df3 ad_pcm: Track pts explicitly 
ad_pcm used the old audio timestamp tracking system that calculated
timestamp at end of decoder output as
last_timestamp_in_input_decoder_has_read +
bytes_read_after_that_timestamp / input_bitrate.
For PCM this can be accurate as input bitrate is constant. However it
relies on input bitrate being known and actually set. At least in some
case with .mov input and libavformat demuxer it wasn't set. Instead of
special-casing PCM to make sure input bitrate is set (in general it
may not be known or constant at all) change ad_pcm to explicitly set
the pts information on the decoder output side.
 2008-08-03 21:25:48 +03:00
diego 02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from 
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-03 15:21:40 +00:00
Uoti Urpala 6cce822505 Merge svn changes up to r27399 
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
 2008-08-02 22:04:35 +03:00
compn ded7033671 cosmetics: reindent after last commit 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27399 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-02 18:43:17 +00:00
compn cae7631dbe change ve_raw.c:set_format to not overwrite biCompression if force_fourcc is set. 
fixes -ovc raw -ffourcc
patch by "Andrew Wason" rectalogic !@! rectalogic !.! com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27398 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-02 18:41:43 +00:00
diego 96a506733d Change a bunch of codec-specific preprocessor directives from a HAVE_ 
prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-02 16:30:32 +00:00
Uoti Urpala 04f3909a72 Merge svn changes up to r27374 
Conflicts:

	cfg-common-opts.h
	cfg-mplayer.h
	command.c
	configure
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpcodecs/vf_vo.c
	libmpdemux/demuxer.h
	libmpdemux/stheader.h
	mp_core.h
	mplayer.c
	stream/stream_radio.c
 2008-07-30 16:39:24 +03:00
diego 4b141479da Start unifying names of internal preprocessor directives. 
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 12:01:30 +00:00
diego 771cd67118 Use conditional compilation instead of an #ifdef around the whole file. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 10:26:23 +00:00
Uoti Urpala 3a69d65f8d Merge svn changes up to r27347 
Conflicts:

	libvo/x11_common.c
	libvo/x11_common.h

Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
 2008-07-25 02:50:58 +03:00
Uoti Urpala 577587ec6c vf_ass: Copy less unnecessary data to/from work area 
The filter copied the chroma planes from every potentially changed row
of the original image to its non-subsampled work area. Change it to
calculate the minimum and maximum x coordinate for each chroma row and
only copy the part between those.

The performance increase is only minor (though observable), but I
think the resulting code is no more complex than the original.
 2008-07-25 01:55:14 +03:00
Uoti Urpala 4dab4347f5 vf_ass: Optimize alpha multiply 
The effect of alpha blending was calculated as
color = orig_color * alpha / 255
where alpha and color range from 0 to 255.
Change this to
color = (orig_color * alpha + 255) / 256
where the "/ 256" can be expressed as a shift whereas the compiler
would probably generate a multiply+shift for the original "/ 255".
This formula gives a result that is too high by 1 for some inputs.
However it gives the exact result if alpha is 0 or 255 which is
probably the case where small errors would matter most.
 2008-07-23 02:05:55 +03:00
diego fa164d8a94 Add Dirac video support via libdirac and libschroedinger in libavcodec. 
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27339 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-22 22:58:51 +00:00
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