DEALINGS IN THE SOFTWARE.
**/
-#ifndef FFMPEG_OGGDEC_H
-#define FFMPEG_OGGDEC_H
+#ifndef AVFORMAT_OGGDEC_H
+#define AVFORMAT_OGGDEC_H
-#include <stdint.h>
#include "avformat.h"
+#include "metadata.h"
-typedef struct ogg_codec {
+struct ogg_codec {
const int8_t *magic;
uint8_t magicsize;
const int8_t *name;
+ /**
+ * Attempt to process a packet as a header
+ * @return 1 if the packet was a valid header,
+ * 0 if the packet was not a header (was a data packet)
+ * -1 if an error occurred or for unsupported stream
+ */
int (*header)(AVFormatContext *, int);
int (*packet)(AVFormatContext *, int);
- uint64_t (*gptopts)(AVFormatContext *, int, uint64_t);
-} ogg_codec_t;
+ /**
+ * Translate a granule into a timestamp.
+ * Will set dts if non-null and known.
+ * @return pts
+ */
+ uint64_t (*gptopts)(AVFormatContext *, int, uint64_t, int64_t *dts);
+ /**
+ * 1 if granule is the start time of the associated packet.
+ * 0 if granule is the end time of the associated packet.
+ */
+ int granule_is_start;
+};
-typedef struct ogg_stream {
+struct ogg_stream {
uint8_t *buf;
unsigned int bufsize;
unsigned int bufpos;
unsigned int pstart;
unsigned int psize;
unsigned int pflags;
+ unsigned int pduration;
uint32_t serial;
- uint32_t seq;
- uint64_t granule, lastgp;
+ uint64_t granule;
+ int64_t lastpts;
+ int64_t lastdts;
+ int64_t sync_pos; ///< file offset of the first page needed to reconstruct the current packet
+ int64_t page_pos; ///< file offset of the current page
int flags;
- ogg_codec_t *codec;
+ const struct ogg_codec *codec;
int header;
int nsegs, segp;
uint8_t segments[255];
+ int incomplete; ///< whether we're expecting a continuation in the next page
+ int page_end; ///< current packet is the last one completed in the page
+ int keyframe_seek;
void *private;
-} ogg_stream_t;
+};
-typedef struct ogg_state {
+struct ogg_state {
uint64_t pos;
int curidx;
struct ogg_state *next;
int nstreams;
- ogg_stream_t streams[1];
-} ogg_state_t;
+ struct ogg_stream streams[1];
+};
-typedef struct ogg {
- ogg_stream_t *streams;
+struct ogg {
+ struct ogg_stream *streams;
int nstreams;
int headers;
int curidx;
- uint64_t size;
- ogg_state_t *state;
-} ogg_t;
+ struct ogg_state *state;
+};
#define OGG_FLAG_CONT 1
#define OGG_FLAG_BOS 2
#define OGG_FLAG_EOS 4
-extern ogg_codec_t flac_codec;
-extern ogg_codec_t ogm_audio_codec;
-extern ogg_codec_t ogm_old_codec;
-extern ogg_codec_t ogm_text_codec;
-extern ogg_codec_t ogm_video_codec;
-extern ogg_codec_t old_flac_codec;
-extern ogg_codec_t speex_codec;
-extern ogg_codec_t theora_codec;
-extern ogg_codec_t vorbis_codec;
+extern const struct ogg_codec ff_celt_codec;
+extern const struct ogg_codec ff_dirac_codec;
+extern const struct ogg_codec ff_flac_codec;
+extern const struct ogg_codec ff_ogm_audio_codec;
+extern const struct ogg_codec ff_ogm_old_codec;
+extern const struct ogg_codec ff_ogm_text_codec;
+extern const struct ogg_codec ff_ogm_video_codec;
+extern const struct ogg_codec ff_old_dirac_codec;
+extern const struct ogg_codec ff_old_flac_codec;
+extern const struct ogg_codec ff_skeleton_codec;
+extern const struct ogg_codec ff_speex_codec;
+extern const struct ogg_codec ff_theora_codec;
+extern const struct ogg_codec ff_vorbis_codec;
-extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
+int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, const uint8_t *buf, int size);
-#endif /* FFMPEG_OGGDEC_H */
+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 && os->codec->gptopts){
+ pts = os->codec->gptopts(s, i, gp, dts);
+ } else {
+ pts = gp;
+ if (dts)
+ *dts = pts;
+ }
+
+ return pts;
+}
+
+#endif /* AVFORMAT_OGGDEC_H */