Commit Graph

35 Commits

Author SHA1 Message Date
Michael Niedermayer
59eb12faff Merge remote branch 'qatar/master'
* qatar/master: (30 commits)
  AVOptions: make default_val a union, as proposed in AVOption2.
  arm/h264pred: add missing argument type.
  h264dsp_mmx: place bracket outside #if/#endif block.
  lavf/utils: fix ff_interleave_compare_dts corner case.
  fate: add 10-bit H264 tests.
  h264: do not print "too many references" warning for intra-only.
  Enable decoding of high bit depth h264.
  Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder.
  Add support for higher QP values in h264.
  Add the notion of pixel size in h264 related functions.
  Make the h264 loop filter bit depth aware.
  Template dsputil_template.c with respect to pixel size, etc.
  Template h264idct_template.c with respect to pixel size, etc.
  Preparatory patch for high bit depth h264 decoding support.
  Move some functions in dsputil.c into a new file dsputil_template.c.
  Move the functions in h264idct into a new file h264idct_template.c.
  Move the functions in h264pred.c into a new file h264pred_template.c.
  Preparatory patch for high bit depth h264 decoding support.
  Add pixel formats for 9- and 10-bit yuv420p.
  Choose h264 chroma dc dequant function dynamically.
  ...

Conflicts:
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavcodec/alpha/dsputil_alpha.c
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/arm/dsputil_init_neon.c
	libavcodec/arm/dsputil_iwmmxt.c
	libavcodec/arm/h264pred_init_arm.c
	libavcodec/bfin/dsputil_bfin.c
	libavcodec/dsputil.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_ps.c
	libavcodec/h264_refs.c
	libavcodec/h264dsp.c
	libavcodec/h264idct.c
	libavcodec/h264pred.c
	libavcodec/mlib/dsputil_mlib.c
	libavcodec/options.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/h264_altivec.c
	libavcodec/ps2/dsputil_mmi.c
	libavcodec/sh4/dsputil_align.c
	libavcodec/sh4/dsputil_sh4.c
	libavcodec/sparc/dsputil_vis.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/dsputil_mmx.c
	libavformat/options.c
	libavformat/utils.c
	libavutil/pixfmt.h
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/swscale_template.c
	tests/ref/seek/lavf_avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-11 05:47:02 +02:00
Anton Khirnov
188dea1dbf lavc: move some flac-specific options to its private context. 2011-05-10 07:42:33 +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 Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
Justin Ruggles
7101b18508 Separate window function from autocorrelation.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 77a78e9bdc)
2011-01-23 19:32:06 +01:00
Justin Ruggles
0d8837bdda Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 56f8952b25)
2011-01-23 19:32:06 +01:00
Justin Ruggles
77a78e9bdc Separate window function from autocorrelation.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 19:59:08 +00:00
Justin Ruggles
56f8952b25 Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-21 19:58:59 +00:00
Stefano Sabatini
5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +00:00
Reimar Döffinger
edac49daf5 Use "const" qualifier for pointers that point to input data of
audio encoders.
This is purely for clarity/documentation purposes.

Originally committed as revision 24481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 13:59:49 +00:00
Justin Ruggles
23940f1405 Add AVCodecContext.lpc_type and Add AVCodecContext.lpc_passes fields.
Add AVLPCType enum.
Deprecate AVCodecContext.use_lpc.

Originally committed as revision 24199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 16:56:20 +00:00
Jai Menon
a7fc91468c Remove useless header inclusion.
Originally committed as revision 22851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-12 13:21:33 +00:00
Jai Menon
3ffdd09a7a alacenc : Report supported input sample formats.
Originally committed as revision 22829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-10 17:32:41 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Jai Menon
215dab5fee alacenc : use private compression_level value consistently.
Originally committed as revision 20261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-17 08:04:33 +00:00
Jai Menon
a0992374ee alacenc : Move some code around for clarity.
Originally committed as revision 20256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-16 16:50:15 +00:00
Justin Ruggles
9a9964c50e cosmetics: reindent and line wrap after last commit
Originally committed as revision 20174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 21:33:50 +00:00
Justin Ruggles
d6eee9f3e9 alacenc: add a fixed LPC coefficient mode as compression level 1. old
compression level 1 is now compression level 2 and is still the default.

Originally committed as revision 20173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 21:27:36 +00:00
Reimar Döffinger
43d7c6118d put_bits can only reliably write up to 31 bit bits, above it relies on
undefined shift behaviour.
Document this, fix the assert and add a put_bits32 to handle writing 32
bits and use that where necessary.

Originally committed as revision 20124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 15:40:29 +00:00
Jai Menon
2370338850 Fix max_coded_frame_size computation to account for byte alignment.
Fixes issue 1386.

Originally committed as revision 19859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 15:06:04 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Jai Menon
309a8bb8a1 alacenc : cosmetics : remove misleading comment
Originally committed as revision 18493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 15:11:40 +00:00
Stefano Sabatini
b275500706 Split bitstream.h, put the bitstream writer stuff in the new file
put_bits.h.

Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:35:26 +00:00
Benoit Fouet
4f46099b90 Use sign_extend().
On behalf of Jai.

Originally committed as revision 17759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 13:11:10 +00:00
Jai Menon
3d5e1bfb20 Fix an overflow in the predictor.
fixes issue 636
Patch by Jai.

Originally committed as revision 16007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-05 07:58:31 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
Jai Menon
ec6cda8c6e alacenc : perform decorrelation only for stereo samples
Originally committed as revision 14904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 14:57:35 +00:00
Jai Menon
a1ab56c5a8 alacenc: compare against ALAC_MAX_LPC_ORDER instead of MAX_LPC_ORDER
Originally committed as revision 14847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 18:45:00 +00:00
Jai Menon
e13894e80e alacenc: last few hunks approved by michael
Originally committed as revision 14845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 17:20:41 +00:00
Ramiro Polla
cc940caf4d alacenc: Use user-specified min and max prediction order.
Originally committed as revision 14844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:12:05 +00:00
Ramiro Polla
0d962ecb70 Import more OKed parts of ALAC encoder from GSoC repo.
Originally committed as revision 14843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:07:58 +00:00
Ramiro Polla
ca04826627 Import more ok'd parts of ALAC encoder from GSoC repo.
Originally committed as revision 14820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 22:47:40 +00:00
Ramiro Polla
83e92ab6b8 alacenc: NULL_IF_CONFIG_SMALL long_name.
Originally committed as revision 14801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 12:25:01 +00:00
Ramiro Polla
6b93147684 Import ok'd parts of ALAC encoder from GSoC repo.
Originally committed as revision 14798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 04:36:06 +00:00