openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-30 21:41:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separate init and writing header in ogg to allow metadata

Browse Source
This commit is contained in:
jpff 2007-08-11 15:10:33 +01:00
parent 26cbea1f9f
commit 8f08074dbb
1 changed files with 318 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

624
src/ogg.c
View File

@ -9,7 +9,7 @@
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY ; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU Lesser General Public License for more details.
**
** You should have received a copy of the GNU Lesser General Public License
@ -31,10 +31,11 @@
#include "sfendian.h"
#include "common.h"
static int ogg_read_header(SF_PRIVATE *psf) ;
static int ogg_write_header(SF_PRIVATE *psf, int calc_length) ;
static int ogg_close(SF_PRIVATE *psf) ;
static int ogg_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
static int ogg_read_header(SF_PRIVATE *psf) ;
static int ogg_write_init(SF_PRIVATE *psf, int calc_length) ;
static int ogg_write_header(SF_PRIVATE *psf, int calc_length) ;
static int ogg_close(SF_PRIVATE *psf) ;
static int ogg_command (SF_PRIVATE *psf, int command, void *data, int datasize) ;
static sf_count_t ogg_seek (SF_PRIVATE *psf, int mode, sf_count_t offset) ;
static sf_count_t ogg_read_s(SF_PRIVATE *psf, short *ptr, sf_count_t len) ;
static sf_count_t ogg_read_i(SF_PRIVATE *psf, int *ptr, sf_count_t len) ;
@ -47,27 +48,28 @@ static sf_count_t ogg_write_d(SF_PRIVATE *psf, const double *ptr, sf_count_t len
typedef struct {
ogg_sync_state oy ; /* sync and verify incoming physical bitstream */
ogg_sync_state oy ; /* sync and verify incoming physical bitstream */
ogg_stream_state os ; /* take physical pages, weld into a logical
stream of packets */
ogg_page og ; /* one Ogg bitstream page. Vorbis packets are inside */
ogg_packet op ; /* one raw packet of data for decode */
int eos ;
stream of packets */
ogg_page og ; /* one Ogg bitstream page. Vorbis packets are inside */
ogg_packet op ; /* one raw packet of data for decode */
int eos ;
} OGG_PRIVATE ;
typedef struct {
vorbis_info vi ; /* struct that stores all the static vorbis bitstream
settings */
vorbis_comment vc ; /* struct that stores all the bitstream user comments */
vorbis_info vi ; /* struct that stores all the static vorbis bitstream
settings */
vorbis_comment vc ; /* struct that stores all the bitstream user comments */
vorbis_dsp_state vd ; /* central working state for the packet->PCM decoder */
vorbis_block vb ; /* local working space for packet->PCM decode */
vorbis_block vb ; /* local working space for packet->PCM decode */
long loc; /* Count current location */
} VORBIS_PRIVATE ;
static int
static int
ogg_read_header(SF_PRIVATE *psf)
{
char *buffer ;
int bytes ;
int bytes ;
int i, nn ;
OGG_PRIVATE *odata = (OGG_PRIVATE*)psf->container_data ;
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
@ -78,7 +80,7 @@ ogg_read_header(SF_PRIVATE *psf)
(which is guaranteed to be small and only contain the Vorbis
stream initial header) We need the first page to get the stream
serialno. */
buffer = ogg_sync_buffer(&odata->oy,4096L) ; /* Expose the buffer */
/* submit a 4k block to libvorbis' Ogg layer */
/* need to patch up guess type stuff */
@ -86,47 +88,47 @@ ogg_read_header(SF_PRIVATE *psf)
buffer[5]=2 ;
bytes=psf_fread(buffer+12,1,4096-12,psf) ;
ogg_sync_wrote(&(odata->oy),bytes+12) ;
/* Get the first page. */
if ((nn=ogg_sync_pageout(&(odata->oy),&(odata->og)))!=1) {
/* have we simply run out of data? If so, we're done. */
if (bytes<4096) return 0 ;
/* error case. Must not be Vorbis data */
psf_log_printf(psf,"Input does not appear to be an Ogg bitstream.\n") ;
return SFE_MALFORMED_FILE ;
}
/* Get the serial number and set up the rest of decode. */
/* serialno first ; use it to set up a logical stream */
ogg_stream_init(&odata->os,ogg_page_serialno(&odata->og)) ;
/* extract the initial header from the first page and verify that the
Ogg bitstream is in fact Vorbis data */
/* I handle the initial header first instead of just having the code
read all three Vorbis headers at once because reading the initial
header is an easy way to identify a Vorbis bitstream and it's
useful to see that functionality seperated out. */
vorbis_info_init(&vdata->vi) ;
vorbis_comment_init(&vdata->vc) ;
if (ogg_stream_pagein(&odata->os,&odata->og)<0) {
if (ogg_stream_pagein(&odata->os,&odata->og)<0) {
/* error; stream version mismatch perhaps */
psf_log_printf(psf,"Error reading first page of Ogg bitstream data\n") ;
return SFE_MALFORMED_FILE ;
}
if (ogg_stream_packetout(&odata->os,&odata->op)!=1) {
if (ogg_stream_packetout(&odata->os,&odata->op)!=1) {
/* no page? must not be vorbis */
psf_log_printf(psf,"Error reading initial header packet.\n") ;
return SFE_MALFORMED_FILE ;
}
if (vorbis_synthesis_headerin(&vdata->vi,&vdata->vc,&odata->op)<0) {
if (vorbis_synthesis_headerin(&vdata->vi,&vdata->vc,&odata->op)<0) {
/* error case; not a vorbis header */
psf_log_printf(psf,"This Ogg bitstream does not contain Vorbis "
"audio data->\n") ;
"audio data->\n") ;
return SFE_MALFORMED_FILE ;
}
psf_log_printf(psf,"JPff: a vorbis file\n") ;
@ -134,232 +136,240 @@ ogg_read_header(SF_PRIVATE *psf)
{
int n;
for (n=0; n<vdata->vc.comments; n++) {
char *comment = vdata->vc.user_comments[n];
printf("%d: %s\n", n, comment);
if (strncmp(comment, "Title=", 6)==0)
psf_store_string(psf, SF_STR_TITLE,comment+6);
else if (strncmp(comment, "Copyright=", 10)==0)
psf_store_string(psf, SF_STR_COPYRIGHT, comment+10);
else if (strncmp(comment, "Software=", 9)==0)
psf_store_string(psf, SF_STR_SOFTWARE, comment+9);
else if (strncmp(comment, "Artist=", 7)==0)
psf_store_string(psf, SF_STR_ARTIST, comment+7);
else if (strncmp(comment, "Comment=", 8)==0)
psf_store_string(psf, SF_STR_COMMENT, comment+8);
else if (strncmp(comment, "Date=", 5)==0)
psf_store_string(psf, SF_STR_DATE, comment+5);
char *comment = vdata->vc.user_comments[n];
printf("%d: %s\n", n, comment);
if (strncmp(comment, "Title=", 6)==0)
psf_store_string(psf, SF_STR_TITLE,comment+6);
else if (strncmp(comment, "Copyright=", 10)==0)
psf_store_string(psf, SF_STR_COPYRIGHT, comment+10);
else if (strncmp(comment, "Software=", 9)==0)
psf_store_string(psf, SF_STR_SOFTWARE, comment+9);
else if (strncmp(comment, "Artist=", 7)==0)
psf_store_string(psf, SF_STR_ARTIST, comment+7);
else if (strncmp(comment, "Comment=", 8)==0)
psf_store_string(psf, SF_STR_COMMENT, comment+8);
else if (strncmp(comment, "Date=", 5)==0)
psf_store_string(psf, SF_STR_DATE, comment+5);
}
}
/* At this point, we're sure we're Vorbis. We've set up the logical
(Ogg) bitstream decoder. Get the comment and codebook headers and
/* At this point, we're sure we're Vorbis. We've set up the logical
(Ogg) bitstream decoder. Get the comment and codebook headers and
set up the Vorbis decoder */
/* The next two packets in order are the comment and codebook headers.
They're likely large and may span multiple pages. Thus we reead
and submit data until we get our two pacakets, watching that no
pages are missing. If a page is missing, error out; losing a
header page is the only place where missing data is fatal. */
i=0 ; /* Count of number of packets read */
i=0 ; /* Count of number of packets read */
while (i<2) {
int result = ogg_sync_pageout(&odata->oy,&odata->og) ;
if (result==0) {
/* Need more data */
buffer = ogg_sync_buffer(&odata->oy,4096) ;
bytes = psf_fread(buffer,1,4096,psf) ;
if (bytes==0 && i<2) {
psf_log_printf(psf,"End of file before finding all Vorbis headers!\n") ;
return SFE_MALFORMED_FILE ;
}
nn=ogg_sync_wrote(&odata->oy,bytes) ;
/* Need more data */
buffer = ogg_sync_buffer(&odata->oy,4096) ;
bytes = psf_fread(buffer,1,4096,psf) ;
if (bytes==0 && i<2) {
psf_log_printf(psf,"End of file before finding all Vorbis headers!\n") ;
return SFE_MALFORMED_FILE ;
}
nn=ogg_sync_wrote(&odata->oy,bytes) ;
}
/* Don't complain about missing or corrupt data yet. We'll
catch it at the packet output phase */
catch it at the packet output phase */
else if (result==1) {
/* we can ignore any errors here
as they'll also become apparent
at packetout */
nn=ogg_stream_pagein(&odata->os,&odata->og) ;
while (i<2) {
result=ogg_stream_packetout(&odata->os,&odata->op) ;
if (result==0) break ;
if (result<0) {
/* Uh oh; data at some point was corrupted or missing!
We can't tolerate that in a header. Die. */
psf_log_printf(psf,"Corrupt secondary header. Exiting.\n") ;
return SFE_MALFORMED_FILE ;
}
vorbis_synthesis_headerin(&vdata->vi,&vdata->vc,&odata->op) ;
i++ ;
}
/* we can ignore any errors here
as they'll also become apparent
at packetout */
nn=ogg_stream_pagein(&odata->os,&odata->og) ;
while (i<2) {
result=ogg_stream_packetout(&odata->os,&odata->op) ;
if (result==0) break ;
if (result<0) {
/* Uh oh; data at some point was corrupted or missing!
We can't tolerate that in a header. Die. */
psf_log_printf(psf,"Corrupt secondary header. Exiting.\n") ;
return SFE_MALFORMED_FILE ;
}
vorbis_synthesis_headerin(&vdata->vi,&vdata->vc,&odata->op) ;
i++ ;
}
}
else {
/* fprintf(stderr, "JPff:ignoring result=%d\n", result) ; */
/* fprintf(stderr, "JPff:ignoring result=%d\n", result) ; */
}
}
/* Throw the comments plus a few lines about the bitstream we're
decoding */
{ char **ptr=vdata->vc.user_comments ;
while(*ptr){
psf_log_printf(psf,"%s\n",*ptr) ;
++ptr ;
}
psf_log_printf(psf,"\nBitstream is %d channel, %D Hz\n",
vdata->vi.channels,vdata->vi.rate);
psf_log_printf(psf,"Encoded by: %s\n",vdata->vc.vendor);
while(*ptr){
psf_log_printf(psf,"%s\n",*ptr) ;
++ptr ;
}
psf_log_printf(psf,"\nBitstream is %d channel, %D Hz\n",
vdata->vi.channels,vdata->vi.rate);
psf_log_printf(psf,"Encoded by: %s\n",vdata->vc.vendor);
}
psf->sf.samplerate = (int)vdata->vi.rate;
psf->sf.channels = vdata->vi.channels;
psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS | SF_FORMAT_FLOAT;
psf->sf.channels = vdata->vi.channels;
psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS | SF_FORMAT_FLOAT;
/* OK, got and parsed all three headers. Initialize the Vorbis
packet->PCM decoder. */
vorbis_synthesis_init(&vdata->vd,&vdata->vi) ; /* central decode state */
vorbis_block_init(&vdata->vd,&vdata->vb) ; /* Local state for most of the
decode so multiple block
decodes can proceed in parallel.
We could init multiple
vorbis_block structures for
vd here */
vorbis_block_init(&vdata->vd,&vdata->vb) ; /* Local state for most of the
decode so multiple block
decodes can proceed in parallel.
We could init multiple
vorbis_block structures for
vd here */
vdata->loc = 0;
return 0 ;
}
static int
ogg_write_init(SF_PRIVATE *psf, int UNUSED (calc_length))
{
int ret ;
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
vorbis_info_init(&vdata->vi) ;
/* **** The style of encoding should be selectable here */
ret = vorbis_encode_init_vbr (&vdata->vi,psf->sf.channels,
psf->sf.samplerate,0.4f) ; /* VBR quality mode */
#if 0
ret = vorbis_encode_init (&vdata->vi,psf->sf.channels,
psf->sf.samplerate,-1,128000,-1) ; /* average bitrate mode */
ret = ( vorbis_encode_setup_managed (&vdata->vi,psf->sf.channels,
psf->sf.samplerate,-1,128000,-1) ||
vorbis_encode_ctl (&vdata->vi,OV_ECTL_RATEMANAGE_AVG,NULL) ||
vorbis_encode_setup_init (&vdata->vi)) ;
#endif
if (ret) return SFE_BAD_OPEN_FORMAT ;
vdata->loc = 0;
return 0 ;
}
static int
ogg_write_header(SF_PRIVATE *psf, int UNUSED (calc_length))
{
OGG_PRIVATE *odata = (OGG_PRIVATE*)psf->container_data ;
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
int ret ;
vorbis_info_init(&vdata->vi) ;
/* **** The style of encoding should be selectable here */
ret = vorbis_encode_init_vbr (&vdata->vi,psf->sf.channels,
psf->sf.samplerate,0.4f) ; /* VBR quality mode */
#if 0
ret = vorbis_encode_init (&vdata->vi,psf->sf.channels,
psf->sf.samplerate,-1,128000,-1) ; /* average bitrate mode */
ret = ( vorbis_encode_setup_managed (&vdata->vi,psf->sf.channels,
psf->sf.samplerate,-1,128000,-1) ||
vorbis_encode_ctl (&vdata->vi,OV_ECTL_RATEMANAGE_AVG,NULL) ||
vorbis_encode_setup_init (&vdata->vi)) ;
#endif
if (ret) return SFE_BAD_OPEN_FORMAT ;
/* add a comment */
OGG_PRIVATE *odata = (OGG_PRIVATE*)psf->container_data ;
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
/* add a comment */
vorbis_comment_init (&vdata->vc) ;
{
static char encoder [] = "ENCODER" ;
static char libname [] = "libsndfile" ;
static char *metatypes[] = {NULL, "Title", "Copyright", "Software",
"Artist", "Comment", "Date", "Album",
"Licence"};
int k ;
printf("Metadata (%d)\n", __LINE__);
vorbis_comment_add_tag (&vdata->vc,encoder,libname) ;
for (k = 0 ; k < SF_MAX_STRINGS ; k++)
{ if (psf->strings [k].type == 0)
break ;
/* if (psf->strings [k].flags != location) */
/* continue ; */
static char encoder [] = "ENCODER" ;
static char libname [] = "libsndfile" ;
static char *metatypes[] = {NULL, "Title", "Copyright", "Software",
"Artist", "Comment", "Date", "Album",
"Licence"};
int k ;
printf("Metadata (%d)\n", __LINE__);
vorbis_comment_add_tag (&vdata->vc,encoder,libname) ;
for (k = 0 ; k < SF_MAX_STRINGS ; k++)
{ if (psf->strings [k].type == 0)
break ;
/* if (psf->strings [k].flags != location) */
/* continue ; */
vorbis_comment_add_tag (&vdata->vc, metatypes[psf->strings [k].type], psf->strings [k].str) ;
}
}
/* set up the analysis state and auxiliary encoding storage */
vorbis_analysis_init (&vdata->vd,&vdata->vi) ;
vorbis_block_init (&vdata->vd,&vdata->vb) ;
/* set up our packet->stream encoder */
/* pick a random serial number; that way we can more likely build
chained streams just by concatenation */
srand (time(NULL)) ;
ogg_stream_init (&odata->os,rand()) ;
vorbis_comment_add_tag (&vdata->vc, metatypes[psf->strings [k].type], psf->strings [k].str) ;
}
}
/* set up the analysis state and auxiliary encoding storage */
vorbis_analysis_init (&vdata->vd,&vdata->vi) ;
vorbis_block_init (&vdata->vd,&vdata->vb) ;
/* Vorbis streams begin with three headers; the initial header (with
most of the codec setup parameters) which is mandated by the Ogg
bitstream spec. The second header holds any comment fields. The
third header holds the bitstream codebook. We merely need to
make the headers, then pass them to libvorbis one at a time;
libvorbis handles the additional Ogg bitstream constraints */
{ ogg_packet header;
ogg_packet header_comm;
ogg_packet header_code;
/* set up our packet->stream encoder */
/* pick a random serial number; that way we can more likely build
chained streams just by concatenation */
srand (time(NULL)) ;
ogg_stream_init (&odata->os,rand()) ;
vorbis_analysis_headerout(&vdata->vd,&vdata->vc,&header,
&header_comm,&header_code);
ogg_stream_packetin(&odata->os,&header); /* automatically placed in its own
page */
ogg_stream_packetin(&odata->os,&header_comm);
ogg_stream_packetin(&odata->os,&header_code);
/* printf("Vorbis packets (%d)\n", __LINE__); */
/* Vorbis streams begin with three headers; the initial header (with
most of the codec setup parameters) which is mandated by the Ogg
bitstream spec. The second header holds any comment fields. The
third header holds the bitstream codebook. We merely need to
make the headers, then pass them to libvorbis one at a time;
libvorbis handles the additional Ogg bitstream constraints */
/* This ensures the actual
* audio data will start on a new page, as per spec
*/
while (1) {
int result = ogg_stream_flush(&odata->os,&odata->og);
if (result==0) break ;
psf_fwrite(odata->og.header,1,odata->og.header_len,psf) ;
psf_fwrite(odata->og.body,1,odata->og.body_len,psf) ;
}
}
/* printf("header written (%d)\n", __LINE__); */
return 0 ;
{ ogg_packet header;
ogg_packet header_comm;
ogg_packet header_code;
vorbis_analysis_headerout(&vdata->vd,&vdata->vc,&header,
&header_comm,&header_code);
ogg_stream_packetin(&odata->os,&header); /* automatically placed in its own
page */
ogg_stream_packetin(&odata->os,&header_comm);
ogg_stream_packetin(&odata->os,&header_code);
/* printf("Vorbis packets (%d)\n", __LINE__); */
/* This ensures the actual
* audio data will start on a new page, as per spec
*/
while (1) {
int result = ogg_stream_flush(&odata->os,&odata->og);
if (result==0) break ;
psf_fwrite(odata->og.header,1,odata->og.header_len,psf) ;
psf_fwrite(odata->og.body,1,odata->og.body_len,psf) ;
}
}
/* printf("header written (%d)\n", __LINE__); */
return 0 ;
}
static int
static int
ogg_close(SF_PRIVATE *psf)
{
OGG_PRIVATE *odata = (OGG_PRIVATE*)psf->container_data ;
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
OGG_PRIVATE *odata = (OGG_PRIVATE*)psf->container_data ;
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
/* clean up this logical bitstream; before exit we shuld see if we're
followed by another [chained] */
/* clean up this logical bitstream; before exit we shuld see if we're
followed by another [chained] */
if (psf->mode == SFM_WRITE) {
vorbis_analysis_wrote(&vdata->vd,0) ;
while (vorbis_analysis_blockout(&vdata->vd,&vdata->vb)==1) {
if (psf->mode == SFM_WRITE) {
vorbis_analysis_wrote(&vdata->vd,0) ;
while (vorbis_analysis_blockout(&vdata->vd,&vdata->vb)==1) {
/* analysis, assume we want to use bitrate management */
vorbis_analysis(&vdata->vb,NULL);
vorbis_bitrate_addblock(&vdata->vb);
/* analysis, assume we want to use bitrate management */
vorbis_analysis(&vdata->vb,NULL);
vorbis_bitrate_addblock(&vdata->vb);
while (vorbis_bitrate_flushpacket(&vdata->vd,&odata->op)) {
/* weld the packet into the bitstream */
ogg_stream_packetin(&odata->os,&odata->op);
/* write out pages (if any) */
while (!odata->eos) {
int result=ogg_stream_pageout(&odata->os,&odata->og);
if(result==0)break;
psf_fwrite(odata->og.header,1,odata->og.header_len,psf);
psf_fwrite(odata->og.body,1,odata->og.body_len,psf);
/* this could be set above, but for illustrative purposes, I do
it here (to show that vorbis does know where the stream ends) */
if (ogg_page_eos(&odata->og)) odata->eos=1;
}
}
}
}
while (vorbis_bitrate_flushpacket(&vdata->vd,&odata->op)) {
ogg_stream_clear(&odata->os) ;
/* ogg_page and ogg_packet structs always point to storage in
libvorbis. They are never freed or manipulated directly */
vorbis_block_clear(&vdata->vb) ;
vorbis_dsp_clear(&vdata->vd) ;
vorbis_comment_clear(&vdata->vc) ;
vorbis_info_clear(&vdata->vi) ; /* must be called last */
/* should look here to reopen if chained */
/* weld the packet into the bitstream */
ogg_stream_packetin(&odata->os,&odata->op);
/* OK, clean up the framer */
ogg_sync_clear(&odata->oy) ;
return 0 ;
/* write out pages (if any) */
while (!odata->eos) {
int result=ogg_stream_pageout(&odata->os,&odata->og);
if(result==0)break;
psf_fwrite(odata->og.header,1,odata->og.header_len,psf);
psf_fwrite(odata->og.body,1,odata->og.body_len,psf);
/* this could be set above, but for illustrative purposes, I do
it here (to show that vorbis does know where the stream ends) */
if (ogg_page_eos(&odata->og)) odata->eos=1;
}
}
}
}
ogg_stream_clear(&odata->os) ;
/* ogg_page and ogg_packet structs always point to storage in
libvorbis. They are never freed or manipulated directly */
vorbis_block_clear(&vdata->vb) ;
vorbis_dsp_clear(&vdata->vd) ;
vorbis_comment_clear(&vdata->vc) ;
vorbis_info_clear(&vdata->vi) ; /* must be called last */
/* should look here to reopen if chained */
/* OK, clean up the framer */
ogg_sync_clear(&odata->oy) ;
return 0 ;
}
int
@ -367,49 +377,49 @@ ogg_open (SF_PRIVATE *psf)
{ int error = 0 ;
int subformat ;
OGG_PRIVATE* odata = calloc (1, sizeof(OGG_PRIVATE)) ;
VORBIS_PRIVATE* vdata = calloc (1, sizeof(VORBIS_PRIVATE)) ;
OGG_PRIVATE* odata = calloc (1, sizeof(OGG_PRIVATE)) ;
VORBIS_PRIVATE* vdata = calloc (1, sizeof(VORBIS_PRIVATE)) ;
psf->container_data = odata ;
psf->codec_data = vdata ;
if (psf->mode == SFM_RDWR)
return SFE_BAD_MODE_RW ;
if (psf->mode == SFM_READ)
{ if ((error = ogg_read_header (psf)))
return error ;
psf->container_data = odata ;
psf->codec_data = vdata ;
if (psf->mode == SFM_RDWR)
return SFE_BAD_MODE_RW ;
if (psf->mode == SFM_READ)
{ if ((error = ogg_read_header (psf)))
return error ;
psf->read_short = ogg_read_s ;
psf->read_int = ogg_read_i ;
psf->read_float = ogg_read_f ;
psf->read_double = ogg_read_d ;
} ;
if ((psf->sf.format & SF_FORMAT_TYPEMASK) != SF_FORMAT_OGG)
{ if ((error = ogg_write_header (psf, 0)))
psf->write_header = ogg_write_header ;
} ;
subformat = psf->sf.format & SF_FORMAT_SUBMASK ;
psf->container_close = ogg_close ;
if (psf->mode == SFM_WRITE) {
if ((error = ogg_write_header (psf, 0)))
return error ;
} ;
if ((psf->sf.format & SF_FORMAT_TYPEMASK) != SF_FORMAT_OGG)
{ if ((error = ogg_write_header (psf, 0)))
psf->write_header = ogg_write_header ;
} ;
subformat = psf->sf.format & SF_FORMAT_SUBMASK ;
psf->container_close = ogg_close ;
if (psf->mode == SFM_WRITE) {
if ((error = ogg_write_init (psf, 0)))
return error ;
psf->write_header = ogg_write_header ;
psf->write_short = ogg_write_s ;
psf->write_int = ogg_write_i ;
psf->write_float = ogg_write_f ;
psf->write_double = ogg_write_d ;
}
}
psf->bytewidth = 1 ;
psf->blockwidth = psf->bytewidth * psf->sf.channels ;
psf->blockwidth = psf->bytewidth * psf->sf.channels ;
psf->seek = ogg_seek ;
psf->command = ogg_command ;
psf->command = ogg_command ;
switch (subformat)
psf_log_printf(psf, "ogg_open finished\n") ;
psf_log_printf(psf, "ogg_open finished\n") ;
/* FIXME, FIXME, FIXME : Hack these here for now and correct later. */
psf->sf.frames = 0x7FFFFFF ; /* Unknown really */
/* psf->sf.channels = vdata->vi.channels ; */
/* psf->sf.channels = vdata->vi.channels ; */
psf->sf.format = SF_FORMAT_OGG | SF_FORMAT_VORBIS ;
psf->sf.sections = 1 ;
@ -420,14 +430,14 @@ ogg_open (SF_PRIVATE *psf)
return error ;
} /* ogg_open */
static int
static int
ogg_command (SF_PRIVATE *UNUSED (psf), int command,
void *UNUSED (data), int UNUSED (datasize))
void *UNUSED (data), int UNUSED (datasize))
{
switch (command)
{ case SFC_SET_DITHER_ON_WRITE:
case SFC_SET_DITHER_ON_READ:
/* These should be done */
/* These should be done */
default :
break ;
} ;
@ -447,7 +457,7 @@ ogg_rshort(int samples, void *vptr, int off,int channels, float **pcm)
int i = 0, j, n;
for (j=0; j<samples; j++) {
for (n=0; n<channels; n++) {
ptr[i++] = (short)(pcm[n][j]*32767.0f) ;
ptr[i++] = (short)(pcm[n][j]*32767.0f) ;
}
}
return i;
@ -462,8 +472,8 @@ ogg_rint(int samples, void *vptr, int off, int channels, float **pcm)
for (j=0; j<samples; j++) {
for (n=0; n<channels; n++) {
ptr[i++] = (int)(pcm[n][j]*2147483647.0f) ;
}
}
}
}
return i;
}
@ -474,7 +484,7 @@ ogg_rfloat(int samples, void *vptr, int off, int channels, float **pcm)
int i = 0, j, n;
for (j=0; j<samples; j++) {
for (n=0; n<channels; n++) {
ptr[i++] = pcm[n][j] ;
ptr[i++] = pcm[n][j] ;
}
}
return i;
@ -487,7 +497,7 @@ ogg_rdouble(int samples, void *vptr, int off, int channels, float **pcm)
int i = 0, j, n;
for (j=0; j<samples; j++) {
for (n=0; n<channels; n++) {
ptr[i++] = (double)(pcm[n][j]) ;
ptr[i++] = (double)(pcm[n][j]) ;
}
}
return i;
@ -496,7 +506,7 @@ ogg_rdouble(int samples, void *vptr, int off, int channels, float **pcm)
static sf_count_t
ogg_read_sample(SF_PRIVATE *psf, void *ptr, sf_count_t lens,
int(transfn)(int, void *, int, int, float **))
int(transfn)(int, void *, int, int, float **))
{
int i = 0 ;
float **pcm;
@ -507,74 +517,76 @@ ogg_read_sample(SF_PRIVATE *psf, void *ptr, sf_count_t lens,
fprintf(stdout, "Reading %d samples (%d)\n", (int)lens, __LINE__);
while ((samples=vorbis_synthesis_pcmout(&vdata->vd,&pcm))>0) {
if (samples>len) samples = len ;
/* printf("Vread %d frames (%d)\n", samples, __LINE__); */
/* printf("Vread %d frames (%d)\n", samples, __LINE__); */
i += transfn(samples, ptr, i, psf->sf.channels, pcm);
len -= samples ;
/* tell libvorbis how many samples we actually consumed */
vorbis_synthesis_read(&vdata->vd,samples) ;
/* fprintf(stdout, " %d needed (%d)\n", len, __LINE__); */
vdata->loc += samples ;
/* fprintf(stdout, " %d needed (%d)\n", len, __LINE__); */
if (len==0) return i; /* Is this necessary */
}
goto start0 ; /* Jump into the nasty nest */
}
goto start0 ; /* Jump into the nasty nest */
while (len>0 && !odata->eos) {
while (len>0 && !odata->eos) {
int result = ogg_sync_pageout(&odata->oy,&odata->og) ;
/* fprintf(stdout, "ogg_sync_pageout = %d (%d)\n", result, __LINE__); */
if (result==0) break ; /* need more data */
if (result<0) { /* missing or corrupt data at this page position */
int result = ogg_sync_pageout(&odata->oy,&odata->og) ;
/* fprintf(stdout, "ogg_sync_pageout = %d (%d)\n", result, __LINE__); */
if (result==0) break ; /* need more data */
if (result<0) { /* missing or corrupt data at this page position */
psf_log_printf(psf,"Corrupt or missing data in bitstream; "
"continuing...\n") ;
"continuing...\n") ;
}
else {
else {
ogg_stream_pagein(&odata->os,&odata->og); /* can safely ignore errors at
this point */
/* fprintf(stdout, "ogg_stream_pagein (%d)\n", __LINE__) ; */
start0:
while (1) {
this point */
/* fprintf(stdout, "ogg_stream_pagein (%d)\n", __LINE__) ; */
start0:
while (1) {
result = ogg_stream_packetout(&odata->os,&odata->op) ;
fprintf(stdout, "ogg_stream_packetout = %d (%d)\n", result, __LINE__);
fprintf(stdout, "ogg_stream_packetout = %d (%d)\n", result, __LINE__);
if (result==0) break ; /* need more data */
if (result<0) { /* missing or corrupt data at this page position */
/* no reason to complain; already complained above */
}
else {
else {
/* we have a packet. Decode it */
/* fprintf(stdout, "Calling vorbis_synthesis (%d)\n", __LINE__); */
/* fprintf(stdout, "Calling vorbis_synthesis (%d)\n", __LINE__); */
if (vorbis_synthesis(&vdata->vb,&odata->op)==0) {/* test for success! */
vorbis_synthesis_blockin(&vdata->vd,&vdata->vb) ;
/* fprintf(stdout, "Calling vorbis_synthesis_blockin (%d)\n", __LINE__); */
}
/* fprintf(stdout,"(%d)\n", __LINE__); */
/* fprintf(stdout, "Calling vorbis_synthesis_blockin (%d)\n", __LINE__); */
}
/* fprintf(stdout,"(%d)\n", __LINE__); */
/*
**pcm is a multichannel float vector. In stereo, for
example, pcm[0] is left, and pcm[1] is right. samples is
the size of each channel. Convert the float values
the size of each channel. Convert the float values
(-1.<=range<=1.) to whatever PCM format and write it out */
while ((samples=vorbis_synthesis_pcmout(&vdata->vd,&pcm))>0) {
if (samples>len) samples = len ;
/* printf("Vread %d frames (%d)\n", samples, __LINE__); */
i += transfn(samples, ptr, i, psf->sf.channels, pcm);
len -= samples ;
/* tell libvorbis how many samples we actually consumed */
vorbis_synthesis_read(&vdata->vd,samples) ;
/* fprintf(stdout, " %d needed (%d)\n", len, __LINE__); */
if (len==0) return i; /* Is this necessary */
}
if (samples>len) samples = len ;
/* printf("Vread %d frames (%d)\n", samples, __LINE__); */
i += transfn(samples, ptr, i, psf->sf.channels, pcm);
len -= samples ;
/* tell libvorbis how many samples we actually consumed */
vorbis_synthesis_read(&vdata->vd,samples) ;
vdata->loc += samples;
/* fprintf(stdout, " %d needed (%d)\n", len, __LINE__); */
if (len==0) return i; /* Is this necessary */
}
}
}
if (ogg_page_eos(&odata->og)) odata->eos=1;
/* fprintf(stdout, "odata->eos=%d (%d)\n", odata->eos, __LINE__); */
/* fprintf(stdout, "odata->eos=%d (%d)\n", odata->eos, __LINE__); */
}
}
if (!odata->eos) {
char *buffer ;
int bytes ;
char *buffer ;
int bytes ;
buffer = ogg_sync_buffer(&odata->oy,4096) ;
bytes = psf_fread(buffer,1,4096,psf) ;
ogg_sync_wrote(&odata->oy,bytes) ;
/* fprintf(stdout, "Reading raw %d bytes (%d)\n", bytes, __LINE__) ; */
/* fprintf(stdout, "Reading raw %d bytes (%d)\n", bytes, __LINE__) ; */
if (bytes==0) odata->eos=1;
}
}
@ -613,12 +625,12 @@ ogg_write_s(SF_PRIVATE *psf, const short *ptr, sf_count_t lens)
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
int len = lens / psf->sf.channels;
float **buffer=vorbis_analysis_buffer(&vdata->vd,len) ;
for (i=0; i<len; i++)
for (i=0; i<len; i++)
for (m=0; m<psf->sf.channels; m++)
buffer[m][i] = (float)(ptr[j++])/32767.0f ;
buffer[m][i] = (float)(ptr[j++])/32767.0f ;
vorbis_analysis_wrote(&vdata->vd,len) ;
/* vorbis does some data preanalysis, then divvies up blocks for
more involved (potentially parallel) processing. Get a single
more involved (potentially parallel) processing. Get a single
block for encoding now */
while (vorbis_analysis_blockout(&vdata->vd,&vdata->vb)==1) {
/* analysis, assume we want to use bitrate management */
@ -626,22 +638,22 @@ ogg_write_s(SF_PRIVATE *psf, const short *ptr, sf_count_t lens)
vorbis_bitrate_addblock(&vdata->vb);
while(vorbis_bitrate_flushpacket(&vdata->vd,&odata->op)) {
/* weld the packet into the bitstream */
ogg_stream_packetin(&odata->os,&odata->op);
/* write out pages (if any) */
while(!odata->eos) {
int result=ogg_stream_pageout(&odata->os,&odata->og);
if(result==0)break;
psf_fwrite(odata->og.header,1,odata->og.header_len,psf);
psf_fwrite(odata->og.body,1,odata->og.body_len,psf);
/* this could be set above, but for illustrative purposes, I do
it here (to show that vorbis does know where the stream ends) */
if(ogg_page_eos(&odata->og)) odata->eos=1 ;
}
}
}
}
return lens ;
@ -655,12 +667,12 @@ ogg_write_i(SF_PRIVATE *psf, const int *ptr, sf_count_t lens)
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
int len = lens / psf->sf.channels;
float **buffer=vorbis_analysis_buffer(&vdata->vd,len) ;
for (i=0; i<len; i++)
for (i=0; i<len; i++)
for (m=0; m<psf->sf.channels; m++)
buffer[m][i] = (float)(ptr[j++])/2147483647.0f ;
buffer[m][i] = (float)(ptr[j++])/2147483647.0f ;
vorbis_analysis_wrote(&vdata->vd,len) ;
/* vorbis does some data preanalysis, then divvies up blocks for
more involved (potentially parallel) processing. Get a single
more involved (potentially parallel) processing. Get a single
block for encoding now */
while (vorbis_analysis_blockout(&vdata->vd,&vdata->vb)==1) {
/* analysis, assume we want to use bitrate management */
@ -668,22 +680,22 @@ ogg_write_i(SF_PRIVATE *psf, const int *ptr, sf_count_t lens)
vorbis_bitrate_addblock(&vdata->vb);
while(vorbis_bitrate_flushpacket(&vdata->vd,&odata->op)) {
/* weld the packet into the bitstream */
ogg_stream_packetin(&odata->os,&odata->op);
/* write out pages (if any) */
while(!odata->eos) {
int result=ogg_stream_pageout(&odata->os,&odata->og);
if(result==0)break;
psf_fwrite(odata->og.header,1,odata->og.header_len,psf);
psf_fwrite(odata->og.body,1,odata->og.body_len,psf);
/* this could be set above, but for illustrative purposes, I do
it here (to show that vorbis does know where the stream ends) */
if(ogg_page_eos(&odata->og)) odata->eos=1 ;
}
}
}
}
return lens;
@ -698,12 +710,12 @@ ogg_write_f(SF_PRIVATE *psf, const float *ptr, sf_count_t lens)
int len = lens / psf->sf.channels;
float **buffer=vorbis_analysis_buffer(&vdata->vd,len) ;
printf("Got buffer (%d)\n", __LINE__);
for (i=0; i<len; i++)
for (i=0; i<len; i++)
for (m=0; m<psf->sf.channels; m++)
buffer[m][i] = ptr[j++] ;
buffer[m][i] = ptr[j++] ;
vorbis_analysis_wrote(&vdata->vd,len) ;
/* vorbis does some data preanalysis, then divvies up blocks for
more involved (potentially parallel) processing. Get a single
more involved (potentially parallel) processing. Get a single
block for encoding now */
while (vorbis_analysis_blockout(&vdata->vd,&vdata->vb)==1) {
/* analysis, assume we want to use bitrate management */
@ -711,22 +723,22 @@ ogg_write_f(SF_PRIVATE *psf, const float *ptr, sf_count_t lens)
vorbis_bitrate_addblock(&vdata->vb);
while(vorbis_bitrate_flushpacket(&vdata->vd,&odata->op)) {
/* weld the packet into the bitstream */
ogg_stream_packetin(&odata->os,&odata->op);
/* write out pages (if any) */
while(!odata->eos) {
int result=ogg_stream_pageout(&odata->os,&odata->og);
if(result==0)break;
psf_fwrite(odata->og.header,1,odata->og.header_len,psf);
psf_fwrite(odata->og.body,1,odata->og.body_len,psf);
/* this could be set above, but for illustrative purposes, I do
it here (to show that vorbis does know where the stream ends) */
if(ogg_page_eos(&odata->og)) odata->eos=1 ;
}
}
}
}
return lens;
@ -740,12 +752,12 @@ ogg_write_d(SF_PRIVATE *psf, const double *ptr, sf_count_t lens)
VORBIS_PRIVATE *vdata = (VORBIS_PRIVATE*)psf->codec_data ;
int len = lens / psf->sf.channels;
float **buffer=vorbis_analysis_buffer(&vdata->vd,len) ;
for (i=0; i<len; i++)
for (i=0; i<len; i++)
for (m=0; m<psf->sf.channels; m++)
buffer[m][i] = (float)ptr[j++] ;
buffer[m][i] = (float)ptr[j++] ;
vorbis_analysis_wrote(&vdata->vd,len) ;
/* vorbis does some data preanalysis, then divvies up blocks for
more involved (potentially parallel) processing. Get a single
more involved (potentially parallel) processing. Get a single
block for encoding now */
while (vorbis_analysis_blockout(&vdata->vd,&vdata->vb)==1) {
/* analysis, assume we want to use bitrate management */
@ -753,22 +765,22 @@ ogg_write_d(SF_PRIVATE *psf, const double *ptr, sf_count_t lens)
vorbis_bitrate_addblock(&vdata->vb);
while(vorbis_bitrate_flushpacket(&vdata->vd,&odata->op)) {
/* weld the packet into the bitstream */
ogg_stream_packetin(&odata->os,&odata->op);
/* write out pages (if any) */
while(!odata->eos) {
int result=ogg_stream_pageout(&odata->os,&odata->og);
if(result==0)break;
psf_fwrite(odata->og.header,1,odata->og.header_len,psf);
psf_fwrite(odata->og.body,1,odata->og.body_len,psf);
/* this could be set above, but for illustrative purposes, I do
it here (to show that vorbis does know where the stream ends) */
if(ogg_page_eos(&odata->og)) odata->eos=1 ;
}
}
}
}
return lens;