mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-28 12:41:05 +00:00
Merge remote-tracking branch 'origin/master' into 0.11
Merge in doc updates for audio enums from 0.10, and get rid of the #if #else in the enum list, since that confuses gtk-doc. Conflicts: gst-libs/gst/audio/audio.c gst-libs/gst/audio/audio.h
This commit is contained in:
Tim-Philipp Müller
commit
4529c6dc32
3 changed files with 105 additions and 62 deletions
2
common
2
common
|
|
@ -1 +1 @@
|
|||
Subproject commit 605cd9a65ed61505f24b840d3fe8e252be72b151
|
||||
Subproject commit a39eb835fb3be2a4c5a6a89b5ca5cc064e79b2e2
|
||||
|
|
@ -82,6 +82,42 @@ GST_IS_APP_SINK_CLASS
|
|||
<SECTION>
|
||||
<FILE>gstaudio</FILE>
|
||||
<INCLUDE>gst/audio/audio.h</INCLUDE>
|
||||
GstAudioFlags
|
||||
GstAudioFormat
|
||||
GstAudioFormatFlags
|
||||
GstAudioFormatInfo
|
||||
GstAudioInfo
|
||||
gst_audio_info_init
|
||||
gst_audio_info_clear
|
||||
gst_audio_info_copy
|
||||
gst_audio_info_free
|
||||
gst_audio_info_from_caps
|
||||
gst_audio_info_to_caps
|
||||
gst_audio_info_convert
|
||||
gst_audio_format_get_info
|
||||
GST_AUDIO_FORMAT_INFO_DEPTH
|
||||
GST_AUDIO_FORMAT_INFO_ENDIANNESS
|
||||
GST_AUDIO_FORMAT_INFO_FLAGS
|
||||
GST_AUDIO_FORMAT_INFO_FORMAT
|
||||
GST_AUDIO_FORMAT_INFO_IS_FLOAT
|
||||
GST_AUDIO_FORMAT_INFO_IS_INTEGER
|
||||
GST_AUDIO_FORMAT_INFO_IS_BE
|
||||
GST_AUDIO_FORMAT_INFO_IS_LE
|
||||
GST_AUDIO_FORMAT_INFO_IS_SIGNED
|
||||
GST_AUDIO_FORMAT_INFO_NAME
|
||||
GST_AUDIO_FORMAT_INFO_WIDTH
|
||||
GST_AUDIO_INFO_BPF
|
||||
GST_AUDIO_INFO_BPS
|
||||
GST_AUDIO_INFO_CHANNELS
|
||||
GST_AUDIO_INFO_DEPTH
|
||||
GST_AUDIO_INFO_FLAGS
|
||||
GST_AUDIO_INFO_FORMAT
|
||||
GST_AUDIO_INFO_HAS_DEFAULT_POSITIONS
|
||||
GST_AUDIO_INFO_NAME
|
||||
GST_AUDIO_INFO_POSITION
|
||||
GST_AUDIO_INFO_RATE
|
||||
GST_AUDIO_INFO_WIDTH
|
||||
|
||||
GstAudioFieldFlag
|
||||
GST_FRAMES_TO_CLOCK_TIME
|
||||
GST_CLOCK_TIME_TO_FRAMES
|
||||
|
|
@ -101,6 +137,8 @@ GST_TYPE_BUFFER_FORMAT
|
|||
GST_TYPE_BUFFER_FORMAT_TYPE
|
||||
gst_buffer_format_get_type
|
||||
gst_buffer_format_type_get_type
|
||||
<SUBSECTION Private>
|
||||
_GST_AUDIO_FORMAT_NE
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
|
|
|
|||
|
|
@ -28,39 +28,59 @@
|
|||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#if G_BYTE_ORDER == G_BIG_ENDIAN
|
||||
#define _GST_AUDIO_FORMAT_NE(fmt) GST_AUDIO_FORMAT_ ## fmt ## BE
|
||||
#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||
#define _GST_AUDIO_FORMAT_NE(fmt) GST_AUDIO_FORMAT_ ## fmt ## LE
|
||||
#endif
|
||||
|
||||
/**
|
||||
* GstAudioFormat:
|
||||
* @GST_AUDIO_FORMAT_UNKNOWN: unknown audio format
|
||||
* @GST_AUDIO_FORMAT_S8: sample
|
||||
* @GST_AUDIO_FORMAT_U8: sample
|
||||
* @GST_AUDIO_FORMAT_S16LE: sample
|
||||
* @GST_AUDIO_FORMAT_S16BE: sample
|
||||
* @GST_AUDIO_FORMAT_U16LE: sample
|
||||
* @GST_AUDIO_FORMAT_U16BE: sample
|
||||
* @GST_AUDIO_FORMAT_S24_32LE: sample
|
||||
* @GST_AUDIO_FORMAT_S24_32BE: sample
|
||||
* @GST_AUDIO_FORMAT_U24_32LE: sample
|
||||
* @GST_AUDIO_FORMAT_U24_32BE: sample
|
||||
* @GST_AUDIO_FORMAT_S32LE: sample
|
||||
* @GST_AUDIO_FORMAT_S32BE: sample
|
||||
* @GST_AUDIO_FORMAT_U32LE: sample
|
||||
* @GST_AUDIO_FORMAT_U32BE: sample
|
||||
* @GST_AUDIO_FORMAT_S24LE: sample
|
||||
* @GST_AUDIO_FORMAT_S24BE: sample
|
||||
* @GST_AUDIO_FORMAT_U24LE: sample
|
||||
* @GST_AUDIO_FORMAT_U24BE: sample
|
||||
* @GST_AUDIO_FORMAT_S20LE: sample
|
||||
* @GST_AUDIO_FORMAT_S20BE: sample
|
||||
* @GST_AUDIO_FORMAT_U20LE: sample
|
||||
* @GST_AUDIO_FORMAT_U20BE: sample
|
||||
* @GST_AUDIO_FORMAT_S18LE: sample
|
||||
* @GST_AUDIO_FORMAT_S18BE: sample
|
||||
* @GST_AUDIO_FORMAT_U18LE: sample
|
||||
* @GST_AUDIO_FORMAT_U18BE: sample
|
||||
* @GST_AUDIO_FORMAT_F32LE: sample
|
||||
* @GST_AUDIO_FORMAT_F32BE: sample
|
||||
* @GST_AUDIO_FORMAT_F64LE: sample
|
||||
* @GST_AUDIO_FORMAT_F64BE: sample
|
||||
* @GST_AUDIO_FORMAT_S8: 8 bits in 8 bits, signed
|
||||
* @GST_AUDIO_FORMAT_U8: 8 bits in 8 bits, unsigned
|
||||
* @GST_AUDIO_FORMAT_S16LE: 16 bits in 16 bits, signed, little endian
|
||||
* @GST_AUDIO_FORMAT_S16BE: 16 bits in 16 bits, signed, big endian
|
||||
* @GST_AUDIO_FORMAT_U16LE: 16 bits in 16 bits, unsigned, little endian
|
||||
* @GST_AUDIO_FORMAT_U16BE: 16 bits in 16 bits, unsigned, big endian
|
||||
* @GST_AUDIO_FORMAT_S24_32LE: 24 bits in 32 bits, signed, little endian
|
||||
* @GST_AUDIO_FORMAT_S24_32BE: 24 bits in 32 bits, signed, big endian
|
||||
* @GST_AUDIO_FORMAT_U24_32LE: 24 bits in 32 bits, unsigned, little endian
|
||||
* @GST_AUDIO_FORMAT_U24_32BE: 24 bits in 32 bits, unsigned, big endian
|
||||
* @GST_AUDIO_FORMAT_S32LE: 32 bits in 32 bits, signed, little endian
|
||||
* @GST_AUDIO_FORMAT_S32BE: 32 bits in 32 bits, signed, big endian
|
||||
* @GST_AUDIO_FORMAT_U32LE: 32 bits in 32 bits, unsigned, little endian
|
||||
* @GST_AUDIO_FORMAT_U32BE: 32 bits in 32 bits, unsigned, big endian
|
||||
* @GST_AUDIO_FORMAT_S24LE: 24 bits in 24 bits, signed, little endian
|
||||
* @GST_AUDIO_FORMAT_S24BE: 24 bits in 24 bits, signed, big endian
|
||||
* @GST_AUDIO_FORMAT_U24LE: 24 bits in 24 bits, unsigned, little endian
|
||||
* @GST_AUDIO_FORMAT_U24BE: 24 bits in 24 bits, unsigned, big endian
|
||||
* @GST_AUDIO_FORMAT_S20LE: 20 bits in 24 bits, signed, little endian
|
||||
* @GST_AUDIO_FORMAT_S20BE: 20 bits in 24 bits, signed, big endian
|
||||
* @GST_AUDIO_FORMAT_U20LE: 20 bits in 24 bits, unsigned, little endian
|
||||
* @GST_AUDIO_FORMAT_U20BE: 20 bits in 24 bits, unsigned, big endian
|
||||
* @GST_AUDIO_FORMAT_S18LE: 18 bits in 24 bits, signed, little endian
|
||||
* @GST_AUDIO_FORMAT_S18BE: 18 bits in 24 bits, signed, big endian
|
||||
* @GST_AUDIO_FORMAT_U18LE: 18 bits in 24 bits, unsigned, little endian
|
||||
* @GST_AUDIO_FORMAT_U18BE: 18 bits in 24 bits, unsigned, big endian
|
||||
* @GST_AUDIO_FORMAT_F32LE: 32-bit floating point samples, little endian
|
||||
* @GST_AUDIO_FORMAT_F32BE: 32-bit floating point samples, big endian
|
||||
* @GST_AUDIO_FORMAT_F64LE: 64-bit floating point samples, little endian
|
||||
* @GST_AUDIO_FORMAT_F64BE: 64-bit floating point samples, big endian
|
||||
* @GST_AUDIO_FORMAT_S16: 16 bits in 16 bits, signed, native endianness
|
||||
* @GST_AUDIO_FORMAT_U16: 16 bits in 16 bits, unsigned, native endianness
|
||||
* @GST_AUDIO_FORMAT_S24_32: 24 bits in 32 bits, signed, native endianness
|
||||
* @GST_AUDIO_FORMAT_U24_32: 24 bits in 32 bits, unsigned, native endianness
|
||||
* @GST_AUDIO_FORMAT_S32: 32 bits in 32 bits, signed, native endianness
|
||||
* @GST_AUDIO_FORMAT_U32: 32 bits in 32 bits, unsigned, native endianness
|
||||
* @GST_AUDIO_FORMAT_S24: 24 bits in 24 bits, signed, native endianness
|
||||
* @GST_AUDIO_FORMAT_U24: 24 bits in 24 bits, unsigned, native endianness
|
||||
* @GST_AUDIO_FORMAT_S20: 20 bits in 24 bits, signed, native endianness
|
||||
* @GST_AUDIO_FORMAT_U20: 20 bits in 24 bits, unsigned, native endianness
|
||||
* @GST_AUDIO_FORMAT_S18: 18 bits in 24 bits, signed, native endianness
|
||||
* @GST_AUDIO_FORMAT_U18: 18 bits in 24 bits, unsigned, native endianness
|
||||
* @GST_AUDIO_FORMAT_F32: 32-bit floating point samples, native endianness
|
||||
* @GST_AUDIO_FORMAT_F64: 64-bit floating point samples, native endianness
|
||||
*
|
||||
* Enum value describing the most common audio formats.
|
||||
*/
|
||||
|
|
@ -104,39 +124,24 @@ typedef enum {
|
|||
GST_AUDIO_FORMAT_F32BE,
|
||||
GST_AUDIO_FORMAT_F64LE,
|
||||
GST_AUDIO_FORMAT_F64BE,
|
||||
#if G_BYTE_ORDER == G_BIG_ENDIAN
|
||||
GST_AUDIO_FORMAT_S16 = GST_AUDIO_FORMAT_S16BE,
|
||||
GST_AUDIO_FORMAT_U16 = GST_AUDIO_FORMAT_U16BE,
|
||||
GST_AUDIO_FORMAT_S24_32 = GST_AUDIO_FORMAT_S24_32BE,
|
||||
GST_AUDIO_FORMAT_U24_32 = GST_AUDIO_FORMAT_U24_32BE,
|
||||
GST_AUDIO_FORMAT_S32 = GST_AUDIO_FORMAT_S32BE,
|
||||
GST_AUDIO_FORMAT_U32 = GST_AUDIO_FORMAT_U32BE,
|
||||
GST_AUDIO_FORMAT_S24 = GST_AUDIO_FORMAT_S24BE,
|
||||
GST_AUDIO_FORMAT_U24 = GST_AUDIO_FORMAT_U24BE,
|
||||
GST_AUDIO_FORMAT_S20 = GST_AUDIO_FORMAT_S20BE,
|
||||
GST_AUDIO_FORMAT_U20 = GST_AUDIO_FORMAT_U20BE,
|
||||
GST_AUDIO_FORMAT_S18 = GST_AUDIO_FORMAT_S18BE,
|
||||
GST_AUDIO_FORMAT_U18 = GST_AUDIO_FORMAT_U18BE,
|
||||
GST_AUDIO_FORMAT_F32 = GST_AUDIO_FORMAT_F32BE,
|
||||
GST_AUDIO_FORMAT_F64 = GST_AUDIO_FORMAT_F64BE
|
||||
#elif G_BYTE_ORDER == G_LITTLE_ENDIAN
|
||||
GST_AUDIO_FORMAT_S16 = GST_AUDIO_FORMAT_S16LE,
|
||||
GST_AUDIO_FORMAT_U16 = GST_AUDIO_FORMAT_U16LE,
|
||||
GST_AUDIO_FORMAT_S24_32 = GST_AUDIO_FORMAT_S24_32LE,
|
||||
GST_AUDIO_FORMAT_U24_32 = GST_AUDIO_FORMAT_U24_32LE,
|
||||
GST_AUDIO_FORMAT_S32 = GST_AUDIO_FORMAT_S32LE,
|
||||
GST_AUDIO_FORMAT_U32 = GST_AUDIO_FORMAT_U32LE,
|
||||
GST_AUDIO_FORMAT_S24 = GST_AUDIO_FORMAT_S24LE,
|
||||
GST_AUDIO_FORMAT_U24 = GST_AUDIO_FORMAT_U24LE,
|
||||
GST_AUDIO_FORMAT_S20 = GST_AUDIO_FORMAT_S20LE,
|
||||
GST_AUDIO_FORMAT_U20 = GST_AUDIO_FORMAT_U20LE,
|
||||
GST_AUDIO_FORMAT_S18 = GST_AUDIO_FORMAT_S18LE,
|
||||
GST_AUDIO_FORMAT_U18 = GST_AUDIO_FORMAT_U18LE,
|
||||
GST_AUDIO_FORMAT_F32 = GST_AUDIO_FORMAT_F32LE,
|
||||
GST_AUDIO_FORMAT_F64 = GST_AUDIO_FORMAT_F64LE
|
||||
#endif
|
||||
/* native endianness equivalents */
|
||||
GST_AUDIO_FORMAT_S16 = _GST_AUDIO_FORMAT_NE(S16),
|
||||
GST_AUDIO_FORMAT_U16 = _GST_AUDIO_FORMAT_NE(U16),
|
||||
GST_AUDIO_FORMAT_S24_32 = _GST_AUDIO_FORMAT_NE(S24_32),
|
||||
GST_AUDIO_FORMAT_U24_32 = _GST_AUDIO_FORMAT_NE(U24_32),
|
||||
GST_AUDIO_FORMAT_S32 = _GST_AUDIO_FORMAT_NE(S32),
|
||||
GST_AUDIO_FORMAT_U32 = _GST_AUDIO_FORMAT_NE(U32),
|
||||
GST_AUDIO_FORMAT_S24 = _GST_AUDIO_FORMAT_NE(S24),
|
||||
GST_AUDIO_FORMAT_U24 = _GST_AUDIO_FORMAT_NE(U24),
|
||||
GST_AUDIO_FORMAT_S20 = _GST_AUDIO_FORMAT_NE(S20),
|
||||
GST_AUDIO_FORMAT_U20 = _GST_AUDIO_FORMAT_NE(U20),
|
||||
GST_AUDIO_FORMAT_S18 = _GST_AUDIO_FORMAT_NE(S18),
|
||||
GST_AUDIO_FORMAT_U18 = _GST_AUDIO_FORMAT_NE(U18),
|
||||
GST_AUDIO_FORMAT_F32 = _GST_AUDIO_FORMAT_NE(F32),
|
||||
GST_AUDIO_FORMAT_F64 = _GST_AUDIO_FORMAT_NE(F64)
|
||||
} GstAudioFormat;
|
||||
|
||||
/* FIXME: need GTypes */
|
||||
typedef struct _GstAudioFormatInfo GstAudioFormatInfo;
|
||||
typedef struct _GstAudioInfo GstAudioInfo;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue