summaryrefslogtreecommitdiffstats
path: root/libavcodec/alacenc.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * alacenc: remove unneeded frame_size check in alac_encode_frame()Justin Ruggles2012-02-111-5/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-071-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "v210enc: use FFALIGN()" doxygen: Do not include license boilerplates in Doxygen comment blocks. avplay: reset decoder flush state when seeking ape: skip packets with invalid size ape: calculate final packet size instead of guessing ape: stop reading after the last frame has been read ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished ape: return error if seeking to the current packet fails in ape_read_packet() avcodec: Clarify AVFrame member documentation. v210dec: check for coded_frame allocation failure v210enc: use stride as it is already calculated v210enc: use FFALIGN() v210enc: return proper AVERROR codes instead of -1 v210enc: do not set coded_frame->key_frame v210enc: check for coded_frame allocation failure drawtext: add 'fix_bounds' option on coords fixing drawtext: fix text_{w, h} expression vars drawtext: add missing braces around an if() block. Conflicts: libavcodec/arm/vp8.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/v210dec.c libavfilter/vf_drawtext.c libavformat/ape.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Do not include license boilerplates in Doxygen comment blocks.Diego Biurrun2012-02-061-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-041-3/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: add dxtory test adx_parser: rewrite. adxdec: Validate channel count to fix a division by zero. adxdec: Do not require extradata. cmdutils: K&R reformatting cosmetics alacdec: implement the 2-pass prediction type. alacenc: implement the 2-pass prediction type. alacenc: do not generate invalid multi-channel ALAC files alacdec: fill in missing or guessed info about the extradata format. utvideo: proper median prediction for interlaced videos lavu: bump lavu minor for av_popcount64 dca: K&R formatting cosmetics dct: K&R formatting cosmetics lavf: flush decoders in avformat_find_stream_info(). win32: detect number of CPUs using affinity Add av_popcount64 snow: Restore three mistakenly removed casts. Conflicts: cmdutils.c doc/APIchanges libavcodec/adx_parser.c libavcodec/adxdec.c libavcodec/alacenc.c libavutil/avutil.h tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alacenc: implement the 2-pass prediction type.Justin Ruggles2012-01-031-1/+10
| | | | | | | | This isn't used by the reference encoder, but it is supported by the decoder.
| * alacenc: do not generate invalid multi-channel ALAC filesJustin Ruggles2012-01-031-0/+8
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-031-47/+54
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aac_latm: reconfigure decoder on audio specific config changes latmdec: fix audio specific config parsing Add avcodec_decode_audio4(). avcodec: change number of plane pointers from 4 to 8 at next major bump. Update developers documentation with coding conventions. svq1dec: avoid undefined get_bits(0) call ARM: h264dsp_neon cosmetics ARM: make some NEON macros reusable Do not memcpy raw video frames when using null muxer fate: update asf seektest vp8: flush buffers on size changes. doc: improve general documentation for MacOSX asf: use packet dts as approximation of pts asf: do not call av_read_frame rtsp: Initialize the media_type_mask in the rtp guessing demuxer Cleaned up alacenc.c Conflicts: doc/APIchanges doc/developer.texi libavcodec/8svx.c libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/nellymoserdec.c libavcodec/tta.c libavcodec/utils.c libavcodec/version.h libavcodec/wmadec.c libavformat/asfdec.c tests/ref/seek/lavf_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Cleaned up alacenc.cNathan Adil Maxson2011-12-011-47/+54
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use designated initialisers for all codecs.Anton Khirnov2011-07-291-7/+7
| | | | | | | | It's more readable and less prone to breakage.
* | Encoding alac with more than two channels is not supported.Carl Eugen Hoyos2011-05-211-0/+5
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-111-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: move some flac-specific options to its private context.Anton Khirnov2011-05-101-2/+2
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Separate window function from autocorrelation.Justin Ruggles2011-01-211-2/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext.Justin Ruggles2011-01-211-7/+7
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
| | | | | | | | | | | | | | | | 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 d36beb3f6902b1217beda576aa18abf7eb72b03c)
* | Separate window function from autocorrelation.Justin Ruggles2011-01-231-2/+6
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 77a78e9bdcc589efac41da4f92a489f4523667c0)
* | Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext.Justin Ruggles2011-01-231-7/+7
|/ | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 56f8952b252f85281317ecd3e0b04c4cae93fd72)
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-121-2/+2
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use "const" qualifier for pointers that point to input data ofReimar Döffinger2010-07-241-3/+3
| | | | | | | audio encoders. This is purely for clarity/documentation purposes. Originally committed as revision 24481 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add AVCodecContext.lpc_type and Add AVCodecContext.lpc_passes fields.Justin Ruggles2010-07-111-1/+2
| | | | | | | Add AVLPCType enum. Deprecate AVCodecContext.use_lpc. Originally committed as revision 24199 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove useless header inclusion.Jai Menon2010-04-121-1/+0
| | | | Originally committed as revision 22851 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc : Report supported input sample formats.Jai Menon2010-04-101-0/+1
| | | | Originally committed as revision 22829 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc : use private compression_level value consistently.Jai Menon2009-10-171-1/+1
| | | | Originally committed as revision 20261 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc : Move some code around for clarity.Jai Menon2009-10-161-10/+10
| | | | Originally committed as revision 20256 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: reindent and line wrap after last commitJustin Ruggles2009-10-051-6/+10
| | | | Originally committed as revision 20174 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc: add a fixed LPC coefficient mode as compression level 1. oldJustin Ruggles2009-10-051-2/+13
| | | | | | 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
* put_bits can only reliably write up to 31 bit bits, above it relies onReimar Döffinger2009-10-011-1/+1
| | | | | | | | 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
* Fix max_coded_frame_size computation to account for byte alignment.Jai Menon2009-09-151-2/+1
| | | | | | Fixes issue 1386. Originally committed as revision 19859 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc : cosmetics : remove misleading commentJai Menon2009-04-131-1/+0
| | | | Originally committed as revision 18493 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split bitstream.h, put the bitstream writer stuff in the new fileStefano Sabatini2009-04-121-0/+1
| | | | | | put_bits.h. Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use sign_extend().Benoit Fouet2009-03-031-2/+3
| | | | | | On behalf of Jai. Originally committed as revision 17759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix an overflow in the predictor.Jai Menon2008-12-051-1/+2
| | | | | | | fixes issue 636 Patch by Jai. Originally committed as revision 16007 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Bump Major version, this commit is almost just renaming bits_per_sample toLuca Abeni2008-09-081-5/+5
| | | | | | | | | | | 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
* alacenc : perform decorrelation only for stereo samplesJai Menon2008-08-221-1/+2
| | | | Originally committed as revision 14904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc: compare against ALAC_MAX_LPC_ORDER instead of MAX_LPC_ORDERJai Menon2008-08-191-2/+2
| | | | Originally committed as revision 14847 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc: last few hunks approved by michaelJai Menon2008-08-191-0/+110
| | | | Originally committed as revision 14845 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc: Use user-specified min and max prediction order.Ramiro Polla2008-08-191-1/+1
| | | | Originally committed as revision 14844 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Import more OKed parts of ALAC encoder from GSoC repo.Ramiro Polla2008-08-191-0/+98
| | | | Originally committed as revision 14843 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Import more ok'd parts of ALAC encoder from GSoC repo.Ramiro Polla2008-08-171-15/+125
| | | | Originally committed as revision 14820 to svn://svn.ffmpeg.org/ffmpeg/trunk
* alacenc: NULL_IF_CONFIG_SMALL long_name.Ramiro Polla2008-08-171-1/+1
| | | | Originally committed as revision 14801 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Import ok'd parts of ALAC encoder from GSoC repo.Ramiro Polla2008-08-171-0/+197
Originally committed as revision 14798 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud