diff options
Diffstat (limited to 'lib/rbcodec/codecs/libpcm')
-rw-r--r-- | lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/dvi_adpcm.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/ieee_float.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/itut_g711.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/linear_pcm.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/ms_adpcm.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/pcm_common.h | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/swf_adpcm.c | 4 | ||||
-rw-r--r-- | lib/rbcodec/codecs/libpcm/yamaha_adpcm.c | 4 |
10 files changed, 20 insertions, 20 deletions
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 = { | |||
46 | static struct adpcm_data cur_data; | 46 | static struct adpcm_data cur_data; |
47 | static int blocksperchunk; | 47 | static int blocksperchunk; |
48 | 48 | ||
49 | static struct pcm_format *fmt; | 49 | static struct libpcm_pcm_format *fmt; |
50 | 50 | ||
51 | static bool set_format(struct pcm_format *format) | 51 | static bool set_format(struct libpcm_pcm_format *format) |
52 | { | 52 | { |
53 | uint32_t max_chunk_count; | 53 | uint32_t max_chunk_count; |
54 | 54 | ||
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 @@ | |||
35 | * [3] ffmpeg source code, libavcodec/adpcm.c | 35 | * [3] ffmpeg source code, libavcodec/adpcm.c |
36 | */ | 36 | */ |
37 | 37 | ||
38 | static struct pcm_format *fmt; | 38 | static struct libpcm_pcm_format *fmt; |
39 | 39 | ||
40 | static bool set_format(struct pcm_format *format) | 40 | static bool set_format(struct libpcm_pcm_format *format) |
41 | { | 41 | { |
42 | fmt = format; | 42 | fmt = format; |
43 | 43 | ||
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 @@ | |||
26 | * IEEE float | 26 | * IEEE float |
27 | */ | 27 | */ |
28 | 28 | ||
29 | static struct pcm_format *fmt; | 29 | static struct libpcm_pcm_format *fmt; |
30 | 30 | ||
31 | static bool set_format(struct pcm_format *format) | 31 | static bool set_format(struct libpcm_pcm_format *format) |
32 | { | 32 | { |
33 | fmt = format; | 33 | fmt = format; |
34 | 34 | ||
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 = { | |||
106 | 24, 16, 8, 0 | 106 | 24, 16, 8, 0 |
107 | }; | 107 | }; |
108 | 108 | ||
109 | static struct pcm_format *fmt; | 109 | static struct libpcm_pcm_format *fmt; |
110 | 110 | ||
111 | static bool set_format(struct pcm_format *format) | 111 | static bool set_format(struct libpcm_pcm_format *format) |
112 | { | 112 | { |
113 | fmt = format; | 113 | fmt = format; |
114 | 114 | ||
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 @@ | |||
32 | #define DEC_DEPTH_32 (32 - PCM_OUTPUT_DEPTH) | 32 | #define DEC_DEPTH_32 (32 - PCM_OUTPUT_DEPTH) |
33 | 33 | ||
34 | 34 | ||
35 | static struct pcm_format *fmt; | 35 | static struct libpcm_pcm_format *fmt; |
36 | 36 | ||
37 | static bool set_format(struct pcm_format *format) | 37 | static bool set_format(struct libpcm_pcm_format *format) |
38 | { | 38 | { |
39 | fmt = format; | 39 | fmt = format; |
40 | 40 | ||
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]; | |||
37 | static uint16_t delta[2]; | 37 | static uint16_t delta[2]; |
38 | static int16_t sample[2][2]; | 38 | static int16_t sample[2][2]; |
39 | 39 | ||
40 | static struct pcm_format *fmt; | 40 | static struct libpcm_pcm_format *fmt; |
41 | 41 | ||
42 | static const int16_t adaptation_table[] ICONST_ATTR = { | 42 | static const int16_t adaptation_table[] ICONST_ATTR = { |
43 | 230, 230, 230, 230, 307, 409, 512, 614, | 43 | 230, 230, 230, 230, 307, 409, 512, 614, |
44 | 768, 614, 512, 409, 307, 230, 230, 230 | 44 | 768, 614, 512, 409, 307, 230, 230, 230 |
45 | }; | 45 | }; |
46 | 46 | ||
47 | static bool set_format(struct pcm_format *format) | 47 | static bool set_format(struct libpcm_pcm_format *format) |
48 | { | 48 | { |
49 | fmt = format; | 49 | fmt = format; |
50 | 50 | ||
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; | |||
47 | */ | 47 | */ |
48 | #define MSADPCM_NUM_COEFF 7 | 48 | #define MSADPCM_NUM_COEFF 7 |
49 | 49 | ||
50 | struct pcm_format { | 50 | struct libpcm_pcm_format { |
51 | /* | 51 | /* |
52 | * RIFF: wFormatTag (in 'fmt ' chunk) | 52 | * RIFF: wFormatTag (in 'fmt ' chunk) |
53 | * AIFF: compressionType (in 'COMM' chunk) | 53 | * AIFF: compressionType (in 'COMM' chunk) |
@@ -138,7 +138,7 @@ struct pcm_codec { | |||
138 | * true: RIFF/AIFF header check OK | 138 | * true: RIFF/AIFF header check OK |
139 | * false: RIFF/AIFF header check NG | 139 | * false: RIFF/AIFF header check NG |
140 | */ | 140 | */ |
141 | bool (*set_format)(struct pcm_format *format); | 141 | bool (*set_format)(struct libpcm_pcm_format *format); |
142 | 142 | ||
143 | /* | 143 | /* |
144 | * get seek position | 144 | * 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 @@ | |||
33 | * [3] ffmpeg source code, libavcodec/adpcm.c | 33 | * [3] ffmpeg source code, libavcodec/adpcm.c |
34 | */ | 34 | */ |
35 | 35 | ||
36 | static struct pcm_format *fmt; | 36 | static struct libpcm_pcm_format *fmt; |
37 | 37 | ||
38 | static bool set_format(struct pcm_format *format) | 38 | static bool set_format(struct libpcm_pcm_format *format) |
39 | { | 39 | { |
40 | fmt = format; | 40 | fmt = format; |
41 | 41 | ||
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; | |||
45 | static int lastbytebits = 0; | 45 | static int lastbytebits = 0; |
46 | static bool after_seek = false; | 46 | static bool after_seek = false; |
47 | 47 | ||
48 | static struct pcm_format *fmt; | 48 | static struct libpcm_pcm_format *fmt; |
49 | 49 | ||
50 | #define GET_SAMPLE_COUNT(s) ((((s) << 3) / fmt->channels - 22) / fmt->bitspersample + 1) | 50 | #define GET_SAMPLE_COUNT(s) ((((s) << 3) / fmt->channels - 22) / fmt->bitspersample + 1) |
51 | 51 | ||
52 | static bool set_format(struct pcm_format *format) | 52 | static bool set_format(struct libpcm_pcm_format *format) |
53 | { | 53 | { |
54 | fmt = format; | 54 | fmt = format; |
55 | 55 | ||
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; | |||
76 | static struct adpcm_data cur_data; | 76 | static struct adpcm_data cur_data; |
77 | static int blocksperchunk; | 77 | static int blocksperchunk; |
78 | 78 | ||
79 | static struct pcm_format *fmt; | 79 | static struct libpcm_pcm_format *fmt; |
80 | 80 | ||
81 | static bool set_format(struct pcm_format *format) | 81 | static bool set_format(struct libpcm_pcm_format *format) |
82 | { | 82 | { |
83 | fmt = format; | 83 | fmt = format; |
84 | 84 | ||