Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/encode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,11 @@ impl Encoder {
.flags()
.contains(AvFormatFlags::GLOBAL_HEADER);

let mut writer_stream = writer.output.add_stream(settings.codec())?;

let mut writer_stream = writer.output.add_stream(settings.encoder)?;
let writer_stream_index = writer_stream.index();

let mut encoder_context = match settings.codec() {
let mut encoder_context = match settings.encoder {
Some(codec) => ffi::codec_context_as(&codec)?,
None => AvContext::new(),
};
Expand Down Expand Up @@ -389,6 +390,7 @@ pub struct Settings {
pixel_format: AvPixel,
keyframe_interval: u64,
options: Options,
encoder: Option<AvCodec>
}

impl Settings {
Expand All @@ -415,6 +417,7 @@ impl Settings {
pixel_format: AvPixel::YUV420P,
keyframe_interval: Self::KEY_FRAME_INTERVAL,
options,
encoder: Self::codec(&self)
}
}

Expand Down Expand Up @@ -444,6 +447,7 @@ impl Settings {
pixel_format,
keyframe_interval: Self::KEY_FRAME_INTERVAL,
options,
encoder: Self::codec(&self)
}
}

Expand Down Expand Up @@ -484,6 +488,16 @@ impl Settings {
)
}

pub fn with_encoder(mut self, encoder_name: &str) -> Result<Self, Error> {
let encoder = ffmpeg::encoder::find_by_name(encoder_name)
.or_else(|| ffmpeg::encoder::find(AvCodecId::H264))
.ok_or_else(|| Error::EncoderNotFound(encoder_name.to_string()))?;

self.encoder = Some(encoder);
Ok(self)
}


/// Get encoder options.
fn options(&self) -> &Options {
&self.options
Expand Down
Loading