mirror of https://github.com/FFmpeg/FFmpeg.git
Originally committed as revision 896 to svn://svn.ffmpeg.org/ffmpeg/trunkpull/126/head
Mark Hills
23 years ago
committed by
Michael Niedermayer
parent
ad324c9351
commit
81e0d0b412
13 changed files with 359 additions and 0 deletions
@ -0,0 +1,168 @@ |
||||
/*
|
||||
* 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 |
||||
*/ |
||||
|
||||
#include <stdio.h> |
||||
#include <time.h> |
||||
|
||||
#include <ogg/ogg.h> |
||||
#include <vorbis/vorbisenc.h> |
||||
|
||||
#include "avformat.h" |
||||
#include "oggvorbis.h" |
||||
|
||||
|
||||
typedef struct OggContext { |
||||
ogg_stream_state os ; |
||||
int header_written ; |
||||
ogg_int64_t base_packet_no ; |
||||
ogg_int64_t base_granule_pos ; |
||||
} OggContext ; |
||||
|
||||
|
||||
static int ogg_write_header(AVFormatContext *avfcontext) { |
||||
OggContext *context ; |
||||
AVCodecContext *avccontext ; |
||||
vorbis_info vi ; |
||||
vorbis_dsp_state vd ; |
||||
vorbis_comment vc ; |
||||
vorbis_block vb ; |
||||
ogg_packet header, header_comm, header_code ;
|
||||
int n ; |
||||
|
||||
fprintf(stderr, "ogg_write_header\n") ; |
||||
|
||||
if(!(context = malloc(sizeof(OggContext)))) |
||||
return -1 ; |
||||
avfcontext->priv_data = context ; |
||||
|
||||
srand(time(NULL)); |
||||
ogg_stream_init(&context->os, rand()); |
||||
|
||||
for(n = 0 ; n < avfcontext->nb_streams ; n++) { |
||||
avccontext = &avfcontext->streams[n]->codec ; |
||||
|
||||
/* begin vorbis specific code */ |
||||
|
||||
vorbis_info_init(&vi) ; |
||||
|
||||
/* code copied from libavcodec/oggvorbis.c */ |
||||
|
||||
if(oggvorbis_init_encoder(&vi, avccontext) < 0) { |
||||
fprintf(stderr, "ogg_write_header: init_encoder failed") ; |
||||
return -1 ; |
||||
} |
||||
|
||||
vorbis_analysis_init(&vd, &vi) ; |
||||
vorbis_block_init(&vd, &vb) ; |
||||
|
||||
vorbis_comment_init(&vc) ; |
||||
vorbis_comment_add_tag(&vc, "encoder", "ffmpeg") ; |
||||
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_comment_clear(&vc) ; |
||||
|
||||
/* end of vorbis specific code */ |
||||
|
||||
context->header_written = 0 ; |
||||
context->base_packet_no = 0 ; |
||||
} |
||||
|
||||
return 0 ; |
||||
} |
||||
|
||||
|
||||
static int ogg_write_packet(AVFormatContext *avfcontext, |
||||
int stream_index, |
||||
unsigned char *buf, int size, int force_pts) |
||||
{ |
||||
OggContext *context = avfcontext->priv_data ; |
||||
ogg_packet *op ; |
||||
ogg_page og ; |
||||
int l = 0 ; |
||||
|
||||
/* flush header packets so audio starts on a new page */ |
||||
|
||||
if(!context->header_written) { |
||||
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_written = 1 ; |
||||
} |
||||
|
||||
while(l < size) { |
||||
op = (ogg_packet*)(buf + l) ; |
||||
op->packet = buf + l + sizeof(ogg_packet) ; /* fix data pointer */ |
||||
|
||||
if(!context->base_packet_no) { /* this is the first packet */ |
||||
context->base_packet_no = op->packetno ;
|
||||
context->base_granule_pos = op->granulepos ; |
||||
} |
||||
|
||||
/* correct the fields in the packet -- essential for streaming */ |
||||
|
||||
op->packetno -= context->base_packet_no ; |
||||
op->granulepos -= context->base_granule_pos ; |
||||
|
||||
ogg_stream_packetin(&context->os, op) ; |
||||
l += sizeof(ogg_packet) + op->bytes ; |
||||
|
||||
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); |
||||
} |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
|
||||
static int ogg_write_trailer(AVFormatContext *avfcontext) { |
||||
OggContext *context = avfcontext->priv_data ; |
||||
ogg_page og ; |
||||
|
||||
fprintf(stderr, "ogg_write_trailer\n") ; |
||||
|
||||
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 ogg_oformat = { |
||||
"ogg", |
||||
"Ogg Vorbis", |
||||
"audio/x-vorbis", |
||||
"ogg", |
||||
sizeof(OggContext), |
||||
CODEC_ID_VORBIS, |
||||
0, |
||||
ogg_write_header, |
||||
ogg_write_packet, |
||||
ogg_write_trailer, |
||||
}; |
||||
|
||||
|
||||
int ogg_init(void) { |
||||
av_register_output_format(&ogg_oformat) ; |
||||
return 0 ; |
||||
} |
||||
@ -0,0 +1,140 @@ |
||||
/*
|
||||
* Ogg Vorbis codec support via libvorbisenc |
||||
* Mark Hills <mark@pogo.org.uk> |
||||
*/ |
||||
|
||||
#include <time.h> |
||||
|
||||
#include <vorbis/vorbisenc.h> |
||||
|
||||
#include "avcodec.h" |
||||
#include "oggvorbis.h" |
||||
|
||||
#define OGGVORBIS_FRAME_SIZE 1024 |
||||
|
||||
|
||||
typedef struct OggVorbisContext { |
||||
vorbis_info vi ; |
||||
vorbis_dsp_state vd ; |
||||
vorbis_block vb ; |
||||
} OggVorbisContext ; |
||||
|
||||
|
||||
int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) { |
||||
if(avccontext->quality) { /* VBR requested */ |
||||
|
||||
fprintf(stderr, "init_encode: channels=%d quality=%d\n",
|
||||
avccontext->channels, avccontext->quality) ; |
||||
|
||||
return vorbis_encode_init_vbr(vi, avccontext->channels, |
||||
avccontext->sample_rate, (float)avccontext->quality / 1000) ; |
||||
} |
||||
|
||||
fprintf(stderr, "init_encoder: channels=%d bitrate=%d tolerance=%d\n",
|
||||
avccontext->channels, avccontext->bit_rate, |
||||
avccontext->bit_rate_tolerance) ; |
||||
|
||||
return vorbis_encode_init(vi, avccontext->channels, |
||||
avccontext->sample_rate, -1, avccontext->bit_rate, -1) ; |
||||
} |
||||
|
||||
|
||||
static int oggvorbis_encode_init(AVCodecContext *avccontext) { |
||||
OggVorbisContext *context = avccontext->priv_data ; |
||||
|
||||
fprintf(stderr, "oggvorbis_encode_init\n") ; |
||||
|
||||
vorbis_info_init(&context->vi) ; |
||||
|
||||
if(oggvorbis_init_encoder(&context->vi, avccontext) < 0) { |
||||
fprintf(stderr, "oggvorbis_encode_init: init_encoder failed") ; |
||||
return -1 ; |
||||
} |
||||
|
||||
vorbis_analysis_init(&context->vd, &context->vi) ; |
||||
vorbis_block_init(&context->vd, &context->vb) ; |
||||
|
||||
avccontext->frame_size = OGGVORBIS_FRAME_SIZE ; |
||||
|
||||
return 0 ; |
||||
} |
||||
|
||||
|
||||
int oggvorbis_encode_frame(AVCodecContext *avccontext, unsigned char *packets, |
||||
int buf_size, void *data) |
||||
{ |
||||
OggVorbisContext *context = avccontext->priv_data ; |
||||
float **buffer ; |
||||
ogg_packet op ; |
||||
signed char *audio = data ; |
||||
int l, samples = buf_size / 16 ; /* samples = OGGVORBIS_FRAME_SIZE */ ; |
||||
|
||||
buffer = vorbis_analysis_buffer(&context->vd, samples) ; |
||||
|
||||
if(context->vi.channels == 1) { |
||||
for(l = 0 ; l < samples ; l++) |
||||
buffer[0][l]=((audio[l*2+1]<<8)|(0x00ff&(int)audio[l*2]))/32768.f; |
||||
} else { |
||||
for(l = 0 ; l < samples ; l++){ |
||||
buffer[0][l]=((audio[l*4+1]<<8)|(0x00ff&(int)audio[l*4]))/32768.f; |
||||
buffer[1][l]=((audio[l*4+3]<<8)|(0x00ff&(int)audio[l*4+2]))/32768.f; |
||||
} |
||||
} |
||||
|
||||
vorbis_analysis_wrote(&context->vd, samples) ;
|
||||
|
||||
l = 0 ; |
||||
|
||||
while(vorbis_analysis_blockout(&context->vd, &context->vb) == 1) { |
||||
vorbis_analysis(&context->vb, NULL); |
||||
vorbis_bitrate_addblock(&context->vb) ; |
||||
|
||||
while(vorbis_bitrate_flushpacket(&context->vd, &op)) { |
||||
memcpy(packets + l, &op, sizeof(ogg_packet)) ; |
||||
memcpy(packets + l + sizeof(ogg_packet), op.packet, op.bytes) ; |
||||
l += sizeof(ogg_packet) + op.bytes ; |
||||
} |
||||
} |
||||
|
||||
return l ; |
||||
} |
||||
|
||||
|
||||
int oggvorbis_encode_close(AVCodecContext *avccontext) { |
||||
OggVorbisContext *context = avccontext->priv_data ; |
||||
/* ogg_packet op ; */ |
||||
|
||||
fprintf(stderr, "oggvorbis_encode_close\n") ; |
||||
|
||||
vorbis_analysis_wrote(&context->vd, 0) ; /* notify vorbisenc this is EOF */ |
||||
|
||||
/* We need to write all the remaining packets into the stream
|
||||
* on closing */ |
||||
|
||||
/*
|
||||
while(vorbis_bitrate_flushpacket(&context->vd, &op)) { |
||||
memcpy(packets + l, &op, sizeof(ogg_packet)) ; |
||||
memcpy(packets + l + sizeof(ogg_packet), op.packet, op.bytes) ; |
||||
l += sizeof(ogg_packet) + op.bytes ;
|
||||
} |
||||
*/ |
||||
|
||||
vorbis_block_clear(&context->vb); |
||||
vorbis_dsp_clear(&context->vd); |
||||
vorbis_info_clear(&context->vi); |
||||
|
||||
return 0 ; |
||||
} |
||||
|
||||
|
||||
AVCodec oggvorbis_encoder = { |
||||
"vorbis", |
||||
CODEC_TYPE_AUDIO, |
||||
CODEC_ID_VORBIS, |
||||
sizeof(OggVorbisContext), |
||||
oggvorbis_encode_init, |
||||
oggvorbis_encode_frame, |
||||
oggvorbis_encode_close |
||||
}; |
||||
|
||||
|
||||
@ -0,0 +1,10 @@ |
||||
#ifndef AVCODEC_OGGVORBIS_H |
||||
#define AVCODEC_OGGVORBIS_H |
||||
|
||||
#include <vorbis/vorbisenc.h> |
||||
|
||||
#include "avcodec.h" |
||||
|
||||
int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) ; |
||||
|
||||
#endif |
||||
Loading…
Reference in new issue