Kieran/zap-stream-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clippy fixes

Browse Source
This commit is contained in:
kieran 2024-08-30 13:11:12 +01:00
parent c3e3e17c50
commit 2afbde6c53
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
10 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/demux/mod.rs
View File

@ -5,7 +5,6 @@ use anyhow::Error;
use bytes::{BufMut, Bytes};
use ffmpeg_sys_next::*;
use ffmpeg_sys_next::AVMediaType::{AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_VIDEO};
use log::warn;
use tokio::sync::mpsc::{UnboundedReceiver, UnboundedSender};
use tokio::sync::mpsc::error::TryRecvError;
use tokio::time::Instant;

2
src/egress/hls.rs
View File

@ -183,7 +183,7 @@ impl HlsEgress {
av_packet_copy_props(pkt_clone, pkt);
self.packet_buffer.push_back(PipelinePayload::AvPacket(
pkt_clone,
AVPacketSource::Muxer(variant.clone()),
AVPacketSource::Muxer(*variant),
));
}

9
src/egress/recorder.rs
View File

@ -3,10 +3,8 @@ use std::{fs, ptr};
use anyhow::Error;
use ffmpeg_sys_next::{
av_dict_set, av_dump_format, av_guess_format, av_interleaved_write_frame, av_malloc,
av_mallocz, av_opt_set, av_packet_rescale_ts, av_strdup, av_write_trailer,
avformat_alloc_context, avformat_alloc_output_context2, avformat_free_context, avio_open,
avio_open2, AVDictionary, AVFormatContext, AVPacket, AVIO_FLAG_WRITE, AV_DICT_APPEND,
av_dump_format, av_interleaved_write_frame, av_opt_set, avformat_alloc_output_context2, avformat_free_context,
avio_open2, AVFormatContext, AVPacket, AVIO_FLAG_WRITE,
};
use ffmpeg_sys_next::{
avcodec_parameters_from_context, avformat_write_header, AVFMT_GLOBALHEADER,
@ -17,8 +15,7 @@ use tokio::sync::mpsc::UnboundedReceiver;
use uuid::Uuid;
use crate::egress::{map_variants_to_streams, EgressConfig};
use crate::encode::{dump_pkt_info, set_encoded_pkt_timing};
use crate::pipeline::{AVPacketSource, PipelinePayload, PipelineProcessor};
use crate::pipeline::{PipelinePayload, PipelineProcessor};
use crate::utils::get_ffmpeg_error_msg;
use crate::variant::VariantStreamType;

2
src/encode/audio.rs
View File

@ -19,7 +19,7 @@ use crate::encode::set_encoded_pkt_timing;
use crate::ipc::Rx;
use crate::pipeline::{AVFrameSource, AVPacketSource, PipelinePayload, PipelineProcessor};
use crate::utils::get_ffmpeg_error_msg;
use crate::variant::{AudioVariant, VariantStream, VariantStreamType};
use crate::variant::{AudioVariant, VariantStreamType};
pub struct AudioEncoder<T> {
variant: AudioVariant,

5
src/encode/mod.rs
View File

@ -1,8 +1,7 @@
use ffmpeg_sys_next::{
AV_NOPTS_VALUE, av_packet_rescale_ts, AV_PKT_FLAG_KEY, av_rescale_q, AVCodecContext, AVPacket,
AVRational, AVStream,
AV_NOPTS_VALUE, av_packet_rescale_ts, AV_PKT_FLAG_KEY, AVCodecContext, AVPacket,
AVRational,
};
use ffmpeg_sys_next::AVMediaType::{AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_VIDEO};
use log::info;
use crate::variant::VariantStreamType;

2
src/encode/video.rs
View File

@ -10,7 +10,7 @@ use ffmpeg_sys_next::{
use libc::EAGAIN;
use tokio::sync::mpsc::UnboundedSender;
use crate::encode::{dump_pkt_info, set_encoded_pkt_timing};
use crate::encode::set_encoded_pkt_timing;
use crate::ipc::Rx;
use crate::pipeline::{AVFrameSource, AVPacketSource, PipelinePayload, PipelineProcessor};
use crate::utils::get_ffmpeg_error_msg;

6
src/ingress/test.rs
View File

@ -1,23 +1,21 @@
use std::{ptr, slice};
use std::mem::transmute;
use std::ops::Add;
use std::time::{Duration, SystemTime};
use ffmpeg_sys_next::{
av_frame_alloc, av_frame_copy_props, av_frame_free, av_frame_get_buffer, av_packet_alloc,
av_packet_free, AV_PROFILE_H264_MAIN, av_q2d, avcodec_alloc_context3, avcodec_find_encoder,
av_packet_free, AV_PROFILE_H264_MAIN, avcodec_alloc_context3, avcodec_find_encoder,
avcodec_open2, avcodec_receive_packet, avcodec_send_frame, AVERROR, AVRational,
EAGAIN, SWS_BILINEAR, sws_getContext, sws_scale_frame,
};
use ffmpeg_sys_next::AVCodecID::AV_CODEC_ID_H264;
use ffmpeg_sys_next::AVColorSpace::{AVCOL_SPC_BT709, AVCOL_SPC_RGB};
use ffmpeg_sys_next::AVPictureType::AV_PICTURE_TYPE_NONE;
use ffmpeg_sys_next::AVPixelFormat::{AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_YUV420P};
use ffmpeg_sys_next::AVPixelFormat::{AV_PIX_FMT_RGBA, AV_PIX_FMT_YUV420P};
use fontdue::layout::{CoordinateSystem, Layout, TextStyle};
use libc::memcpy;
use log::{error, info};
use tokio::sync::mpsc::unbounded_channel;
use usvg::{Font, Node};
use crate::ingress::ConnectionInfo;
use crate::pipeline::builder::PipelineBuilder;

2
src/pipeline/mod.rs
View File

@ -126,7 +126,7 @@ impl Clone for PipelinePayload {
PipelinePayload::AvFrame(new_frame, v.clone())
},
PipelinePayload::SourceInfo(i) => PipelinePayload::SourceInfo(i.clone()),
PipelinePayload::EncoderInfo(v, s) => PipelinePayload::EncoderInfo(v.clone(), *s),
PipelinePayload::EncoderInfo(v, s) => PipelinePayload::EncoderInfo(*v, *s),
PipelinePayload::Flush => PipelinePayload::Flush,
}
}

4
src/tag_frame.rs
View File

@ -2,8 +2,8 @@ use anyhow::Error;
use tokio::sync::mpsc::UnboundedSender;
use crate::ipc::Rx;
use crate::pipeline::{AVFrameSource, AVPacketSource, PipelinePayload, PipelineProcessor};
use crate::variant::{VariantStream, VariantStreamType};
use crate::pipeline::{PipelinePayload, PipelineProcessor};
use crate::variant::VariantStream;
pub struct TagFrame<TRecv> {
variant: VariantStream,

1
src/variant.rs
View File

@ -10,7 +10,6 @@ use ffmpeg_sys_next::{
};
use ffmpeg_sys_next::AVChannelOrder::AV_CHANNEL_ORDER_NATIVE;
use ffmpeg_sys_next::AVCodecID::{AV_CODEC_ID_AAC, AV_CODEC_ID_H264};
use ffmpeg_sys_next::AVColorRange::AVCOL_RANGE_MPEG;
use ffmpeg_sys_next::AVColorSpace::AVCOL_SPC_BT709;
use ffmpeg_sys_next::AVPixelFormat::AV_PIX_FMT_YUV420P;
use serde::{Deserialize, Serialize};