X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-core%2Fsrc%2Fsoundcvt%2Fmod.rs;h=8d1ebb8a1487fca180afffeecc585902225f311a;hp=bc34b23da0e386a25b4ed6bfbf9961f802cb3452;hb=d24468d9dbd54f5cbe414649ff061699337fa7fe;hpb=fa90ccfb8676a917a02fbb56381f86aa1962d313 diff --git a/nihav-core/src/soundcvt/mod.rs b/nihav-core/src/soundcvt/mod.rs index bc34b23..8d1ebb8 100644 --- a/nihav-core/src/soundcvt/mod.rs +++ b/nihav-core/src/soundcvt/mod.rs @@ -304,7 +304,7 @@ impl SampleWriter for PackedSampleWriter<'_> { } } -pub fn convert_audio_frame(src: &NABufferType, dst_info: &NAAudioInfo, dst_chmap: &NAChannelMap) -> +pub fn convert_audio_frame(src: &NABufferType, dst_info: &NAAudioInfo, dst_chmap: &NAChannelMap) -> Result { let mut nsamples = src.get_audio_length(); if nsamples == 0 { @@ -441,7 +441,7 @@ Result { } } drop(sw); - + Ok(dst_buf) } @@ -490,7 +490,7 @@ pub fn calculate_reorder_matrix(src: &NAChannelMap, dst: &NAChannelMap) -> Vec bool { (chmap.num_channels() == 2) && - (chmap.get_channel(0) == NAChannelType::L) && + (chmap.get_channel(0) == NAChannelType::L) && (chmap.get_channel(1) == NAChannelType::R) }