Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-10Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'Michael Niedermayer
* commit '30b39164256999efc8d77edc85e2e0b963c24834': ac3dec: make downmix() take array of pointers to channel data Conflicts: libavcodec/ac3dsp.c libavcodec/ac3dsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-10Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'Michael Niedermayer
* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047': ac3dec: output planar float only svq3: make slice type value unsigned to match svq3_get_ue_golomb return type configure: Have protocols select network code instead of depending on it Conflicts: libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-09ac3dec: make downmix() take array of pointers to channel dataMans Rullgard
2012-12-09ac3dec: output planar float onlyMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-10-06Give all anonymously typedeffed structs in headers a nameDiego Biurrun
Anonymous structs cannot be forward declared and have no benefit.
2012-09-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: os_support: Choose between direct.h and io.h using a configure check os_support: Include io.h instead of direct.h on mingw32ce x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared swscale: Remove two bogus asserts ac3: move ac3_downmix() from dsputil to ac3dsp lavr/audio_mix_matrix: acknowledge the existence of LFE2. mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel. lavu/audioconvert: add a second low frequency channel. Conflicts: doc/APIchanges libavcodec/ac3dsp.c libavcodec/ac3dsp.h libavcodec/mlp_parser.c libavutil/audioconvert.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13ac3: move ac3_downmix() from dsputil to ac3dspMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2011-12-03Add avcodec_decode_audio4().Justin Ruggles
Deprecate avcodec_decode_audio3(). Implement audio support in avcodec_default_get_buffer(). Implement the new audio decoder API in all audio decoders.
2011-09-06ac3dec: avoid pointless alloc and indirection for input_bufferReimar Döffinger
Since we now always allocate it, it can simply be made part of the context instead.
2011-08-13ac3dec: export center & suroundmix levelsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-11Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer
* commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-10ac3dec: add a drc_scale private optionAnton Khirnov
Deprecate corresponding AVCodecContext option. This is the first test of decoder private options.
2011-07-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6 ARM: NEON optimised vector_clip_int32() swscale: disable full_chroma_int when converting to non-24/32bpp RGB. suggest to use av_get_bytes_per_sample() in av_get_bits_per_sample_format() doxy ffmpeg: use av_get_bytes_per_sample() in place of av_get_bits_per_sample_fmt() put_bits: remove ALT_BITSTREAM_WRITER put_bits: always use intreadwrite.h macros libavformat: Add an example how to use the metadata API doxygen: Prefer member groups over grouping into modules doxygen: be more permissive when searching for API examples avformat: doxify the Metadata API lavf: restore old behavior for custom AVIOContex with an AVFMT_NOFILE format. lavf: use the correct pointer in av_open_input_stream(). avidec: infer absolute vs relative index from first packet Conflicts: libavformat/Makefile libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-02doxygen: Prefer member groups over grouping into modulesReinhard Tartler
Before this, almost all module groups have been used for grouping functions and fields in structures semantically. This causes them to not appear properly in the file documentation and needlessly clutters up the "Modules" index. Additionally, this commit streamlines some spelling and appearances.
2011-06-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (24 commits) utils: Drop pointless '#if 1' preprocessor directive. ac3enc: remove empty ac3_float function that is never called ac3enc: split templated float vs. fixed functions into a separate file. ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions. Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications. Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support h264_parser: Fix whitespace after previous change. h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. wav: remove an invalid free(). lavf: initialise reference_dts in av_estimate_timings_from_pts. h264: don't be so picky on decoding pps in extradata. avcodec.h: add or elaborate on some documentation comments. h264: change a few comments into error messages ac3dec: fix doxy-style for comment ("///>" should be "///<" instead). img2: add .dpx to the list of supported file extensions. ffv1: fix undefined behavior with insane widths. ARM: jrevdct_arm: simplify stack usage ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-13ac3dec: fix doxy-style for comment ("///>" should be "///<" instead).Reimar Döffinger
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-05-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: (22 commits) configure: enable memalign_hack automatically when needed swscale: unbreak the build on non-x86 systems. swscale: remove if(bitexact) branch from functions. swscale: remove if(canMMX2BeUsed) conditional. swscale: remove swScale_{c,MMX,MMX2} duplication. swscale: use emms_c(). Move emms_c() from libavcodec to libavutil. tiff: set palette in the context when specified in TIFF_PAL tag rtsp: use strtoul to parse rtptime and seq values. pgssubdec: fix incorrect colors. dvdsubdec: fix incorrect colors. ape: Allow demuxing of files with metadata tags. swscale: remove dead macro WRITEBGR24OLD. swscale: remove AMD3DNOW "optimizations". swscale: remove duplicate code in ppc/ subdirectory. swscale: remove duplicated x86/ functions. swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*. vsrc_buffer.h: add file doxy vsrc_buffer: tweak error message in init() msmpeg4: reindent. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-24ac3enc: add channel coupling supportJustin Ruggles
Channel coupling is an optional AC-3 feature that increases quality by combining high frequency information from multiple channels into a single channel. The per-channel high frequency information is sent with less accuracy in both the frequency and time domains. This allows more bits to be used for lower frequencies while preserving enough information to reconstruct the high frequencies.
2011-04-27Merge remote branch 'qatar/master'Michael Niedermayer
* 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-26Add AVX FFT implementation.Vitor Sessak
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-04-05ac3dec: avoid pointless alloc and indirection for input_bufferReimar Döffinger
Since we now always allocate it, it can simply be made part of the context instead.
2011-04-01Fix doxy-style for comment ("///>" should be "///<" instead).Reimar Döffinger
2011-03-30Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: ac3enc: move compute_mantissa_size() to ac3dsp ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext Remove support for stripping executables ac3enc: NEON optimised float_to_fixed24 ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp dfa: protect pointer range checks against overflows. Duplicate: mimic: implement multithreading. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-29ac3: move ff_ac3_bit_alloc_calc_bap to ac3dspMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-26Merge remote-tracking branch 'newdev/master'Michael Niedermayer
* newdev/master: mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom. Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder. Use audio_service_type to set stream disposition. Add APIchanges entry for audio_service_type. Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream. configure: in check_ld, place new -l flags before existing ones support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl doc: update build system documentation aacenc: indentation aacenc: fix the side calculation in search_for_ms vp8.c: rename EDGE_* to VP8_EDGE_*. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavcodec/vp8.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-25Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parserJustin Ruggles
and decoder, and vice-versa for the AC-3 encoder.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-05ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.hJustin Ruggles
(cherry picked from commit b35743ffb46558be3a90c44f24a7de5fa2c15d85)
2011-03-05ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.hJustin Ruggles
2011-02-04Separate format conversion DSP functions from DSPContext.Justin Ruggles
This will be beneficial for use with the audio conversion API without requiring it to depend on all of dsputil. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit c73d99e672329c8f2df290736ffc474c360ac4ae)
2011-02-02Separate format conversion DSP functions from DSPContext.Justin Ruggles
This will be beneficial for use with the audio conversion API without requiring it to depend on all of dsputil. Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-28Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles
(cherry picked from commit 9d06d7bce3babb82ed650c13ed13a57f6f626a71)
2011-01-28Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles
2010-12-14define AC3_CRITICAL_BANDS and use it in the AC-3 encoder and decoder.Justin Ruggles
Originally committed as revision 25967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-14cosmetics: use better (and shared) macro names for some constant valuesJustin Ruggles
Originally committed as revision 25950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
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-03-31Add spectral extension to the E-AC-3 decoder.Carl Eugen Hoyos
Original patch by Justin, updated and resubmitted by Christophe Gisquet, christophe D gisquet A gmail Originally committed as revision 22734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07Move some prototypes from dsputil.c to reasonable header filesMåns Rullgård
Originally committed as revision 22260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06Move FFT parts from dsputil.h to fft.hMåns Rullgård
Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård
These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead. Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22Move array specifiers outside DECLARE_ALIGNED() invocationsMåns Rullgård
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20Merge FFTContext and MDCTContextMåns Rullgård
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-05cosmetics: move fixed_coeffs into the aligned arrays comment groupJustin Ruggles
Originally committed as revision 19590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-05Modify decode_band_structure() so that the actual band structure is onlyJustin Ruggles
used within the function. This removes the need to have the coupling band structure stored in the AC3DecodeContext. Originally committed as revision 19585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-05Use coupling band sizes instead of coupling band structure whenJustin Ruggles
calculating coupling transform coefficients. Originally committed as revision 19584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-12The internal header libavutil/internal.h should not be used outside libavutil.Diego Biurrun
Originally committed as revision 19157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-06ac3dec: Remove unneeded context variable, num_cpl_subbands. It is alsoJustin Ruggles
not needed for spectral extension or enhanced coupling since it is redundant information, so I am removing it from decode_band_structure() as well. Originally committed as revision 18751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19Add channel layout support to the AC-3 decoder and AC-3 parser.Justin Ruggles
Originally committed as revision 18622 to svn://svn.ffmpeg.org/ffmpeg/trunk