projects
/
nihav-tool.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ffe6957
)
output alpha part of the PGMYUV too
author
Kostya Shishkov
<kostya.shishkov@gmail.com>
Fri, 22 Mar 2019 17:56:55 +0000
(18:56 +0100)
committer
Kostya Shishkov
<kostya.shishkov@gmail.com>
Fri, 22 Mar 2019 17:56:55 +0000
(18:56 +0100)
src/frmwriter.rs
patch
|
blob
|
blame
|
history
diff --git
a/src/frmwriter.rs
b/src/frmwriter.rs
index 1a94fab964299638dbe219fa4149563cc4a4b9f5..c743fc0132fbf5f6fae2bc44898c16dd73ec0ed1 100644
(file)
--- a/
src/frmwriter.rs
+++ b/
src/frmwriter.rs
@@
-12,7
+12,13
@@
pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
let buf = frm.get_buffer().get_vbuf().unwrap();
let (w, h) = buf.get_dimensions(0);
let (w2, h2) = buf.get_dimensions(1);
let buf = frm.get_buffer().get_vbuf().unwrap();
let (w, h) = buf.get_dimensions(0);
let (w2, h2) = buf.get_dimensions(1);
- let tot_h = h + h2;
+ let has_alpha = buf.get_info().get_format().has_alpha();
+ let tot_h;
+ if has_alpha {
+ tot_h = h * 2 + h2;
+ } else {
+ tot_h = h + h2;
+ }
let hdr = format!("P5\n{} {}\n255\n", w, tot_h);
ofile.write_all(hdr.as_bytes()).unwrap();
let dta = buf.get_data();
let hdr = format!("P5\n{} {}\n255\n", w, tot_h);
ofile.write_all(hdr.as_bytes()).unwrap();
let dta = buf.get_data();
@@
-45,6
+51,17
@@
pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
base1 += stride1;
base2 += stride2;
}
base1 += stride1;
base2 += stride2;
}
+ if has_alpha {
+ let ls = buf.get_stride(3);
+ let mut idx = buf.get_offset(3);
+ let mut idx2 = idx + w;
+ for _ in 0..h {
+ let line = &dta[idx..idx2];
+ ofile.write_all(line).unwrap();
+ idx += ls;
+ idx2 += ls;
+ }
+ }
}
pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
}
pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {