From 037c11f52f01812eb33973b242a159426b15d143 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Wed, 12 Jan 2022 15:33:06 -0600 Subject: [PATCH] media-converter: Add MEDIACONV_DONT_DISCARD --- media-converter/src/audioconv.rs | 5 +++++ media-converter/src/lib.rs | 8 ++++++++ media-converter/src/videoconv.rs | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/media-converter/src/audioconv.rs b/media-converter/src/audioconv.rs index 291cc06d..5f1896ce 100644 --- a/media-converter/src/audioconv.rs +++ b/media-converter/src/audioconv.rs @@ -34,6 +34,7 @@ use glib::subclass::prelude::*; use crate::format_hash; use crate::HASH_SEED; +use crate::discarding_disabled; use gst; use gst::prelude::*; @@ -233,6 +234,10 @@ impl AudioConverterDumpFozdb { if self.already_cleaned { return; } + if discarding_disabled() { + self.already_cleaned = true; + return; + } if let Some(fozdb) = &mut self.open(false).fozdb { if let Ok(read_fozdb_path) = std::env::var("MEDIACONV_AUDIO_TRANSCODED_FILE") { if let Ok(read_fozdb) = fossilize::StreamArchive::new(&read_fozdb_path, OpenOptions::new().read(true), AUDIOCONV_FOZ_NUM_TAGS) { diff --git a/media-converter/src/lib.rs b/media-converter/src/lib.rs index e06eb587..ba0c95dd 100644 --- a/media-converter/src/lib.rs +++ b/media-converter/src/lib.rs @@ -141,6 +141,14 @@ impl<'a> Read for BufferedReader<'a> { } } +fn discarding_disabled() -> bool { + let v = match std::env::var("MEDIACONV_DONT_DISCARD") { + Err(_) => { return false; }, + Ok(c) => c, + }; + return v != "0"; +} + fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { videoconv::register(plugin)?; audioconvbin::register(plugin)?; diff --git a/media-converter/src/videoconv.rs b/media-converter/src/videoconv.rs index a123ef04..893eb962 100644 --- a/media-converter/src/videoconv.rs +++ b/media-converter/src/videoconv.rs @@ -37,6 +37,7 @@ use crate::HASH_SEED; use crate::box_array; use crate::copy_into_array; use crate::BufferedReader; +use crate::discarding_disabled; use gst; use gst::prelude::*; @@ -157,7 +158,11 @@ impl VideoConverterDumpFozdb { fn discard_transcoded(&mut self) { if self.already_cleaned { - return + return; + } + if discarding_disabled() { + self.already_cleaned = true; + return; } if let Some(fozdb) = &mut self.open(false).fozdb { if let Ok(read_fozdb_path) = std::env::var("MEDIACONV_VIDEO_TRANSCODED_FILE") {