mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2024-12-24 11:54:01 +00:00
cosmetics: alignment
This commit is contained in:
parent
84db1ec0e5
commit
8b067ae42a
@ -69,9 +69,11 @@ bluray_pcm_channel_layout_packet_converter_c::remap_6ch(packet_cptr const &packe
|
||||
// post-remap order: FL FR FC LFE BL BR
|
||||
while (start_ptr != end_ptr) {
|
||||
start_ptr += m_bytes_per_channel * 3;
|
||||
|
||||
memcpy(m_remap_buf->get_buffer(), start_ptr, m_remap_buf_size);
|
||||
memcpy(start_ptr, m_remap_buf->get_buffer() + m_bytes_per_channel * 2, m_bytes_per_channel);
|
||||
memcpy(start_ptr + m_bytes_per_channel, m_remap_buf->get_buffer(), m_bytes_per_channel * 2);
|
||||
|
||||
start_ptr += m_remap_buf_size;
|
||||
}
|
||||
}
|
||||
@ -84,9 +86,11 @@ bluray_pcm_channel_layout_packet_converter_c::remap_7ch(packet_cptr const &packe
|
||||
// post-remap order: FL FR FC BL BR SL SR
|
||||
while (start_ptr != end_ptr) {
|
||||
start_ptr += m_bytes_per_channel * 3;
|
||||
|
||||
memcpy(m_remap_buf->get_buffer(), start_ptr, m_remap_buf_size);
|
||||
memcpy(start_ptr, m_remap_buf->get_buffer() + m_bytes_per_channel, m_bytes_per_channel * 2);
|
||||
memcpy(start_ptr + m_bytes_per_channel * 2, m_remap_buf->get_buffer(), m_bytes_per_channel);
|
||||
|
||||
start_ptr += m_remap_buf_size + m_bytes_per_channel;
|
||||
}
|
||||
}
|
||||
@ -99,12 +103,13 @@ bluray_pcm_channel_layout_packet_converter_c::remap_8ch(packet_cptr const &packe
|
||||
// post-remap order: FL FR FC LFE BL BR SL SR
|
||||
while (start_ptr != end_ptr) {
|
||||
start_ptr += m_bytes_per_channel * 3;
|
||||
|
||||
memcpy(m_remap_buf->get_buffer(), start_ptr, m_remap_buf_size);
|
||||
memcpy(start_ptr, m_remap_buf->get_buffer() + m_bytes_per_channel * 4, m_bytes_per_channel);
|
||||
// BL and BR stay at the same place
|
||||
memcpy(start_ptr + m_bytes_per_channel * 3, m_remap_buf->get_buffer(), m_bytes_per_channel);
|
||||
memcpy(start_ptr + m_bytes_per_channel * 4,
|
||||
m_remap_buf->get_buffer() + m_bytes_per_channel * 3, m_bytes_per_channel);
|
||||
memcpy(start_ptr + m_bytes_per_channel * 4, m_remap_buf->get_buffer() + m_bytes_per_channel * 3, m_bytes_per_channel);
|
||||
|
||||
start_ptr += m_remap_buf_size;
|
||||
}
|
||||
}
|
||||
@ -120,9 +125,11 @@ bluray_pcm_channel_layout_packet_converter_c::convert(packet_cptr const &packet)
|
||||
auto remainder = packet->data->get_size() % (m_bytes_per_channel * m_num_output_channels);
|
||||
if (remainder != 0)
|
||||
packet->data->set_size(packet->data->get_size() - remainder);
|
||||
|
||||
(this->*m_remap)(packet);
|
||||
}
|
||||
|
||||
m_ptzr->process(packet);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user