RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-05 14:26:17 +00:00
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_enc: use a private AVPacket instance for encoding

Browse Source 
The code currently uses OutputStream.pkt, which complicates its
ownership semantics.
This commit is contained in:
Anton Khirnov 2023-05-31 12:08:49 +02:00
parent f94957e8f4
commit 730a2221af
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fftools/ffmpeg_enc.c
View File

@ -57,6 +57,9 @@ struct Encoder {
AVFrame *sq_frame;
// packet for receiving encoded output
AVPacket *pkt;
// combined size of all the packets received from the encoder
uint64_t data_size;
@ -78,6 +81,8 @@ void enc_free(Encoder **penc)
av_frame_free(&enc->last_frame);
av_frame_free(&enc->sq_frame);
av_packet_free(&enc->pkt);
av_freep(penc);
}
@ -97,6 +102,10 @@ int enc_alloc(Encoder **penc, const AVCodec *codec)
goto fail;
}
enc->pkt = av_packet_alloc();
if (!enc->pkt)
goto fail;
*penc = enc;
return 0;
@ -454,10 +463,11 @@ static int check_recording_time(OutputStream *ost, int64_t ts, AVRational tb)
void enc_subtitle(OutputFile *of, OutputStream *ost, AVSubtitle *sub)
{
Encoder *e = ost->enc;
int subtitle_out_max_size = 1024 * 1024;
int subtitle_out_size, nb, i, ret;
AVCodecContext *enc;
AVPacket *pkt = ost->pkt;
AVPacket *pkt = e->pkt;
int64_t pts;
if (sub->pts == AV_NOPTS_VALUE) {
@ -669,7 +679,7 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame)
{
Encoder *e = ost->enc;
AVCodecContext *enc = ost->enc_ctx;
AVPacket *pkt = ost->pkt;
AVPacket *pkt = e->pkt;
const char *type_desc = av_get_media_type_string(enc->codec_type);
const char *action = frame ? "encode" : "flush";
int ret;