Autodesk Animator Studio Codec (AASC) video decoder, courtesy of

[ffmpeg] / libavformat / ogg.c

diff --git a/libavformat/ogg.c b/libavformat/ogg.c
index 3c8b1e2b9cac77db5c3873e3dbd77a49f376eb85..c30ccd2f2473eb28921b6bbec032bcbc492bf5d8 100644 (file)
--- a/libavformat/ogg.c
+++ b/libavformat/ogg.c
@@ -9,10 +9,8 @@
 #include <stdio.h>
 
 #include <ogg/ogg.h>
-#include <vorbis/vorbisenc.h>
 
 #include "avformat.h"
-#include "oggvorbis.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -35,52 +33,28 @@ typedef struct OggContext {
 static int ogg_write_header(AVFormatContext *avfcontext) 
 {
     OggContext *context = avfcontext->priv_data;
-    AVCodecContext *avccontext ;
-    vorbis_info vi ;
-    vorbis_dsp_state vd ;
-    vorbis_comment vc ;
-    vorbis_block vb ;
-    ogg_packet header, header_comm, header_code ; 
-    int n ;
-
-    av_set_pts_info(avfcontext, 60, 1, AV_TIME_BASE);
+    ogg_packet *op= &context->op;    
+    int n, i;
 
     ogg_stream_init(&context->os, 31415);
     
     for(n = 0 ; n < avfcontext->nb_streams ; n++) {
-       avccontext = &avfcontext->streams[n]->codec ;
+        AVCodecContext *codec = &avfcontext->streams[n]->codec;
+        uint8_t *p= codec->extradata;
+        
+        av_set_pts_info(avfcontext->streams[n], 60, 1, AV_TIME_BASE);
 
-       /* begin vorbis specific code */
-               
-       vorbis_info_init(&vi) ;
+        for(i=0; i < codec->extradata_size; i+= op->bytes){
+            op->bytes = p[i++]<<8;
+            op->bytes+= p[i++];
 
-       /* code copied from libavcodec/oggvorbis.c */
+            op->packet= &p[i];
+            op->b_o_s= op->packetno==0;
 
-       if(oggvorbis_init_encoder(&vi, avccontext) < 0) {
-           fprintf(stderr, "ogg_write_header: init_encoder failed") ;
-           return -1 ;
-       }
+            ogg_stream_packetin(&context->os, op);
 
-       vorbis_analysis_init(&vd, &vi) ;
-       vorbis_block_init(&vd, &vb) ;
-       
-       vorbis_comment_init(&vc) ;
-       vorbis_comment_add_tag(&vc, "encoder", LIBAVFORMAT_IDENT) ;
-       if(*avfcontext->title)
-           vorbis_comment_add_tag(&vc, "title", avfcontext->title) ;
-
-       vorbis_analysis_headerout(&vd, &vc, &header,
-                                 &header_comm, &header_code) ;
-       ogg_stream_packetin(&context->os, &header) ;
-       ogg_stream_packetin(&context->os, &header_comm) ;
-       ogg_stream_packetin(&context->os, &header_code) ;  
-       
-       vorbis_block_clear(&vb) ;
-       vorbis_dsp_clear(&vd) ;
-       vorbis_info_clear(&vi) ;
-       vorbis_comment_clear(&vc) ;
-       
-       /* end of vorbis specific code */
+            op->packetno++; //FIXME multiple streams
+        }
 
        context->header_handled = 0 ;
     }
@@ -88,22 +62,16 @@ static int ogg_write_header(AVFormatContext *avfcontext)
     return 0 ;
 }
 
-
-static int ogg_write_packet(AVFormatContext *avfcontext,
-                           int stream_index,
-                           const uint8_t *buf, int size, int64_t pts)
+static int ogg_write_packet(AVFormatContext *avfcontext, AVPacket *pkt)
 {
     OggContext *context = avfcontext->priv_data ;
-    AVCodecContext *avctx= &avfcontext->streams[stream_index]->codec;
+    AVCodecContext *avctx= &avfcontext->streams[pkt->stream_index]->codec;
     ogg_packet *op= &context->op;
     ogg_page og ;
+    int64_t pts;
 
-    pts= av_rescale(pts, avctx->sample_rate, AV_TIME_BASE);
+    pts= av_rescale(pkt->pts, avctx->sample_rate, AV_TIME_BASE);
 
-    if(!size){
-//        av_log(avfcontext, AV_LOG_DEBUG, "zero packet\n");
-        return 0;
-    }
 //    av_log(avfcontext, AV_LOG_DEBUG, "M%d\n", size);
 
     /* flush header packets so audio starts on a new page */
@@ -117,8 +85,8 @@ static int ogg_write_packet(AVFormatContext *avfcontext,
        context->header_handled = 1 ;
     }
 
-    op->packet = (uint8_t*) buf;
-    op->bytes  = size;
+    op->packet = (uint8_t*) pkt->data;
+    op->bytes  = pkt->size;
     op->b_o_s  = op->packetno == 0;
     op->granulepos= pts;
 
@@ -194,32 +162,49 @@ static int next_packet(AVFormatContext *avfcontext, ogg_packet *op) {
 static int ogg_read_header(AVFormatContext *avfcontext, AVFormatParameters *ap)
 {
     OggContext *context = avfcontext->priv_data;
+    ogg_packet op ;    
     char *buf ;
     ogg_page og ;
     AVStream *ast ;
-     
-    avfcontext->ctx_flags |= AVFMTCTX_NOHEADER;
+    AVCodecContext *codec;
+    uint8_t *p;
+    int i;
      
     ogg_sync_init(&context->oy) ;
     buf = ogg_sync_buffer(&context->oy, DECODER_BUFFER_SIZE) ;
 
     if(get_buffer(&avfcontext->pb, buf, DECODER_BUFFER_SIZE) <= 0)
-       return -EIO ;
+       return AVERROR_IO ;
     
     ogg_sync_wrote(&context->oy, DECODER_BUFFER_SIZE) ;   
     ogg_sync_pageout(&context->oy, &og) ;
     ogg_stream_init(&context->os, ogg_page_serialno(&og)) ;
     ogg_stream_pagein(&context->os, &og) ;
-  
+    
     /* currently only one vorbis stream supported */
 
     ast = av_new_stream(avfcontext, 0) ;
     if(!ast)
        return AVERROR_NOMEM ;
+    av_set_pts_info(ast, 60, 1, AV_TIME_BASE);
+
+    codec= &ast->codec;
+    codec->codec_type = CODEC_TYPE_AUDIO;
+    codec->codec_id = CODEC_ID_VORBIS;
+    for(i=0; i<3; i++){
+        if(next_packet(avfcontext, &op)){
+            return -1;
+        }
+        if(op.bytes >= (1<<16) || op.bytes < 0)
+            return -1;
+        codec->extradata_size+= 2 + op.bytes;
+        codec->extradata= av_realloc(codec->extradata, codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+        p= codec->extradata + codec->extradata_size - 2 - op.bytes;
+        *(p++)= op.bytes>>8;
+        *(p++)= op.bytes&0xFF;
+        memcpy(p, op.packet, op.bytes);
+    }
 
-    ast->codec.codec_type = CODEC_TYPE_AUDIO ;
-    ast->codec.codec_id = CODEC_ID_VORBIS ;
-    
     return 0 ;
 }
 
@@ -228,11 +213,14 @@ static int ogg_read_packet(AVFormatContext *avfcontext, AVPacket *pkt) {
     ogg_packet op ;
 
     if(next_packet(avfcontext, &op)) 
-       return -EIO ;
+       return AVERROR_IO ;
     if(av_new_packet(pkt, op.bytes) < 0)
-       return -EIO ;
+       return AVERROR_IO ;
     pkt->stream_index = 0 ;
     memcpy(pkt->data, op.packet, op.bytes);
+    if(avfcontext->streams[0]->codec.sample_rate && op.granulepos!=-1)
+        pkt->pts= av_rescale(op.granulepos, AV_TIME_BASE, avfcontext->streams[0]->codec.sample_rate);
+//    printf("%lld %d %d\n", pkt->pts, (int)op.granulepos, avfcontext->streams[0]->codec.sample_rate);
 
     return op.bytes;
 }
@@ -243,6 +231,7 @@ static int ogg_read_close(AVFormatContext *avfcontext) {
 
     ogg_stream_clear(&context->os) ;
     ogg_sync_clear(&context->oy) ;
+    av_freep(&avfcontext->streams[0]->codec.extradata);
 
     return 0 ;
 }