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

pts hack (correct solution would be to pass the pts from the encoder to the muxer)

Browse Source 
Originally committed as revision 2957 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-04-04 17:06:30 +00:00
parent bbb77e7c2e
commit 3f4993f19b
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/oggvorbis.c
View File

@ -8,7 +8,9 @@
#include "avcodec.h" #include "avcodec.h"
//#define OGGVORBIS_FRAME_SIZE 1024 #undef NDEBUG
#include <assert.h>
#define OGGVORBIS_FRAME_SIZE 64 #define OGGVORBIS_FRAME_SIZE 64
#define BUFFER_SIZE (1024*64) #define BUFFER_SIZE (1024*64)
@ -19,6 +21,7 @@ typedef struct OggVorbisContext {
vorbis_block vb ; vorbis_block vb ;
uint8_t buffer[BUFFER_SIZE]; uint8_t buffer[BUFFER_SIZE];
int buffer_index; int buffer_index;
int64_t fake_pts; //pts which libavformat will guess, HACK FIXME
/* decoder */ /* decoder */
vorbis_comment vc ; vorbis_comment vc ;
@ -130,20 +133,27 @@ static int oggvorbis_encode_frame(AVCodecContext *avccontext,
} }
} }
l=0;
if(context->buffer_index){ if(context->buffer_index){
ogg_packet *op2= (ogg_packet*)context->buffer; ogg_packet *op2= (ogg_packet*)context->buffer;
op2->packet = context->buffer + sizeof(ogg_packet); op2->packet = context->buffer + sizeof(ogg_packet);
l= op2->bytes;
if(op2->granulepos <= context->fake_pts /*&& (context->fake_pts || context->buffer_index > 4*1024)*/){
memcpy(packets, op2->packet, l); assert(op2->granulepos == context->fake_pts);
context->buffer_index -= l + sizeof(ogg_packet); l= op2->bytes;
memcpy(context->buffer, context->buffer + l + sizeof(ogg_packet), context->buffer_index);
memcpy(packets, op2->packet, l);
context->buffer_index -= l + sizeof(ogg_packet);
memcpy(context->buffer, context->buffer + l + sizeof(ogg_packet), context->buffer_index);
}
// av_log(avccontext, AV_LOG_DEBUG, "E%d\n", l); // av_log(avccontext, AV_LOG_DEBUG, "E%d\n", l);
return l;
} }
return 0; if(l || context->fake_pts){
context->fake_pts += avccontext->frame_size;
}
return l;
} }