X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-llaudio%2Fsrc%2Fcodecs%2Fflacenc.rs;h=8b5b44decdff16272799cf3b81641d026e6ae33a;hb=6f2630992fe340ad1a122ec10c649f756e478185;hp=ccfe8075c0832cbdea55d6063fc4cd00a9d5f17d;hpb=051abe1fcd6b3ad59c2a2d11f2dd48bb880b7743;p=nihav.git

diff --git a/nihav-llaudio/src/codecs/flacenc.rs b/nihav-llaudio/src/codecs/flacenc.rs
index ccfe807..8b5b44d 100644
--- a/nihav-llaudio/src/codecs/flacenc.rs
+++ b/nihav-llaudio/src/codecs/flacenc.rs
@@ -299,7 +299,7 @@ impl FLACEncoder {
         let mut dbuf = bw.end();
         calc_header_crc(&mut dbuf[..hdr_crc_pos]);
         calc_frame_crc(&mut dbuf);
-        let ts = NATimeInfo::new(None, None, Some(nsamples as u64), 1, self.srate);
+        let ts = NATimeInfo::new(Some(self.cur_pos as u64), None, Some(nsamples as u64), 1, self.srate);
 
         for samp in self.samples.iter_mut() {
             samp.drain(..nsamples);
@@ -396,9 +396,9 @@ impl NAEncoder for FLACEncoder {
     fn negotiate_format(&self, encinfo: &EncodeParameters) -> EncoderResult<EncodeParameters> {
         match encinfo.format {
             NACodecTypeInfo::None => {
-                let mut ofmt = EncodeParameters::default();
-                ofmt.format = NACodecTypeInfo::Audio(NAAudioInfo::new(0, 1, SND_S16_FORMAT, DEFAULT_BLOCK_LEN));
-                Ok(ofmt)
+                Ok(EncodeParameters {
+                    format: NACodecTypeInfo::Audio(NAAudioInfo::new(0, 1, SND_S16_FORMAT, DEFAULT_BLOCK_LEN)),
+                    ..Default::default() })
             },
             NACodecTypeInfo::Video(_) => Err(EncoderError::FormatError),
             NACodecTypeInfo::Audio(ainfo) => {
@@ -599,6 +599,7 @@ mod test {
         let mut enc_reg = RegisteredEncoders::new();
         llaudio_register_all_encoders(&mut enc_reg);
 
+        // sample: https://samples.mplayerhq.hu/A-codecs/lossless/luckynight.flac
         let dec_config = DecoderTestParams {
                 demuxer:        "flac",
                 in_name:        "assets/LLaudio/luckynight.flac",