diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-09 00:32:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-09 00:32:08 +0100 |
| commit | 17af99550ea468bf6702f4973630a24629a65ff7 (patch) | |
| tree | 00be394a21f6506c2425b0b6691ac42a23a277c2 /src/sound_asset_writer.cc | |
| parent | fe83eb5293fa4027856f6ee9faec7bfc8288badf (diff) | |
Simplify previous commit and remove some debugging.
Diffstat (limited to 'src/sound_asset_writer.cc')
| -rw-r--r-- | src/sound_asset_writer.cc | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc index f7513d91..92855db7 100644 --- a/src/sound_asset_writer.cc +++ b/src/sound_asset_writer.cc @@ -51,7 +51,7 @@ struct SoundAssetWriter::ASDCPState ASDCP::PCM::AudioDescriptor audio_desc; }; -SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path file, Standard standard, ChannelAssignment assign) +SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path file, Standard standard) : AssetWriter (asset, file, standard) , _state (new SoundAssetWriter::ASDCPState) , _sound_asset (asset) @@ -69,23 +69,10 @@ SoundAssetWriter::SoundAssetWriter (SoundAsset* asset, boost::filesystem::path f if (standard == INTEROP) { _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_NONE; } else { - switch (assign) { - case CHANNEL_ASSIGNMENT_51: - _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_1; - break; - case CHANNEL_ASSIGNMENT_61: - _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_2; - break; - case CHANNEL_ASSIGNMENT_71: - _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_3; - break; - case CHANNEL_ASSIGNMENT_WTF: - _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_4; - break; - case CHANNEL_ASSIGNMENT_71_DS: - _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_5; - break; - } + /* Just use WTF ("wild track format") for SMPTE for now; searches suggest that this + uses the same assignment as Interop. + */ + _state->audio_desc.ChannelFormat = ASDCP::PCM::CF_CFG_4; } _state->frame_buffer.Capacity (ASDCP::PCM::CalcFrameBufferSize (_state->audio_desc)); |