summaryrefslogtreecommitdiff
path: root/libavcodec/alac.c
Commit message (Collapse)AuthorAge
...
* | Merge commit '418693bdc5edad72b0d055f741931612d797eb05'Michael Niedermayer2012-12-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '418693bdc5edad72b0d055f741931612d797eb05': lavc: rewrite and extend AVFrame doxy opt: avoid segfault in av_opt_next() if the class does not have an option list ttadec: fix last frame handling when seeking alacdec: do not be too strict about the extradata size Conflicts: libavcodec/alac.c libavcodec/avcodec.h libavcodec/tta.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alacdec: do not be too strict about the extradata sizeJustin Ruggles2012-12-22
| | | | | | | | | | | | | | Sometimes the extradata has duplicate atoms, but that shouldn't prevent decoding. Just ensure that it is at least 36 bytes as a sanity check. CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: slice-mt: check master context for valid current_picture_ptr h264: slice-mt: get last_pic_dropable from master context alacenc: add support for multi-channel encoding Conflicts: Changelog libavcodec/alac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alacenc: add support for multi-channel encodingJustin Ruggles2012-12-05
| |
* | Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'Michael Niedermayer2012-12-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '594d4d5df3c70404168701dd5c90b7e6e5587793': lavc: add a wrapper for AVCodecContext.get_buffer(). Conflicts: libavcodec/4xm.c libavcodec/8svx.c libavcodec/bmv.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/kmvc.c libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/pcx.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/rl2.c libavcodec/snow.c libavcodec/targa.c libavcodec/tscc.c libavcodec/txd.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vb.c libavcodec/vmdav.c libavcodec/vp56.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add a wrapper for AVCodecContext.get_buffer().Anton Khirnov2012-12-04
| | | | | | | | It will be useful in the upcoming transition to refcounted AVFrames.
* | alac: check channel count more completely, fix out of array readMichael Niedermayer2012-11-13
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-11
| | | | | | | | Also reorder some other #include when applicable.
* | alac: fix bps checkMichael Niedermayer2012-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alac: Check channel indexes more completely, fix out of array accesses.Michael Niedermayer2012-11-10
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alac: fix integer overflow leading to subsequent out of array accesses.Michael Niedermayer2012-11-10
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alac: fix nb_samples < order caseMichael Niedermayer2012-11-10
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-22
|\| | | | | | | | | | | | | | | | | * qatar/master: riff: remove a write-only variable lavc: extend frame_size doxy. alacdec: set bits_per_raw_sample Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alacdec: set bits_per_raw_sampleJustin Ruggles2012-10-21
| |
* | lavc: add missing new line to some messagesPiotr Bandurski2012-09-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
* | alac: remove redundant "alac: " from log messagesPaul B Mahol2012-08-01
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: proresdsp: port x86 assembly to cpuflags. lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro lavfi: better channel layout negotiation alac: check for truncated packets alac: reverse lpc coeff order, simplify filter lavr: add x86-optimized mixing functions x86: add support for fmaddps fma4 instruction with abstraction to avx/sse tscc2: fix typo in array index build: use COMPILE template for HOSTOBJS build: do full flag handling for all compiler-type tools eval: fix printing of NaN in eval fate test. build: Rename aandct component to more descriptive aandcttables mpegaudio: bury inline asm under HAVE_INLINE_ASM. x86inc: automatically insert vzeroupper for YMM functions. rtmp: Check the buffer length of ping packets rtmp: Allow having more unknown data at the end of a chunk size packet without failing rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets Conflicts: Makefile configure libavcodec/x86/proresdsp.asm libavutil/eval.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alac: check for truncated packetsJustin Ruggles2012-07-27
| | | | | | | | | | This will give a clearer error message when the error is caused by a truncated packet.
| * alac: reverse lpc coeff order, simplify filterJustin Ruggles2012-07-27
| | | | | | | | Reversing the lpc coefficient order simplifies indexing in the filter.
* | alacdec: fix packed sample output with 5.1Michael Niedermayer2012-07-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libopenjpeg: introduce lowres and lowqual private options FATE: add a test for flac cover art. cafdec: allow larger ALAC magic cookie alac: fix channel pointer assignment for 24 and 32-bit Conflicts: libavcodec/alac.c libavcodec/libopenjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alac: fix channel pointer assignment for 24 and 32-bitJustin Ruggles2012-07-19
| | | | | | | | Needs to be done separately for each element.
* | alac: drop packed sample output support with the next major bumpMichael Niedermayer2012-07-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alacdec: several players have problems with planar audio still thus ↵Michael Niedermayer2012-07-20
| | | | | | | | | | | | temporary put packed output back by default Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (38 commits) alac: cosmetics: general pretty-printing and comment clean up alac: calculate buffer size outside the loop in allocate_buffers() alac: change some data types to plain int alac: cosmetics: rename some variables and function names alac: multi-channel decoding support alac: split element parsing into a separate function alac: support a read sample size of up to 32 alac: output in planar sample format alac: add 32-bit decoding support alac: simplify channel interleaving alac: use AVPacket fields directly in alac_decode_frame() alac: fix check for valid max_samples_per_frame alac: use get_sbits() to read LPC coefficients instead of casting alac: move the current samples per frame to the ALACContext alac: avoid using a double-negative when checking if the frame is compressed alac: factor out output_size check in predictor_decompress_fir_adapt() alac: factor out loading of next decoded sample in LPC prediction alac: use index into buffer_out instead of incrementing the pointer alac: simplify lpc coefficient adaptation alac: reduce the number of local variables needed in lpc prediction ... Conflicts: libavcodec/alac.c libavformat/cafdec.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alac: cosmetics: general pretty-printing and comment clean upJustin Ruggles2012-07-19
| |
| * alac: calculate buffer size outside the loop in allocate_buffers()Justin Ruggles2012-07-19
| |
| * alac: change some data types to plain intJustin Ruggles2012-07-19
| |
| * alac: cosmetics: rename some variables and function namesJustin Ruggles2012-07-19
| |
| * alac: multi-channel decoding supportAndrew D'Addesio2012-07-19
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * alac: split element parsing into a separate functionJustin Ruggles2012-07-19
| | | | | | | | | | This will make multi-channel implementation simpler. Based partially on a patch by Andrew D'Addesio <modchipv12@gmail.com>.
| * alac: support a read sample size of up to 32Justin Ruggles2012-07-19
| | | | | | | | | | Use get_bits_long() in decode_scalar(). Use unsigned int for decoded value.
| * alac: output in planar sample formatJustin Ruggles2012-07-19
| | | | | | | | | | Avoids unneeded interleaving and allows for reusing the AVFrame output buffer as the internal buffer for 24-bit and 32-bit sample size.
| * alac: add 32-bit decoding supportJustin Ruggles2012-07-19
| |
| * alac: simplify channel interleavingAndrew D'Addesio2012-07-19
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * alac: use AVPacket fields directly in alac_decode_frame()Justin Ruggles2012-07-19
| |
| * alac: fix check for valid max_samples_per_frameJustin Ruggles2012-07-19
| |
| * alac: use get_sbits() to read LPC coefficients instead of castingJustin Ruggles2012-07-19
| |
| * alac: move the current samples per frame to the ALACContextJustin Ruggles2012-07-19
| | | | | | | | This will simplify the multi-channel implementation.
| * alac: avoid using a double-negative when checking if the frame is compressedJustin Ruggles2012-07-19
| |
| * alac: factor out output_size check in predictor_decompress_fir_adapt()Justin Ruggles2012-07-19
| |
| * alac: factor out loading of next decoded sample in LPC predictionJustin Ruggles2012-07-19
| |
| * alac: use index into buffer_out instead of incrementing the pointerJustin Ruggles2012-07-19
| |
| * alac: simplify lpc coefficient adaptationJustin Ruggles2012-07-19
| |
| * alac: reduce the number of local variables needed in lpc predictionJustin Ruggles2012-07-19
| |
| * alac: simplify 1st order prediction and reading of warm-up samplesJustin Ruggles2012-07-19
| |
| * alac: cosmetics: reindent after last commitJustin Ruggles2012-07-19
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 18:14:03 +0000