/**
- Copyright (C) 2005 Matthieu CASTET
+ Copyright (C) 2005 Matthieu CASTET, Alex Beregszaszi
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
**/
#include <stdlib.h>
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
#include "avformat.h"
-#include "bitstream.h"
-#include "bswap.h"
-#include "ogg2.h"
+#include "oggdec.h"
-typedef struct theora_params {
+struct theora_params {
int gpshift;
int gpmask;
-} theora_params_t;
+ unsigned version;
+};
static int
theora_header (AVFormatContext * s, int idx)
{
- ogg_t *ogg = s->priv_data;
- ogg_stream_t *os = ogg->streams + idx;
+ struct ogg *ogg = s->priv_data;
+ struct ogg_stream *os = ogg->streams + idx;
AVStream *st = s->streams[idx];
- theora_params_t *thp = os->private;
+ struct theora_params *thp = os->private;
int cds = st->codec->extradata_size + os->psize + 2;
uint8_t *cdp;
return 0;
if(!thp){
- thp = av_mallocz(sizeof(*thp));
- os->private = thp;
+ thp = av_mallocz(sizeof(*thp));
+ os->private = thp;
}
if (os->buf[os->pstart] == 0x80) {
GetBitContext gb;
+ int width, height;
+
init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
skip_bits(&gb, 7*8); /* 0x80"theora" */
- if(get_bits(&gb, 8) != 3) /* major version */
- return -1;
- if(get_bits(&gb, 8) != 2) /* minor version */
+
+ thp->version = get_bits_long(&gb, 24);
+ if (thp->version < 0x030100)
+ {
+ av_log(s, AV_LOG_ERROR,
+ "Too old or unsupported Theora (%x)\n", thp->version);
return -1;
- skip_bits(&gb, 8); /* revision */
+ }
+
+ width = get_bits(&gb, 16) << 4;
+ height = get_bits(&gb, 16) << 4;
+ avcodec_set_dimensions(st->codec, width, height);
- st->codec->width = get_bits(&gb, 16) << 4;
- st->codec->height = get_bits(&gb, 16) << 4;
+ if (thp->version >= 0x030400)
+ skip_bits(&gb, 100);
- skip_bits(&gb, 64);
- st->codec->time_base.den = get_bits(&gb, 32);
- st->codec->time_base.num = get_bits(&gb, 32);
+ if (thp->version >= 0x030200) {
+ width = get_bits_long(&gb, 24);
+ height = get_bits_long(&gb, 24);
+ if ( width <= st->codec->width && width > st->codec->width-16
+ && height <= st->codec->height && height > st->codec->height-16)
+ avcodec_set_dimensions(st->codec, width, height);
- st->codec->sample_aspect_ratio.num = get_bits(&gb, 24);
- st->codec->sample_aspect_ratio.den = get_bits(&gb, 24);
+ skip_bits(&gb, 16);
+ }
+ st->codec->time_base.den = get_bits_long(&gb, 32);
+ st->codec->time_base.num = get_bits_long(&gb, 32);
+ st->time_base = st->codec->time_base;
+
+ st->sample_aspect_ratio.num = get_bits_long(&gb, 24);
+ st->sample_aspect_ratio.den = get_bits_long(&gb, 24);
+
+ if (thp->version >= 0x030200)
+ skip_bits(&gb, 38);
+ if (thp->version >= 0x304000)
+ skip_bits(&gb, 2);
- skip_bits(&gb, 38);
thp->gpshift = get_bits(&gb, 5);
- thp->gpmask = (1 << thp->gpshift) - 1;
+ thp->gpmask = (1 << thp->gpshift) - 1;
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_THEORA;
static uint64_t
theora_gptopts(AVFormatContext *ctx, int idx, uint64_t gp)
{
- AVStream *st = ctx->streams[idx];
- ogg_t *ogg = ctx->priv_data;
- ogg_stream_t *os = ogg->streams + idx;
- theora_params_t *thp = os->private;
+ struct ogg *ogg = ctx->priv_data;
+ struct ogg_stream *os = ogg->streams + idx;
+ struct theora_params *thp = os->private;
uint64_t iframe = gp >> thp->gpshift;
uint64_t pframe = gp & thp->gpmask;
- return (iframe + pframe) * AV_TIME_BASE * st->codec->time_base.num /
- st->codec->time_base.den;
+ if (thp->version < 0x030201)
+ iframe++;
+
+ if(!pframe)
+ os->pflags |= PKT_FLAG_KEY;
+
+ return iframe + pframe;
}
-ogg_codec_t theora_codec = {
+const struct ogg_codec ff_theora_codec = {
.magic = "\200theora",
.magicsize = 7,
.header = theora_header,