devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

libm4a: Fix warnings introduced in 001a338e51

Browse source 
Change-Id: Ia915e6f8babbd71533f22af566e5c45c2b40fbe5
This commit is contained in:
Solomon Peachy 2023-09-19 11:47:38 -04:00
parent 001a338e51
commit ac82a653bb
3 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/rbcodec/codecs/aac.c
View file

@ -62,7 +62,7 @@ enum codec_status codec_run(void)
int framelength; int framelength;
int lead_trim = 0; int lead_trim = 0;
unsigned int frame_samples; unsigned int frame_samples;
unsigned int i; uint32_t i;
unsigned char* buffer; unsigned char* buffer;
NeAACDecFrameInfo frame_info; NeAACDecFrameInfo frame_info;
NeAACDecHandle decoder; NeAACDecHandle decoder;
@ -138,7 +138,7 @@ enum codec_status codec_run(void)
* upsampling files the resulting sound_samples_done must be expanded * upsampling files the resulting sound_samples_done must be expanded
* by a factor of 2. This is done via using sbr_fac. */ * by a factor of 2. This is done via using sbr_fac. */
if (m4a_seek_raw(&demux_res, &input_stream, file_offset, if (m4a_seek_raw(&demux_res, &input_stream, file_offset,
&sound_samples_done, (int*) &i, &seek_idx)) { &sound_samples_done, &i, &seek_idx)) {
sound_samples_done *= sbr_fac; sound_samples_done *= sbr_fac;
} else { } else {
sound_samples_done = 0; sound_samples_done = 0;
@ -173,7 +173,7 @@ enum codec_status codec_run(void)
* by a factor 2. This is done via using sbr_fac. */ * by a factor 2. This is done via using sbr_fac. */
if (m4a_seek(&demux_res, &input_stream, if (m4a_seek(&demux_res, &input_stream,
(uint64_t) param * ci->id3->frequency / sbr_fac / 1000ULL, (uint64_t) param * ci->id3->frequency / sbr_fac / 1000ULL,
&sound_samples_done, (int*) &i, &seek_idx)) { &sound_samples_done, &i, &seek_idx)) {
sound_samples_done *= sbr_fac; sound_samples_done *= sbr_fac;
elapsed_time = sound_samples_done * 1000LL / ci->id3->frequency; elapsed_time = sound_samples_done * 1000LL / ci->id3->frequency;
ci->set_elapsed(elapsed_time); ci->set_elapsed(elapsed_time);

4
lib/rbcodec/codecs/libm4a/m4a.c
View file

@ -141,7 +141,7 @@ int m4a_check_sample_offset(demux_res_t *demux_res, uint32_t frame, uint32_t *st
* sound_samples_done and current_sample), 0 if failed. */ * sound_samples_done and current_sample), 0 if failed. */
unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream, unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
uint64_t sound_sample_loc, uint64_t* sound_samples_done, uint64_t sound_sample_loc, uint64_t* sound_samples_done,
int* current_sample, int* lookup_table_idx) uint32_t* current_sample, uint32_t* lookup_table_idx)
{ {
uint32_t i, sample_i; uint32_t i, sample_i;
uint32_t time, time_cnt, time_dur; uint32_t time, time_cnt, time_dur;
@ -266,7 +266,7 @@ unsigned int m4a_seek(demux_res_t* demux_res, stream_t* stream,
*/ */
unsigned int m4a_seek_raw(demux_res_t* demux_res, stream_t* stream, unsigned int m4a_seek_raw(demux_res_t* demux_res, stream_t* stream,
uint32_t file_loc, uint64_t* sound_samples_done, uint32_t file_loc, uint64_t* sound_samples_done,
int* current_sample, int* lookup_table_idx) uint32_t* current_sample, uint32_t* lookup_table_idx)
{ {
uint32_t i; uint32_t i;
uint32_t chunk_sample = 0; uint32_t chunk_sample = 0;

4
lib/rbcodec/codecs/libm4a/m4a.h
View file

@ -131,9 +131,9 @@ void stream_create(stream_t *stream,struct codec_api* ci);
unsigned int get_sample_offset(demux_res_t *demux_res, uint32_t sample); unsigned int get_sample_offset(demux_res_t *demux_res, uint32_t sample);
unsigned int m4a_seek (demux_res_t* demux_res, stream_t* stream, unsigned int m4a_seek (demux_res_t* demux_res, stream_t* stream,
uint64_t sound_sample_loc, uint64_t* sound_samples_done, uint64_t sound_sample_loc, uint64_t* sound_samples_done,
int* current_sample, int* lookup_table_idx); uint32_t* current_sample, uint32_t* lookup_table_idx);
unsigned int m4a_seek_raw (demux_res_t* demux_res, stream_t* stream, unsigned int m4a_seek_raw (demux_res_t* demux_res, stream_t* stream,
uint32_t file_loc, uint64_t* sound_samples_done, int* current_sample, int* lookup_table_idx); uint32_t file_loc, uint64_t* sound_samples_done, uint32_t* current_sample, uint32_t* lookup_table_idx);
int m4a_check_sample_offset(demux_res_t *demux_res, uint32_t frame, uint32_t *start); int m4a_check_sample_offset(demux_res_t *demux_res, uint32_t frame, uint32_t *start);
#endif /* STREAM_H */ #endif /* STREAM_H */