Mercurial > libavformat.hg

changeset 2733:6d33af177dfa libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove now useless libogg support
author bcoudurier
date Mon, 12 Nov 2007 10:26:33 +0000
parents 2b101e9d25c0
children 1b2658f20244
files Makefile allformats.c libogg.c
diffstat 3 files changed, 0 insertions(+), 283 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Nov 11 21:56:18 2007 +0000
+++ b/Makefile	Mon Nov 12 10:26:33 2007 +0000
@@ -161,7 +161,6 @@
 OBJS-$(CONFIG_LIBDC1394_DEMUXER)         += libdc1394.o
 OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
 OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
-OBJS-$(CONFIG_LIBOGG_MUXER)              += libogg.o
 
 OBJS-$(CONFIG_VHOOK)                     += framehook.o
 
--- a/allformats.c	Sun Nov 11 21:56:18 2007 +0000
+++ b/allformats.c	Mon Nov 12 10:26:33 2007 +0000
@@ -172,7 +172,6 @@
     /* external libraries */
     REGISTER_DEMUXER  (LIBDC1394, libdc1394);
     REGISTER_MUXDEMUX (LIBNUT, libnut);
-    REGISTER_MUXER    (LIBOGG, libogg);
 
     /* protocols */
     REGISTER_PROTOCOL (FILE, file);
--- a/libogg.c	Sun Nov 11 21:56:18 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-/*
- * Ogg bitstream support
- * Mark Hills <mark@pogo.org.uk>
- *
- * Uses libogg, but requires libvorbisenc to construct correct headers
- * when containing Vorbis stream -- currently the only format supported
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <stdio.h>
-
-#include <ogg/ogg.h>
-
-#include "avformat.h"
-
-
-#define DECODER_BUFFER_SIZE 4096
-
-
-typedef struct OggContext {
-    /* output */
-    ogg_stream_state os ;
-    int header_handled ;
-    ogg_packet op;
-
-    /* input */
-    ogg_sync_state oy ;
-} OggContext ;
-
-
-#ifdef CONFIG_MUXERS
-static int ogg_write_header(AVFormatContext *avfcontext)
-{
-    OggContext *context = avfcontext->priv_data;
-    ogg_packet *op= &context->op;
-    int n;
-
-    ogg_stream_init(&context->os, 31415);
-
-    for(n = 0 ; n < avfcontext->nb_streams ; n++) {
-        AVCodecContext *codec = avfcontext->streams[n]->codec;
-        uint8_t *headers = codec->extradata;
-        int headers_len = codec->extradata_size;
-        uint8_t *header_start[3];
-        int header_len[3];
-        int i, j;
-
-        av_set_pts_info(avfcontext->streams[n], 60, 1, AV_TIME_BASE);
-
-        for(j=1,i=0;i<2;++i, ++j) {
-            header_len[i]=0;
-            while(j<headers_len && headers[j]==0xff) {
-                header_len[i]+=0xff;
-                ++j;
-            }
-            header_len[i]+=headers[j];
-        }
-        header_len[2]=headers_len-header_len[0]-header_len[1]-j;
-        headers+=j;
-        header_start[0] = headers;
-        header_start[1] = header_start[0] + header_len[0];
-        header_start[2] = header_start[1] + header_len[1];
-
-        for(i=0; i < 3; ++i){
-            op->bytes = header_len[i];
-
-            op->packet= header_start[i];
-            op->b_o_s= op->packetno==0;
-
-            ogg_stream_packetin(&context->os, op);
-
-            op->packetno++; //FIXME multiple streams
-        }
-
-        context->header_handled = 0 ;
-    }
-
-    return 0 ;
-}
-
-static int ogg_write_packet(AVFormatContext *avfcontext, AVPacket *pkt)
-{
-    OggContext *context = avfcontext->priv_data ;
-    AVCodecContext *avctx= avfcontext->streams[pkt->stream_index]->codec;
-    ogg_packet *op= &context->op;
-    ogg_page og ;
-    int64_t pts;
-
-    pts= av_rescale(pkt->pts, avctx->sample_rate, AV_TIME_BASE);
-
-//    av_log(avfcontext, AV_LOG_DEBUG, "M%d\n", size);
-
-    /* flush header packets so audio starts on a new page */
-
-    if(!context->header_handled) {
-        while(ogg_stream_flush(&context->os, &og)) {
-            put_buffer(&avfcontext->pb, og.header, og.header_len) ;
-            put_buffer(&avfcontext->pb, og.body, og.body_len) ;
-            put_flush_packet(&avfcontext->pb);
-        }
-        context->header_handled = 1 ;
-    }
-
-    op->packet = (uint8_t*) pkt->data;
-    op->bytes  = pkt->size;
-    op->b_o_s  = op->packetno == 0;
-    op->granulepos= pts;
-
-    /* correct the fields in the packet -- essential for streaming */
-
-    ogg_stream_packetin(&context->os, op);
-
-    while(ogg_stream_pageout(&context->os, &og)) {
-        put_buffer(&avfcontext->pb, og.header, og.header_len);
-        put_buffer(&avfcontext->pb, og.body, og.body_len);
-        put_flush_packet(&avfcontext->pb);
-    }
-    op->packetno++;
-
-    return 0;
-}
-
-
-static int ogg_write_trailer(AVFormatContext *avfcontext) {
-    OggContext *context = avfcontext->priv_data ;
-    ogg_page og ;
-
-    while(ogg_stream_flush(&context->os, &og)) {
-        put_buffer(&avfcontext->pb, og.header, og.header_len) ;
-        put_buffer(&avfcontext->pb, og.body, og.body_len) ;
-        put_flush_packet(&avfcontext->pb);
-    }
-
-    ogg_stream_clear(&context->os) ;
-    return 0 ;
-}
-
-
-AVOutputFormat libogg_muxer = {
-    "libogg",
-    "Ogg format",
-    "application/ogg",
-    "ogg",
-    sizeof(OggContext),
-    CODEC_ID_VORBIS,
-    0,
-    ogg_write_header,
-    ogg_write_packet,
-    ogg_write_trailer,
-} ;
-#endif //CONFIG_MUXERS
-
-#if 0
-static int next_packet(AVFormatContext *avfcontext, ogg_packet *op) {
-    OggContext *context = avfcontext->priv_data ;
-    ogg_page og ;
-    char *buf ;
-
-    while(ogg_stream_packetout(&context->os, op) != 1) {
-
-        /* while no pages are available, read in more data to the sync */
-        while(ogg_sync_pageout(&context->oy, &og) != 1) {
-            buf = ogg_sync_buffer(&context->oy, DECODER_BUFFER_SIZE) ;
-            if(get_buffer(&avfcontext->pb, buf, DECODER_BUFFER_SIZE) <= 0)
-                return 1 ;
-            ogg_sync_wrote(&context->oy, DECODER_BUFFER_SIZE) ;
-        }
-
-        /* got a page. Feed it into the stream and get the packet */
-        if(ogg_stream_pagein(&context->os, &og) != 0)
-            return 1 ;
-    }
-
-    return 0 ;
-}
-
-
-static int ogg_read_header(AVFormatContext *avfcontext, AVFormatParameters *ap)
-{
-    OggContext *context = avfcontext->priv_data;
-    ogg_packet op ;
-    char *buf ;
-    ogg_page og ;
-    AVStream *ast ;
-    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 AVERROR(EIO) ;
-
-    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(ENOMEM) ;
-    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);
-        memset(codec->extradata + codec->extradata_size, 0, 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);
-    }
-
-    return 0 ;
-}
-
-
-static int ogg_read_packet(AVFormatContext *avfcontext, AVPacket *pkt) {
-    ogg_packet op ;
-
-    if(next_packet(avfcontext, &op))
-        return AVERROR(EIO) ;
-    if(av_new_packet(pkt, op.bytes) < 0)
-        return AVERROR(EIO) ;
-    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("%"PRId64" %d %d\n", pkt->pts, (int)op.granulepos, avfcontext->streams[0]->codec.sample_rate);
-
-    return op.bytes;
-}
-
-
-static int ogg_read_close(AVFormatContext *avfcontext) {
-    OggContext *context = avfcontext->priv_data ;
-
-    ogg_stream_clear(&context->os) ;
-    ogg_sync_clear(&context->oy) ;
-
-    return 0 ;
-}
-
-
-static AVInputFormat ogg_iformat = {
-    "ogg",
-    "Ogg Vorbis",
-    sizeof(OggContext),
-    NULL,
-    ogg_read_header,
-    ogg_read_packet,
-    ogg_read_close,
-    .extensions = "ogg",
-} ;
-#endif