virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

kill obnoxious ogg_packet passing from demuxer to decoder

Browse Source 
Originally committed as revision 2953 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-04-04 02:07:15 +00:00
parent 8bfed902f3
commit d76f581ff5
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/oggvorbis.c
View File

@ -19,6 +19,7 @@ typedef struct OggVorbisContext {
/* decoder */ /* decoder */
vorbis_comment vc ; vorbis_comment vc ;
ogg_packet op;
} OggVorbisContext ; } OggVorbisContext ;
@ -146,6 +147,7 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) {
vorbis_info_init(&context->vi) ; vorbis_info_init(&context->vi) ;
vorbis_comment_init(&context->vc) ; vorbis_comment_init(&context->vc) ;
context->op.packetno= 0;
return 0 ; return 0 ;
} }
@ -181,8 +183,8 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext,
uint8_t *buf, int buf_size) uint8_t *buf, int buf_size)
{ {
OggVorbisContext *context = avccontext->priv_data ; OggVorbisContext *context = avccontext->priv_data ;
ogg_packet *op = (ogg_packet*)buf ;
float **pcm ; float **pcm ;
ogg_packet *op= &context->op;
int samples, total_samples, total_bytes,i; int samples, total_samples, total_bytes,i;
if(!buf_size){ if(!buf_size){
@ -191,14 +193,15 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext,
return 0; return 0;
} }
op->packet = (char*)op + sizeof(ogg_packet) ; /* correct data pointer */ 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); // 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++) /* for(i=0; i<op->bytes; i++)
av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]); av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]);
av_log(avccontext, AV_LOG_DEBUG, "\n");*/ av_log(avccontext, AV_LOG_DEBUG, "\n");*/
// op->b_o_s= op->packetno == 0;
if(op->packetno < 3) { if(op->packetno < 3) {
if(vorbis_synthesis_headerin(&context->vi, &context->vc, op)<0){ if(vorbis_synthesis_headerin(&context->vi, &context->vc, op)<0){
av_log(avccontext, AV_LOG_ERROR, "%lld. vorbis header damaged\n", op->packetno+1); av_log(avccontext, AV_LOG_ERROR, "%lld. vorbis header damaged\n", op->packetno+1);
@ -206,6 +209,7 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext,
} }
avccontext->channels = context->vi.channels ; avccontext->channels = context->vi.channels ;
avccontext->sample_rate = context->vi.rate ; avccontext->sample_rate = context->vi.rate ;
op->packetno++;
return buf_size ; return buf_size ;
} }
@ -230,6 +234,7 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext,
vorbis_synthesis_read(&context->vd, samples) ; vorbis_synthesis_read(&context->vd, samples) ;
} }
op->packetno++;
*data_size = total_bytes ; *data_size = total_bytes ;
return buf_size ; return buf_size ;
} }

7
libavformat/ogg.c
View File

@ -226,13 +226,12 @@ static int ogg_read_packet(AVFormatContext *avfcontext, AVPacket *pkt) {
if(next_packet(avfcontext, &op)) if(next_packet(avfcontext, &op))
return -EIO ; return -EIO ;
if(av_new_packet(pkt, sizeof(ogg_packet) + op.bytes) < 0) if(av_new_packet(pkt, op.bytes) < 0)
return -EIO ; return -EIO ;
pkt->stream_index = 0 ; pkt->stream_index = 0 ;
memcpy(pkt->data, &op, sizeof(ogg_packet)) ; memcpy(pkt->data, op.packet, op.bytes);
memcpy(pkt->data + sizeof(ogg_packet), op.packet, op.bytes) ;
return sizeof(ogg_packet) + op.bytes ; return op.bytes;
} }