[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7431 - Extractor/src/plugins
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7431 - Extractor/src/plugins |
Date: |
Mon, 14 Jul 2008 00:25:30 -0600 (MDT) |
Author: holindho
Date: 2008-07-14 00:25:30 -0600 (Mon, 14 Jul 2008)
New Revision: 7431
Modified:
Extractor/src/plugins/mp3extractor.c
Log:
fix mpeg audio bitrate tables
Modified: Extractor/src/plugins/mp3extractor.c
===================================================================
--- Extractor/src/plugins/mp3extractor.c 2008-07-14 01:51:33 UTC (rev
7430)
+++ Extractor/src/plugins/mp3extractor.c 2008-07-14 06:25:30 UTC (rev
7431)
@@ -226,21 +226,21 @@
#define MPA_ORIGINAL_SHIFT 2
static const unsigned int bitrate_table[16][6] = {
- {0, 0, 0, 0, 0, 0},
- {32, 32, 32, 32, 32, 8},
- {64, 48, 40, 64, 48, 16},
- {96, 56, 48, 96, 56, 24},
- {128, 64, 56, 128, 64, 32},
- {160, 80, 64, 160, 80, 64},
- {192, 96, 80, 192, 96, 80},
- {224, 112, 96, 224, 112, 56},
- {256, 128, 112, 256, 128, 64},
- {288, 160, 128, 288, 160, 128},
- {320, 192, 160, 320, 192, 160},
- {352, 224, 192, 352, 224, 112},
- {384, 256, 224, 384, 256, 128},
- {416, 320, 256, 416, 320, 256},
- {448, 384, 320, 448, 384, 320},
+ {0, 0, 0, 0, 0, 0},
+ {32, 32, 32, 32, 8, 8},
+ {64, 48, 40, 48, 16, 16},
+ {96, 56, 48, 56, 24, 24},
+ {128, 64, 56, 64, 32, 32},
+ {160, 80, 64, 80, 40, 40},
+ {192, 96, 80, 96, 48, 48},
+ {224, 112, 96, 112, 56, 56},
+ {256, 128, 112, 128, 64, 64},
+ {288, 160, 128, 144, 80, 80},
+ {320, 192, 160, 160, 96, 96},
+ {352, 224, 192, 176, 112, 112},
+ {384, 256, 224, 192, 128, 128},
+ {416, 320, 256, 224, 144, 144},
+ {448, 384, 320, 256, 160, 160},
{-1, -1, -1, -1, -1, -1}
};
static const int freq_table[4][3] = {
@@ -415,7 +415,7 @@
}
if (!layer || !mpeg_ver)
return prev; /*unknown mpeg type */
- if (mpeg_ver < 3)
+ if (mpeg_ver < MPEG_V25)
idx_num = (mpeg_ver - 1) * 3 + layer - 1;
else
idx_num = 2 + layer;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7431 - Extractor/src/plugins,
gnunet <=