decoder/audio: eliminate the "bits" variable
Pass the audiofile_setup_sample_format() result to audio_format_init_checked().
This commit is contained in:
parent
2c1fb48318
commit
141cbc60b9
@ -127,7 +127,6 @@ audiofile_stream_decode(struct decoder *decoder, struct input_stream *is)
|
|||||||
AFvirtualfile *vf;
|
AFvirtualfile *vf;
|
||||||
int fs, frame_count;
|
int fs, frame_count;
|
||||||
AFfilehandle af_fp;
|
AFfilehandle af_fp;
|
||||||
int bits;
|
|
||||||
struct audio_format audio_format;
|
struct audio_format audio_format;
|
||||||
float total_time;
|
float total_time;
|
||||||
uint16_t bit_rate;
|
uint16_t bit_rate;
|
||||||
@ -148,11 +147,9 @@ audiofile_stream_decode(struct decoder *decoder, struct input_stream *is)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bits = audiofile_setup_sample_format(af_fp);
|
|
||||||
|
|
||||||
if (!audio_format_init_checked(&audio_format,
|
if (!audio_format_init_checked(&audio_format,
|
||||||
afGetRate(af_fp, AF_DEFAULT_TRACK),
|
afGetRate(af_fp, AF_DEFAULT_TRACK),
|
||||||
bits,
|
audiofile_setup_sample_format(af_fp),
|
||||||
afGetVirtualChannels(af_fp, AF_DEFAULT_TRACK),
|
afGetVirtualChannels(af_fp, AF_DEFAULT_TRACK),
|
||||||
&error)) {
|
&error)) {
|
||||||
g_warning("%s", error->message);
|
g_warning("%s", error->message);
|
||||||
|
Loading…
Reference in New Issue
Block a user