Skip to content

Commit

Permalink
avresample: Mark avresample_buffer() as pointer to const
Browse files Browse the repository at this point in the history
That buffer is read only and marking it accordingly let
the user passing a constant buffer to it without having
a const-correctness warning.

Signed-off-by: Luca Barbato <[email protected]>
  • Loading branch information
kiplingw authored and lu-zero committed Dec 14, 2015
1 parent 5bc223b commit cc4c242
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
7 changes: 4 additions & 3 deletions libavresample/audio_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ int ff_audio_data_set_channels(AudioData *a, int channels)
return 0;
}

int ff_audio_data_init(AudioData *a, uint8_t **src, int plane_size, int channels,
int nb_samples, enum AVSampleFormat sample_fmt,
int read_only, const char *name)
int ff_audio_data_init(AudioData *a, uint8_t * const *src, int plane_size,
int channels, int nb_samples,
enum AVSampleFormat sample_fmt, int read_only,
const char *name)
{
int p;

Expand Down
7 changes: 4 additions & 3 deletions libavresample/audio_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ int ff_audio_data_set_channels(AudioData *a, int channels);
* @param name name for debug logging (can be NULL)
* @return 0 on success, negative AVERROR value on error
*/
int ff_audio_data_init(AudioData *a, uint8_t **src, int plane_size, int channels,
int nb_samples, enum AVSampleFormat sample_fmt,
int read_only, const char *name);
int ff_audio_data_init(AudioData *a, uint8_t * const *src, int plane_size,
int channels, int nb_samples,
enum AVSampleFormat sample_fmt, int read_only,
const char *name);

/**
* Allocate AudioData.
Expand Down
5 changes: 3 additions & 2 deletions libavresample/avresample.h
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,9 @@ int avresample_get_out_samples(AVAudioResampleContext *avr, int in_nb_samples);
* output FIFO
*/
int avresample_convert(AVAudioResampleContext *avr, uint8_t **output,
int out_plane_size, int out_samples, uint8_t **input,
int in_plane_size, int in_samples);
int out_plane_size, int out_samples,
uint8_t * const *input, int in_plane_size,
int in_samples);

/**
* Return the number of samples currently in the resampling delay buffer.
Expand Down
3 changes: 2 additions & 1 deletion libavresample/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,8 @@ static int handle_buffered_output(AVAudioResampleContext *avr,

int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
uint8_t **output, int out_plane_size,
int out_samples, uint8_t **input,
int out_samples,
uint8_t * const *input,
int in_plane_size, int in_samples)
{
AudioData input_buffer;
Expand Down

0 comments on commit cc4c242

Please sign in to comment.