Skip to content

Commit 138f7cd

Browse files
fix: resolve clippy lints in export optimization code
- Fix collapsible_if in encoder thread (mp4.rs) - Fix needless_option_as_deref in finish_encoder_nv12_pooled - Remove unused finish_encoder_nv12 wrapper (replaced by pooled variant) - Remove unused PendingNv12Readback::wait (replaced by wait_with_pool) - Remove unused NV12BufferPool::return_buf and max_buffers field - Remove unnecessary mut on buffer_pool parameter Co-authored-by: Richie McIlroy <richiemcilroy@users.noreply.github.com>
1 parent f6b5257 commit 138f7cd

2 files changed

Lines changed: 8 additions & 43 deletions

File tree

crates/export/src/mp4.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ impl Mp4ExportSettings {
222222
let mut audio_sample_cursor = 0u64;
223223

224224
while let Ok(input) = frame_rx.recv() {
225-
if encoded_frames == 0 {
226-
if let Some(audio) = &mut audio_renderer {
227-
audio.set_playhead(0.0, &project_for_audio);
228-
}
225+
if encoded_frames == 0
226+
&& let Some(audio) = &mut audio_renderer
227+
{
228+
audio.set_playhead(0.0, &project_for_audio);
229229
}
230230

231231
let audio_frame = audio_renderer.as_mut().and_then(|audio| {

crates/rendering/src/frame_pipeline.rs

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@ const GPU_BUFFER_WAIT_TIMEOUT_SECS: u64 = 10;
99

1010
pub struct NV12BufferPool {
1111
buffers: Vec<Vec<u8>>,
12-
capacity: usize,
1312
}
1413

1514
impl NV12BufferPool {
16-
pub fn new(capacity: usize) -> Self {
15+
pub fn new(pre_alloc: usize) -> Self {
1716
Self {
18-
buffers: Vec::with_capacity(capacity),
19-
capacity,
17+
buffers: Vec::with_capacity(pre_alloc),
2018
}
2119
}
2220

@@ -29,12 +27,6 @@ impl NV12BufferPool {
2927
Vec::with_capacity(size)
3028
}
3129
}
32-
33-
pub fn release(&mut self, buf: Vec<u8>) {
34-
if self.buffers.len() < self.capacity {
35-
self.buffers.push(buf);
36-
}
37-
}
3830
}
3931

4032
pub struct RgbaToNv12Converter {
@@ -334,10 +326,6 @@ impl PendingNv12Readback {
334326
RenderingError::BufferMapWaitingFailed
335327
}
336328

337-
pub async fn wait(self, device: &wgpu::Device) -> Result<Nv12RenderedFrame, RenderingError> {
338-
self.wait_with_pool(device, None).await
339-
}
340-
341329
pub async fn wait_with_pool(
342330
mut self,
343331
device: &wgpu::Device,
@@ -914,43 +902,20 @@ pub async fn finish_encoder(
914902
Ok(previous_frame)
915903
}
916904

917-
pub async fn finish_encoder_nv12(
918-
session: &mut RenderSession,
919-
nv12_converter: &mut RgbaToNv12Converter,
920-
device: &wgpu::Device,
921-
queue: &wgpu::Queue,
922-
uniforms: &ProjectUniforms,
923-
encoder: wgpu::CommandEncoder,
924-
) -> Result<Option<Nv12RenderedFrame>, RenderingError> {
925-
finish_encoder_nv12_pooled(
926-
session,
927-
nv12_converter,
928-
device,
929-
queue,
930-
uniforms,
931-
encoder,
932-
None,
933-
)
934-
.await
935-
}
936-
937905
pub async fn finish_encoder_nv12_pooled(
938906
session: &mut RenderSession,
939907
nv12_converter: &mut RgbaToNv12Converter,
940908
device: &wgpu::Device,
941909
queue: &wgpu::Queue,
942910
uniforms: &ProjectUniforms,
943911
mut encoder: wgpu::CommandEncoder,
944-
mut buffer_pool: Option<&mut NV12BufferPool>,
912+
buffer_pool: Option<&mut NV12BufferPool>,
945913
) -> Result<Option<Nv12RenderedFrame>, RenderingError> {
946914
let width = uniforms.output_size.0;
947915
let height = uniforms.output_size.1;
948916

949917
let previous_frame = if let Some(prev) = nv12_converter.take_pending() {
950-
Some(
951-
prev.wait_with_pool(device, buffer_pool.as_deref_mut())
952-
.await?,
953-
)
918+
Some(prev.wait_with_pool(device, buffer_pool).await?)
954919
} else {
955920
None
956921
};

0 commit comments

Comments
 (0)