[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec avcodec.h, 1.394, 1.395 oggvorbis.c, 1.17, 1.18 utils.c, 1.139, 1.140
Måns Rullgård CVS
mru
Fri May 13 20:10:26 CEST 2005
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv25698/libavcodec
Modified Files:
avcodec.h oggvorbis.c utils.c
Log Message:
change extradata format for vorbis
Index: avcodec.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/avcodec.h,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -d -r1.394 -r1.395
--- avcodec.h 8 May 2005 20:15:42 -0000 1.394
+++ avcodec.h 13 May 2005 18:10:22 -0000 1.395
@@ -2357,6 +2357,8 @@
((uint8_t*)(x))[0])
#endif
+extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
+
#ifdef __cplusplus
}
#endif
Index: oggvorbis.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/oggvorbis.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- oggvorbis.c 30 Apr 2005 21:43:57 -0000 1.17
+++ oggvorbis.c 13 May 2005 18:10:22 -0000 1.18
@@ -49,6 +49,7 @@
OggVorbisContext *context = avccontext->priv_data ;
ogg_packet header, header_comm, header_code;
uint8_t *p;
+ unsigned int offset, len;
vorbis_info_init(&context->vi) ;
if(oggvorbis_init_encoder(&context->vi, avccontext) < 0) {
@@ -64,22 +65,21 @@
vorbis_analysis_headerout(&context->vd, &context->vc, &header,
&header_comm, &header_code);
- avccontext->extradata_size= 3*2 + header.bytes + header_comm.bytes + header_code.bytes;
- p= avccontext->extradata= av_mallocz(avccontext->extradata_size);
-
- *(p++) = header.bytes>>8;
- *(p++) = header.bytes&0xFF;
- memcpy(p, header.packet, header.bytes);
- p += header.bytes;
-
- *(p++) = header_comm.bytes>>8;
- *(p++) = header_comm.bytes&0xFF;
- memcpy(p, header_comm.packet, header_comm.bytes);
- p += header_comm.bytes;
-
- *(p++) = header_code.bytes>>8;
- *(p++) = header_code.bytes&0xFF;
- memcpy(p, header_code.packet, header_code.bytes);
+ len = header.bytes + header_comm.bytes + header_code.bytes;
+ avccontext->extradata_size= 64 + len + len/255;
+ p = avccontext->extradata= av_mallocz(avccontext->extradata_size);
+ p[0] = 2;
+ offset = 1;
+ offset += av_xiphlacing(&p[offset], header.bytes);
+ offset += av_xiphlacing(&p[offset], header_comm.bytes);
+ memcpy(&p[offset], header.packet, header.bytes);
+ offset += header.bytes;
+ memcpy(&p[offset], header_comm.packet, header_comm.bytes);
+ offset += header_comm.bytes;
+ memcpy(&p[offset], header_code.packet, header_code.bytes);
+ offset += header_code.bytes;
+ avccontext->extradata_size = offset;
+ avccontext->extradata= av_realloc(avccontext->extradata, avccontext->extradata_size);
/* vorbis_block_clear(&context->vb);
vorbis_dsp_clear(&context->vd);
@@ -184,19 +184,54 @@
static int oggvorbis_decode_init(AVCodecContext *avccontext) {
OggVorbisContext *context = avccontext->priv_data ;
uint8_t *p= avccontext->extradata;
- int i;
+ int i, hsizes[3];
+ unsigned char *headers[3], *extradata = avccontext->extradata;
+ unsigned int offset;
vorbis_info_init(&context->vi) ;
vorbis_comment_init(&context->vc) ;
+ if(! avccontext->extradata_size || ! p) {
+ av_log(avccontext, AV_LOG_ERROR, "vorbis extradata absent\n");
+ return -1;
+ }
+ if(*p != 2) {
+ av_log(avccontext, AV_LOG_ERROR,
+ "vorbis initial header len is wrong: %d\n", *p);
+ return -1;
+ }
+ offset = 1;
+ p++;
+ for(i=0; i<2; i++) {
+ hsizes[i] = 0;
+ while((*p == 0xFF) && (offset < avccontext->extradata_size)) {
+ hsizes[i] += 0xFF;
+ offset++;
+ p++;
+ }
+ if(offset >= avccontext->extradata_size - 1) {
+ av_log(avccontext, AV_LOG_ERROR, "vorbis header sizes damaged\n");
+ return -1;
+ }
+ hsizes[i] += *p;
+ offset++;
+ p++;
+ }
+ hsizes[2] = avccontext->extradata_size - hsizes[0] - hsizes[1] - offset;
+#if 0
+ av_log(avccontext, AV_LOG_DEBUG,
+ "vorbis header sizes: %d, %d, %d, / extradata_len is %d \n",
+ hsizes[0], hsizes[1], hsizes[2], avccontext->extradata_size);
+#endif
+ headers[0] = extradata + offset;
+ headers[1] = extradata + offset + hsizes[0];
+ headers[2] = extradata + offset + hsizes[0] + hsizes[1];
+
for(i=0; i<3; i++){
context->op.b_o_s= i==0;
- context->op.bytes= *(p++)<<8;
- context->op.bytes+=*(p++);
- context->op.packet= p;
- p += context->op.bytes;
-
- if(vorbis_synthesis_headerin(&context->vi, &context->vc, &context->op)<0){
+ context->op.bytes = hsizes[i];
+ context->op.packet = headers[i];
+ if(vorbis_synthesis_headerin(&context->vi, &context->vc, &context->op)<0){
av_log(avccontext, AV_LOG_ERROR, "%d. vorbis header damaged\n", i+1);
return -1;
}
Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- utils.c 7 May 2005 19:24:07 -0000 1.139
+++ utils.c 13 May 2005 18:10:22 -0000 1.140
@@ -1015,3 +1015,17 @@
return -1;
}
#endif
+
+unsigned int av_xiphlacing(unsigned char *s, unsigned int v)
+{
+ unsigned int n = 0;
+
+ while(v >= 0xff) {
+ *s++ = 0xff;
+ v -= 0xff;
+ n++;
+ }
+ *s = v;
+ n++;
+ return n;
+}
More information about the ffmpeg-cvslog
mailing list