From dfaed51f04128953f1a8c44a1f5114d5a330d252 Mon Sep 17 00:00:00 2001 From: David Conrad Date: Thu, 11 Mar 2010 07:17:33 +0000 Subject: oggdec: Move ogg_find_stream and ogg_gptopts to oggdec.h (skeleton will need them) Originally committed as revision 22455 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/oggdec.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'libavformat/oggdec.h') diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 425d7a291e..aa6e8990b0 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -115,4 +115,34 @@ extern const AVMetadataConv ff_vorbiscomment_metadata_conv[]; int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size); +static inline int +ogg_find_stream (struct ogg * ogg, int serial) +{ + int i; + + for (i = 0; i < ogg->nstreams; i++) + if (ogg->streams[i].serial == serial) + return i; + + return -1; +} + +static inline uint64_t +ogg_gptopts (AVFormatContext * s, int i, uint64_t gp, int64_t *dts) +{ + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + i; + uint64_t pts = AV_NOPTS_VALUE; + + if(os->codec->gptopts){ + pts = os->codec->gptopts(s, i, gp, dts); + } else { + pts = gp; + if (dts) + *dts = pts; + } + + return pts; +} + #endif /* AVFORMAT_OGGDEC_H */ -- cgit v1.2.3