summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo_xvmc.c
Commit message (Collapse)AuthorAge
* Merge commit '759001c534287a96dc96d1e274665feb7059145d'Michael Niedermayer2013-03-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '759001c534287a96dc96d1e274665feb7059145d': lavc decoders: work with refcounted frames. Anton Khirnov (1): lavc decoders: work with refcounted frames. Clément Bœsch (47): lavc/ansi: reset file lavc/ansi: re-do refcounted frame changes from Anton fraps: reset file lavc/fraps: switch to refcounted frames gifdec: reset file lavc/gifdec: switch to refcounted frames dsicinav: resolve conflicts smc: resolve conflicts zmbv: resolve conflicts rpza: resolve conflicts vble: resolve conflicts xxan: resolve conflicts targa: resolve conflicts vmnc: resolve conflicts utvideodec: resolve conflicts tscc: resolve conflicts ulti: resolve conflicts ffv1dec: resolve conflicts dnxhddec: resolve conflicts v210dec: resolve conflicts vp3: resolve conflicts vcr1: resolve conflicts v210x: resolve conflicts wavpack: resolve conflicts pngdec: fix compilation roqvideodec: resolve conflicts pictordec: resolve conflicts mdec: resolve conflicts tiertexseqv: resolve conflicts smacker: resolve conflicts vb: resolve conflicts vqavideo: resolve conflicts xl: resolve conflicts tmv: resolve conflicts vmdav: resolve conflicts truemotion1: resolve conflicts truemotion2: resolve conflicts lcldec: fix compilation libcelt_dec: fix compilation qdrw: fix compilation r210dec: fix compilation rl2: fix compilation wnv1: fix compilation yop: fix compilation tiff: resolve conflicts interplayvideo: fix compilation qpeg: resolve conflicts (FIXME/TESTME). Hendrik Leppkes (33): 012v: convert to refcounted frames 8bps: fix compilation 8svx: resolve conflicts 4xm: resolve conflicts aasc: resolve conflicts bfi: fix compilation aura: fix compilation alsdec: resolve conflicts avrndec: convert to refcounted frames avuidec: convert to refcounted frames bintext: convert to refcounted frames cavsdec: resolve conflicts brender_pix: convert to refcounted frames cinepak: resolve conflicts cinepak: avoid using AVFrame struct directly in private context cljr: fix compilation cpia: convert to refcounted frames cscd: resolve conflicts iff: resolve conflicts and do proper conversion to refcounted frames 4xm: fix reference frame handling cyuv: fix compilation dxa: fix compilation eacmv: fix compilation eamad: fix compilation eatgv: fix compilation escape124: remove unused variable. escape130: convert to refcounted frames evrcdec: convert to refcounted frames exr: convert to refcounted frames mvcdec: convert to refcounted frames paf: properly free the frame data on decode close sgirle: convert to refcounted frames lavfi/moviesrc: use refcounted frames Michael Niedermayer (56): Merge commit '759001c534287a96dc96d1e274665feb7059145d' resolve conflicts in headers motion_est: resolve conflict mpeg4videodec: fix conflicts dpcm conflict fix dpx: fix conflicts indeo3: resolve confilcts kmvc: resolve conflicts kmvc: resolve conflicts h264: resolve conflicts utils: resolve conflicts rawdec: resolve conflcits mpegvideo: resolve conflicts svq1enc: resolve conflicts mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads pthreads: resolve conflicts frame_thread_encoder: simple compilefix not yet tested snow: update to buffer refs crytsalhd: fix compile dirac: switch to new API sonic: update to new API svq1: resolve conflict, update to new API ffwavesynth: update to new buffer API g729: update to new API indeo5: fix compile j2kdec: update to new buffer API linopencore-amr: fix compile libvorbisdec: update to new API loco: fix compile paf: update to new API proresdec: update to new API vp56: update to new api / resolve conflicts xface: convert to refcounted frames xan: fix compile&fate v408: update to ref counted buffers v308: update to ref counted buffers yuv4dec: update to ref counted buffers y41p: update to ref counted frames xbm: update to refcounted frames targa_y216: update to refcounted buffers qpeg: fix fate/crash cdxl: fix fate tscc: fix reget buffer useage targa_y216dec: fix style msmpeg4: fix fate h264: ref_picture() copy fields that have been lost too update_frame_pool: use channel field h264: Put code that prevents deadlocks back mpegvideo: dont allow last == current wmalossless: fix buffer ref messup ff_alloc_picture: free tables in case of dimension mismatches h264: fix null pointer dereference and assertion failure frame_thread_encoder: update to bufrefs ec: fix used arrays snowdec: fix off by 1 error in dimensions check h264: disallow single unpaired fields as references of frames Paul B Mahol (2): lavc/vima: convert to refcounted frames sanm: convert to refcounted frames Conflicts: libavcodec/4xm.c libavcodec/8bps.c libavcodec/8svx.c libavcodec/aasc.c libavcodec/alsdec.c libavcodec/anm.c libavcodec/ansi.c libavcodec/avs.c libavcodec/bethsoftvideo.c libavcodec/bfi.c libavcodec/c93.c libavcodec/cavsdec.c libavcodec/cdgraphics.c libavcodec/cinepak.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/dsicinav.c libavcodec/dvdec.c libavcodec/dxa.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/eatgq.c libavcodec/eatgv.c libavcodec/eatqi.c libavcodec/error_resilience.c libavcodec/escape124.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/flicvideo.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_direct.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/huffyuvdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo2.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/ivi_common.c libavcodec/jvdec.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/lagarith.c libavcodec/libopenjpegdec.c libavcodec/mdec.c libavcodec/mimic.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mmvideo.c libavcodec/motion_est.c libavcodec/motionpixels.c libavcodec/mpc7.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/msrle.c libavcodec/msvideo1.c libavcodec/nuv.c libavcodec/options_table.h libavcodec/pcx.c libavcodec/pictordec.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/pthread.c libavcodec/qpeg.c libavcodec/qtrle.c libavcodec/r210dec.c libavcodec/rawdec.c libavcodec/roqvideodec.c libavcodec/rpza.c libavcodec/smacker.c libavcodec/smc.c libavcodec/svq1dec.c libavcodec/svq1enc.c libavcodec/targa.c libavcodec/tiertexseqv.c libavcodec/tiff.c libavcodec/tmv.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/tscc.c libavcodec/ulti.c libavcodec/utils.c libavcodec/utvideodec.c libavcodec/v210dec.c libavcodec/v210x.c libavcodec/vb.c libavcodec/vble.c libavcodec/vcr1.c libavcodec/vmdav.c libavcodec/vmnc.c libavcodec/vp3.c libavcodec/vp56.c libavcodec/vp56.h libavcodec/vp6.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/xl.c libavcodec/xxan.c libavcodec/zmbv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc decoders: work with refcounted frames.Anton Khirnov2013-03-08
| |
* | Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer2013-02-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary dsputil.h #includesDiego Biurrun2013-02-26
| |
* | Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'Michael Niedermayer2013-02-16
|\| | | | | | | | | | | | | | | | | | | * commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885': mpegvideo: split ff_draw_horiz_band(). Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: split ff_draw_horiz_band().Anton Khirnov2013-02-15
| | | | | | | | Split out dependency on MpegEncContext.
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Drop DCTELEM typedefDiego Biurrun2013-01-22
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: changelog: misc typo and wording fixes H.264: add filter_mb_fast support for >8-bit decoding doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. lls: use av_lfg instead of rand() in test program build: remove unnecessary dependency on libs from 'all' target H.264: avoid redundant alpha/beta calculations in loopfilter H.264: optimize intra/inter loopfilter decision mpegts: fix Continuity Counter error detection build: remove unnecessary FFLDFLAGS variable vp8/mt: flush worker thread, not application thread context, on seek. mt: proper locking around release_buffer calls. DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e] hwaccel: unbreak build Eliminate FF_COMMON_FRAME macro. Conflicts: Changelog Makefile doc/developer.texi libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: unbreak buildMans Rullgard2011-07-10
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-02
|/
* Simplify: Remove impossible condition.Nicolas Kaiser2010-11-09
| | | | | | Patch by Nicolas Kaiser, nikai nikai net Originally committed as revision 25714 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-30
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Consistently use third person in doxies.Stefano Sabatini2009-10-27
| | | | Originally committed as revision 20388 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change the type of pblocks from pointers to short array intoIvan Kalvachev2009-02-22
| | | | | | | pointers to array of 64 DCTELEM, similarly to other block fields. This also get rid of some casts and fixes a warning. Originally committed as revision 17517 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add more paranoid checks of xvmc token.Ivan Kalvachev2009-02-19
| | | | Originally committed as revision 17453 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Directly #include required X11/XvMC header.Diego Biurrun2009-02-19
| | | | Originally committed as revision 17450 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace sizeof(short) by the more robust sizeof(*s->pblocks[i]) in memset andDiego Biurrun2009-02-17
| | | | | | memcpy calls. s->pblocks is the element actually being handled. Originally committed as revision 17404 to svn://svn.ffmpeg.org/ffmpeg/trunk
* small Doxygen comment grammar fixDiego Biurrun2009-02-17
| | | | Originally committed as revision 17403 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert converting two asserts into if checks and error messages.Diego Biurrun2009-02-17
| | | | | | It did not achieve the intended effect. Originally committed as revision 17402 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Thoroughly check all fields set by the application in xvmc struct.Ivan Kalvachev2009-02-16
| | | | Originally committed as revision 17387 to svn://svn.ffmpeg.org/ffmpeg/trunk
* whitespace cosmetics: Place spaces around += for better readability.Diego Biurrun2009-02-16
| | | | Originally committed as revision 17368 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace two asserts by checks and error messages.Diego Biurrun2009-02-16
| | | | Originally committed as revision 17362 to svn://svn.ffmpeg.org/ffmpeg/trunk
* whitespace cosmeticsDiego Biurrun2009-02-16
| | | | Originally committed as revision 17358 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Give struct members more sensible names:Diego Biurrun2009-02-16
| | | | | | | total_number_of_mv_blocks --> allocated_mv_blocks total_number_of_data_blocks --> allocated_data_blocks Originally committed as revision 17356 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename AV_XVMC_RENDER_MAGIC constant to AV_XVMC_ID to reflect a similarDiego Biurrun2009-02-15
| | | | | | change in the name of the struct member xvmc_id. Originally committed as revision 17348 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: typo fixDiego Biurrun2009-02-15
| | | | Originally committed as revision 17346 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spelling/grammar/wording fixes for Doxygen commentsDiego Biurrun2009-02-15
| | | | Originally committed as revision 17344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename unique_id to the way michaelni likes it. (xvmc_id)Ivan Kalvachev2009-02-15
| | | | Originally committed as revision 17341 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Document all functions in mpegvideo_xvmc.Ivan Kalvachev2009-02-15
| | | | Originally committed as revision 17340 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.Diego Biurrun2009-02-15
| | | | Originally committed as revision 17339 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Kill the magic field in xvmc structure.Ivan Kalvachev2009-02-15
| | | | Originally committed as revision 17338 to svn://svn.ffmpeg.org/ffmpeg/trunk
* K&R whitespace cosmeticsDiego Biurrun2009-02-15
| | | | Originally committed as revision 17337 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l: Remove duplicated hunk of code.Diego Biurrun2009-02-15
| | | | Originally committed as revision 17335 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics. Vertical align.Ivan Kalvachev2009-02-15
| | | | Originally committed as revision 17319 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Almost cosmetics.Ivan Kalvachev2009-02-15
| | | | | | Move some assignments after the checks. Originally committed as revision 17318 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check all critical xvmc struct fields in ff_xvmc_field_start()Ivan Kalvachev2009-02-15
| | | | | | | and log error if they are not correct. All other functions are supposedly called after that one, so use assert() for them. Originally committed as revision 17317 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Proper condition in xvmc decode mb.Ivan Kalvachev2009-02-15
| | | | | | | The old one would try to use mv blocks that are written outside their buffer, in case of unhandled error. Originally committed as revision 17315 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename xvmc_render_state to something with pixfmt in its name.Ivan Kalvachev2009-02-15
| | | | Originally committed as revision 17314 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert 17308.Ivan Kalvachev2009-02-15
| | | | | | | The above commit makes ff_xvmc_decode_mb to output one log entry for each decoded MB, causing massive slowdown. Originally committed as revision 17312 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Give a little better name to the magic(_id) field in xvmc structIvan Kalvachev2009-02-15
| | | | Originally committed as revision 17310 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace assert in ff_xvmc_field_end() by av_log call at level AV_LOG_ERROR.Diego Biurrun2009-02-15
| | | | Originally committed as revision 17308 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove redundant assert(render) in ff_xvmc_init_block(). The immediatelyDiego Biurrun2009-02-15
| | | | | | following if condition checks render and does an assert if it fails. Originally committed as revision 17304 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove asserts that are immediately followed by a check and error return.Diego Biurrun2009-02-15
| | | | Originally committed as revision 17303 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Doxygen comment/explanation for ff_xvmc_init_block().Diego Biurrun2009-02-15
| | | | Originally committed as revision 17301 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add Doxygen comment similar to ff_xvmc_field_start() to ff_xvmc_field_end().Diego Biurrun2009-02-14
| | | | Originally committed as revision 17296 to svn://svn.ffmpeg.org/ffmpeg/trunk
* whitespace cosmetics: remove stray spaceDiego Biurrun2009-02-14
| | | | Originally committed as revision 17295 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Doxygenize ff_xvmc_field_start() comment.Diego Biurrun2009-02-14
| | | | Originally committed as revision 17292 to svn://svn.ffmpeg.org/ffmpeg/trunk