openharmony/interface_sdk_c
1
0
Fork 0
mirror of https://gitee.com/openharmony/interface_sdk_c synced 2024-11-23 23:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

audio_channel_layout mark

Browse Source 
Signed-off-by: peng <yangpeng43@huawei.com>
This commit is contained in:
peng 2023-12-28 17:32:04 +08:00
parent b8d3b2b678
commit 7a0307bf4e
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
multimedia/av_codec/avcodec_audio_channel_layout.h
View File

@ -24,6 +24,8 @@ extern "C" {
* @brief Audio Channel Set
* A 64-bit integer with bits set for each channel.
* @syscap SystemCapability.Multimedia.Media.CodecBase
* @deprecated since 11
* @useinstead OH_AudioChannelSet
* @since 10
*/
enum AudioChannelSet : uint64_t {
@ -91,6 +93,8 @@ enum AudioChannelSet : uint64_t {
* Indicates that the channel order in which the user requests decoder output
* is the native codec channel order.
* @syscap SystemCapability.Multimedia.Media.CodecBase
* @deprecated since 11
* @useinstead OH_AudioChannelLayout
* @since 10
*/
enum AudioChannelLayout : uint64_t {
@ -146,18 +150,14 @@ enum AudioChannelLayout : uint64_t {
AudioChannelSet::TOP_FRONT_LEFT | AudioChannelSet::TOP_FRONT_RIGHT),
STEREO_DOWNMIX = (AudioChannelSet::STEREO_LEFT | AudioChannelSet::STEREO_RIGHT),
CH_2POINT0POINT2 = (STEREO | AudioChannelSet::TOP_SIDE_LEFT | AudioChannelSet::TOP_SIDE_RIGHT),
CH_2POINT1POINT2 = (CH_2POINT0POINT2 | AudioChannelSet::LOW_FREQUENCY),
CH_3POINT0POINT2 = (CH_2POINT0POINT2 | AudioChannelSet::FRONT_CENTER),
HOA_ORDER1_ACN_N3D = 0x100000000001,
HOA_ORDER1_ACN_SN3D = 0x100000001001,
HOA_ORDER1_FUMA = 0x100000000101,
HOA_ORDER2_ACN_N3D = 0x100000000002,
HOA_ORDER2_ACN_SN3D = 0x100000001002,
HOA_ORDER2_FUMA = 0x100000000102,
HOA_ORDER3_ACN_N3D = 0x100000000003,
HOA_ORDER3_ACN_SN3D = 0x100000001003,
HOA_ORDER3_FUMA = 0x100000000103,
HOA_FIRST = AudioChannelSet::AMBISONICS_ACN0 | AudioChannelSet::AMBISONICS_ACN1 | AudioChannelSet::AMBISONICS_ACN2 |
AudioChannelSet::AMBISONICS_ACN3,
HOA_SECOND = HOA_FIRST | AudioChannelSet::AMBISONICS_ACN4 | AudioChannelSet::AMBISONICS_ACN5 |
AudioChannelSet::AMBISONICS_ACN6 | AudioChannelSet::AMBISONICS_ACN7 | AudioChannelSet::AMBISONICS_ACN8,
HOA_THIRD = HOA_SECOND | AudioChannelSet::AMBISONICS_ACN9 | AudioChannelSet::AMBISONICS_ACN10 |
AudioChannelSet::AMBISONICS_ACN11 | AudioChannelSet::AMBISONICS_ACN12 |
AudioChannelSet::AMBISONICS_ACN13 | AudioChannelSet::AMBISONICS_ACN14 |
AudioChannelSet::AMBISONICS_ACN15,
};
#ifdef __cplusplus
}

7
multimedia/av_codec/native_avmuxer.h
View File

@ -90,8 +90,8 @@ OH_AVErrCode OH_AVMuxer_Start(OH_AVMuxer *muxer);
* @useinstead OH_AVMuxer_WriteSampleBuffer
* @since 10
*/
OH_AVErrCode OH_AVMuxer_WriteSample(OH_AVMuxer *muxer, uint32_t trackIndex, OH_AVMemory *sample,
OH_AVCodecBufferAttr info);
OH_AVErrCode OH_AVMuxer_WriteSample(OH_AVMuxer *muxer, uint32_t trackIndex,
OH_AVMemory *sample, OH_AVCodecBufferAttr info);
/**
* @brief Write an encoded sample to the muxer.
@ -106,7 +106,8 @@ OH_AVErrCode OH_AVMuxer_WriteSample(OH_AVMuxer *muxer, uint32_t trackIndex, OH_A
* otherwise returns a specific error code, refer to {@link OH_AVErrCode}
* @since 11
*/
OH_AVErrCode OH_AVMuxer_WriteSampleBuffer(OH_AVMuxer *muxer, uint32_t trackIndex, const OH_AVBuffer *sample);
OH_AVErrCode OH_AVMuxer_WriteSampleBuffer(OH_AVMuxer *muxer, uint32_t trackIndex,
const OH_AVBuffer *sample);
/**
* @brief Stop the muxer.