*/
#include <stdio.h>
+#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
+#include <limits.h>
+#include <unistd.h>
#include <ogg/ogg.h>
#include <vorbis/codec.h>
+#include <assert.h>
#include "vcedit.h"
#define CHUNKSIZE 4096
+static int vcedit_open (vcedit_state *state);
+
struct vcedit_state_St {
int refcount;
vorbis_comment *vc;
vorbis_info *vi;
- vcedit_read_func read;
- vcedit_write_func write;
+ char filename[PATH_MAX];
- void *in;
+ FILE *in;
long serial;
unsigned char *mainbuf;
unsigned char *bookbuf;
int eosin;
};
+static void
+vcedit_state_free (vcedit_state *state)
+{
+ free (state->oy);
+ free (state->os);
+ free (state->vc);
+ free (state->vi);
+ free (state->mainbuf);
+ free (state->bookbuf);
+ free (state->vendor);
+
+ if (state->in) {
+ fclose (state->in);
+ state->in = NULL;
+ }
+
+ free (state);
+}
+
+static bool
+vcedit_state_init (vcedit_state *state)
+{
+ state->refcount = 1;
+
+ state->oy = malloc (sizeof (ogg_sync_state));
+ if (!state->oy)
+ return false;
+
+ state->os = malloc (sizeof (ogg_stream_state));
+ if (!state->os)
+ return false;
+
+ state->vc = malloc (sizeof (vorbis_comment));
+ if (!state->vc)
+ return false;
+
+ state->vi = malloc (sizeof (vorbis_info));
+ if (!state->vi)
+ return false;
+
+ return true;
+}
+
vcedit_state *
-vcedit_state_new (void)
+vcedit_state_new (const char *filename)
{
vcedit_state *state;
memset (state, 0, sizeof (vcedit_state));
- state->refcount = 1;
+ if (!vcedit_state_init (state)) {
+ vcedit_state_free (state);
+ return NULL;
+ }
+
+ snprintf (state->filename, sizeof (state->filename),
+ "%s", filename);
+
+ state->in = fopen (state->filename, "rb");
+
+ if (vcedit_open (state) < 0) {
+ vcedit_state_free (state);
+ return NULL;
+ }
return state;
}
static void
vcedit_clear_internals (vcedit_state *state)
{
- const char *tmp;
-
- if (state->vc) {
- vorbis_comment_clear (state->vc);
- free (state->vc);
- }
-
- if (state->os) {
- ogg_stream_clear (state->os);
- free (state->os);
- }
+ ogg_stream_clear (state->os);
+ ogg_sync_clear (state->oy);
- if (state->oy) {
- ogg_sync_clear (state->oy);
- free (state->oy);
- }
+ vorbis_info_clear (state->vi);
+ vorbis_comment_clear (state->vc);
free (state->vendor);
+ state->vendor = NULL;
+
free (state->mainbuf);
- free (state->bookbuf);
+ state->mainbuf = NULL;
+ state->mainlen = 0;
- if (state->vi) {
- vorbis_info_clear (state->vi);
- free (state->vi);
- }
+ free (state->bookbuf);
+ state->bookbuf = NULL;
+ state->booklen = 0;
- tmp = state->lasterror;
- memset (state, 0, sizeof (vcedit_state));
- state->lasterror = tmp;
+ state->serial = 0;
}
void
void
vcedit_state_unref (vcedit_state *state)
{
- state->refcount--;
+ if (--state->refcount)
+ return;
- if (!state->refcount) {
- vcedit_clear_internals (state);
- free (state);
- }
+ vcedit_clear_internals (state);
+ vcedit_state_free (state);
}
/* Next two functions pulled straight from libvorbis, apart from one change
static int
_commentheader_out (vorbis_comment *vc, char *vendor, ogg_packet *op)
{
+ int i;
+
oggpack_buffer opb;
oggpack_writeinit (&opb);
/* comments */
oggpack_write (&opb, vc->comments, 32);
- if (vc->comments) {
- int i;
-
- for (i = 0; i < vc->comments; i++) {
- if (vc->user_comments[i]) {
- oggpack_write (&opb, vc->comment_lengths[i], 32);
- _v_writestring (&opb, vc->user_comments[i],
- vc->comment_lengths[i]);
- } else
- oggpack_write (&opb, 0, 32);
+ for (i = 0; i < vc->comments; i++) {
+ if (!vc->user_comments[i])
+ oggpack_write (&opb, 0, 32);
+ else {
+ oggpack_write (&opb, vc->comment_lengths[i], 32);
+ _v_writestring (&opb, vc->user_comments[i],
+ vc->comment_lengths[i]);
}
}
static int
_blocksize (vcedit_state *s, ogg_packet *p)
{
- int this = vorbis_packet_blocksize (s->vi, p);
- int ret = (this + s->prevW) / 4;
+ int this, ret = 0;
- if (!s->prevW) {
- s->prevW = this;
- return 0;
- }
+ this = vorbis_packet_blocksize (s->vi, p);
+
+ if (s->prevW)
+ ret = (this + s->prevW) / 4;
s->prevW = this;
while (ogg_sync_pageout (s->oy, page) <= 0) {
buffer = ogg_sync_buffer (s->oy, CHUNKSIZE);
- bytes = s->read (buffer, 1, CHUNKSIZE, s->in);
+ bytes = fread (buffer, 1, CHUNKSIZE, s->in);
ogg_sync_wrote (s->oy, bytes);
if (!bytes)
return _fetch_next_packet (s, p, page);
}
-int
-vcedit_open_callbacks (vcedit_state *state, void *in,
- vcedit_read_func read_func,
- vcedit_write_func write_func)
+static int
+vcedit_open (vcedit_state *state)
{
char *buffer;
int bytes, i;
ogg_packet header_main, header_comments, header_codebooks;
ogg_page og;
- state->in = in;
- state->read = read_func;
- state->write = write_func;
-
- state->oy = malloc (sizeof (ogg_sync_state));
ogg_sync_init (state->oy);
while (1) {
buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
- bytes = state->read (buffer, 1, CHUNKSIZE, state->in);
+ bytes = fread (buffer, 1, CHUNKSIZE, state->in);
ogg_sync_wrote (state->oy, bytes);
state->serial = ogg_page_serialno (&og);
- state->os = malloc (sizeof (ogg_stream_state));
ogg_stream_init (state->os, state->serial);
-
- state->vi = malloc (sizeof (vorbis_info));
vorbis_info_init (state->vi);
-
- state->vc = malloc (sizeof (vorbis_comment));
vorbis_comment_init (state->vc);
if (ogg_stream_pagein (state->os, &og) < 0) {
}
buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
- bytes = state->read (buffer, 1, CHUNKSIZE, state->in);
+ bytes = fread (buffer, 1, CHUNKSIZE, state->in);
if (bytes == 0 && i < 2) {
state->lasterror = "EOF before end of vorbis headers.";
}
int
-vcedit_write (vcedit_state *state, void *out)
+vcedit_write (vcedit_state *state)
{
ogg_stream_state streamout;
ogg_packet header_main, header_comments, header_codebooks, op;
ogg_page ogout, ogin;
ogg_int64_t granpos = 0;
- int result, bytes, needflush = 0, needout = 0;
- char *buffer;
+ FILE *out;
+ char *buffer, tmpfile[PATH_MAX];
+ int s, result, bytes, needflush = 0, needout = 0;
size_t tmp;
- state->eosin = 0;
- state->extrapage = 0;
+ strcpy (tmpfile, state->filename);
+ strcat (tmpfile, ".XXXXXX");
+
+ s = mkstemp (tmpfile);
+ if (s == -1) {
+ state->lasterror = "Error writing stream to output. "
+ "Cannot open temporary file.";
+ return -1;
+ }
+
+ out = fdopen (s, "wb");
+ if (!out) {
+ unlink (tmpfile);
+ close (s);
+ state->lasterror = "Error writing stream to output. "
+ "Cannot open temporary file.";
+ return -1;
+ }
+
+ state->prevW = state->extrapage = state->eosin = 0;
header_main.bytes = state->mainlen;
header_main.packet = state->mainbuf;
ogg_stream_packetin (&streamout, &header_codebooks);
while ((result = ogg_stream_flush (&streamout, &ogout))) {
- tmp = state->write (ogout.header, 1, ogout.header_len, out);
+ tmp = fwrite (ogout.header, 1, ogout.header_len, out);
if (tmp != (size_t) ogout.header_len)
goto cleanup;
- tmp = state->write (ogout.body, 1, ogout.body_len, out);
+ tmp = fwrite (ogout.body, 1, ogout.body_len, out);
if (tmp != (size_t) ogout.body_len)
goto cleanup;
}
if (needflush) {
if (ogg_stream_flush (&streamout, &ogout)) {
- tmp = state->write (ogout.header, 1, ogout.header_len, out);
+ tmp = fwrite (ogout.header, 1, ogout.header_len, out);
if (tmp != (size_t) ogout.header_len)
goto cleanup;
- tmp = state->write (ogout.body, 1, ogout.body_len, out);
+ tmp = fwrite (ogout.body, 1, ogout.body_len, out);
if (tmp != (size_t) ogout.body_len)
goto cleanup;
}
} else if (needout) {
if (ogg_stream_pageout (&streamout, &ogout)) {
- tmp = state->write (ogout.header, 1, ogout.header_len, out);
+ tmp = fwrite (ogout.header, 1, ogout.header_len, out);
if (tmp != (size_t) ogout.header_len)
goto cleanup;
- tmp = state->write (ogout.body, 1, ogout.body_len, out);
+ tmp = fwrite (ogout.body, 1, ogout.body_len, out);
if (tmp != (size_t) ogout.body_len)
goto cleanup;
}
streamout.e_o_s = 1;
while (ogg_stream_flush (&streamout, &ogout)) {
- tmp = state->write (ogout.header, 1, ogout.header_len, out);
+ tmp = fwrite (ogout.header, 1, ogout.header_len, out);
if (tmp != (size_t) ogout.header_len)
goto cleanup;
- tmp = state->write (ogout.body, 1, ogout.body_len, out);
+ tmp = fwrite (ogout.body, 1, ogout.body_len, out);
if (tmp != (size_t) ogout.body_len)
goto cleanup;
}
if (state->extrapage) {
- tmp = state->write (ogin.header, 1, ogin.header_len, out);
+ tmp = fwrite (ogin.header, 1, ogin.header_len, out);
if (tmp != (size_t) ogin.header_len)
goto cleanup;
- tmp = state->write (ogin.body, 1, ogin.body_len, out);
+ tmp = fwrite (ogin.body, 1, ogin.body_len, out);
if (tmp != (size_t) ogin.body_len)
goto cleanup;
}
/* Don't bother going through the rest, we can just
* write the page out now
*/
- tmp = state->write (ogout.header,1,ogout.header_len, out);
+ tmp = fwrite (ogout.header, 1, ogout.header_len, out);
if (tmp != (size_t) ogout.header_len)
goto cleanup;
- tmp = state->write (ogout.body,1,ogout.body_len, out);
+ tmp = fwrite (ogout.body, 1, ogout.body_len, out);
if (tmp != (size_t) ogout.body_len)
goto cleanup;
}
}
buffer = ogg_sync_buffer (state->oy, CHUNKSIZE);
- bytes = state->read (buffer, 1, CHUNKSIZE, state->in);
+ bytes = fread (buffer, 1, CHUNKSIZE, state->in);
ogg_sync_wrote (state->oy, bytes);
if (!bytes) {
}
}
+ fclose (out);
+ fclose (state->in);
+
+ unlink (state->filename);
+ rename (tmpfile, state->filename);
+
cleanup:
ogg_stream_clear (&streamout);
return -1;
}
+ vcedit_clear_internals (state);
+
+ state->in = fopen (state->filename, "rb");
+ vcedit_open (state);
+
return 0;
}
projects / ruby-vorbistagger.git / blobdiff