]> git.nihav.org Git - nihav-encoder.git/commitdiff
imgseq: always use rawvideo
authorKostya Shishkov <kostya.shishkov@gmail.com>
Sun, 30 Jun 2024 12:10:18 +0000 (14:10 +0200)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Sun, 30 Jun 2024 12:10:18 +0000 (14:10 +0200)
rawvideo-ms requires a padding to multiple of 4 and thus not always suitable

src/imgseq.rs

index d3948b541242e4d32029c42b89baf5aeefb751bb..7de339b42b43fa0d04eaa25bb4bc32f8e2198fa4 100644 (file)
@@ -172,7 +172,7 @@ impl<'a> ImgSeqDemuxerCreator<'a> {
         if let Ok(file) = File::open(fname.as_str()) {
             let mut file = BufReader::new(file);
             let vinfo = read_pnm_header(&mut file, self.pgmyuv)?;
-            let cinfo = NACodecInfo::new(if vinfo.format.model.is_yuv() { "rawvideo" } else { "rawvideo-ms" }, NACodecTypeInfo::Video(vinfo), None);
+            let cinfo = NACodecInfo::new("rawvideo", NACodecTypeInfo::Video(vinfo), None);
             let stream = NAStream::new(StreamType::Video, 0, cinfo, self.tb_num, self.tb_den, 0).into_ref();
             return Ok(ImgSeqDemuxer::new(stream, self.start.unwrap_or(0), template, self.pgmyuv));
         }
@@ -184,7 +184,7 @@ impl<'a> ImgSeqDemuxerCreator<'a> {
             if let Ok(file) = File::open(fname.as_str()) {
                 let mut file = BufReader::new(file);
                 let vinfo = read_pnm_header(&mut file, self.pgmyuv)?;
-                let cinfo = NACodecInfo::new(if vinfo.format.model.is_yuv() { "rawvideo" } else { "rawvideo-ms" }, NACodecTypeInfo::Video(vinfo), None);
+                let cinfo = NACodecInfo::new("rawvideo", NACodecTypeInfo::Video(vinfo), None);
                 let stream = NAStream::new(StreamType::Video, 0, cinfo, self.tb_num, self.tb_den, 0).into_ref();
                 return Ok(ImgSeqDemuxer::new(stream, new_start, template, self.pgmyuv));
             }