Kieran/ffmpeg-rs-raw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: always set pict_type in encoder

Browse Source
This commit is contained in:
kieran 2024-11-18 16:19:25 +00:00
parent c2ae78acbc
commit 4c3e1dfccc
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/encode.rs
View File

@ -1,5 +1,6 @@
use crate::{bail_ffmpeg, cstr, get_ffmpeg_error_msg, options_to_dict}; use crate::{bail_ffmpeg, cstr, get_ffmpeg_error_msg, options_to_dict};
use anyhow::{bail, Error, Result}; use anyhow::{bail, Error, Result};
use ffmpeg_sys_the_third::AVPictureType::AV_PICTURE_TYPE_NONE;
use ffmpeg_sys_the_third::{ use ffmpeg_sys_the_third::{
av_channel_layout_default, av_d2q, av_inv_q, av_packet_alloc, av_packet_free, av_channel_layout_default, av_d2q, av_inv_q, av_packet_alloc, av_packet_free,
avcodec_alloc_context3, avcodec_find_encoder, avcodec_find_encoder_by_name, avcodec_alloc_context3, avcodec_find_encoder, avcodec_find_encoder_by_name,
@ -209,6 +210,12 @@ impl Encoder {
) -> Result<Vec<*mut AVPacket>, Error> { ) -> Result<Vec<*mut AVPacket>, Error> {
let mut pkgs = Vec::new(); let mut pkgs = Vec::new();
if !frame.is_null() {
// always reset pict_type, this can be set by the decoder,
// but it confuses the encoder
(*frame).pict_type = AV_PICTURE_TYPE_NONE;
}
let mut ret = avcodec_send_frame(self.ctx, frame); let mut ret = avcodec_send_frame(self.ctx, frame);
if ret < 0 && ret != AVERROR(EAGAIN) { if ret < 0 && ret != AVERROR(EAGAIN) {
bail!(get_ffmpeg_error_msg(ret)); bail!(get_ffmpeg_error_msg(ret));