summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* Make various functions staticUoti Urpala2008-08-128-29/+25
|
* Merge svn changes up to r27441Uoti Urpala2008-08-087-31/+31
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-073-15/+15
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename all preprocessor directives related to Apple / Mac OS X.diego2008-08-062-12/+12
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename preprocessor directives related to image libraries.diego2008-08-051-2/+2
| | | | | | | | | | | | | | Change a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-032-2/+2
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | ad_pcm: Track pts explicitlyUoti Urpala2008-08-031-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge svn changes up to r27399Uoti Urpala2008-08-026-25/+26
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * cosmetics: reindent after last commitcompn2008-08-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27399 b3059339-0415-0410-9bf9-f77b7e298cf2
| * change ve_raw.c:set_format to not overwrite biCompression if force_fourcc is ↵compn2008-08-021-0/+1
| | | | | | | | | | | | | | | | | | | | 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
| * Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-025-24/+24
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-3017-65/+62
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Start unifying names of internal preprocessor directives.diego2008-07-3016-62/+62
| | | | | | | | | | | | | | | | 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
| * Use conditional compilation instead of an #ifdef around the whole file.diego2008-07-301-3/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27347Uoti Urpala2008-07-251-0/+4
|\| | | | | | | | | | | | | | | | | | | | | 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.
| * Add Dirac video support via libdirac and libschroedinger in libavcodec.diego2008-07-221-0/+4
| | | | | | | | | | | | | | patch by Anuradha Suraparaju, anuradha rd.bbc.co uk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27339 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vf_ass: Copy less unnecessary data to/from work areaUoti Urpala2008-07-251-48/+50
| | | | | | | | | | | | | | | | | | | | 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.
* | vf_ass: Optimize alpha multiplyUoti Urpala2008-07-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge svn changes up to r27281Uoti Urpala2008-07-153-45/+44
|\|
| * Try to keep decoded audio buffer aligned.reimar2008-07-141-1/+1
| | | | | | | | | | | | | | 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
| * Simplify and clamp coefficient index for MS ADPCMreimar2008-07-121-12/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27270 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, fix MS ADPCM decoding for e.g. ↵reimar2008-07-121-1/+1
| | | | | | | | | | | | | | | | | | 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
| * Make really sure channels can only be 1 or 2 for imaadpcmreimar2008-07-111-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27262 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify imaadpcm return statementreimar2008-07-111-2/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27261 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check length of input buffer for msadpcmreimar2008-07-111-1/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27260 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a comment on shift vs. divisionreimar2008-07-111-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27259 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Scale msadpcm coefficients to fit into 8 bitsreimar2008-07-111-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27258 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify ad_msadpmc.c: Use AV_RL16, merge sign extension into LE_16 read andreimar2008-07-111-9/+2
| | | | | | | | | | | | | | | | 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
| * Copy macro simplification from imaadpcm to msadpcmreimar2008-07-111-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27256 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless comments from ad_msadpcmreimar2008-07-111-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27255 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make msadpcm arrays constreimar2008-07-111-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27254 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused macrosreimar2008-07-111-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27253 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explicitly include inttypes.h in ad_imaadpcmreimar2008-07-111-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27252 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27202Uoti Urpala2008-07-051-1/+0
|\|
| * Remove unused variable.diego2008-07-021-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27185 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27184Uoti Urpala2008-07-011-102/+56
|\|
| * Half size for adpcm_indexreimar2008-06-291-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27153 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify predictor updatesreimar2008-06-291-9/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of 16-bit sign extension macroreimar2008-06-291-9/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27151 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify some imaadpcm macrosreimar2008-06-291-4/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27150 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Directly pass arrays into decode_nibblesreimar2008-06-291-16/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27149 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use smaller types for tablesreimar2008-06-291-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27148 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make imaadpcm tables constreimar2008-06-291-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27147 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify code to read index/predictorreimar2008-06-291-57/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27146 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a few size checks to IMA decoder. The code is still a mess though,reimar2008-06-291-0/+12
| | | | | | | | | | | | | | but bug # 1114 is probably fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27145 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify ad_imaadpcm decode_audio functionreimar2008-06-291-16/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27144 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Create a context struct for OSD stateUoti Urpala2008-06-245-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge svn changes up to r27025Uoti Urpala2008-06-072-1/+8
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * Fix channel order for libvorbis decoder, original patched by Nicolas George.ulion2008-06-071-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27020 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.ulion2008-06-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-0421-152/+156
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Properly free memory allocate by liba52.reimar2008-06-012-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26955 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert commit r26897.iive2008-05-282-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * cosmetics: XviD --> Xviddiego2008-05-272-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing MPLAYER_ prefix to multiple inclusion guards.diego2008-05-171-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26793 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove pointless parentheses from return calls.diego2008-05-1619-151/+151
| | | | | | | |