added a typefind function for all supported audiofile types.

Original commit message from CVS:
added a typefind function for all supported audiofile types.

the type is called audio/audiofile - I could have split it into seperate types like audio/aiff and audio/wave but there doesn't seem to be a way to have a padtemplate respond to more than one type, hence this umbrella type.

Also, fixed optimisation logic so that aiffs are read through the lib.
This commit is contained in:
Steve Baker 2002-04-24 10:19:41 +00:00
parent fc5286e9c0
commit 559e8bc4ee
2 changed files with 199 additions and 13 deletions

View file

@ -149,8 +149,7 @@ gst_afparse_init (GstAFParse *afparse)
afparse->vfile->seek = gst_afparse_vf_seek;
afparse->vfile->tell = gst_afparse_vf_tell;
/* default to low latency */
afparse->frames_per_read = 64;
afparse->frames_per_read = 1024;
afparse->curoffset = 0;
afparse->seq = 0;
@ -175,6 +174,7 @@ gst_afparse_loop(GstElement *element)
guint8 *data;
gboolean bypass_afread = TRUE;
GstByteStream *bs;
int s_format, v_format, s_width, v_width;
afparse = GST_AFPARSE(element);
@ -191,15 +191,15 @@ gst_afparse_loop(GstElement *element)
/* if audiofile changes the data in any way, we have to access
* the audio data via afReadFrames. Otherwise we can just access
* the data directly. */
afGetSampleFormat(afparse->file, AF_DEFAULT_TRACK, &s_format, &s_width);
afGetVirtualSampleFormat(afparse->file, AF_DEFAULT_TRACK, &v_format, &v_width);
if (afGetCompression != AF_COMPRESSION_NONE ||
afGetByteOrder(afparse->file, AF_DEFAULT_TRACK) != afGetVirtualByteOrder(afparse->file, AF_DEFAULT_TRACK)){
int s_format, v_format, s_width, v_width;
afGetSampleFormat(afparse->file, AF_DEFAULT_TRACK, &s_format, &s_width);
afGetVirtualSampleFormat(afparse->file, AF_DEFAULT_TRACK, &v_format, &v_width);
if (s_format != v_format || s_width != v_width){
bypass_afread = FALSE;
}
afGetByteOrder(afparse->file, AF_DEFAULT_TRACK) != afGetVirtualByteOrder(afparse->file, AF_DEFAULT_TRACK) ||
s_format != v_format ||
s_width != v_width){
bypass_afread = FALSE;
}
if (bypass_afread){
g_print("will bypass afReadFrames\n");
}
@ -226,9 +226,10 @@ gst_afparse_loop(GstElement *element)
break;
}
}
gst_pad_push (afparse->srcpad, buf);
afparse->timestamp += numframes * 1E9 / afparse->rate;
else {
gst_pad_push (afparse->srcpad, buf);
afparse->timestamp += numframes * 1E9 / afparse->rate;
}
}
while (TRUE);
@ -255,7 +256,6 @@ gst_afparse_loop(GstElement *element)
}
while (TRUE);
}
gst_afparse_close_file (afparse);
gst_buffer_pool_unref(bufpool);

186
ext/audiofile/gstaftypes.c Normal file
View file

@ -0,0 +1,186 @@
/* GStreamer
* Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
* 2000 Wim Taymans <wtay@chello.be>
*
* gstaftypes.c:
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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 GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <gst/gst.h>
#include <string.h>
#include <audiofile.h>
#include <af_vfs.h>
static ssize_t gst_aftypes_vf_read (AFvirtualfile *vfile, void *data, size_t nbytes);
static long gst_aftypes_vf_length (AFvirtualfile *vfile);
static ssize_t gst_aftypes_vf_write (AFvirtualfile *vfile, const void *data, size_t nbytes);
static void gst_aftypes_vf_destroy(AFvirtualfile *vfile);
static long gst_aftypes_vf_seek (AFvirtualfile *vfile, long offset, int is_relative);
static long gst_aftypes_vf_tell (AFvirtualfile *vfile);
static GstCaps* gst_aftypes_type_find(GstBuffer *buf, gpointer private);
static GstTypeDefinition aftype_definitions[] = {
{ "aftypes audio/audiofile", "audio/audiofile", ".wav .aiff .aif .aifc", gst_aftypes_type_find },
{ NULL, NULL, NULL, NULL },
};
typedef struct _GstAFTypesBuffer GstAFTypesBuffer;
struct _GstAFTypesBuffer {
GstBuffer *buffer;
long offset;
};
static GstCaps*
gst_aftypes_type_find(GstBuffer *buf, gpointer private)
{
GstAFTypesBuffer *buffer_wrap = g_new0(GstAFTypesBuffer, 1);
AFvirtualfile *vfile;
AFfilehandle file;
int file_format, format_version;
g_print("calling gst_aftypes_type_find\n");
buffer_wrap->buffer = buf;
buffer_wrap->offset = 0;
vfile = af_virtual_file_new();
vfile->closure = buffer_wrap;
vfile->read = gst_aftypes_vf_read;
vfile->length = gst_aftypes_vf_length;
vfile->write = gst_aftypes_vf_write;
vfile->destroy = gst_aftypes_vf_destroy;
vfile->seek = gst_aftypes_vf_seek;
vfile->tell = gst_aftypes_vf_tell;
file = afOpenVirtualFile (vfile, "r", AF_NULL_FILESETUP);
file_format = afGetFileFormat (file, &format_version);
afCloseFile (file);
g_print("file format: %d\n", file_format);
/* reject raw data, just in case it is some other format */
if (file_format == AF_FILE_UNKNOWN ||
file_format == AF_FILE_RAWDATA){
return NULL;
}
return gst_caps_new ("audiofile_type_find", "audio/audiofile", NULL);
}
static gboolean
plugin_init (GModule *module, GstPlugin *plugin)
{
gint i=0;
while (aftype_definitions[i].name) {
GstTypeFactory *type;
type = gst_type_factory_new (&aftype_definitions[i]);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type));
i++;
}
return TRUE;
}
GstPluginDesc plugin_desc = {
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"aftypes",
plugin_init
};
static ssize_t
gst_aftypes_vf_read (AFvirtualfile *vfile, void *data, size_t nbytes)
{
GstAFTypesBuffer *bwrap = (GstAFTypesBuffer*)vfile->closure;
long bufsize = GST_BUFFER_SIZE(bwrap->buffer);
guchar *bytes = GST_BUFFER_DATA(bwrap->buffer);
if (bwrap->offset + nbytes > bufsize){
nbytes = bufsize;
}
bytes += bwrap->offset;
memcpy(data, bytes, nbytes);
bwrap->offset += nbytes;
g_print("read %d bytes\n", nbytes);
return nbytes;
}
static long
gst_aftypes_vf_seek (AFvirtualfile *vfile, long offset, int is_relative)
{
GstAFTypesBuffer *bwrap = (GstAFTypesBuffer*)vfile->closure;
long bufsize = GST_BUFFER_SIZE(bwrap->buffer);
g_print("request seek to: %ld\n", offset);
if (!is_relative){
if (offset > bufsize || offset < 0){
return -1;
}
bwrap->offset = offset;
}
else {
if (bwrap->offset + offset > bufsize ||
bwrap->offset + offset < 0){
return -1;
}
bwrap->offset += offset;
}
g_print("seek to: %ld\n", bwrap->offset);
return bwrap->offset;
}
static long
gst_aftypes_vf_length (AFvirtualfile *vfile)
{
GstAFTypesBuffer *bwrap = (GstAFTypesBuffer*)vfile->closure;
return GST_BUFFER_SIZE(bwrap->buffer);
}
static ssize_t
gst_aftypes_vf_write (AFvirtualfile *vfile, const void *data, size_t nbytes)
{
g_warning("shouldn't write to a readonly pad");
return 0;
}
static void
gst_aftypes_vf_destroy(AFvirtualfile *vfile)
{
}
static long
gst_aftypes_vf_tell (AFvirtualfile *vfile)
{
GstAFTypesBuffer *bwrap = (GstAFTypesBuffer*)vfile->closure;
g_print("doing tell: %ld\n", bwrap->offset);
return bwrap->offset;
}