X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Ftest%2Fdec_video.rs;h=62672b3bae3255fa80abf86ba545a790875af486;hb=6011e20199143f519881660144a4ca95ba77fd2d;hp=0b78157089b42ec5cacf17ada43ede7f8bc6bcd3;hpb=a191f568b14cfba727449e77444cf0bcc931c01a;p=nihav.git diff --git a/nihav-core/src/test/dec_video.rs b/nihav-core/src/test/dec_video.rs index 0b78157..62672b3 100644 --- a/nihav-core/src/test/dec_video.rs +++ b/nihav-core/src/test/dec_video.rs @@ -4,10 +4,10 @@ use crate::frame::*; use crate::codecs::*; use crate::demuxers::*; //use crate::io::byteio::*; +use crate::scale::*; use super::wavwriter::WavWriter; -fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) { - let frm = frmref.borrow(); +fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { if let NABufferType::None = frm.get_buffer() { return; } let name = format!("assets/{}out{:02}_{:06}.pgm", pfx, strno, num); let mut ofile = File::create(name).unwrap(); @@ -15,11 +15,12 @@ fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) { let (w, h) = buf.get_dimensions(0); let (w2, h2) = buf.get_dimensions(1); let has_alpha = buf.get_info().get_format().has_alpha(); - let tot_h; + let mut tot_h = h + h2; if has_alpha { - tot_h = h * 2 + h2; - } else { - tot_h = h + h2; + tot_h += h; + } + if w2 > w/2 { + tot_h += h2; } let hdr = format!("P5\n{} {}\n255\n", w, tot_h); ofile.write_all(hdr.as_bytes()).unwrap(); @@ -27,31 +28,54 @@ fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) { let ls = buf.get_stride(0); let mut idx = 0; let mut idx2 = w; - let mut pad: Vec = Vec::with_capacity((w - w2 * 2) / 2); - pad.resize((w - w2 * 2) / 2, 0xFF); for _ in 0..h { let line = &dta[idx..idx2]; ofile.write_all(line).unwrap(); idx += ls; idx2 += ls; } - let mut base1 = buf.get_offset(1); - let stride1 = buf.get_stride(1); - let mut base2 = buf.get_offset(2); - let stride2 = buf.get_stride(2); - for _ in 0..h2 { - let bend1 = base1 + w2; - let line = &dta[base1..bend1]; - ofile.write_all(line).unwrap(); - ofile.write_all(pad.as_slice()).unwrap(); + if w2 <= w/2 { + let mut pad: Vec = Vec::with_capacity((w - w2 * 2) / 2); + pad.resize((w - w2 * 2) / 2, 0xFF); + let mut base1 = buf.get_offset(1); + let stride1 = buf.get_stride(1); + let mut base2 = buf.get_offset(2); + let stride2 = buf.get_stride(2); + for _ in 0..h2 { + let bend1 = base1 + w2; + let line = &dta[base1..bend1]; + ofile.write_all(line).unwrap(); + ofile.write_all(pad.as_slice()).unwrap(); - let bend2 = base2 + w2; - let line = &dta[base2..bend2]; - ofile.write_all(line).unwrap(); - ofile.write_all(pad.as_slice()).unwrap(); + let bend2 = base2 + w2; + let line = &dta[base2..bend2]; + ofile.write_all(line).unwrap(); + ofile.write_all(pad.as_slice()).unwrap(); - base1 += stride1; - base2 += stride2; + base1 += stride1; + base2 += stride2; + } + } else { + let mut pad: Vec = Vec::with_capacity(w - w2); + pad.resize(w - w2, 0xFF); + let mut base1 = buf.get_offset(1); + let stride1 = buf.get_stride(1); + for _ in 0..h2 { + let bend1 = base1 + w2; + let line = &dta[base1..bend1]; + ofile.write_all(line).unwrap(); + ofile.write_all(pad.as_slice()).unwrap(); + base1 += stride1; + } + let mut base2 = buf.get_offset(2); + let stride2 = buf.get_stride(2); + for _ in 0..h2 { + let bend2 = base2 + w2; + let line = &dta[base2..bend2]; + ofile.write_all(line).unwrap(); + ofile.write_all(pad.as_slice()).unwrap(); + base2 += stride2; + } } if has_alpha { let ls = buf.get_stride(3); @@ -66,8 +90,7 @@ fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) { } } -fn write_palppm(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) { - let frm = frmref.borrow(); +fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { let name = format!("assets/{}out{:02}_{:06}.ppm", pfx, strno, num); let mut ofile = File::create(name).unwrap(); let buf = frm.get_buffer().get_vbuf().unwrap(); @@ -98,70 +121,26 @@ fn write_palppm(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) { } } -fn write_ppm(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) { - let frm = frmref.borrow(); +fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) { let name = format!("assets/{}out{:02}_{:06}.ppm", pfx, strno, num); let mut ofile = File::create(name).unwrap(); - if let NABufferType::VideoPacked(ref buf) = frm.get_buffer() { + let info = frm.get_buffer().get_video_info().unwrap(); + let mut dpic = alloc_video_buffer(NAVideoInfo::new(info.get_width(), info.get_height(), false, RGB24_FORMAT), 0).unwrap(); + let ifmt = ScaleInfo { width: info.get_width(), height: info.get_height(), fmt: info.get_format() }; + let ofmt = ScaleInfo { width: info.get_width(), height: info.get_height(), fmt: RGB24_FORMAT }; + let mut scaler = NAScale::new(ifmt, ofmt).unwrap(); + scaler.convert(&frm.get_buffer(), &mut dpic).unwrap(); + let buf = dpic.get_vbuf().unwrap(); let (w, h) = buf.get_dimensions(0); let hdr = format!("P6\n{} {}\n255\n", w, h); ofile.write_all(hdr.as_bytes()).unwrap(); let dta = buf.get_data(); let stride = buf.get_stride(0); - let offs: [usize; 3] = [ - buf.get_info().get_format().get_chromaton(0).unwrap().get_offset() as usize, - buf.get_info().get_format().get_chromaton(1).unwrap().get_offset() as usize, - buf.get_info().get_format().get_chromaton(2).unwrap().get_offset() as usize - ]; - let step = buf.get_info().get_format().get_elem_size() as usize; let mut line: Vec = Vec::with_capacity(w * 3); line.resize(w * 3, 0); for src in dta.chunks(stride) { - for x in 0..w { - line[x * 3 + 0] = src[x * step + offs[0]]; - line[x * 3 + 1] = src[x * step + offs[1]]; - line[x * 3 + 2] = src[x * step + offs[2]]; - } - ofile.write_all(line.as_slice()).unwrap(); + ofile.write_all(&src[0..w*3]).unwrap(); } - } else if let NABufferType::Video16(ref buf) = frm.get_buffer() { - let (w, h) = buf.get_dimensions(0); - let hdr = format!("P6\n{} {}\n255\n", w, h); - ofile.write_all(hdr.as_bytes()).unwrap(); - let dta = buf.get_data(); - let stride = buf.get_stride(0); - let depths: [u8; 3] = [ - buf.get_info().get_format().get_chromaton(0).unwrap().get_depth(), - buf.get_info().get_format().get_chromaton(1).unwrap().get_depth(), - buf.get_info().get_format().get_chromaton(2).unwrap().get_depth() - ]; - let masks: [u16; 3] = [ - (1 << depths[0]) - 1, - (1 << depths[1]) - 1, - (1 << depths[2]) - 1 - ]; - let shifts: [u8; 3] = [ - buf.get_info().get_format().get_chromaton(0).unwrap().get_shift(), - buf.get_info().get_format().get_chromaton(1).unwrap().get_shift(), - buf.get_info().get_format().get_chromaton(2).unwrap().get_shift() - ]; - let mut line: Vec = Vec::with_capacity(w * 3); - line.resize(w * 3, 0); - for src in dta.chunks(stride) { - for x in 0..w { - let elem = src[x]; - let r = ((elem >> shifts[0]) & masks[0]) << (8 - depths[0]); - let g = ((elem >> shifts[1]) & masks[1]) << (8 - depths[1]); - let b = ((elem >> shifts[2]) & masks[2]) << (8 - depths[2]); - line[x * 3 + 0] = r as u8; - line[x * 3 + 1] = g as u8; - line[x * 3 + 2] = b as u8; - } - ofile.write_all(line.as_slice()).unwrap(); - } - } else { -panic!(" unhandled buf format"); - } } /*fn open_wav_out(pfx: &str, strno: usize) -> WavWriter { @@ -182,7 +161,7 @@ pub fn test_file_decoding(demuxer: &str, name: &str, limit: Option, let mut br = ByteReader::new(&mut fr); let mut dmx = create_demuxer(dmx_f, &mut br).unwrap(); - let mut decs: Vec>> = Vec::new(); + let mut decs: Vec, Box)>> = Vec::new(); for i in 0..dmx.get_num_streams() { let s = dmx.get_stream(i).unwrap(); let info = s.get_info(); @@ -190,8 +169,9 @@ pub fn test_file_decoding(demuxer: &str, name: &str, limit: Option, if let Some(df) = decfunc { if (decode_video && info.is_video()) || (decode_audio && info.is_audio()) { let mut dec = (df)(); - dec.init(info).unwrap(); - decs.push(Some(dec)); + let mut dsupp = Box::new(NADecoderSupport::new()); + dec.init(&mut dsupp, info).unwrap(); + decs.push(Some((dsupp, dec))); } else { decs.push(None); } @@ -211,12 +191,12 @@ pub fn test_file_decoding(demuxer: &str, name: &str, limit: Option, if pkt.get_pts().unwrap() > limit.unwrap() { break; } } let streamno = pkt.get_stream().get_id() as usize; - if let Some(ref mut dec) = decs[streamno] { - let frm = dec.decode(&pkt).unwrap(); - if pkt.get_stream().get_info().is_video() && video_pfx.is_some() && frm.borrow().get_frame_type() != FrameType::Skip { + if let Some((ref mut dsupp, ref mut dec)) = decs[streamno] { + let frm = dec.decode(dsupp, &pkt).unwrap(); + if pkt.get_stream().get_info().is_video() && video_pfx.is_some() && frm.get_frame_type() != FrameType::Skip { let pfx = video_pfx.unwrap(); - let pts = if let Some(fpts) = frm.borrow().get_pts() { fpts } else { pkt.get_pts().unwrap() }; - let vinfo = frm.borrow().get_buffer().get_video_info().unwrap(); + let pts = if let Some(fpts) = frm.get_pts() { fpts } else { pkt.get_pts().unwrap() }; + let vinfo = frm.get_buffer().get_video_info().unwrap(); if vinfo.get_format().is_paletted() { write_palppm(pfx, streamno, pts, frm); } else if vinfo.get_format().get_model().is_yuv() { @@ -239,7 +219,7 @@ pub fn test_decode_audio(demuxer: &str, name: &str, limit: Option, audio_pf let mut br = ByteReader::new(&mut fr); let mut dmx = create_demuxer(dmx_f, &mut br).unwrap(); - let mut decs: Vec>> = Vec::new(); + let mut decs: Vec, Box)>> = Vec::new(); for i in 0..dmx.get_num_streams() { let s = dmx.get_stream(i).unwrap(); let info = s.get_info(); @@ -247,8 +227,9 @@ pub fn test_decode_audio(demuxer: &str, name: &str, limit: Option, audio_pf if let Some(df) = decfunc { if info.is_audio() { let mut dec = (df)(); - dec.init(info).unwrap(); - decs.push(Some(dec)); + let mut dsupp = Box::new(NADecoderSupport::new()); + dec.init(&mut dsupp, info).unwrap(); + decs.push(Some((dsupp, dec))); } else { decs.push(None); } @@ -275,9 +256,8 @@ pub fn test_decode_audio(demuxer: &str, name: &str, limit: Option, audio_pf if pkt.get_pts().unwrap() > limit.unwrap() { break; } } let streamno = pkt.get_stream().get_id() as usize; - if let Some(ref mut dec) = decs[streamno] { - let frm_ = dec.decode(&pkt).unwrap(); - let frm = frm_.borrow(); + if let Some((ref mut dsupp, ref mut dec)) = decs[streamno] { + let frm = dec.decode(dsupp, &pkt).unwrap(); if frm.get_info().is_audio() { if !wrote_header { wwr.write_header(frm.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap();