summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* cleanup: remove more warningsClément Bœsch2011-05-026-76/+15
|
* Merge branch 'mplayer1_changes'Uoti Urpala2011-05-025-19/+31
|\
| * ad_speex: support decoding stream without header packetreimar2011-05-021-13/+14
| | | | | | | | | | | | | | Setup default speex modes, allows decoding of speex in flv which does not contain a header packet. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33327 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vd_ffmpeg: Make DR work with reget_buffer without buffer_hintsreimar2011-05-021-0/+3
| | | | | | | | | | | | Allow DR to work with reget_buffer when no buffer_hints are set. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33287 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vd_ffmpeg: handle reget_buffer in DRI failure fallback codereimar2011-05-021-0/+6
| | | | | | | | | | | | Allow reget_buffer to somewhat work after direct rendering failure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33286 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ad_qtaudio: don't run win32 loader code when it's not usedreimar2011-05-021-2/+2
| | | | | | | | | | | | | | Do not try to set up the FS segment when using quicktime to decode, it makes no sense to do that. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33259 b3059339-0415-0410-9bf9-f77b7e298cf2
| * vd_ffmpeg: require aligned stride in get_buffer()zuxy2011-04-131-1/+1
| | | | | | | | | | | | | | Change MP_IMGFLAG_ACCEPT_STRIDE to MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE in get_buffer() as various FFmpeg assembly routines assume aligned input. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33097 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ad_pcm, codecs.conf: support 'lpcm' in mov and float in aiffcehoyos2011-04-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | Support 'lpcm' in mov files, has audible (clipping?) artefacts on some systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33075 b3059339-0415-0410-9bf9-f77b7e298cf2 Support 32bit big endian float pcm in aiff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33076 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ad_liba52: Fix -ac a52 with tags other than 0x2000 or dnetreimar2011-04-131-3/+3
| | | | | | | | | | | | | | Audio with all codec tags other than 0x2000 was byte-swapped, while only "dnet" should be. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33028 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vf_*: fix pts values passed to the next filterRudolf Polzer2011-04-2416-56/+269
| | | | | | | | | | | | | | | | | | | | | | | | Many video filters failed to calculate or even just pass through pts values for their output frames. Fix this, and also make the two remaining filters that called vf_next_put_image() twice for the same input frame (vf_softpulldown, vf_telecine) use vf_queue_frame() so that e.g. framestepping properly sees both frames. Changed filters: vf_bmovl, vf_detc, vf_divtc, vf_filmdint, vf_ivtc, vf_lavc, vf_phase, vf_pullup, vf_softpulldown, vf_telecine, vf_tile, vf_tinterlace.
* | Update libav API usesUoti Urpala2011-04-204-10/+8
| | | | | | | | | | | | | | | | | | | | | | Update various code to use newer alternatives instead of deprecated functions/fields that are being dropped at libav API bump. An exception is avcodec_thread_init() which is being dropped even though it's still _necessary_ with fairly recent libav versions, so there's no good alternative which would work with both those recent versions and latest libavcodec. I think there are grounds to consider the drop premature and revert it for now; if that doesn't happen I'll add a version-test #if check around it later.
* | cleanup: avoid various GCC warningsClément Bœsch2011-04-202-3/+3
|/
* mp3lib: drop internal mp3lib treeUoti Urpala2011-04-023-128/+0
| | | | | | | | | | | | | Delete mp3lib which has been the default mp3 decoder until now. In addition to being an unnecessary embedded library it now fails to compile correctly with the new gcc-4.6, producing noise. After the deletion the default decoder priority for mp3 will be first libmpg123 (a newer version of the code that mp3lib was based on) if available, then ffmp3float which should be available in all normal compiles. I think that some tweaking may be required as these decoder alternatives get wider testing, but any problems should be solvable and there should be no need for mp3lib.
* vd_ffmpeg: fix thread count setting with latest ffmpeg-mtUoti Urpala2011-03-291-1/+3
| | | | | | | | Recent ffmpeg-mt versions changed the API for setting the number of decoding threads to use (I'm not sure whether dropping backwards compatibility was intentional or not). As a result only one thread was used. Make the thread setting compatible with the new API to restore proper multithreaded decoding.
* ad_qtaudio: fix use with the libavformat mov demuxerfaust32011-02-151-2/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32863 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_mpng: libpng API update, use color type gettercboesch2011-02-151-3/+6
| | | | | | | | | | Use color type getter instead of direct access to private member. Using the getter is mandatory since recent libpng 1.5 release. Patch by Gianluigi Tiesi (mplayer - netfarm it) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32840 b3059339-0415-0410-9bf9-f77b7e298cf2
* libmpcodecs/vf_*.c: Replace memalign() by av_malloc()michael2011-02-153-8/+12
| | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32834 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix postprocessing and perspective filters on x86-64 (missing libavutil/mem.h include). Original patch by Reinhard Tartler git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32835 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix compilation with old FFmpeg versionsUoti Urpala2011-02-081-1/+8
| | | | | | | | | | | | af_lavcac3enc: use old SampleFormat names without AV_ prefix, the latter were only added in 2010-11 vd_ffmpeg: add ifdef around CODEC_ID_LAGARITH use demux_real: use ffmpeg_files/intreadwrite.h stream/http.c, stream/realrtsp/real.c: define AV_BASE64_SIZE macro for old libavutil versions lacking it
* ad_ffmpeg: add missing extradata paddingUoti Urpala2011-02-021-1/+2
| | | | | | One of two alternative code parts passing codec extradata to libavcodec didn't add the buffer padding that libavcodec requires, resulting in invalid reads beoynd allocated memory area. Fix.
* libmpeg2: drop libmpeg2 supportUoti Urpala2011-02-012-318/+0
| | | | | libavcodec mpeg2 decoder has been the default for a while and seems to work fine.
* vo_zr2: drop Zoran supportUoti Urpala2011-01-314-1306/+0
| | | | | | | There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
* codecs.conf, vd_ffmpeg: Enable fflagarith video decodercehoyos2011-01-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32773 b3059339-0415-0410-9bf9-f77b7e298cf2
* libfaad2:/ Remove forked internal libfaad2 copydiego2011-01-311-32/+1
| | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove AAC/FAAD2 installation instructions. There is nothing special about building and installing FAAD2, so there is no longer a need to keep maintaining instructions for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge branch 'sub'Uoti Urpala2011-01-264-48/+91
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sub: sub/OSD: move some related files to sub/ subtitles: options: enable -ass by default subtitles: change default libass rendering style demux_mkv, chapters: change millisecond arithmetic to ns cleanup: rename ass_* functions to mp_ass_* subs: use correct font aspect ratio for libass + converted subs cleanup: some random minor code simplification and cleanup vf_vo: fix EOSD change detection bug sd_ass: remove subreader use, support plaintext markup subtitles: style support for common SubRip tags and MicroDVD core: ordered chapters: fix bad subtitle parameter subs/demux: don't try to enable sub track when creating it subtitles/demux: store duration instead of endpts in demux packets subtitles: add framework for subtitle decoders options: add special -leak-report option subtitles: remove code trying to handle text subs with libavcodec cleanup: move MP_NOPTS_VALUE definition to mpcommon.h subtitles: move global ass_track to struct osd_state core: move most mpcommon.c contents to mplayer.c core: move global "subdata" and "vo_sub_last" to mpctx subtitles: remove sub_last_pts hack options: move -noconfig to option struct, simplify
| * sub/OSD: move some related files to sub/Uoti Urpala2011-01-263-5/+5
| |
| * cleanup: rename ass_* functions to mp_ass_*Uoti Urpala2011-01-262-14/+14
| | | | | | | | | | | | | | | | The various ass_* functions were created when libass was part of the MPlayer tree and the distinction between MPlayer-specific and other functions was less clear. Now that libass is a clearly separate library, using the same ass_* namespace for player functions is ugly. Rename the functions to use mp_ass_ prefix instead.
| * subs: use correct font aspect ratio for libass + converted subsUoti Urpala2011-01-262-25/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rendering of ASS subtitles tries to be bug compatible with VSFilter and stretches fonts when the video is anamorphic (some scripts try to compensate for this VSFilter behavior, so trying to render them "correctly" would give the wrong result). However this behavior is not appropriate for subtitles we converted to ASS format ourselves for libass rendering, as they certainly don't have VSFilter bug workarounds. Change the code to use different behavior for "native" ASS tracks and converted ones. It's questionable whether the VSFilter-compatible behavior is appropriate for external .ass files either, as there could be anamorphic and non-anamorphic versions of the same video and the bug-compatible behavior can only be correct for one alternative at most. However it's probably better to keep it as a default at least, so that extracting a muxed subtitle track and using that does not give behavior different from the original muxed one. The aspect ratio setting is per ASS_Renderer, and changing it resets libass caches. For that reason this commit adds separate renderer instances to use for the "correct" and "VSFilter bug compatible" cases.
| * cleanup: some random minor code simplification and cleanupUoti Urpala2011-01-261-9/+8
| |
| * vf_vo: fix EOSD change detection bugUoti Urpala2011-01-181-1/+0
| | | | | | | | | | | | | | | | | | | | vf_vo had code setting its prev_visibility variable correctly, then a line that overrode the value just set with an incorrect one. Remove the wrong extra line. As a result of the bug the "contents changed" indicator wasn't forced to true when switching from a subtitle track to "no track" and then back. A visible effect was at least that a currently visible static subtitle disappeared when doing that switch back and forth.
| * cleanup: move MP_NOPTS_VALUE definition to mpcommon.hUoti Urpala2011-01-151-4/+1
| |
| * subtitles: move global ass_track to struct osd_stateUoti Urpala2011-01-153-12/+18
| |
* | mp_msg: Remove uses of MSGT_MENCODERClément Bœsch2011-01-252-5/+5
| | | | | | | | | | Some of the code that could run outside MEcoder used MSGT_MENCODER. Replace those with appropriate MSGT_ types.
* | cleanup: remove unused MEncoder-related codeClément Bœsch2011-01-254-17/+8
|/ | | | | Remove some code and variables that were no longer used after MEncoder removal. Also remove some MEncoder references in comments.
* cosmetics: remove unused code, small formatting tweaksUoti Urpala2010-12-201-1/+1
|
* vd_ffmpeg: set thread count to number of cores on machine by defaultUoti Urpala2010-12-201-1/+14
| | | | | | | | | | | Make "-lavdopts threads=0" mean an autodetected number of threads, and make that the default value of the option. Also increase the upper limit of the option from 8 to 16. Add new file osdep/numcores.c which tries to determine the number of cores available on the machine. numcores.c is based (heavily modified) on public domain numcpus.c by Philip Willoughby <pgw99@doc.ic.ac.uk>, downloaded from http://csgsoft.doc.ic.ac.uk/numcpus/
* ad_faad: fix crash when used on an empty audio streamreimar2010-12-161-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32706 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_speex: improve timestamp handlingreimar2010-12-161-1/+9
| | | | | | | Improve speex codec pts handling, make audio timestamps work reasonably even with the native demuxer as long as seeking is not done. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32704 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: fix MP_IMGTYPE selection for non-ref non-B framesreimar2010-12-161-1/+1
| | | | | | | | | | | | | | | Change direct rendering buffer allocation code to treat non-ref frames like B-frames even if has_b_frames is not set and they are indeed not B-frames (no reordering). Treating it as an I/P frame would violate the assumptions of MPlayer's buffering system, which thinks only the latest previous I/P frame is needed (in addition to one possibly being decoded). In this case the previous I/P frame will still be needed in the future, not the non-ref frame being decoded now. This happens with flv files, as in bug #1079, and this change fixes that corruption. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32700 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: Reset ctx->vo_initialized to 0 on a resolution changereimar2010-12-161-0/+1
| | | | | | | | Otherwise we might think the filter chain/vo is ready when it actually is not, leading to a crash. Fixes crash part of bug 1156. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32690 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_speex: Fix possible memory leaks on errorreimar2010-12-161-2/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32689 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_qtvideo: Do not dump image description by defaultreimar2010-12-161-1/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32656 b3059339-0415-0410-9bf9-f77b7e298cf2 Reindent. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32657 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_stereo3d: Properly support src/dst stridereimar2010-12-161-31/+38
| | | | | | | | | | | | | | Patch by Endre Kollár [taxy443 gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32626 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove unused struct element. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32627 b3059339-0415-0410-9bf9-f77b7e298cf2 Indicate that stereo3d can now handle strides properly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32628 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_stereo3d: Adjust d_height instead of bad ad-hoc scalingreimar2010-12-161-44/+28
| | | | | | Patch by Endre Kollár [taxy443 gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32625 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_liba52: fix -a52drc handlingUoti Urpala2010-11-231-1/+1
| | | | Custom values other than 0 were ignored. Fix.
* demux_mkv, ad_ffmpeg: use Matroska OutputSamplingFrequency if availableUoti Urpala2010-11-211-11/+16
| | | | | | | | | | | | | | | | | | Use the value of the OutputSamplingFrequency element instead of the SamplingFrequency element as the "container samplerate". In most cases this only removes a warning, as those typically differ for SBR AAC files and there was already a special case detecting this in ad_ffmpeg. The implementation adds a new "container_out_samplerate" field to the sh_audio struct. Reusing the existing "samplerate" field and the equivalent inside the 'wf' struct and just setting those to the new value instead would probably work (at least I'm not aware of any codec that would need the original SamplingFrequency for initialization). However using a separate field also avoids some ugliness: the 'wf' struct may not exist (though most demuxers create it), and the 'samplerate' field is overwritten to reflect the final value decided by codec when decoding is first initialized.
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-1426-58/+53
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* core: do initial A-V sync by modifying audio streamUoti Urpala2010-11-132-7/+21
| | | | | | | Add code to enforce matching pts with video when (re)starting the audio stream, by either cutting away the first samples or inserting silence at the beginning. New option -noinitial-audio-sync can be used to disable this and return to old behavior.
* vd_ffmpeg: compare IMGFMT instead of PIX_FMTreimar2010-11-081-3/+3
| | | | | | | Use IMGFMT to compare instead of PIX_FMT to avoid issues with the "JPEG" formats like PIX_FMT_YUVJ422P. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32594 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_faad: Make work with -demuxer lavfreimar2010-11-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32586 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_ffmpeg: Handle EAGAIN, needed for LATM to work properly with demux_tsreimar2010-11-081-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32583 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_scale: accept all non-hw-accel formats we know a PIX_FMT forreimar2010-11-081-35/+1
| | | | | | | | | | Make scale filter accept all non-hardware-acceleration input formats we know a PIX_FMT_* for. It is possible we will not have a conversion for some of these formats, but since it will just fail differently this approach is better since it avoids having to expand the explicit list continuously. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32576 b3059339-0415-0410-9bf9-f77b7e298cf2
* video: simplify some tests with a new IMGFMT_IS_HWACCEL macroreimar2010-11-084-6/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32575 b3059339-0415-0410-9bf9-f77b7e298cf2
* build: enable vf_geq if libavutil version installs eval.hUoti Urpala2010-11-061-0/+2
| | | | | New enough libavutil versions allow building vf_geq.c without requiring internal FFmpeg headers.
* vf_stereo3d: Add stereo3d filterreimar2010-11-022-0/+480
| | | | | | | | | Further review very welcome, but it is time (and good enough) to add this. Patch by Gordon Schmidt [gordon.schmidt s2000.tu-chemnitz de] with changes by Endre Kollár [taxy443 gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32527 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: improve aspect ratio handlingreimar2010-11-021-5/+7
| | | | | | | | | Respect container aspect first if available, but change to ratio based on video codec level information if there's a resolution or pixel aspect change from the original codec values in the middle of the video. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32525 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_qtvideo: fix crash on OS X