summaryrefslogtreecommitdiff
path: root/libavdevice/alsa-audio-common.c
Commit message (Collapse)AuthorAge
* lavd/alsa: simplify reordering functions definition.Nicolas George2013-02-02
|
* 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.
* | 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
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-25
| | | | | | | | | | | | | | | | | | | | 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-tracking branch 'qatar/master'Michael Niedermayer2011-09-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swfdec: Add support for sample_rate_code 0 (5512 Hz) dct-test: factor out some common code and do whas was likely intended doc: library versions need to be bumped in version.h Revert "ffmpeg: get rid of useless AVInputStream.nb_streams." Remove some forgotten AVCodecContext.palctrl usage. lavc/utils: move avcodec_init() higher in the file. lavc: replace some deprecated FF_*_TYPE with AV_PICTURE_TYPE_* ac3dec: actually use drc_scale private option lavc: undeprecate AVPALETTE_SIZE and AVPALETTE_COUNT macros alsa: add missing header msmpeg4: remove leftover unused debug variable declaration Fix assert() calls that need updates after FF_COMMON_FRAME macro elimination. Fix av_dlog invocations with wrong or missing logging context. vf_yadif: add support to yuva420p vf_yadif: correct documentation on the parity parameter vf_yadif: copy buffer properties like aspect for second frame as well oma: support for encrypted files id3v2: add support for non-text and GEOB type tag frames des: add possibility to calculate DES-CBC-MAC with small buffer Conflicts: ffmpeg.c libavcodec/dct-test.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alsa: add missing headerAnton Khirnov2011-09-21
| | | | | | | | Fixes compile with next lavc major.
* | Fix compilation with --disable-everything --enable-outdev=alsa.Carl Eugen Hoyos2011-09-18
| | | | | | | | Bug found and analysed by skierpage.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) H.264: fix filter_mb_fast with 4:4:4 + 8x8dct alsa: limit buffer_size to 32768 frames. alsa: fallback to buffer_size/4 for period_size. doc: replace @pxref by @ref where appropriate mpeg1video: don't abort if thread_count is too high. segafilm: add support for videos with cri adx adpcm gxf: Fix 25 fps DV material in GXF being misdetected as 50 fps libxvid: Add const qualifier to silence compiler warning. H.264: improve qp_thresh check H.264: use fill_rectangle in CABAC decoding H.264: Remove redundant hl_motion_16/8 code H.264: merge fill_rectangle into P-SKIP MV prediction, to match B-SKIP H.264: faster P-SKIP decoding H.264: av_always_inline some more functions H.264: Add x86 assembly for 10-bit H.264 predict functions swscale: rename uv_off/uv_off2 to uv_off_px/byte. swscale: implement error dithering in planarCopyWrapper. swscale: error dithering for 16/9/10-bit to 8-bit. swscale: fix overflow in 16-bit vertical scaling. swscale: fix crash in 8-bpc bilinear output without alpha. ... Conflicts: doc/developer.texi libavdevice/alsa-audio.h libavformat/gxf.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * alsa: limit buffer_size to 32768 frames.Justin Ruggles2011-07-09
| | | | | | | | | | | | In testing, the file output plugin gave a max buffer size of about 20 million frames, which is way more than what is really needed and causes a memory allocation error on my system.
| * alsa: fallback to buffer_size/4 for period_size.Justin Ruggles2011-07-09
| | | | | | | | | | buffer_size/4 is the value used by aplay. This fixes output to null devices, e.g. writing ALSA output to a file.
* | ALSA demuxer: use av_gettime and a timefilter.Nicolas George2011-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PTS for captured audio was measured using snd_pcm_htimestamp. snd_pcm_htimestamp hangs when the input is a dsnoop plugin. Furthermore, at some point, snd_pcm_htimestamp started returning monotonic timestamps rather than wall clock timestamps, in most but not all situations. Monotonic timestamps are fine, but ffmpeg uses wall clock timestamps everywhere else, and we have no API to inform the user which kind of timestamps it is. A separate snd_pcm_htimestamp is only slightly less accurate than snd_pcm_htimestamp: the standard deviation for the difference between two consecutive timestamps is (on my hardware): - ~13 µs with snd_pcm_htimestamp; - ~35 µs with av_gettime; - ~5 µs with av_gettime and a timefilter.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: Consistently use '@' instead of '\' for Doxygen markup. Use av_printf_format to check the usage of printf style functions Add av_printf_format, for marking printf style format strings and their parameters ARM: enable thumb for Cortex-M* CPUs nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). build: remove SRC_PATH_BARE variable build: move basic rules and variables to main Makefile build: move special targets to end of main Makefile lavdev: improve feedback in case of invalid frame rate/size vfwcap: prefer "framerate_q" over "fps" in vfw_read_header() v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters() fbdev: prefer "framerate_q" over "fps" in device context bktr: prefer "framerate" over "fps" for grab_read_header() ALSA: implement channel layout for playback. alsa: support unsigned variants of already supported signed formats. alsa: add support for more formats. ARM: allow building in Thumb2 mode Conflicts: common.mak doc/APIchanges libavcodec/vdpau.h libavdevice/alsa-audio-common.c libavdevice/fbdev.c libavdevice/libdc1394.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ALSA: implement channel layout for playback.Nicolas George2011-06-23
| | | | | | | | | | | | | | | | | | | | Currently quad, 5.0, 5.1 and 7.1 are implemented. Implementing support for other formats/layouts and capture should be straightforward. 5.0 and 7.1 support by Carl Eugen Hoyos. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * alsa: support unsigned variants of already supported signed formats.Carl Eugen Hoyos2011-06-23
| |
| * alsa: add support for more formats.Carl Eugen Hoyos2011-06-23
| | | | | | | | | | | | Specifically, f32, f64, s32, s24, a-law and mu-law. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Support u8, s8, alaw and mulaw channel reordering in alsa.Anton Khirnov2011-06-23
| |
* | lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.hStefano Sabatini2011-05-27
| |
* | Allow to print wider unsupported channel layouts.Carl Eugen Hoyos2011-04-15
| |
* | AV_CH_LAYOUT_2_2 does not need channel reordering for alsa output.Carl Eugen Hoyos2011-04-14
| |
* | Cosmetics: Fix indentation and move one line.Carl Eugen Hoyos2011-04-14
| |
* | Support alsa channel reordering for float.Carl Eugen Hoyos2011-04-14
| |
* | Add forgotten line to silence a warning for int32.Carl Eugen Hoyos2011-04-14
| | | | | | | | | | AV_CH_LAYOUT_QUAD is the only (multi-) channel layout that has the same channel ordering for FFmpeg and alsa.
* | Also support alsa channel reordering for u16 and u32 formats.Carl Eugen Hoyos2011-04-14
| |
* | Rename the s16 and s32 alsa reorder functions as int16 and int32.Carl Eugen Hoyos2011-04-14
| | | | | | | | The functions will also be used for unsigned formats.
* | Support unsigned variants of already supported signed formats in alsa.Carl Eugen Hoyos2011-04-14
| |
* | Support a-law and mu-law output in alsa.Carl Eugen Hoyos2011-04-14
| |
* | Fix output of AV_CH_LAYOUT_5POINT0 via alsa by reordering channels.Carl Eugen Hoyos2011-04-12
| |
* | Support CODEC_ID_PCM_F64* output via alsa (stereo only).Carl Eugen Hoyos2011-04-12
| |
* | Support CODEC_ID_PCM_S24* output via alsa (stereo only).Carl Eugen Hoyos2011-04-12
| |
* | Add support for pcm_f32* to alsa.Carl Eugen Hoyos2011-04-05
| |
* | Support s32 output via alsa audio device.Carl Eugen Hoyos2011-04-05
| |
* | Template alsa reordering functions.Carl Eugen Hoyos2011-04-05
| |
* | ALSA: fix a stupid bad use of av_freep.Nicolas George2011-03-31
| | | | | | | | | | | | It caused a segfault when channel reordering was in use and the last chunk of data was not silent. Spotted and diagnosed by Carl Eugen Hoyos.
* | Also use alsa_reorder_s16_out_51() for AV_CH_LAYOUT_5POINT1.Carl Eugen Hoyos2011-03-30
| |
* | ALSA: implement channel layout for playback.Nicolas George2011-03-26
|/ | | | | | | | Currently, only S16 quad, 5.1 and 7.1 are implemented. Implementing support for other formats/layouts and capture should be straightforward. 7.1 support by Carl Eugen Hoyos.
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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
* Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and markStefano Sabatini2010-03-13
| | | | | | AVERROR_EIO for deletion at the next major bump. Originally committed as revision 22513 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Include alsa headers before the internal FFmpeg headers.Matthieu Castet2009-11-29
| | | | | | | | | | | This avoids symbol redefinitions problems, for example avoids the "free" symbol to be redefined before system headers actually using it are included, thus breaking compilation. In particular this change allows to build FFmpeg with salsa. Patch by matthieu castet <$surname.mat?hieu@free fr>. Originally committed as revision 20665 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix two icc warnings #188: enumerated type mixed with another type.Carl Eugen Hoyos2009-04-14
| | | | Originally committed as revision 18515 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix AVFMT_FLAG_NONBLOCK in alsaLuca Abeni2009-03-07
| | | | Originally committed as revision 17863 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-01
| | | | | | | Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ALSA support in libavdevice.Nicolas George2009-01-26
Patch by Nicolas George: name surname normalesup org Original thread: [FFmpeg-devel] [PATCH] ALSA for libavdevice Date: 12/09/2008 07:17 PM Originally committed as revision 16800 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 20:40:26 +0000