alex
/
libnyquist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

various ogg encoder cleanups

Browse Source
pull/18/head
Dimitri Diakopoulos 10 years ago
parent 2ca4e517dd
commit 892c798f9f
1 changed files with 43 additions and 56 deletions
Show Stats Download Patch File Download Diff File

99
src/WavEncoder.cpp
Unescape Escape View File

@ -212,7 +212,7 @@ int WavEncoder::WriteFile(const EncoderParams p, const AudioData * d, const std:
#include "opus/opusfile/include/opusfile.h" #include "opus/opusfile/include/opusfile.h"
#include "ogg/ogg.h" #include "ogg/ogg.h"
typedef std::pair<std::string, std::string> metadata_type; typedef std::pair<std::string, std::string> metadata_t;
class OggWriter class OggWriter
{ {
@ -223,7 +223,6 @@ class OggWriter
ostream->write(reinterpret_cast<char*>(page.header), static_cast<std::streamsize>(page.header_len)); ostream->write(reinterpret_cast<char*>(page.header), static_cast<std::streamsize>(page.header_len));
ostream->write(reinterpret_cast<char*>(page.body), static_cast<std::streamsize>(page.body_len)); ostream->write(reinterpret_cast<char*>(page.body), static_cast<std::streamsize>(page.body_len));
} }
if (flush && ogg_stream_flush(&oss, &page)) if (flush && ogg_stream_flush(&oss, &page))
{ {
ostream->write(reinterpret_cast<char*>(page.header), static_cast<std::streamsize>(page.header_len)); ostream->write(reinterpret_cast<char*>(page.header), static_cast<std::streamsize>(page.header_len));
@ -240,12 +239,6 @@ class OggWriter
std::array<char, 1> chan_map_1 = {{ 0x0 }}; std::array<char, 1> chan_map_1 = {{ 0x0 }};
std::array<char, 2> chan_map_2 = {{ 0x0, 0x1 }}; std::array<char, 2> chan_map_2 = {{ 0x0, 0x1 }};
std::array<char, 3> chan_map_3 = {{ 0x0, 0x2, 0x1 }};
std::array<char, 4> chan_map_4 = {{ 0x0, 0x1, 0x2, 0x3 }};
std::array<char, 5> chan_map_5 = {{ 0x0, 0x4, 0x1, 0x2, 0x3 }};
std::array<char, 6> chan_map_6 = {{ 0x0, 0x4, 0x1, 0x2, 0x3, 0x5 }};
std::array<char, 7> chan_map_7 = {{ 0x0, 0x4, 0x1, 0x2, 0x3, 0x5, 0x6 }};
std::array<char, 8> chan_map_8 = {{ 0x0, 0x6, 0x1, 0x2, 0x3, 0x4, 0x5, 0x7 }};
std::array<char, 9> _preamble = {{ 'O', 'p', 'u', 's', 'H', 'e', 'a', 'd', 0x1 }}; std::array<char, 9> _preamble = {{ 'O', 'p', 'u', 's', 'H', 'e', 'a', 'd', 0x1 }};
std::array<char, 1> _channel_count; std::array<char, 1> _channel_count;
@ -272,19 +265,13 @@ class OggWriter
{ {
case 1: header.insert(header.end(), chan_map_1.cbegin(), chan_map_1.cend()); break; case 1: header.insert(header.end(), chan_map_1.cbegin(), chan_map_1.cend()); break;
case 2: header.insert(header.end(), chan_map_2.cbegin(), chan_map_2.cend()); break; case 2: header.insert(header.end(), chan_map_2.cbegin(), chan_map_2.cend()); break;
case 3: header.insert(header.end(), chan_map_3.cbegin(), chan_map_3.cend()); break;
case 4: header.insert(header.end(), chan_map_4.cbegin(), chan_map_4.cend()); break;
case 5: header.insert(header.end(), chan_map_5.cbegin(), chan_map_5.cend()); break;
case 6: header.insert(header.end(), chan_map_6.cbegin(), chan_map_6.cend()); break;
case 7: header.insert(header.end(), chan_map_7.cbegin(), chan_map_7.cend()); break;
case 8: header.insert(header.end(), chan_map_8.cbegin(), chan_map_8.cend()); break;
default: throw std::runtime_error("couldn't map channel data"); default: throw std::runtime_error("couldn't map channel data");
} }
return header; return header;
} }
std::vector<char> make_tags(const std::string & vendor, const std::vector<metadata_type> & metadata) std::vector<char> make_tags(const std::string & vendor, const std::vector<metadata_t> & metadata)
{ {
std::vector<char> tags; std::vector<char> tags;
@ -313,72 +300,72 @@ class OggWriter
return tags; return tags;
} }
ogg_int64_t packet_number; ogg_int64_t packet_number;
ogg_int64_t granule; ogg_int64_t granule;
ogg_page page; ogg_page page;
ogg_stream_state oss; ogg_stream_state oss;
int channel_count; int channel_count;
long sample_rate; long sample_rate;
int bits_per_sample; int bits_per_sample;
std::ofstream * ostream; std::ofstream * ostream;
std::string description; std::string description;
std::vector<metadata_type> metadata; std::vector<metadata_t> metadata;
public: public:
OggWriter(int channel_count, long sample_rate, int bits_per_sample, std::ofstream & stream, const std::vector<metadata_type> & md) OggWriter(int channel_count, long sample_rate, int bits_per_sample, std::ofstream & stream, const std::vector<metadata_t> & md)
{ {
channel_count = channel_count; this->channel_count = channel_count;
sample_rate = sample_rate; this->sample_rate = sample_rate;
bits_per_sample = bits_per_sample; this->bits_per_sample = bits_per_sample;
ostream = &stream; this-> ostream = &stream;
metadata = md; this->metadata = md;
int oss_init_error; int oggInitErr, packetErr;
int packet_write_error;
ogg_packet header_packet; ogg_packet header_packet;
ogg_packet tags_packet; ogg_packet tags_packet;
std::vector<char> header_vector; std::vector<char> header_vector;
std::vector<char> tags_vector; std::vector<char> tags_vector;
description = "Ogg"; description = "Ogg";
packet_number = 0; packet_number = 0;
granule = 0; granule = 0;
// Validate parameters // Validate parameters
if (channel_count < 1 && channel_count > 255) throw std::runtime_error("Channel count must be between 1 and 255."); if (channel_count < 1 && channel_count > 255) throw std::runtime_error("Channel count must be between 1 and 255.");
// Initialize the Ogg stream. // Initialize the Ogg stream.
oss_init_error = ogg_stream_init(&oss, 12345); oggInitErr = ogg_stream_init(&oss, 12345);
if (oss_init_error) throw std::runtime_error("Could not initialize the Ogg stream state."); if (oggInitErr) throw std::runtime_error("Could not initialize the Ogg stream state.");
// Initialize the header packet. // Initialize the header packet.
header_vector = make_header(channel_count, 3840, sample_rate, 0); header_vector = make_header(channel_count, 3840, sample_rate, 0);
header_packet.packet = reinterpret_cast<unsigned char*>(header_vector.data()); header_packet.packet = reinterpret_cast<unsigned char*>(header_vector.data());
header_packet.bytes = header_vector.size(); header_packet.bytes = header_vector.size();
header_packet.b_o_s = 1; header_packet.b_o_s = 1;
header_packet.e_o_s = 0; header_packet.e_o_s = 0;
header_packet.granulepos = 0; header_packet.granulepos = 0;
header_packet.packetno = packet_number++; header_packet.packetno = packet_number++;
// Initialize tags // Initialize tags
tags_vector = make_tags("libnyquist", metadata); tags_vector = make_tags("libnyquist", metadata);
tags_packet.packet = reinterpret_cast<unsigned char*>(tags_vector.data()); tags_packet.packet = reinterpret_cast<unsigned char*>(tags_vector.data());
tags_packet.bytes = tags_vector.size(); tags_packet.bytes = tags_vector.size();
tags_packet.b_o_s = 0; tags_packet.b_o_s = 0;
tags_packet.e_o_s = 0; tags_packet.e_o_s = 0;
tags_packet.granulepos = 0; tags_packet.granulepos = 0;
tags_packet.packetno = packet_number++; tags_packet.packetno = packet_number++;
// Write header page // Write header page
packet_write_error = ogg_stream_packetin(&oss, &header_packet); packetErr = ogg_stream_packetin(&oss, &header_packet);
if (packet_write_error) throw std::runtime_error("Could not write header packet to the Ogg stream."); if (packetErr) throw std::runtime_error("Could not write header packet to the Ogg stream.");
write_to_ostream(true); write_to_ostream(true);
// Write tags page // Write tags page
packet_write_error = ogg_stream_packetin(&oss, &tags_packet); packetErr = ogg_stream_packetin(&oss, &tags_packet);
if (packet_write_error) throw std::runtime_error("Could not write tags packet to the Ogg stream."); if (packetErr) throw std::runtime_error("Could not write tags packet to the Ogg stream.");
write_to_ostream(true); write_to_ostream(true);
} }
@ -433,7 +420,7 @@ int OggOpusEncoder::WriteFile(const EncoderParams p, const AudioData * d, const
std::ofstream fout(path.c_str(), std::ios::out | std::ios::binary); std::ofstream fout(path.c_str(), std::ios::out | std::ios::binary);
std::vector<metadata_type> oggMetadata = {{"artist", "dimitri"}}; std::vector<metadata_t> oggMetadata = {{"artist", "dimitri"}};
OggWriter writer(d->channelCount, d->sampleRate, GetFormatBitsPerSample(d->sourceFormat), fout, oggMetadata); OggWriter writer(d->channelCount, d->sampleRate, GetFormatBitsPerSample(d->sourceFormat), fout, oggMetadata);
std::vector<uint8_t> outBuffer(OPUS_MAX_PACKET_SIZE); std::vector<uint8_t> outBuffer(OPUS_MAX_PACKET_SIZE);

Write Preview
Loading…
Cancel
Save