Commit db3d09cf authored by conrad's avatar conrad

cleanup -- move linear and granuleshift metrics out to their own files


git-svn-id: http://svn.annodex.net/liboggz/trunk@805 8158c8cd-e7e1-0310-9fa4-c5954c97daef
parent a18d158c
...@@ -17,7 +17,9 @@ liboggz_la_SOURCES = \ ...@@ -17,7 +17,9 @@ liboggz_la_SOURCES = \
oggz_auto.c oggz_auto.h \ oggz_auto.c oggz_auto.h \
oggz_stream.c oggz_stream.h \ oggz_stream.c oggz_stream.h \
oggz_table.c \ oggz_table.c \
oggz_vector.c oggz_vector.h oggz_vector.c oggz_vector.h \
metric_granuleshift.c \
metric_linear.c
liboggz_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@ liboggz_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
liboggz_la_LIBADD = @OGG_LIBS@ liboggz_la_LIBADD = @OGG_LIBS@
/*
Copyright (C) 2003 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name of CSIRO Australia nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "oggz_private.h"
typedef struct {
ogg_int64_t gr_n;
ogg_int64_t gr_d;
int granuleshift;
} oggz_metric_granuleshift_t;
static ogg_int64_t
oggz_metric_default_granuleshift (OGGZ * oggz, long serialno,
ogg_int64_t granulepos, void * user_data)
{
oggz_metric_granuleshift_t * gdata = (oggz_metric_granuleshift_t *)user_data;
ogg_int64_t iframe, pframe;
ogg_int64_t units;
iframe = granulepos >> gdata->granuleshift;
pframe = granulepos - (iframe << gdata->granuleshift);
granulepos = (iframe + pframe);
units = granulepos * gdata->gr_d / gdata->gr_n;
#ifdef DEBUG
printf ("oggz_..._granuleshift: serialno %010ld Got frame %lld (%lld + %lld): %lld units\n",
serialno, granulepos, iframe, pframe, units);
#endif
return units;
}
int
oggz_set_metric_granuleshift (OGGZ * oggz, long serialno,
ogg_int64_t granule_rate_numerator,
ogg_int64_t granule_rate_denominator,
int granuleshift)
{
oggz_metric_granuleshift_t * granuleshift_data;
/* we divide by the granulerate, ie. mult by gr_d/gr_n, so ensure
* numerator is non-zero */
if (granule_rate_numerator == 0) {
granule_rate_numerator = 1;
granule_rate_denominator = 0;
}
granuleshift_data = oggz_malloc (sizeof (oggz_metric_granuleshift_t));
granuleshift_data->gr_n = granule_rate_numerator;
granuleshift_data->gr_d = granule_rate_denominator;
granuleshift_data->granuleshift = granuleshift;
return oggz_set_metric_internal (oggz, serialno,
oggz_metric_default_granuleshift,
granuleshift_data, 1);
}
/*
Copyright (C) 2003 Commonwealth Scientific and Industrial Research
Organisation (CSIRO) Australia
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name of CSIRO Australia nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "config.h"
#include "oggz_private.h"
typedef struct {
ogg_int64_t gr_n;
ogg_int64_t gr_d;
} oggz_metric_linear_t;
static ogg_int64_t
oggz_metric_default_linear (OGGZ * oggz, long serialno, ogg_int64_t granulepos,
void * user_data)
{
oggz_metric_linear_t * ldata = (oggz_metric_linear_t *)user_data;
return (ldata->gr_d * granulepos / ldata->gr_n);
}
int
oggz_set_metric_linear (OGGZ * oggz, long serialno,
ogg_int64_t granule_rate_numerator,
ogg_int64_t granule_rate_denominator)
{
oggz_metric_linear_t * linear_data;
/* we divide by the granulerate, ie. mult by gr_d/gr_n, so ensure
* numerator is non-zero */
if (granule_rate_numerator == 0) {
granule_rate_numerator = 1;
granule_rate_denominator = 0;
}
linear_data = oggz_malloc (sizeof (oggz_metric_linear_t));
linear_data->gr_n = granule_rate_numerator;
linear_data->gr_d = granule_rate_denominator;
return oggz_set_metric_internal (oggz, serialno, oggz_metric_default_linear,
linear_data, 1);
}
int
oggz_set_metric_zero (OGGZ * oggz, long serialno)
{
return oggz_set_metric_linear (oggz, serialno, 0, 1);
}
...@@ -380,48 +380,6 @@ oggz_serialno_new (OGGZ * oggz) ...@@ -380,48 +380,6 @@ oggz_serialno_new (OGGZ * oggz)
/******** OggzMetric management ********/ /******** OggzMetric management ********/
typedef struct {
ogg_int64_t gr_n;
ogg_int64_t gr_d;
} oggz_metric_linear_t;
static ogg_int64_t
oggz_metric_default_linear (OGGZ * oggz, long serialno, ogg_int64_t granulepos,
void * user_data)
{
oggz_metric_linear_t * ldata = (oggz_metric_linear_t *)user_data;
return (ldata->gr_d * granulepos / ldata->gr_n);
}
typedef struct {
ogg_int64_t gr_n;
ogg_int64_t gr_d;
int granuleshift;
} oggz_metric_granuleshift_t;
static ogg_int64_t
oggz_metric_default_granuleshift (OGGZ * oggz, long serialno,
ogg_int64_t granulepos, void * user_data)
{
oggz_metric_granuleshift_t * gdata = (oggz_metric_granuleshift_t *)user_data;
ogg_int64_t iframe, pframe;
ogg_int64_t units;
iframe = granulepos >> gdata->granuleshift;
pframe = granulepos - (iframe << gdata->granuleshift);
granulepos = (iframe + pframe);
units = granulepos * gdata->gr_d / gdata->gr_n;
#ifdef DEBUG
printf ("oggz_..._granuleshift: serialno %010ld Got frame %lld (%lld + %lld): %lld units\n",
serialno, granulepos, iframe, pframe, units);
#endif
return units;
}
int int
oggz_set_metric_internal (OGGZ * oggz, long serialno, oggz_set_metric_internal (OGGZ * oggz, long serialno,
OggzMetric metric, void * user_data, int internal) OggzMetric metric, void * user_data, int internal)
...@@ -457,59 +415,6 @@ oggz_set_metric (OGGZ * oggz, long serialno, ...@@ -457,59 +415,6 @@ oggz_set_metric (OGGZ * oggz, long serialno,
return oggz_set_metric_internal (oggz, serialno, metric, user_data, 0); return oggz_set_metric_internal (oggz, serialno, metric, user_data, 0);
} }
int
oggz_set_metric_linear (OGGZ * oggz, long serialno,
ogg_int64_t granule_rate_numerator,
ogg_int64_t granule_rate_denominator)
{
oggz_metric_linear_t * linear_data;
/* we divide by the granulerate, ie. mult by gr_d/gr_n, so ensure
* numerator is non-zero */
if (granule_rate_numerator == 0) {
granule_rate_numerator = 1;
granule_rate_denominator = 0;
}
linear_data = oggz_malloc (sizeof (oggz_metric_linear_t));
linear_data->gr_n = granule_rate_numerator;
linear_data->gr_d = granule_rate_denominator;
return oggz_set_metric_internal (oggz, serialno, oggz_metric_default_linear,
linear_data, 1);
}
int
oggz_set_metric_zero (OGGZ * oggz, long serialno)
{
return oggz_set_metric_linear (oggz, serialno, 0, 1);
}
int
oggz_set_metric_granuleshift (OGGZ * oggz, long serialno,
ogg_int64_t granule_rate_numerator,
ogg_int64_t granule_rate_denominator,
int granuleshift)
{
oggz_metric_granuleshift_t * granuleshift_data;
/* we divide by the granulerate, ie. mult by gr_d/gr_n, so ensure
* numerator is non-zero */
if (granule_rate_numerator == 0) {
granule_rate_numerator = 1;
granule_rate_denominator = 0;
}
granuleshift_data = oggz_malloc (sizeof (oggz_metric_granuleshift_t));
granuleshift_data->gr_n = granule_rate_numerator;
granuleshift_data->gr_d = granule_rate_denominator;
granuleshift_data->granuleshift = granuleshift;
return oggz_set_metric_internal (oggz, serialno,
oggz_metric_default_granuleshift,
granuleshift_data, 1);
}
/* /*
* Check if a stream in an oggz has a metric * Check if a stream in an oggz has a metric
*/ */
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#ifndef __OGGZ_MACROS_H__ #ifndef __OGGZ_MACROS_H__
#define __OGGZ_MACROS_H__ #define __OGGZ_MACROS_H__
#include <stdlib.h>
#include <ogg/ogg.h> #include <ogg/ogg.h>
/* Use the malloc and free used by ogg; defaults are those from stdlib */ /* Use the malloc and free used by ogg; defaults are those from stdlib */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment