aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpcodecs
Commit message (Collapse)AuthorAge
* Merge svn changes up to r27399Gravatar Uoti Urpala2008-08-02
|\ | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * cosmetics: reindent after last commitGravatar compn2008-08-02
| | | | | | | | 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 ↵Gravatar compn2008-08-02
| | | | | | | | | | | | | | | | | | | | 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_Gravatar diego2008-08-02
| | | | | | | | | | | | | | 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 r27374Gravatar Uoti Urpala2008-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2008-07-30
| | | | | | | | | | | | | | | | 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.Gravatar diego2008-07-30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27371 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27347Gravatar Uoti Urpala2008-07-25
|\| | | | | | | | | | | | | | | | | | | | | 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.
* | vf_ass: Copy less unnecessary data to/from work areaGravatar Uoti Urpala2008-07-25
| | | | | | | | | | | | | | | | | | | | 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 multiplyGravatar Uoti Urpala2008-07-23
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Add Dirac video support via libdirac and libschroedinger in libavcodec.Gravatar diego2008-07-22
| | | | | | | | | | | | | | patch by Anuradha Suraparaju, anuradha rd.bbc.co uk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27339 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27281Gravatar Uoti Urpala2008-07-15
|\|
| * Try to keep decoded audio buffer aligned.Gravatar reimar2008-07-14
| | | | | | | | | | | | | | 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 ADPCMGravatar reimar2008-07-12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27270 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, fix MS ADPCM decoding for e.g. ↵Gravatar reimar2008-07-12
| | | | | | | | | | | | | | | | | | 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 imaadpcmGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27262 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify imaadpcm return statementGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27261 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Check length of input buffer for msadpcmGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27260 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a comment on shift vs. divisionGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27259 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Scale msadpcm coefficients to fit into 8 bitsGravatar reimar2008-07-11
| | | | | | | | 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 andGravatar reimar2008-07-11
| | | | | | | | | | | | | | | | 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 msadpcmGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27256 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless comments from ad_msadpcmGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27255 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make msadpcm arrays constGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27254 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove unused macrosGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27253 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explicitly include inttypes.h in ad_imaadpcmGravatar reimar2008-07-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27252 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27202Gravatar Uoti Urpala2008-07-05
|\|
| * Remove unused variable.Gravatar diego2008-07-02
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27185 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27184Gravatar Uoti Urpala2008-07-01
|\|
| * Half size for adpcm_indexGravatar reimar2008-06-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27153 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify predictor updatesGravatar reimar2008-06-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of 16-bit sign extension macroGravatar reimar2008-06-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27151 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify some imaadpcm macrosGravatar reimar2008-06-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27150 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Directly pass arrays into decode_nibblesGravatar reimar2008-06-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27149 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use smaller types for tablesGravatar reimar2008-06-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27148 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make imaadpcm tables constGravatar reimar2008-06-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27147 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Simplify code to read index/predictorGravatar reimar2008-06-29
| | | | | | | | 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,Gravatar reimar2008-06-29
| | | | | | | | | | | | | | 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 functionGravatar reimar2008-06-29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27144 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Create a context struct for OSD stateGravatar Uoti Urpala2008-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 r27025Gravatar Uoti Urpala2008-06-07
|\| | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * Fix channel order for libvorbis decoder, original patched by Nicolas George.Gravatar ulion2008-06-07
| | | | | | | | 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*.Gravatar ulion2008-06-07
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Gravatar Uoti Urpala2008-06-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar reimar2008-06-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26955 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert commit r26897.Gravatar iive2008-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 --> XvidGravatar diego2008-05-27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing MPLAYER_ prefix to multiple inclusion guards.Gravatar diego2008-05-17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26793 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove pointless parentheses from return calls.Gravatar diego2008-05-16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Gravatar Uoti Urpala2008-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c