diff options
Diffstat (limited to 'firmware/export/mp3data.h')
-rw-r--r-- | firmware/export/mp3data.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/firmware/export/mp3data.h b/firmware/export/mp3data.h index db1a93b8d6..3961664815 100644 --- a/firmware/export/mp3data.h +++ b/firmware/export/mp3data.h | |||
@@ -20,9 +20,9 @@ | |||
20 | #ifndef _MP3DATA_H_ | 20 | #ifndef _MP3DATA_H_ |
21 | #define _MP3DATA_H_ | 21 | #define _MP3DATA_H_ |
22 | 22 | ||
23 | #define MPEG_VERSION2_5 0 | 23 | #define MPEG_VERSION1 0 |
24 | #define MPEG_VERSION1 1 | 24 | #define MPEG_VERSION2 1 |
25 | #define MPEG_VERSION2 2 | 25 | #define MPEG_VERSION2_5 2 |
26 | 26 | ||
27 | struct mp3info { | 27 | struct mp3info { |
28 | /* Standard MP3 frame header fields */ | 28 | /* Standard MP3 frame header fields */ |
@@ -30,23 +30,25 @@ struct mp3info { | |||
30 | int layer; | 30 | int layer; |
31 | bool protection; | 31 | bool protection; |
32 | int bitrate; | 32 | int bitrate; |
33 | int frequency; | 33 | long frequency; |
34 | int padding; | 34 | int padding; |
35 | int channel_mode; | 35 | int channel_mode; |
36 | int mode_extension; | 36 | int mode_extension; |
37 | int emphasis; | 37 | int emphasis; |
38 | int frame_size; /* Frame size in bytes */ | 38 | int frame_size; /* Frame size in bytes */ |
39 | int frame_time; /* Frame duration in milliseconds */ | 39 | int frame_samples; /* Samples per frame */ |
40 | int ft_num; /* Numerator of frametime in milliseconds */ | ||
41 | int ft_den; /* Denominator of frametime in milliseconds */ | ||
40 | 42 | ||
41 | bool is_vbr; /* True if the file is VBR */ | 43 | bool is_vbr; /* True if the file is VBR */ |
42 | bool has_toc; /* True if there is a VBR header in the file */ | 44 | bool has_toc; /* True if there is a VBR header in the file */ |
43 | bool is_xing_vbr; /* True if the VBR header is of Xing type */ | 45 | bool is_xing_vbr; /* True if the VBR header is of Xing type */ |
44 | bool is_vbri_vbr; /* True if the VBR header is of VBRI type */ | 46 | bool is_vbri_vbr; /* True if the VBR header is of VBRI type */ |
45 | unsigned char toc[100]; | 47 | unsigned char toc[100]; |
46 | long frame_count; /* Number of frames in the file (if VBR) */ | 48 | unsigned long frame_count; /* Number of frames in the file (if VBR) */ |
47 | long byte_count; /* File size in bytes */ | 49 | unsigned long byte_count; /* File size in bytes */ |
48 | long file_time; /* Length of the whole file in milliseconds */ | 50 | unsigned long file_time; /* Length of the whole file in milliseconds */ |
49 | int vbr_header_pos; | 51 | unsigned long vbr_header_pos; |
50 | int enc_delay; /* Encoder delay, fetched from LAME header */ | 52 | int enc_delay; /* Encoder delay, fetched from LAME header */ |
51 | int enc_padding; /* Padded samples added to last frame. LAME header */ | 53 | int enc_padding; /* Padded samples added to last frame. LAME header */ |
52 | }; | 54 | }; |