From 826f99e18701988d7e7cdc3d7019a20e1d697403 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Mon, 6 Nov 2017 20:06:08 -0500 Subject: libpcm: Get unbranded structure tag out of my way. No functional changes. Change-Id: If372023cb605389a203a635b700eca20685ad49b --- lib/rbcodec/codecs/aiff.c | 4 ++-- lib/rbcodec/codecs/au.c | 6 +++--- lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c | 4 ++-- lib/rbcodec/codecs/libpcm/dvi_adpcm.c | 4 ++-- lib/rbcodec/codecs/libpcm/ieee_float.c | 4 ++-- lib/rbcodec/codecs/libpcm/itut_g711.c | 4 ++-- lib/rbcodec/codecs/libpcm/linear_pcm.c | 4 ++-- lib/rbcodec/codecs/libpcm/ms_adpcm.c | 4 ++-- lib/rbcodec/codecs/libpcm/pcm_common.h | 4 ++-- lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c | 4 ++-- lib/rbcodec/codecs/libpcm/swf_adpcm.c | 4 ++-- lib/rbcodec/codecs/libpcm/yamaha_adpcm.c | 4 ++-- lib/rbcodec/codecs/smaf.c | 10 +++++----- lib/rbcodec/codecs/vox.c | 4 ++-- lib/rbcodec/codecs/wav.c | 4 ++-- lib/rbcodec/codecs/wav64.c | 4 ++-- 16 files changed, 36 insertions(+), 36 deletions(-) (limited to 'lib/rbcodec/codecs') diff --git a/lib/rbcodec/codecs/aiff.c b/lib/rbcodec/codecs/aiff.c index 9fee781c03..210c2065db 100644 --- a/lib/rbcodec/codecs/aiff.c +++ b/lib/rbcodec/codecs/aiff.c @@ -75,7 +75,7 @@ enum codec_status codec_main(enum codec_entry_call_reason reason) /* this is called for each file to process */ enum codec_status codec_run(void) { - struct pcm_format format; + struct libpcm_pcm_format format; uint32_t bytesdone, decodedsamples; /* rockbox: comment 'set but unused' variables uint32_t num_sample_frames = 0; @@ -127,7 +127,7 @@ enum codec_status codec_run(void) buf += 12; n -= 12; - ci->memset(&format, 0, sizeof(struct pcm_format)); + ci->memset(&format, 0, sizeof(struct libpcm_pcm_format)); format.is_signed = true; format.is_little_endian = false; diff --git a/lib/rbcodec/codecs/au.c b/lib/rbcodec/codecs/au.c index 18d4296125..388c241140 100644 --- a/lib/rbcodec/codecs/au.c +++ b/lib/rbcodec/codecs/au.c @@ -88,7 +88,7 @@ static unsigned int get_be32(uint8_t *buf) return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; } -static int convert_au_format(unsigned int encoding, struct pcm_format *fmt) +static int convert_au_format(unsigned int encoding, struct libpcm_pcm_format *fmt) { fmt->formattag = AU_FORMAT_UNSUPPORT; if (encoding < 8) @@ -119,7 +119,7 @@ enum codec_status codec_main(enum codec_entry_call_reason reason) /* this is called for each file to process */ enum codec_status codec_run(void) { - struct pcm_format format; + struct libpcm_pcm_format format; uint32_t bytesdone, decodedsamples; size_t n; int bufcount; @@ -142,7 +142,7 @@ enum codec_status codec_run(void) param = ci->id3->elapsed; bytesdone = ci->id3->offset; - ci->memset(&format, 0, sizeof(struct pcm_format)); + ci->memset(&format, 0, sizeof(struct libpcm_pcm_format)); format.is_signed = true; format.is_little_endian = false; diff --git a/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c index 60090aaa89..6aa5798e5c 100644 --- a/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c +++ b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c @@ -46,9 +46,9 @@ static const int index_table[] ICONST_ATTR = { static struct adpcm_data cur_data; static int blocksperchunk; -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { uint32_t max_chunk_count; diff --git a/lib/rbcodec/codecs/libpcm/dvi_adpcm.c b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c index 2e702ca394..d91bb1b6f6 100644 --- a/lib/rbcodec/codecs/libpcm/dvi_adpcm.c +++ b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c @@ -35,9 +35,9 @@ * [3] ffmpeg source code, libavcodec/adpcm.c */ -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { fmt = format; diff --git a/lib/rbcodec/codecs/libpcm/ieee_float.c b/lib/rbcodec/codecs/libpcm/ieee_float.c index 97a7fcecd4..29e145b381 100644 --- a/lib/rbcodec/codecs/libpcm/ieee_float.c +++ b/lib/rbcodec/codecs/libpcm/ieee_float.c @@ -26,9 +26,9 @@ * IEEE float */ -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { fmt = format; diff --git a/lib/rbcodec/codecs/libpcm/itut_g711.c b/lib/rbcodec/codecs/libpcm/itut_g711.c index 88ff5f59e6..cbc302ca09 100644 --- a/lib/rbcodec/codecs/libpcm/itut_g711.c +++ b/lib/rbcodec/codecs/libpcm/itut_g711.c @@ -106,9 +106,9 @@ static const int16_t ulaw2linear16[256] ICONST_ATTR = { 24, 16, 8, 0 }; -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { fmt = format; diff --git a/lib/rbcodec/codecs/libpcm/linear_pcm.c b/lib/rbcodec/codecs/libpcm/linear_pcm.c index 5c3c140b8c..fd0aaeb013 100644 --- a/lib/rbcodec/codecs/libpcm/linear_pcm.c +++ b/lib/rbcodec/codecs/libpcm/linear_pcm.c @@ -32,9 +32,9 @@ #define DEC_DEPTH_32 (32 - PCM_OUTPUT_DEPTH) -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { fmt = format; diff --git a/lib/rbcodec/codecs/libpcm/ms_adpcm.c b/lib/rbcodec/codecs/libpcm/ms_adpcm.c index a385d6c99f..b5fe463c74 100644 --- a/lib/rbcodec/codecs/libpcm/ms_adpcm.c +++ b/lib/rbcodec/codecs/libpcm/ms_adpcm.c @@ -37,14 +37,14 @@ static int16_t dec_coeff[2][2]; static uint16_t delta[2]; static int16_t sample[2][2]; -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; static const int16_t adaptation_table[] ICONST_ATTR = { 230, 230, 230, 230, 307, 409, 512, 614, 768, 614, 512, 409, 307, 230, 230, 230 }; -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { fmt = format; diff --git a/lib/rbcodec/codecs/libpcm/pcm_common.h b/lib/rbcodec/codecs/libpcm/pcm_common.h index 90e29c98ee..626133dc41 100644 --- a/lib/rbcodec/codecs/libpcm/pcm_common.h +++ b/lib/rbcodec/codecs/libpcm/pcm_common.h @@ -47,7 +47,7 @@ else if ((data) < (min)) data = min; */ #define MSADPCM_NUM_COEFF 7 -struct pcm_format { +struct libpcm_pcm_format { /* * RIFF: wFormatTag (in 'fmt ' chunk) * AIFF: compressionType (in 'COMM' chunk) @@ -138,7 +138,7 @@ struct pcm_codec { * true: RIFF/AIFF header check OK * false: RIFF/AIFF header check NG */ - bool (*set_format)(struct pcm_format *format); + bool (*set_format)(struct libpcm_pcm_format *format); /* * get seek position diff --git a/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c index d7b3360eb3..26deb7c045 100644 --- a/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c +++ b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c @@ -33,9 +33,9 @@ * [3] ffmpeg source code, libavcodec/adpcm.c */ -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { fmt = format; diff --git a/lib/rbcodec/codecs/libpcm/swf_adpcm.c b/lib/rbcodec/codecs/libpcm/swf_adpcm.c index c440fd1303..7eb74fdd19 100644 --- a/lib/rbcodec/codecs/libpcm/swf_adpcm.c +++ b/lib/rbcodec/codecs/libpcm/swf_adpcm.c @@ -45,11 +45,11 @@ static int blockbits = 0; static int lastbytebits = 0; static bool after_seek = false; -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; #define GET_SAMPLE_COUNT(s) ((((s) << 3) / fmt->channels - 22) / fmt->bitspersample + 1) -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { fmt = format; diff --git a/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c index c67fe7524a..946d7ed0ec 100644 --- a/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c +++ b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c @@ -76,9 +76,9 @@ static bool has_block_header = false; static struct adpcm_data cur_data; static int blocksperchunk; -static struct pcm_format *fmt; +static struct libpcm_pcm_format *fmt; -static bool set_format(struct pcm_format *format) +static bool set_format(struct libpcm_pcm_format *format) { fmt = format; diff --git a/lib/rbcodec/codecs/smaf.c b/lib/rbcodec/codecs/smaf.c index e4ec6342b2..eed9d39db4 100644 --- a/lib/rbcodec/codecs/smaf.c +++ b/lib/rbcodec/codecs/smaf.c @@ -134,7 +134,7 @@ static unsigned int search_chunk(const unsigned char *name, int nlen, off_t *pos return 0; } -static bool parse_audio_track(struct pcm_format *fmt, unsigned int chunksize, off_t *pos) +static bool parse_audio_track(struct libpcm_pcm_format *fmt, unsigned int chunksize, off_t *pos) { const unsigned char *buf; size_t size; @@ -185,7 +185,7 @@ static bool parse_audio_track(struct pcm_format *fmt, unsigned int chunksize, of return true; } -static bool parse_score_track(struct pcm_format *fmt, off_t *pos) +static bool parse_score_track(struct libpcm_pcm_format *fmt, off_t *pos) { const unsigned char *buf; unsigned int chunksize; @@ -277,13 +277,13 @@ static bool parse_score_track(struct pcm_format *fmt, off_t *pos) return true; } -static bool parse_header(struct pcm_format *fmt, off_t *pos) +static bool parse_header(struct libpcm_pcm_format *fmt, off_t *pos) { const unsigned char *buf; unsigned int chunksize; size_t size; - ci->memset(fmt, 0, sizeof(struct pcm_format)); + ci->memset(fmt, 0, sizeof(struct libpcm_pcm_format)); /* check File Chunk and Contents Info Chunk */ buf = ci->request_buffer(&size, 16); @@ -319,7 +319,7 @@ static bool parse_header(struct pcm_format *fmt, off_t *pos) return true; } -static struct pcm_format format; +static struct libpcm_pcm_format format; static uint32_t bytesdone; static uint8_t *read_buffer(size_t *realsize) diff --git a/lib/rbcodec/codecs/vox.c b/lib/rbcodec/codecs/vox.c index d84af24cfc..69eafc72ff 100644 --- a/lib/rbcodec/codecs/vox.c +++ b/lib/rbcodec/codecs/vox.c @@ -30,7 +30,7 @@ CODEC_HEADER static int32_t samples[PCM_SAMPLE_SIZE] IBSS_ATTR; -static struct pcm_format format; +static struct libpcm_pcm_format format; static uint32_t bytesdone; static uint8_t *read_buffer(size_t *realsize) @@ -78,7 +78,7 @@ enum codec_status codec_run(void) bytesdone = ci->id3->offset; ci->seek_buffer(0); - ci->memset(&format, 0, sizeof(struct pcm_format)); + ci->memset(&format, 0, sizeof(struct libpcm_pcm_format)); /* set format */ format.channels = 1; diff --git a/lib/rbcodec/codecs/wav.c b/lib/rbcodec/codecs/wav.c index 3208e2b5b8..0441be78b8 100644 --- a/lib/rbcodec/codecs/wav.c +++ b/lib/rbcodec/codecs/wav.c @@ -94,7 +94,7 @@ static const struct pcm_codec *get_wave_codec(uint32_t formattag) return 0; } -static struct pcm_format format; +static struct libpcm_pcm_format format; static uint32_t bytesdone; static bool set_msadpcm_coeffs(const uint8_t *buf) @@ -202,7 +202,7 @@ enum codec_status codec_run(void) ci->advance_buffer(12); firstblockposn = 12; - ci->memset(&format, 0, sizeof(struct pcm_format)); + ci->memset(&format, 0, sizeof(struct libpcm_pcm_format)); format.is_signed = true; format.is_little_endian = true; diff --git a/lib/rbcodec/codecs/wav64.c b/lib/rbcodec/codecs/wav64.c index 66bb3e3a11..a74c932e0e 100644 --- a/lib/rbcodec/codecs/wav64.c +++ b/lib/rbcodec/codecs/wav64.c @@ -94,7 +94,7 @@ static const struct pcm_codec *get_wave_codec(uint32_t formattag) return 0; } -static struct pcm_format format; +static struct libpcm_pcm_format format; static uint32_t bytesdone; /* Read an unaligned 64-bit little endian unsigned integer from buffer. */ @@ -211,7 +211,7 @@ enum codec_status codec_run(void) ci->advance_buffer(40); firstblockposn = 40; - ci->memset(&format, 0, sizeof(struct pcm_format)); + ci->memset(&format, 0, sizeof(struct libpcm_pcm_format)); format.is_signed = true; format.is_little_endian = true; -- cgit