| Index: ppapi/c/ppb_audio_buffer.h
|
| diff --git a/ppapi/c/ppb_audio_frame.h b/ppapi/c/ppb_audio_buffer.h
|
| similarity index 31%
|
| rename from ppapi/c/ppb_audio_frame.h
|
| rename to ppapi/c/ppb_audio_buffer.h
|
| index 03265c48973a342163c0c44cc3ffef38083668d5..a58af2d173fbd5c9e13544b760d1fa98f033731c 100644
|
| --- a/ppapi/c/ppb_audio_frame.h
|
| +++ b/ppapi/c/ppb_audio_buffer.h
|
| @@ -3,10 +3,10 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -/* From ppb_audio_frame.idl modified Wed Jan 29 13:24:24 2014. */
|
| +/* From ppb_audio_buffer.idl modified Thu Feb 6 15:31:48 2014. */
|
|
|
| -#ifndef PPAPI_C_PPB_AUDIO_FRAME_H_
|
| -#define PPAPI_C_PPB_AUDIO_FRAME_H_
|
| +#ifndef PPAPI_C_PPB_AUDIO_BUFFER_H_
|
| +#define PPAPI_C_PPB_AUDIO_BUFFER_H_
|
|
|
| #include "ppapi/c/pp_bool.h"
|
| #include "ppapi/c/pp_macros.h"
|
| @@ -14,10 +14,10 @@
|
| #include "ppapi/c/pp_stdint.h"
|
| #include "ppapi/c/pp_time.h"
|
|
|
| -#define PPB_AUDIOFRAME_INTERFACE_0_1 "PPB_AudioFrame;0.1" /* dev */
|
| +#define PPB_AUDIOBUFFER_INTERFACE_0_1 "PPB_AudioBuffer;0.1" /* dev */
|
| /**
|
| * @file
|
| - * Defines the <code>PPB_AudioFrame</code> interface.
|
| + * Defines the <code>PPB_AudioBuffer</code> interface.
|
| */
|
|
|
|
|
| @@ -26,23 +26,23 @@
|
| * @{
|
| */
|
| /**
|
| - * PP_AudioFrame_SampleRate is an enumeration of the different audio sample
|
| + * PP_AudioBuffer_SampleRate is an enumeration of the different audio sample
|
| * rates.
|
| */
|
| typedef enum {
|
| - PP_AUDIOFRAME_SAMPLERATE_UNKNOWN = 0,
|
| - PP_AUDIOFRAME_SAMPLERATE_8000 = 8000,
|
| - PP_AUDIOFRAME_SAMPLERATE_44100 = 44100
|
| -} PP_AudioFrame_SampleRate;
|
| + PP_AUDIOBUFFER_SAMPLERATE_UNKNOWN = 0,
|
| + PP_AUDIOBUFFER_SAMPLERATE_8000 = 8000,
|
| + PP_AUDIOBUFFER_SAMPLERATE_44100 = 44100
|
| +} PP_AudioBuffer_SampleRate;
|
|
|
| /**
|
| - * PP_AudioFrame_SampleSize is an enumeration of the different audio sample
|
| + * PP_AudioBuffer_SampleSize is an enumeration of the different audio sample
|
| * sizes.
|
| */
|
| typedef enum {
|
| - PP_AUDIOFRAME_SAMPLESIZE_UNKNOWN = 0,
|
| - PP_AUDIOFRAME_SAMPLESIZE_16_BITS = 2
|
| -} PP_AudioFrame_SampleSize;
|
| + PP_AUDIOBUFFER_SAMPLESIZE_UNKNOWN = 0,
|
| + PP_AUDIOBUFFER_SAMPLESIZE_16_BITS = 2
|
| +} PP_AudioBuffer_SampleSize;
|
| /**
|
| * @}
|
| */
|
| @@ -51,96 +51,96 @@ typedef enum {
|
| * @addtogroup Interfaces
|
| * @{
|
| */
|
| -struct PPB_AudioFrame_0_1 { /* dev */
|
| +struct PPB_AudioBuffer_0_1 { /* dev */
|
| /**
|
| - * Determines if a resource is an AudioFrame resource.
|
| + * Determines if a resource is an AudioBuffer resource.
|
| *
|
| * @param[in] resource The <code>PP_Resource</code> to test.
|
| *
|
| * @return A <code>PP_Bool</code> with <code>PP_TRUE</code> if the given
|
| - * resource is an AudioFrame resource or <code>PP_FALSE</code> otherwise.
|
| + * resource is an AudioBuffer resource or <code>PP_FALSE</code> otherwise.
|
| */
|
| - PP_Bool (*IsAudioFrame)(PP_Resource resource);
|
| + PP_Bool (*IsAudioBuffer)(PP_Resource resource);
|
| /**
|
| - * Gets the timestamp of the audio frame.
|
| + * Gets the timestamp of the audio buffer.
|
| *
|
| - * @param[in] frame A <code>PP_Resource</code> corresponding to an audio frame
|
| - * resource.
|
| + * @param[in] buffer A <code>PP_Resource</code> corresponding to an audio
|
| + * buffer resource.
|
| *
|
| * @return A <code>PP_TimeDelta</code> containing the timestamp of the audio
|
| - * frame. Given in seconds since the start of the containing audio stream.
|
| + * buffer. Given in seconds since the start of the containing audio stream.
|
| */
|
| - PP_TimeDelta (*GetTimestamp)(PP_Resource frame);
|
| + PP_TimeDelta (*GetTimestamp)(PP_Resource buffer);
|
| /**
|
| - * Sets the timestamp of the audio frame.
|
| + * Sets the timestamp of the audio buffer.
|
| *
|
| - * @param[in] frame A <code>PP_Resource</code> corresponding to an audio frame
|
| - * resource.
|
| + * @param[in] buffer A <code>PP_Resource</code> corresponding to an audio
|
| + * buffer resource.
|
| * @param[in] timestamp A <code>PP_TimeDelta</code> containing the timestamp
|
| - * of the audio frame. Given in seconds since the start of the containing
|
| + * of the audio buffer. Given in seconds since the start of the containing
|
| * audio stream.
|
| */
|
| - void (*SetTimestamp)(PP_Resource frame, PP_TimeDelta timestamp);
|
| + void (*SetTimestamp)(PP_Resource buffer, PP_TimeDelta timestamp);
|
| /**
|
| - * Gets the sample rate of the audio frame.
|
| + * Gets the sample rate of the audio buffer.
|
| *
|
| - * @param[in] frame A <code>PP_Resource</code> corresponding to an audio frame
|
| - * resource.
|
| + * @param[in] buffer A <code>PP_Resource</code> corresponding to an audio
|
| + * buffer resource.
|
| *
|
| - * @return The sample rate of the audio frame.
|
| + * @return The sample rate of the audio buffer.
|
| */
|
| - PP_AudioFrame_SampleRate (*GetSampleRate)(PP_Resource frame);
|
| + PP_AudioBuffer_SampleRate (*GetSampleRate)(PP_Resource buffer);
|
| /**
|
| - * Gets the sample size of the audio frame.
|
| + * Gets the sample size of the audio buffer.
|
| *
|
| - * @param[in] frame A <code>PP_Resource</code> corresponding to an audio frame
|
| - * resource.
|
| + * @param[in] buffer A <code>PP_Resource</code> corresponding to an audio
|
| + * buffer resource.
|
| *
|
| - * @return The sample size of the audio frame.
|
| + * @return The sample size of the audio buffer.
|
| */
|
| - PP_AudioFrame_SampleSize (*GetSampleSize)(PP_Resource frame);
|
| + PP_AudioBuffer_SampleSize (*GetSampleSize)(PP_Resource buffer);
|
| /**
|
| - * Gets the number of channels in the audio frame.
|
| + * Gets the number of channels in the audio buffer.
|
| *
|
| - * @param[in] frame A <code>PP_Resource</code> corresponding to an audio frame
|
| - * resource.
|
| + * @param[in] buffer A <code>PP_Resource</code> corresponding to an audio
|
| + * buffer resource.
|
| *
|
| - * @return The number of channels in the audio frame.
|
| + * @return The number of channels in the audio buffer.
|
| */
|
| - uint32_t (*GetNumberOfChannels)(PP_Resource frame);
|
| + uint32_t (*GetNumberOfChannels)(PP_Resource buffer);
|
| /**
|
| - * Gets the number of samples in the audio frame.
|
| + * Gets the number of samples in the audio buffer.
|
| *
|
| - * @param[in] frame A <code>PP_Resource</code> corresponding to an audio frame
|
| - * resource.
|
| + * @param[in] buffer A <code>PP_Resource</code> corresponding to an audio
|
| + * buffer resource.
|
| *
|
| - * @return The number of samples in the audio frame.
|
| - * For example, at a sampling rate of 44,100 Hz in stereo audio, a frame
|
| + * @return The number of samples in the audio buffer.
|
| + * For example, at a sampling rate of 44,100 Hz in stereo audio, a buffer
|
| * containing 4410 * 2 samples would have a duration of 100 milliseconds.
|
| */
|
| - uint32_t (*GetNumberOfSamples)(PP_Resource frame);
|
| + uint32_t (*GetNumberOfSamples)(PP_Resource buffer);
|
| /**
|
| - * Gets the data buffer containing the audio frame samples.
|
| + * Gets the data buffer containing the audio samples.
|
| *
|
| - * @param[in] frame A <code>PP_Resource</code> corresponding to an audio frame
|
| - * resource.
|
| + * @param[in] buffer A <code>PP_Resource</code> corresponding to an audio
|
| + * buffer resource.
|
| *
|
| * @return A pointer to the beginning of the data buffer.
|
| */
|
| - void* (*GetDataBuffer)(PP_Resource frame);
|
| + void* (*GetDataBuffer)(PP_Resource buffer);
|
| /**
|
| * Gets the size of the data buffer in bytes.
|
| *
|
| - * @param[in] frame A <code>PP_Resource</code> corresponding to an audio frame
|
| - * resource.
|
| + * @param[in] buffer A <code>PP_Resource</code> corresponding to an audio
|
| + * buffer resource.
|
| *
|
| * @return The size of the data buffer in bytes.
|
| */
|
| - uint32_t (*GetDataBufferSize)(PP_Resource frame);
|
| + uint32_t (*GetDataBufferSize)(PP_Resource buffer);
|
| };
|
| /**
|
| * @}
|
| */
|
|
|
| -#endif /* PPAPI_C_PPB_AUDIO_FRAME_H_ */
|
| +#endif /* PPAPI_C_PPB_AUDIO_BUFFER_H_ */
|
|
|
|
|