Mercurial > libavcodec.hg
comparison vorbis_enc.c @ 10630:84cca0a953c5 libavcodec
Revert r20095: Allow compiling to vorbis again.
Original patch by Philipp Matthias Hahn, pmhahn pmhahn de
| author | cehoyos |
|---|---|
| date | Wed, 02 Dec 2009 23:51:15 +0000 |
| parents | 2b8a327189cd |
| children | 4b3da727d832 |
comparison
equal
deleted
inserted
replaced
| 10629:f164bb900d0b | 10630:84cca0a953c5 |
|---|---|
| 528 int len, hlens[3]; | 528 int len, hlens[3]; |
| 529 | 529 |
| 530 // identification header | 530 // identification header |
| 531 init_put_bits(&pb, p, buffer_len); | 531 init_put_bits(&pb, p, buffer_len); |
| 532 put_bits(&pb, 8, 1); //magic | 532 put_bits(&pb, 8, 1); //magic |
| 533 ff_put_string(&pb, "vorbis", 0); | 533 for (i = 0; "vorbis"[i]; i++) |
| 534 put_bits(&pb, 8, "vorbis"[i]); | |
| 534 put_bits32(&pb, 0); // version | 535 put_bits32(&pb, 0); // version |
| 535 put_bits(&pb, 8, venc->channels); | 536 put_bits(&pb, 8, venc->channels); |
| 536 put_bits32(&pb, venc->sample_rate); | 537 put_bits32(&pb, venc->sample_rate); |
| 537 put_bits32(&pb, 0); // bitrate | 538 put_bits32(&pb, 0); // bitrate |
| 538 put_bits32(&pb, 0); // bitrate | 539 put_bits32(&pb, 0); // bitrate |
| 547 p += hlens[0]; | 548 p += hlens[0]; |
| 548 | 549 |
| 549 // comment header | 550 // comment header |
| 550 init_put_bits(&pb, p, buffer_len); | 551 init_put_bits(&pb, p, buffer_len); |
| 551 put_bits(&pb, 8, 3); //magic | 552 put_bits(&pb, 8, 3); //magic |
| 552 ff_put_string(&pb, "vorbis", 0); | 553 for (i = 0; "vorbis"[i]; i++) |
| 554 put_bits(&pb, 8, "vorbis"[i]); | |
| 553 put_bits32(&pb, 0); // vendor length TODO | 555 put_bits32(&pb, 0); // vendor length TODO |
| 554 put_bits32(&pb, 0); // amount of comments | 556 put_bits32(&pb, 0); // amount of comments |
| 555 put_bits(&pb, 1, 1); // framing | 557 put_bits(&pb, 1, 1); // framing |
| 556 | 558 |
| 557 flush_put_bits(&pb); | 559 flush_put_bits(&pb); |
| 560 p += hlens[1]; | 562 p += hlens[1]; |
| 561 | 563 |
| 562 // setup header | 564 // setup header |
| 563 init_put_bits(&pb, p, buffer_len); | 565 init_put_bits(&pb, p, buffer_len); |
| 564 put_bits(&pb, 8, 5); //magic | 566 put_bits(&pb, 8, 5); //magic |
| 565 ff_put_string(&pb, "vorbis", 0); | 567 for (i = 0; "vorbis"[i]; i++) |
| 568 put_bits(&pb, 8, "vorbis"[i]); | |
| 566 | 569 |
| 567 // codebooks | 570 // codebooks |
| 568 put_bits(&pb, 8, venc->ncodebooks - 1); | 571 put_bits(&pb, 8, venc->ncodebooks - 1); |
| 569 for (i = 0; i < venc->ncodebooks; i++) | 572 for (i = 0; i < venc->ncodebooks; i++) |
| 570 put_codebook_header(&pb, &venc->codebooks[i]); | 573 put_codebook_header(&pb, &venc->codebooks[i]); |