Commit Graph

111 Commits

Author SHA1 Message Date
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Oded Shimon
4109400295 more forgotten free's.
Originally committed as revision 6527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 11:55:24 +00:00
Oded Shimon
419550990c 10l, wrong order in freeing
Originally committed as revision 6526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 11:47:10 +00:00
Michael Niedermayer
35af7a9b27 slightly saner indention
Originally committed as revision 6525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 11:31:52 +00:00
Oded Shimon
bec5fc5ffb add vorbis_enc_data.h, remove codebook data from vorbis_enc.c
Originally committed as revision 6520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:56:39 +00:00
Oded Shimon
007574482a Original Commit: r114 | ods15 | 2006-10-01 21:38:37 +0200 (Sun, 01 Oct 2006) | 2 lines
blocksize -> log2_blocksize

Originally committed as revision 6518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:52 +00:00
Oded Shimon
631941441d Original Commit: r113 | ods15 | 2006-10-01 21:35:47 +0200 (Sun, 01 Oct 2006) | 2 lines
some more static consts

Originally committed as revision 6517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:49 +00:00
Oded Shimon
2613f6c156 Original Commit: r112 | ods15 | 2006-10-01 20:48:39 +0200 (Sun, 01 Oct 2006) | 3 lines
psy change. -aq param about the same, and behaves more consistently with
different content.

Originally committed as revision 6516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:47 +00:00
Oded Shimon
c83637b965 Original Commit: r111 | ods15 | 2006-10-01 19:40:50 +0200 (Sun, 01 Oct 2006) | 2 lines
update to use ff_vorbis_floor1_render_list

Originally committed as revision 6515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:45 +00:00
Oded Shimon
2eb3db5f69 Original Commit: r110 | ods15 | 2006-10-01 19:17:32 +0200 (Sun, 01 Oct 2006) | 2 lines
slight simlification for residue division by floor

Originally committed as revision 6514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:43 +00:00
Oded Shimon
f8a6a56a75 Original Commit: r109 | ods15 | 2006-10-01 19:14:52 +0200 (Sun, 01 Oct 2006) | 2 lines
5% speed improovement by changing put_vector

Originally committed as revision 6513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:41 +00:00
Oded Shimon
ac0057f3a6 Original Commit: r108 | ods15 | 2006-10-01 18:46:06 +0200 (Sun, 01 Oct 2006) | 2 lines
prevent division/modulo

Originally committed as revision 6512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:39 +00:00
Oded Shimon
0c4630f244 Original Commit: r107 | ods15 | 2006-10-01 18:13:12 +0200 (Sun, 01 Oct 2006) | 2 lines
give proper error message for channels!=2

Originally committed as revision 6511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:36 +00:00
Oded Shimon
a88de9682f Original Commit: r106 | ods15 | 2006-10-01 18:11:55 +0200 (Sun, 01 Oct 2006) | 2 lines
window -> apply_window_and_mdct

Originally committed as revision 6510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:33 +00:00
Oded Shimon
64c82a7411 Original Commit: r105 | ods15 | 2006-10-01 18:09:55 +0200 (Sun, 01 Oct 2006) | 2 lines
slight simplification for channel coupling

Originally committed as revision 6509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:30 +00:00
Oded Shimon
c2ee47ac06 Original Commit: r104 | ods15 | 2006-10-01 18:04:08 +0200 (Sun, 01 Oct 2006) | 2 lines
somewhat cosmetic formatting, use FFMAX

Originally committed as revision 6508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:28 +00:00
Oded Shimon
cc767a8969 Original Commit: r103 | ods15 | 2006-10-01 18:00:43 +0200 (Sun, 01 Oct 2006) | 2 lines
slight optimization, don't calculate average twice

Originally committed as revision 6507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:24 +00:00
Oded Shimon
7e46045784 Original Commit: r102 | ods15 | 2006-10-01 17:58:38 +0200 (Sun, 01 Oct 2006) | 2 lines
remove ready_floor()

Originally committed as revision 6506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:22 +00:00
Oded Shimon
5f3de4b86b Original Commit: r101 | ods15 | 2006-10-01 14:15:00 +0200 (Sun, 01 Oct 2006) | 2 lines
some cleanup

Originally committed as revision 6505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:20 +00:00
Oded Shimon
f11329e461 Original Commit: r100 | ods15 | 2006-10-01 14:01:27 +0200 (Sun, 01 Oct 2006) | 2 lines
update to global functions now shared in vorbis.h

Originally committed as revision 6504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:18 +00:00
Oded Shimon
cbf306f328 Original Commit: r99 | ods15 | 2006-10-01 11:12:44 +0200 (Sun, 01 Oct 2006) | 2 lines
codebook init data cleanup

Originally committed as revision 6503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:14 +00:00
Oded Shimon
ccc0fbf3c4 Original Commit: r98 | ods15 | 2006-10-01 10:15:33 +0200 (Sun, 01 Oct 2006) | 2 lines
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
2006-10-02 06:09:12 +00:00
Oded Shimon
8d38e5e5f0 Original Commit: r97 | ods15 | 2006-09-30 23:32:19 +0300 (Sat, 30 Sep 2006) | 2 lines
don't assert fail for channels != 2, exit cleanly instead...

Originally committed as revision 6501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:10 +00:00
Oded Shimon
7a82a10a09 Original Commit: r96 | ods15 | 2006-09-30 23:25:18 +0300 (Sat, 30 Sep 2006) | 2 lines
even though it doesn't do anything, use flush_put_bits()

Originally committed as revision 6500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:08 +00:00
Oded Shimon
6fde6305b1 Original Commit: r95 | ods15 | 2006-09-30 22:11:08 +0300 (Sat, 30 Sep 2006) | 3 lines
scale user settable quality for more fine-grainablity
now sane values for -aq is 10-30

Originally committed as revision 6499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:06 +00:00
Oded Shimon
39d0567737 Original Commit: r94 | ods15 | 2006-09-30 22:09:33 +0300 (Sat, 30 Sep 2006) | 2 lines
prevent c++ decleration

Originally committed as revision 6498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:04 +00:00
Oded Shimon
ddf217ba14 Original Commit: r93 | ods15 | 2006-09-30 22:02:21 +0300 (Sat, 30 Sep 2006) | 2 lines
update to change made in vorbis.h/vorbis_data.c

Originally committed as revision 6497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:09:02 +00:00
Oded Shimon
4000774d8f Original Commit: r92 | ods15 | 2006-09-30 12:13:47 +0300 (Sat, 30 Sep 2006) | 3 lines
user settable audio quality, with -aq. values between 0.1 to 0.3 are sane.
the higher the better.

Originally committed as revision 6496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:59 +00:00
Oded Shimon
b002eec985 Original Commit: r91 | ods15 | 2006-09-30 10:05:16 +0300 (Sat, 30 Sep 2006) | 4 lines
even better psy.
My encoder officially kicks ass :) same bitrate to libvorbis, and (IMO)
same quality! :)

Originally committed as revision 6495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:57 +00:00
Oded Shimon
68e75e4dec Original Commit: r90 | ods15 | 2006-09-29 22:14:40 +0300 (Fri, 29 Sep 2006) | 3 lines
much better magic for floor, the first psychoacoustic in this encoder!
now creates valid, 175kbps audio, which sounds good! :)

Originally committed as revision 6494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:55 +00:00
Oded Shimon
9b9941bee6 Original Commit: r88 | ods15 | 2006-09-29 21:10:36 +0300 (Fri, 29 Sep 2006) | 2 lines
slight similification

Originally committed as revision 6493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:53 +00:00
Oded Shimon
40b6c72133 Original Commit: r87 | ods15 | 2006-09-29 21:10:05 +0300 (Fri, 29 Sep 2006) | 2 lines
prevent valgrind warning

Originally committed as revision 6492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:51 +00:00
Oded Shimon
8b33748c45 Original Commit: r86 | ods15 | 2006-09-29 21:08:42 +0300 (Fri, 29 Sep 2006) | 2 lines
make put_vector ignore unused codebook entries

Originally committed as revision 6491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:48 +00:00
Oded Shimon
5e93d002e5 Original Commit: r85 | ods15 | 2006-09-29 21:07:58 +0300 (Fri, 29 Sep 2006) | 2 lines
bad array decleration

Originally committed as revision 6490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:46 +00:00
Oded Shimon
866bfee373 Original Commit: r84 | ods15 | 2006-09-29 21:07:07 +0300 (Fri, 29 Sep 2006) | 2 lines
dangling piece from last commit

Originally committed as revision 6489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:44 +00:00
Oded Shimon
a2cf16fe03 Original Commit: r83 | ods15 | 2006-09-29 21:06:13 +0300 (Fri, 29 Sep 2006) | 2 lines
add real_len to residue codebooks, which are smaller than supposed to be

Originally committed as revision 6488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:41 +00:00
Oded Shimon
0e9bf4a296 Original Commit: r82 | ods15 | 2006-09-29 21:03:43 +0300 (Fri, 29 Sep 2006) | 2 lines
fix channels to be correct for rc->type==2 before classes[] decleration

Originally committed as revision 6487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:39 +00:00
Oded Shimon
7f44dfe264 Original Commit: r81 | ods15 | 2006-09-29 21:02:09 +0300 (Fri, 29 Sep 2006) | 2 lines
make residue_encode decide good classification per partition

Originally committed as revision 6486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:36 +00:00
Oded Shimon
840d157323 Original Commit: r80 | ods15 | 2006-09-29 15:44:22 +0300 (Fri, 29 Sep 2006) | 2 lines
import libvorbis codebooks for residue

Originally committed as revision 6485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:33 +00:00
Oded Shimon
6f5be556dd Original Commit: r79 | ods15 | 2006-09-29 15:15:26 +0300 (Fri, 29 Sep 2006) | 2 lines
cosmetic reindent

Originally committed as revision 6484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:31 +00:00
Oded Shimon
9127d7c3d4 Original Commit: r78 | ods15 | 2006-09-29 15:14:28 +0300 (Fri, 29 Sep 2006) | 2 lines
improove floor codebooks

Originally committed as revision 6483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:28 +00:00
Oded Shimon
dac7b2f6dd Original Commit: r77 | ods15 | 2006-09-29 15:12:56 +0300 (Fri, 29 Sep 2006) | 2 lines
fix for book==-1 in floor

Originally committed as revision 6482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:25 +00:00
Oded Shimon
7e4221fd6b Original Commit: r76 | ods15 | 2006-09-29 13:16:37 +0300 (Fri, 29 Sep 2006) | 2 lines
switch to 2048 block size

Originally committed as revision 6481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:23 +00:00
Oded Shimon
a9ce92679d Original Commit: r75 | ods15 | 2006-09-29 13:03:51 +0300 (Fri, 29 Sep 2006) | 2 lines
remove debugging printf

Originally committed as revision 6480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:21 +00:00
Oded Shimon
a277ad842e Original Commit: r74 | ods15 | 2006-09-29 13:03:31 +0300 (Fri, 29 Sep 2006) | 2 lines
support multiple codebooks for floor

Originally committed as revision 6479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:19 +00:00
Oded Shimon
899124aa38 Original Commit: r73 | ods15 | 2006-09-28 21:01:59 +0300 (Thu, 28 Sep 2006) | 2 lines
almost cosmetic, remove redundant variable

Originally committed as revision 6478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:16 +00:00
Oded Shimon
4c588d8e9f Original Commit: r72 | ods15 | 2006-09-28 21:00:47 +0300 (Thu, 28 Sep 2006) | 2 lines
cosmetic

Originally committed as revision 6477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:14 +00:00
Oded Shimon
e3df7fc64c Original Commit: r71 | ods15 | 2006-09-28 21:00:24 +0300 (Thu, 28 Sep 2006) | 2 lines
residue type 2

Originally committed as revision 6476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:11 +00:00
Oded Shimon
9d74ff0e55 Original Commit: r70 | ods15 | 2006-09-28 19:07:36 +0300 (Thu, 28 Sep 2006) | 2 lines
channel coupling

Originally committed as revision 6475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:09 +00:00
Oded Shimon
90a09b69d7 Original Commit: r69 | ods15 | 2006-09-27 20:27:50 +0300 (Wed, 27 Sep 2006) | 2 lines
prevent buffer overflow

Originally committed as revision 6474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 06:08:07 +00:00