X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-flash%2Fsrc%2Fcodecs%2Fadpcmenc.rs;h=9cd04f7b30b9e49fef784fdef705fc2bd4f7cf55;hb=6f2630992fe340ad1a122ec10c649f756e478185;hp=ced3c1b8d6b014481bf5dc6c187c80f6612e5cf1;hpb=92d9fb6993d2d3f6f7a016ee6796a98e6e989f21;p=nihav.git diff --git a/nihav-flash/src/codecs/adpcmenc.rs b/nihav-flash/src/codecs/adpcmenc.rs index ced3c1b..9cd04f7 100644 --- a/nihav-flash/src/codecs/adpcmenc.rs +++ b/nihav-flash/src/codecs/adpcmenc.rs @@ -63,9 +63,9 @@ impl NAEncoder for ADPCMEncoder { fn negotiate_format(&self, encinfo: &EncodeParameters) -> EncoderResult { match encinfo.format { NACodecTypeInfo::None => { - let mut ofmt = EncodeParameters::default(); - ofmt.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 1, SND_S16_FORMAT, BLOCK_LEN)); - Ok(ofmt) + Ok(EncodeParameters { + format: NACodecTypeInfo::Audio(NAAudioInfo::new(0, 1, SND_S16_FORMAT, BLOCK_LEN)), + ..Default::default() }) }, NACodecTypeInfo::Video(_) => Err(EncoderError::FormatError), NACodecTypeInfo::Audio(ainfo) => { @@ -175,6 +175,7 @@ mod test { let mut enc_reg = RegisteredEncoders::new(); flash_register_all_encoders(&mut enc_reg); + // sample: https://samples.mplayerhq.hu/FLV/flash_flv_adpcm_testfiles/mono_11k.flv let dec_config = DecoderTestParams { demuxer: "flv", in_name: "assets/Flash/mono_11k.flv",