From d52480b40d1b98d03ec21ac2ef5c7780ea3d947d Mon Sep 17 00:00:00 2001 From: Oded Shimon Date: Mon, 2 Oct 2006 05:55:22 +0000 Subject: [PATCH] Original Commit: r7 | ods15 | 2006-09-17 08:50:47 +0300 (Sun, 17 Sep 2006) | 2 lines skeleton for residue/floor/mappings header Originally committed as revision 6418 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/vorbis_enc.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c index 8811e3b7f..3a9d5860f 100644 --- a/libavcodec/vorbis_enc.c +++ b/libavcodec/vorbis_enc.c @@ -52,12 +52,30 @@ typedef struct { } codebook_t; typedef struct { +} floor_t; + +typedef struct { +} residue_t; + +typedef struct { +} mapping_t; + +typedef struct { int channels; int sample_rate; int blocksize[2]; int ncodebooks; codebook_t * codebooks; + + int nfloors; + floor_t * floors; + + int nresidues; + residue_t * residues; + + int nmappings; + mapping_t * mappings; } venc_context_t; static inline int ilog(unsigned int a) { @@ -136,6 +154,12 @@ static void put_codebook_header(PutBitContext * pb, codebook_t * cb) { } } +static void put_floor_header(PutBitContext * pb, floor_t * fl) { +} + +static void put_residue_header(PutBitContext * pb, residue_t * r) { +} + static int put_main_header(venc_context_t * venc, uint8_t ** out) { int i; PutBitContext pb; @@ -184,6 +208,22 @@ static int put_main_header(venc_context_t * venc, uint8_t ** out) { put_bits(&pb, 8, venc->ncodebooks - 1); for (i = 0; i < venc->ncodebooks; i++) put_codebook_header(&pb, &venc->codebooks[0]); + // time domain, reserved, zero + put_bits(&pb, 6, 0); + put_bits(&pb, 16, 0); + + // floors + put_bits(&pb, 6, venc->nfloors - 1); + for (i = 0; i < venc->nfloors; i++) put_floor_header(&pb, &venc->floors[0]); + + // residues + put_bits(&pb, 6, venc->nresidues - 1); + for (i = 0; i < venc->nresidues; i++) put_residue_header(&pb, &venc->residues[0]); + + // mappings + put_bits(&pb, 6, venc->nmappings - 1); + for (i = 0; i < venc->nmappings; i++) { + } flush_put_bits(&pb); hlens[2] = (put_bits_count(&pb) + 7) / 8; -- 2.11.0