summaryrefslogtreecommitdiffstats
path: root/libavcodec/vorbis.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'Michael Niedermayer2013-02-261-1/+1
|\ | | | | | | | | | | | | | | | | | | | | * commit 'e951b6d94c441d46b396ef12da1428297d77251d': vorbisdec: cosmetics: rename variable avccontext to avctx configure: Identify icc compiler with a less ambiguous pattern Conflicts: libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdec: cosmetics: rename variable avccontext to avctxJustin Ruggles2013-02-251-1/+1
| | | | | | | | This is consistent with the rest of libavcodec.
* | Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'Michael Niedermayer2013-01-211-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3': fate: Use wmv2 IDCT for wmv2 tests vorbisdsp: change block_size type from int to intptr_t. Conflicts: tests/fate-run.sh tests/fate/vcodec.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbisdsp: change block_size type from int to intptr_t.Ronald S. Bultje2013-01-201-1/+1
| | | | | | | | This saves one instruction in the x86-64 assembly.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give all anonymously typedeffed structs in headers a nameDiego Biurrun2012-10-061-1/+1
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-061-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: Validate that the floor 1 X values contain no duplicates.Alex Converse2012-06-051-1/+2
| | | | | | | | | | Duplicate values in this vector are explicitly banned by the Vorbis I spec and cause divide-by-zero crashes later on.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-161-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ppc: Add ff_ prefix to nonstatic symbols sh4: Add ff_ prefix to nonstatic symbols mpegvideo: Add ff_ prefix to nonstatic functions rtjpeg: Add ff_ prefix to nonstatic symbols rv: Add ff_ prefix to nonstatic symbols vp56: Add ff_ prefix to nonstatic symbols vorbis: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefix to nonstatic symbols vc1: Add ff_ prefix to nonstatic symbols msmpeg4: Add ff_ prefixes to nonstatic symbols snow: Add ff_ prefix to nonstatic symbols mpeg12: Add ff_ prefix to nonstatic symbols mpeg4: Add ff_ prefixes to nonstatic symbols lagarith: Add ff_ prefix to lag_rac_init libavcodec: Add ff_ prefix to j_rev_dct* dsputil: Add ff_ prefix to inv_zigzag_direct16 libavcodec: Prefix fdct_ifast, fdct_ifast248 dsputil: Add ff_ prefix to the dsputil*_init* functions libavcodec: Add ff_ prefix to some nonstatic symbols vlc/rl: Add ff_ prefix to the nonstatic symbols ... Conflicts: libavcodec/Makefile libavcodec/allcodecs.c libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h263.h libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/nuv.c libavcodec/ppc/dsputil_ppc.c libavcodec/proresdsp.c libavcodec/svq3.c libavcodec/version.h libavformat/dv.h libavformat/dvenc.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vorbis: Add ff_ prefix to nonstatic symbolsMartin Storsjö2012-02-151-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make channel layout masks unsignedMans Rullgard2011-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | It makes more sense for a bit mask to use an unsigned type. The change should be source and binary compatible on all supported systems, hence micro version bump. Fixes a few invalid shifts. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-131-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (33 commits) rtpdec_qdm2: Don't try to parse data packet if no configuration is received ac3enc: put the counting of stereo rematrixing bits in the same place to make the code easier to understand. ac3enc: clean up count_frame_bits() and count_frame_bits_fixed() mpegvideo: make FF_DEBUG_DCT_COEFF output coeffs via av_log() instead of just via AVFrame. srtdec: make sure we don't write past the end of buffer wmaenc: improve channel count and bitrate error handling in encode_init() matroskaenc: make sure we don't produce invalid file with no codec ID matroskadec: check that pointers were initialized before accessing them lavf: fix function name in compute_pkt_fields2 av_dlog message lavf: fix av_find_best_stream when providing a wanted stream. lavf: fix av_find_best_stream when decoder_ret is given and using a related stream. ffmpeg: factorize quality calculation tiff: add support for SamplesPerPixel tag in tiff_decode_tag() tiff: Prefer enum TiffCompr over int for TiffContext.compr. mov: Support edit list atom version 1. configure: Enable libpostproc automatically if GPL code is enabled. Cosmetics: fix prototypes in oggdec oggdec: fix memleak with continuous streams. matroskaenc: add missing new line in av_log() call dnxhdenc: add AVClass in private context. ... swscale changes largely rewritten by me or replaced by baptsites due to lots of bugs in ronalds code. Above code is also just in case its not obvios to a large extended duplicates that where cherry picked from ffmpeg. Conflicts: configure ffmpeg.c libavformat/matroskaenc.c libavutil/pixfmt.h libswscale/ppc/swscale_template.c libswscale/swscale.c libswscale/swscale_template.c libswscale/utils.c libswscale/x86/swscale_template.c tests/fate/h264.mak tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_copy_le tests/ref/lavfi/pixfmts_null_le tests/ref/lavfi/pixfmts_scale_le tests/ref/lavfi/pixfmts_vflip_le Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace int_fast integer types with their sized standard posix counterparts.Diego Biurrun2011-05-121-5/+5
| | | | | | | | | | The _fast integer types provide no realworld benefits, but may introduce portability issues and are just plain ugly.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-301-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * vorbis: Replace sized int_fast integer types with plain int/unsigned.Diego Biurrun2011-04-291-1/+1
| | | | | | | | | | | | int/unsigned is the natural memory access type for CPUs, using sized types for temporary variables, counters and similar just increases code size and can possibly cause a slowdown.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix libvorbis encoding with more than 2 channelsJames Darnley2010-06-271-0/+1
| | | | | | | | Fixes issue 1325. Patch by James Darnley, james dot darnley at gmail Originally committed as revision 23818 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move some prototypes from dsputil.c to reasonable header filesMåns Rullgård2010-03-061-0/+1
| | | | Originally committed as revision 22260 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for vorbis 6.1 and 7.1 channel configurations as per the new specRobert Swain2010-01-291-2/+2
| | | | | | http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9 Originally committed as revision 21527 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add vorbis channel layout support according to those defined in the Vorbis IRobert Swain2009-10-021-0/+2
| | | | | | specification Originally committed as revision 20148 to svn://svn.ffmpeg.org/ffmpeg/trunk
* brace placement and linebreak cosmeticsDiego Biurrun2009-09-281-1/+3
| | | | Originally committed as revision 20070 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename all vorbis encoder related typedefs to not use _t for POSIX compatibilityOded Shimon2008-12-121-3/+3
| | | | Originally committed as revision 16076 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mark read-only data as constStefan Gehrer2008-06-241-1/+1
| | | | Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-171-3/+3
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove render_line from vorbis.h, add ff_vorbis_floor1_render_list insteadOded Shimon2006-10-011-27/+1
| | | | Originally committed as revision 6409 to svn://svn.ffmpeg.org/ffmpeg/trunk
* prevent warning in vorbis_data.cOded Shimon2006-10-011-1/+1
| | | | Originally committed as revision 6404 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 100l, broke ffmpeg compilation, ABS() and uint* types not defined in ↵Oded Shimon2006-10-011-0/+2
| | | | | | vorbis_data.c Originally committed as revision 6403 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make some more functions global so they can be shared with vorbis_enc.cOded Shimon2006-10-011-0/+31
| | | | Originally committed as revision 6402 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make ready_floor1_list() shared for vorbis_enc.cOded Shimon2006-10-011-0/+9
| | | | Originally committed as revision 6401 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vorbis.h -> vorbis_data.cOded Shimon2006-09-301-2255/+6
| | | | | | | move tables from vorbis.h to a C file so they can be used later in vorbis_enc.c Originally committed as revision 6398 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add official LGPL license headers to the files that were missing them.Diego Biurrun2006-09-101-0/+18
| | | | Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vorbis cosmetics: mdct0,mdct1 => mdct[2]Loren Merritt2006-08-101-6/+3
| | | | Originally committed as revision 5978 to svn://svn.ffmpeg.org/ffmpeg/trunk
* sse and 3dnow implementations of float->int conversion and mdct windowing.Loren Merritt2006-08-101-0/+2
| | | | | | 15% faster vorbis. Originally committed as revision 5975 to svn://svn.ffmpeg.org/ffmpeg/trunk
* sse & sse2 implementations of vorbis channel coupling.Loren Merritt2006-08-031-0/+1
| | | | | | 9% faster vorbis (on a K8). Originally committed as revision 5898 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct the relation between floors of type 0 and block sizes.Alexander Strasser2006-02-051-2/+3
| | | | Originally committed as revision 4941 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetic: Fix indentation.Alexander Strasser2006-02-041-13/+13
| | | | Originally committed as revision 4935 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Added support for vorbis files containing floor type 0.Alexander Strasser2006-02-041-1/+28
| | | | Originally committed as revision 4933 to svn://svn.ffmpeg.org/ffmpeg/trunk
* decrease V_NB_BITS if possibleMichael Niedermayer2005-05-301-0/+1
| | | | Originally committed as revision 4327 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Vorbis sse fix by (Balatoni Denes: dbalatoni, programozo hu)Michael Niedermayer2005-05-291-0/+2
| | | | Originally committed as revision 4317 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)Michael Niedermayer2005-05-171-0/+2225
Originally committed as revision 4261 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud