Fix FS#10476. Prevent FLAC bitrate calculation overflow with large files. The watermark depends on the bitrate, and so this also fixes playback pauses on large FLAC files.

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

2 files changed, 3 insertions, 2 deletions

diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c
index cc3f683706..3f2f369a88 100644
--- a/apps/codecs/flac.c
+++ b/apps/codecs/flac.c
@@ -172,7 +172,8 @@ static bool flac_init(FLACContext* fc, int first_frame_offset)
     }
 
    if (found_streaminfo) {
-       fc->bitrate = ((fc->filesize-fc->metadatalength) * 8) / fc->length;
+       fc->bitrate = ((int64_t) (fc->filesize-fc->metadatalength) * 8) 
+                     / fc->length;
        return true;
    } else {
        return false;
diff --git a/apps/metadata/flac.c b/apps/metadata/flac.c
index 21ecdd61ca..b8f440c3ed 100644
--- a/apps/metadata/flac.c
+++ b/apps/metadata/flac.c
@@ -96,7 +96,7 @@ bool get_flac_metadata(int fd, struct mp3entry* id3)
                 return false;
             }
 
-            id3->bitrate = (id3->filesize * 8) / id3->length;
+            id3->bitrate = ((int64_t) id3->filesize * 8) / id3->length;
         } 
         else if (type == 4)  /* 4 is the VORBIS_COMMENT block */
         {