- ret = ogg_stream_packetout(stream_in, &packet);
- if (ret != 1) {
- ret = -E_STREAM_PACKETOUT;
- goto err2;
- }
- ret = -E_VORBIS;
- if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
- goto err2;
- PARA_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
- ogg_stream_packetin(stream_out, &packet);
-
- ret = ogg_sync_pageout(sync_in, &page);
- if (ret <= 0) {
- ret = -E_SYNC_PAGEOUT;
- goto err2;
- }
- ogg_stream_pagein(stream_in, &page);
- ogg_stream_packetout(stream_in, &packet);
- ogg_stream_packetin(stream_out, &packet);
-
- ret = ogg_sync_pageout(sync_in, &page);
- if (ret <= 0) {
- ret = -E_SYNC_PAGEOUT;
- goto err2;
- }
- ogg_stream_pagein(stream_in, &page);
- ogg_stream_packetout(stream_in, &packet);
- ogg_stream_packetin(stream_out, &packet);
-
- afi->header_len = 0;
- while (ogg_stream_flush(stream_out, &page))
- afi->header_len += page.body_len + page.header_len;
- PARA_DEBUG_LOG("header_len = %d\n", afi->header_len);
- afi->header_offset = 0;
- ret = 1;
-err2:
- ogg_stream_destroy(stream_in);
- ogg_stream_destroy(stream_out);
-err1:
- ogg_sync_destroy(sync_in);
- vorbis_info_clear(&vi);
- vorbis_comment_clear(&vc);
- return ret;
-}
-
-/*
- * Alloc and fill array table of byte offsets. chunk_table[i] is the
- * offset in the current input file at which the sample containing time i *
- * CHUNK_TIME begins. Always successful.
- */
-static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
- struct afh_info *afi, long unsigned time_total)
-{
- int i, ret, num;
- ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
- long unsigned num_chunks;
-
- old_pos = 0;
- ret = 0;
- num = time_total / chunk_time + 3;
- PARA_DEBUG_LOG("chunk time: %g allocating %d chunk pointers\n",
- chunk_time, num);
- afi->chunk_table = para_malloc((num + 1) * sizeof(size_t));
- afi->chunk_table[0] = 0;
- max_chunk_len = 0;
- for (i = 1; ret <= num; i++) {
- ogg_int64_t diff;
- ret = ov_time_seek(of, i * chunk_time);
- if (ret)
- break;
- pos = ov_raw_tell(of);
- diff = pos - old_pos;
- max_chunk_len = PARA_MAX(max_chunk_len, diff);
- min = (i == 1)? diff : PARA_MIN(min, diff);
- afi->chunk_table[i] = pos;
-// if (i < 11 || !((i - 1) % 1000)|| i > num - 11)
-// PARA_DEBUG_LOG("chunk #%d: %g secs, pos: %zd, "
-// "size: %zd\n", i - 1,
-// i * chunk_time, pos, pos - old_pos);
- old_pos = pos;
- }
- num_chunks = i - 1;
-//fi->chunk_table[i] = pos;
- PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
- num_chunks, chunk_time, max_chunk_len, min);
- return num_chunks;
+ if (packet_num == 1)
+ return 1; /* we also want to have packet #2 */
+ afhi->tags.artist = para_strdup(vorbis_comment_query(&pvd->vc, "artist", 0));
+ afhi->tags.title = para_strdup(vorbis_comment_query(&pvd->vc, "title", 0));
+ afhi->tags.album = para_strdup(vorbis_comment_query(&pvd->vc, "album", 0));
+ afhi->tags.year = para_strdup(vorbis_comment_query(&pvd->vc, "year", 0));
+ afhi->tags.comment = para_strdup(vorbis_comment_query(&pvd->vc, "comment", 0));
+ return 0;