More robust implementation of MPEG frame header search. The parser will not only search for the very first byte sequence that looks like a valid MPEG frame header. It will search for a valid MPEG frame header sequence, decode it, and probe if there is a consecutive MPEG frame header of the same type (MPEG version, layer, sampling frequency) at the expected position. This approach will reduce false detection of MPEG frame headers in case of errorous metadata or garbaged files. Fixes FS#12007.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29603 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 22 insertions, 10 deletions

diff --git a/apps/mp3data.h b/apps/mp3data.h
index 0fccd62..edda352 100644
--- a/apps/mp3data.h
+++ b/apps/mp3data.h
@@ -57,17 +57,29 @@ struct mp3info {
 
 #define MAX_XING_HEADER_SIZE 576
 
-unsigned long find_next_frame(int fd, long *offset, long max_offset,
-                              unsigned long last_header);
-unsigned long mem_find_next_frame(int startpos, long *offset, long max_offset,
-                                  unsigned long last_header);
-int get_mp3file_info(int fd, struct mp3info *info);
-int count_mp3_frames(int fd, int startpos, int filesize,
+unsigned long find_next_frame(int fd, 
+                              long *offset, 
+                              long max_offset,
+                              unsigned long reference_header);
+unsigned long mem_find_next_frame(int startpos, 
+                                  long *offset, 
+                                  long max_offset, 
+                                  unsigned long reference_header);
+int get_mp3file_info(int fd, 
+                     struct mp3info *info);
+int count_mp3_frames(int fd, 
+                     int startpos, 
+                     int filesize,
                      void (*progressfunc)(int));
-int create_xing_header(int fd, long startpos, long filesize,
-                       unsigned char *buf, unsigned long num_frames,
-                       unsigned long rec_time, unsigned long header_template,
-                       void (*progressfunc)(int), bool generate_toc);
+int create_xing_header(int fd, 
+                       long startpos, 
+                       long filesize,
+                       unsigned char *buf, 
+                       unsigned long num_frames,
+                       unsigned long rec_time, 
+                       unsigned long header_template,
+                       void (*progressfunc)(int), 
+                       bool generate_toc);
 
 extern unsigned long bytes2int(unsigned long b0,
                                unsigned long b1,