aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/channel_layout.h
Commit message (Collapse)AuthorAgeFilesLines
* all: fix typos found by codespellTimo Rothenpieler3 days1-2/+2
|
* all: Fix doxy comments wrongly designated as trailing ///<Andreas Rheinhardt2025-03-121-1/+1
| | | | | | | | | | | The ///< or /**< form of doxygen comments are only to be used when the documentation follows the member and the comment block starts on the same line as the member. This commit fixes wrong uses of them; in particular, this fixes the comment for mb_height in H.264 SPS's structure which was wrongly added to mb_width. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avutil/channel_layout: fix definition of 5.1.4 layoutJames Almer2025-01-031-1/+1
| | | | | | | It's meant to have the side channels, as defined in Sound System D from ITU-R - BS.2051-3 Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a 5.1.2 layout using side channelsJames Almer2025-01-031-0/+2
| | | | | | And rename the existing 5.1.2 to explicitly state it contains back channels. Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: simplify the 22.2 layout definitionJames Almer2024-12-131-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a 9.1.6 layoutJames Almer2024-12-131-0/+2
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add Binaural channels and layoutJames Almer2024-11-131-0/+7
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* channel_layout: add new channel positions supported by xHE-AACLynne2024-06-021-0/+8
| | | | apichanges will be updated upon merging, as well as a version bump.
* avutil/channel_layout: add a helper function to get the ambisonic order of a ↵James Almer2024-05-231-0/+10
| | | | | | layout Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: fix some (un)initialization issues in ↵Marton Balint2024-03-161-2/+6
| | | | | | | | | av_channel_layout_from_string() Also make initialization/uninitialization behaviour more explicit in the docs, and make sure we do not leak a channel map on error. Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil/channel_layout: add AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICALMarton Balint2024-03-161-0/+7
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil: remove deprecated FF_API_OLD_CHANNEL_LAYOUTJames Almer2024-03-071-150/+0
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add FF_CHANNEL_ORDER_NBMarton Balint2024-02-181-0/+4
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil/channel_layout: change AV_CHAN_SILENCE to AV_CHAN_UNUSED in the docsMarton Balint2024-02-181-1/+1
| | | | | | It got renamed during the API design phase. Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil/channel_layout: add av_channel_layout_retype()Marton Balint2024-02-121-0/+40
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil/channel_layout: add av_channel_layout_custom_init()Marton Balint2024-02-121-0/+17
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil/channel_layout: add a 9.1.4 channel layoutJames Almer2023-11-081-0/+2
| | | | | | | Mapping to ITU-R BS.2051-3 "Sound System G" and ITU-R BS.1196-8 "Channel Configuration 20". Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a 7.2.3 channel layoutJames Almer2023-11-081-0/+2
| | | | | | | Mapping to ITU-R BS.2051-3 "Sound System F" and ITU-R BS.1196-8 "Channel Configuration 15". Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: simplify 22.2 layout bitmask defineJames Almer2023-10-281-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a 3.1.2 channel layoutJames Almer2023-10-271-0/+2
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a 7.1.4 channel layoutWill Wolcott2023-10-271-0/+2
| | | | | | | | Mapping to ITU-R BS.2051-3 "Sound System J" and ITU-R BS.1196-8 "Channel Configuration 19". Signed-off-by: Will Wolcott <wwolcott@netflix.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a 7.1.2 channel layoutJames Almer2023-10-271-0/+2
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a 5.1.4 channel layoutJames Almer2023-10-271-0/+2
| | | | | | | Mapping to ITU-R BS.2051-3 "Sound System D" and ITU-R BS.1196-8 "Channel Configuration 16". Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: rename 7.1(top) channel layout to 5.1.2James Almer2023-10-271-2/+6
| | | | | | | | | | This layout maps to ITU-R BS.2051-3 "Sound System C" and ITU-R BS.1196-8 "Channel Configuration 14", and it being the first layout with top layer channels, it's best to use a different scheme to properly convey the presence and amount of said channels. The new name will also be a better fit for the additions in the following commits. Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: make pre-defined channel layouts C++ friendlyZhao Zhili2023-08-181-2/+14
| | | | | | | | | | | | C++ doesn't support designated initializers until C++20. We have a bunch of pre-defined channel layouts, the gains to make them usable in C++ exceed the losses. Bump minor version so C++ project can check before use these defines. Also initialize .opaque field explicitly to reduce warning in C++. Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a 7.1(top) channel layoutJames Almer2022-11-031-0/+2
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add a cube channel layoutJames Almer2022-10-301-0/+2
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: Document missing argumentsMarvin Scholz2022-10-171-1/+10
|
* avutil/channel_layout: Use inline code for DoxyMarvin Scholz2022-10-171-3/+3
| | | | | This avoids Doxygen to interpret <i> and others that look like XML tags as those, fixing a warning about unknown tags.
* avutil/channel_layout: Group pre-defined channel layoutsMarvin Scholz2022-10-171-0/+5
|
* avutil/channel_layout: Group deprecated functionsMarvin Scholz2022-10-171-0/+8
| | | | | Makes it a bit easier to spot the deprecated ones when looking at the overview.
* avutil/channel_layout: Move to its own groupMarvin Scholz2022-10-171-2/+8
| | | | Before it was cluttering the general avutil Audio group page.
* avutil/channel_layout: Remove bogus closing groupMarvin Scholz2022-10-171-1/+0
|
* avutil/channel_layout: Don't mention dead projectAndreas Rheinhardt2022-10-031-1/+1
| | | | Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avutil/channel_layout: move and improve the comment about unknown ordersJames Almer2022-09-281-3/+3
| | | | | | | | Don't place it as doxy specific for the order field, and generalize it both to also cover already defined orders and to not make it seem like the user is required to handle a layout they don't fully support or understand. Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: mention how the API user should treat channel orders ↵James Almer2022-09-221-0/+3
| | | | | | | | | | | it does not understand In case new orders are added in the future, existing library users can still use the layout simply by ignoring everything but the channel count in it, so make this explicit. Reviewed-by: Anton Khirnov <anton@khirnov.net> Signed-off-by: James Almer <jamrial@gmail.com>
* channel_layout: add support for AmbisonicVittorio Giovara2022-03-151-1/+51
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: Add a new channel layout APIAnton Khirnov2022-03-151-32/+493
| | | | | | | | | | | | | The new API is more extensible and allows for custom layouts. More accurate information is exported, eg for decoders that do not set a channel layout, lavc will not make one up for them. Deprecate the old API working with just uint64_t bitmasks. Expanded and completed by Vittorio Giovara <vittorio.giovara@gmail.com> and James Almer <jamrial@gmail.com>. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/channel_layout: add 22.2 layoutJan Ekström2020-08-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires some extraneous top side and bottom front channels to be defined. According to STD-B59v2, the defined channel layout is: - FL - FR - FC - LFE1 - BL - BR - FLc - FRc - BC - LFE2 - SiL - SiR - TpFL - TpFR - TpFC - TpC - TpBL - TpBR - TpSiL - TpSiR - TpBC - BtFC - BtFL - BtFR
* avutil/channel_layout: add av_get_extended_channel_layoutMarton Balint2017-01-241-0/+14
| | | | | | | | | | | | | | Return a channel layout and the number of channels based on the specified name. This function is similar to av_get_channel_layout(), but can also parse unknown channel layout specifications. Unknown channel layout specifications are a decimal number and a capital 'C' suffix, in order to not break compatibility with the lowercase 'c' suffix, which is used for a guessed channel layout with the specified number of channels. Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil/channel_layout: fix remains of old syntax in docs and commentsMarton Balint2017-01-241-6/+1
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'Hendrik Leppkes2015-08-241-0/+1
|\ | | | | | | | | | | | | * commit 'e23f84d9652474353d8bbc42787a56ec1991908f': channel_layout: Add a 16channel default layout Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * channel_layout: Add a 16channel default layoutLuca Barbato2015-08-231-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | channel_layout: doxy: merge functions with macrosTimothy Gu2014-07-041-5/+2
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c437fb'Michael Niedermayer2014-01-051-0/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit '5c437fb': lavu: Add values for various Dolby flags to the AVMatrixEncoding enum. Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.Tim Walker2014-01-051-0/+4
| |
* | lavu/channel_layout: change av_get_channel_layout() behavior at the next bumpStefano Sabatini2013-10-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new syntax is preferred since it allows backward syntax compatibility with libswr when switching to the new option handling code with AV_OPT_TYPE_CHANNEL_LAYOUT. With the new parser the string: 1234 is interpreted as a channel layout mask, rather than as a number of channels, and thus it's compatible with the current way to set a channel layout as an integer (e.g. for the icl and ocl options) making use of integer option values. ff_get_channel_layout() with compat=0 will be used in the AV_OPT_TYPE_CHANNEL handler code. The user is encouraged to switch to the new forward compatible syntax, which requires to put a trailing "c" when specifying a layout as a number of channels.
* | lavu/channel_layout: document the semantic of layouts.Nicolas George2012-12-021-0/+8
| |
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-121-5/+31
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.hJustin Ruggles2012-11-111-0/+182
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 19:29:01 +0000