#include "para.h"
#include "afh.h"
-#include "server.h"
#include "error.h"
#include "string.h"
+#include "afs.h"
+#include "server.h"
/** must be big enough to hold header */
#define CHUNK_SIZE 32768
}
static int ogg_compute_header_len(char *map, size_t numbytes,
- struct audio_format_info *afi)
+ struct afh_info *afi)
{
int ret;
size_t len = PARA_MIN(numbytes, CHUNK_SIZE);
* CHUNK_TIME begins. Always successful.
*/
static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
- struct audio_format_info *afi, long unsigned time_total)
+ struct afh_info *afi, long unsigned time_total)
{
int i, ret, num;
ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
* Init oggvorbis file and write some tech data to given pointers.
*/
static int ogg_get_file_info(char *map, size_t numbytes,
- struct audio_format_info *afi)
+ struct afh_info *afi)
{
int ret;
vorbis_info *vi;
goto err;
afi->seconds_total = ov_time_total(&of, -1);
afi->frequency = vi->rate;
- afi->bitrate = ov_bitrate(&of, 0);
+ afi->bitrate = ov_bitrate(&of, 0) / 1000;
afi->channels = vi->channels;
afi->chunks_total = ogg_compute_chunk_table(&of, afi, afi->seconds_total);
sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ukHz, "
"audio_file_info2: \n"
"audio_file_info3: \n",
afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
- afi->frequency / 1000, vi->channels, afi->bitrate / 1000
+ afi->frequency / 1000, vi->channels, afi->bitrate
);
afi->chunk_tv.tv_sec = 0;
afi->chunk_tv.tv_usec = 250 * 1000;