xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 20:19:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Original Commit: r98 | ods15 | 2006-10-01 10:15:33 +0200 (Sun, 01 Oct 2006) | 2 lines

Browse Source 
switch to int8_t for residue codebook numbers, use memcpy in residue init

Originally committed as revision 6502 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Oded Shimon 2006-10-02 06:09:12 +00:00
parent 8d38e5e5f0
commit ccc0fbf3c4
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/vorbis_enc.c
View File

@ -81,7 +81,7 @@ typedef struct {
int partition_size; int partition_size;
int classifications; int classifications;
int classbook; int classbook;
int (*books)[8]; int8_t (*books)[8];
float (*maxes)[2]; float (*maxes)[2];
} residue_t; } residue_t;
@ -466,9 +466,9 @@ static void create_vorbis_context(venc_context_t * venc, AVCodecContext * avccon
rc->partition_size = 32; rc->partition_size = 32;
rc->classifications = 10; rc->classifications = 10;
rc->classbook = 15; rc->classbook = 15;
rc->books = av_malloc(sizeof(int[8]) * rc->classifications); rc->books = av_malloc(sizeof(*rc->books) * rc->classifications);
for (i = 0; i < rc->classifications; i++) { {
int a[10][8] = { static const int8_t a[10][8] = {
{ -1, -1, -1, -1, -1, -1, -1, -1, }, { -1, -1, -1, -1, -1, -1, -1, -1, },
{ -1, -1, 16, -1, -1, -1, -1, -1, }, { -1, -1, 16, -1, -1, -1, -1, -1, },
{ -1, -1, 17, -1, -1, -1, -1, -1, }, { -1, -1, 17, -1, -1, -1, -1, -1, },
@ -480,8 +480,7 @@ static void create_vorbis_context(venc_context_t * venc, AVCodecContext * avccon
{ 24, 25, -1, -1, -1, -1, -1, -1, }, { 24, 25, -1, -1, -1, -1, -1, -1, },
{ 26, 27, 28, -1, -1, -1, -1, -1, }, { 26, 27, 28, -1, -1, -1, -1, -1, },
}; };
int j; memcpy(rc->books, a, sizeof a);
for (j = 0; j < 8; j++) rc->books[i][j] = a[i][j];
} }
ready_residue(rc, venc); ready_residue(rc, venc);