Commit Graph

67 Commits

Author SHA1 Message Date
Michael Niedermayer
be315a3232 Merge remote branch 'qatar/master'
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-30 01:58:26 +02:00
Diego Biurrun
2e15305b70 Remove some disabled printf debug cruft. 2011-04-29 20:00:53 +02:00
Michael Niedermayer
7b9e98173c Revert "Eliminate pointless '#if 1' statements without matching '#else'."
no comment

This reverts commit e6ff064845.

Conflicts:

	libavcodec/dsputil.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 04:13:28 +02:00
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 03:51:04 +02:00
Diego Biurrun
e6ff064845 Eliminate pointless '#if 1' statements without matching '#else'. 2011-04-26 20:18:27 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Diego Biurrun
e51f04968e Restore array sizes in doxygen parameter names.
Originally committed as revision 24108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 13:35:46 +00:00
Diego Biurrun
3fa7626863 Avoid square brackets in Doxygen comments; Doxygen chokes on them.
Originally committed as revision 23979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 11:44:58 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Michael Niedermayer
919e749772 slice dice, inline and outline cmp()
motion_est.o is now less than half its previous size.
No speedchange meassureable.

Originally committed as revision 22771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 01:07:03 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Diego Biurrun
ca74c0a180 cosmetics: Fix two common typos: wont --> will not, lets --> let us.
Originally committed as revision 14372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 17:09:28 +00:00
Michael Niedermayer
81d4ee3e16 New full search ME
Originally committed as revision 14142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-09 18:59:52 +00:00
Aurelien Jacobs
9701840bb5 add FF_ prefix to all (frame)_TYPE usage
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:31:02 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
Carl Eugen Hoyos
154e30f6c2 rename attribute_unused to av_unused and moves its declaration to common.h
patch by Carl Eugen Hoyos cehoyos chez ag or at
original thread: [FFmpeg-devel] [PATCH] attribute_unused -> av_unused
date: 05/29/2007 01:23 PM

Originally committed as revision 9155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 09:32:25 +00:00
Loren Merritt
1cfe393a25 doxy comment tweaks
Originally committed as revision 8580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 23:58:33 +00:00
Guillaume Poirier
bb21f1762a Add doxy comments, based on Loren's explanations posted here:
Date: Mar 30, 2007 9:00 PM
Subject: Re: [Ffmpeg-devel] Motion Estimation in snow.c for Waevelet encoded frames (DWT)

Originally committed as revision 8579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 22:39:43 +00:00
Michael Niedermayer
d951bb9a5c test DIRECT{0,0} too if flag mv0 is used
slight PSNR/bitrate increase

Originally committed as revision 7361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-22 23:30:57 +00:00
Michael Niedermayer
e4d0e2edb9 fix special casing of the 0,0 MV for b frames (slight PSNR/bitrate gain)
Originally committed as revision 7334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-20 17:11:54 +00:00
Michael Niedermayer
ff8dc81b5b dont favor the zero MV if mv0 is used (psnr per bitrate gains ranging from 0 to 0.14, most are <=0.04 though)
Originally committed as revision 7333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-20 01:30:17 +00:00
Michael Niedermayer
2b0cdd9ec6 mv overflow in map fix (untested except regression tests)
Originally committed as revision 7287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 13:31:12 +00:00
Måns Rullgård
849f10351d rename always_inline to av_always_inline and move to common.h
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 00:35:08 +00:00
Michael Niedermayer
2421a01b25 10l umh search needs hex size 2 now after the last change
Originally committed as revision 7224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 12:35:47 +00:00
Michael Niedermayer
f852ff3257 make hex and large 2 small diamond search half their size instead or -1 if the initial size was a power of 2
double the hex size so odd sized hexagons are possible

Originally committed as revision 7223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-05 12:34:52 +00:00
Diego Biurrun
c6c367254f spelling cosmetics: cliped --> clipped
Originally committed as revision 7208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 14:19:49 +00:00
Michael Niedermayer
516ea8d222 fix indention
Originally committed as revision 7206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 11:24:41 +00:00
Michael Niedermayer
1994e7c6b6 dia_size=-1 -> funny_diamond_search()
dia_siue=768 + size -> umh search (old -1 was 784)

Originally committed as revision 7205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 10:58:20 +00:00
Michael Niedermayer
376edfcc0f hexagon search
dia_size=512 + hexagon size (513 is the normal one used in h264)
large to small diamond search
        dia_size=256 + diamond size

Originally committed as revision 7204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 10:45:51 +00:00
Michael Niedermayer
ed1dfc4970 remove pretty much useless skiping of some predictors
this has pretty much no quality or speed effect except very small random changes

Originally committed as revision 7202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 20:38:54 +00:00
Michael Niedermayer
c9cac6e3d7 typo in umh
Originally committed as revision 7193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 09:58:06 +00:00
Michael Niedermayer
c7675718e4 UMH support (dia_size=-1 activates it)
Originally committed as revision 7192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 09:48:33 +00:00
Michael Niedermayer
ac003d2461 cosmetic (prevent name clashes of variables in a macro with surrounding code)
Originally committed as revision 7191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 09:46:52 +00:00
Michael Niedermayer
f7f8af46f7 1 step diamond search around the median MV predictor
+0.01 PSNR
idea from x264

Originally committed as revision 7189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 22:44:22 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS.
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 23:17:58 +00:00
Dominik Mierzejewski
621d92940e Fixes:
mpegvideo.h:777: warning: ‘inline’ is not at beginning of declaration
motion_est_template.c:236: warning: ‘inline’ is not at beginning of declaration

Approved by Diego.

Originally committed as revision 6591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-08 21:11:03 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Michael Niedermayer
1dd509b157 make zero motion vector threshold user setable
Originally committed as revision 5348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-07 11:48:07 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
Michael Niedermayer
1c3990dbba H.261 encoder by (Maarten Daniels <maarten dot daniels at luc dot ac dot be>)
Originally committed as revision 3643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-28 10:12:57 +00:00
Michael Niedermayer
c08a01a6b9 pre_cmp fix
Originally committed as revision 3458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-13 12:37:39 +00:00
Michael Niedermayer
155ec6edf8 quad tree based motion compensation (currently only 16x16 & 8x8 OBMC blocks, but can be extended to other block sizes easily)
different intra block coding (previous was just an ugly hack)
1.8% bitrate reduction -0.01PSNR (foreman@352x288 qscale=8)
1.5% bitrate reduction +0.05PSNR (foreman@352x288 qscale=1)

Originally committed as revision 3416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-26 20:04:54 +00:00
Michael Niedermayer
26efc54e4a 4x4 SSE compare function
wavelet based compare functions
make epzs_motion_search() more flexible so it can be used for a wider range of block sizes
make get_penalty_factor() independant of MpegEncContext

Originally committed as revision 3410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-22 17:16:03 +00:00
Loren Merritt
4994af2fbd shape-adaptive diamond + prediction crash patch by (Loren Merritt <lorenm at u dot washington dot edu>)
Originally committed as revision 3287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-05 02:21:38 +00:00
Michael Niedermayer
0da6315a70 fewer overflows
Originally committed as revision 3222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-14 16:18:04 +00:00
Michael Niedermayer
ae1dbde1cf clip input motion vectors
be somewhat more tollerant on invalid input
return INT_MAX instead of -1 for unuseable mv/mb types as that ensures nicely that they arent used
initalize limits earlier for b frames
a few more asserts to check for out of picture vectors

Originally committed as revision 3213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-10 22:56:43 +00:00
Michael Niedermayer
1f202b0d46 moving motion estimation specific variables from MpegEncContext -> MotionEstContext
Originally committed as revision 3124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-11 01:38:46 +00:00