comparison oggvorbis.c @ 1920:9b87ed973dda libavcodec

kill obnoxious ogg_packet passing from demuxer to decoder

1919:20e4d4511fd2

    vorbis_dsp_state vd ;
    vorbis_block vb ;

    /* decoder */
    vorbis_comment vc ;
} OggVorbisContext ;


int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {

static int oggvorbis_decode_init(AVCodecContext *avccontext) {
    OggVorbisContext *context = avccontext->priv_data ;

    vorbis_info_init(&context->vi) ;
    vorbis_comment_init(&context->vc) ;

    return 0 ;
}

static int oggvorbis_decode_frame(AVCodecContext *avccontext,
                        void *data, int *data_size,
                        uint8_t *buf, int buf_size)
{
    OggVorbisContext *context = avccontext->priv_data ;
    ogg_packet *op = (ogg_packet*)buf ;
    float **pcm ;
    int samples, total_samples, total_bytes,i;
 
    if(!buf_size){
    //FIXME flush
        *data_size=0;
        return 0;
    }
    
    op->packet = (char*)op + sizeof(ogg_packet) ; /* correct data pointer */

//    av_log(avccontext, AV_LOG_DEBUG, "%d %d %d %lld %lld %d %d\n", op->bytes, op->b_o_s, op->e_o_s, op->granulepos, op->packetno, buf_size, context->vi.rate);
    
/*    for(i=0; i<op->bytes; i++)
      av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]);
    av_log(avccontext, AV_LOG_DEBUG, "\n");*/
//    op->b_o_s= op->packetno == 0;
    if(op->packetno < 3) {
	if(vorbis_synthesis_headerin(&context->vi, &context->vc, op)<0){
            av_log(avccontext, AV_LOG_ERROR, "%lld. vorbis header damaged\n", op->packetno+1);
            return -1;
        }
	avccontext->channels = context->vi.channels ;
	avccontext->sample_rate = context->vi.rate ;
	return buf_size ;
    }

    if(op->packetno == 3) {
//	av_log(avccontext, AV_LOG_INFO, "vorbis_decode: %d channel, %ldHz, encoder `%s'\n",

	total_bytes += samples * 2 * context->vi.channels ;
	total_samples += samples ;
        vorbis_synthesis_read(&context->vd, samples) ;
    }

    *data_size = total_bytes ;   
    return buf_size ;
}

1920:9b87ed973dda

    vorbis_dsp_state vd ;
    vorbis_block vb ;

    /* decoder */
    vorbis_comment vc ;
    ogg_packet op;
} OggVorbisContext ;


int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) {

static int oggvorbis_decode_init(AVCodecContext *avccontext) {
    OggVorbisContext *context = avccontext->priv_data ;

    vorbis_info_init(&context->vi) ;
    vorbis_comment_init(&context->vc) ;
    context->op.packetno= 0;

    return 0 ;
}

static int oggvorbis_decode_frame(AVCodecContext *avccontext,
                        void *data, int *data_size,
                        uint8_t *buf, int buf_size)
{
    OggVorbisContext *context = avccontext->priv_data ;
    float **pcm ;
    ogg_packet *op= &context->op;    
    int samples, total_samples, total_bytes,i;
 
    if(!buf_size){
    //FIXME flush
        *data_size=0;
        return 0;
    }
    
    op->packet = buf;
    op->bytes  = buf_size;
    op->b_o_s  = op->packetno == 0;

//    av_log(avccontext, AV_LOG_DEBUG, "%d %d %d %lld %lld %d %d\n", op->bytes, op->b_o_s, op->e_o_s, op->granulepos, op->packetno, buf_size, context->vi.rate);
    
/*    for(i=0; i<op->bytes; i++)
      av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]);
    av_log(avccontext, AV_LOG_DEBUG, "\n");*/
    if(op->packetno < 3) {
	if(vorbis_synthesis_headerin(&context->vi, &context->vc, op)<0){
            av_log(avccontext, AV_LOG_ERROR, "%lld. vorbis header damaged\n", op->packetno+1);
            return -1;
        }
	avccontext->channels = context->vi.channels ;
	avccontext->sample_rate = context->vi.rate ;
        op->packetno++;
	return buf_size ;
    }

    if(op->packetno == 3) {
//	av_log(avccontext, AV_LOG_INFO, "vorbis_decode: %d channel, %ldHz, encoder `%s'\n",

	total_bytes += samples * 2 * context->vi.channels ;
	total_samples += samples ;
        vorbis_synthesis_read(&context->vd, samples) ;
    }

    op->packetno++;
    *data_size = total_bytes ;   
    return buf_size ;
}