comparison ogg2.c @ 755:27449ee55201 libavformat

support theora in ogg, plus required ogg core changes

754:aa52767bb802

#define MAX_PAGE_SIZE 65307
#define DECODER_BUFFER_SIZE MAX_PAGE_SIZE

static ogg_codec_t *ogg_codecs[] = {
    &vorbis_codec,
    NULL
};

#if 0                           // CONFIG_ENCODERS
static int

}

static uint64_t
ogg_gptopts (AVFormatContext * s, int i, uint64_t gp)
{
    AVStream *st = s->streams[i];
    AVCodecContext *codec = &st->codec;
    uint64_t pts = AV_NOPTS_VALUE;

    if (codec->codec_type == CODEC_TYPE_AUDIO){
        pts = gp * 1000000LL / codec->sample_rate;
    }else if (codec->codec_type == CODEC_TYPE_VIDEO){
//FIXME
        pts = gp * 1000000LL / codec->sample_rate;
//  pts = gp * st->video.frame_rate.den * 27000000LL /
//      st->video.frame_rate.num;
    }

    return pts;
}

    ogg_t *ogg = s->priv_data;
    int i;

    for (i = 0; i < ogg->nstreams; i++){
        av_free (ogg->streams[i].buf);
        av_freep (&s->streams[i]->codec.extradata);
    }
    av_free (ogg->streams);
    return 0;
}

755:27449ee55201

#define MAX_PAGE_SIZE 65307
#define DECODER_BUFFER_SIZE MAX_PAGE_SIZE

static ogg_codec_t *ogg_codecs[] = {
    &vorbis_codec,
    &theora_codec,
    NULL
};

#if 0                           // CONFIG_ENCODERS
static int

}

static uint64_t
ogg_gptopts (AVFormatContext * s, int i, uint64_t gp)
{
    ogg_t *ogg = s->priv_data;
    ogg_stream_t *os = ogg->streams + i;
    AVStream *st = s->streams[i];
    AVCodecContext *codec = &st->codec;
    uint64_t pts = AV_NOPTS_VALUE;

    if(os->codec->gptopts){
	pts = os->codec->gptopts(s, i, gp);
    } else if (codec->codec_type == CODEC_TYPE_AUDIO){
        pts = gp * 1000000LL / codec->sample_rate;
    }else if (codec->codec_type == CODEC_TYPE_VIDEO){
        pts = gp;
    }

    return pts;
}

    ogg_t *ogg = s->priv_data;
    int i;

    for (i = 0; i < ogg->nstreams; i++){
        av_free (ogg->streams[i].buf);
        av_free (ogg->streams[i].private);
        av_freep (&s->streams[i]->codec.extradata);
    }
    av_free (ogg->streams);
    return 0;
}