Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

fftools/ffmpeg: make sure FrameData is writable when we modify it

Browse source 
Also, add a function that returns const FrameData* for cases that only
read from it.
This commit is contained in:
Anton Khirnov 2023-11-13 09:35:44 +01:00
parent 1d536e0283
commit 99d2fa38ad
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fftools/ffmpeg.c
View file

@ -427,21 +427,34 @@ InputStream *ist_iter(InputStream *prev)
return NULL; return NULL;
} }
FrameData *frame_data(AVFrame *frame) static int frame_data_ensure(AVFrame *frame, int writable)
{ {
if (!frame->opaque_ref) { if (!frame->opaque_ref) {
FrameData *fd; FrameData *fd;
frame->opaque_ref = av_buffer_allocz(sizeof(*fd)); frame->opaque_ref = av_buffer_allocz(sizeof(*fd));
if (!frame->opaque_ref) if (!frame->opaque_ref)
return NULL; return AVERROR(ENOMEM);
fd = (FrameData*)frame->opaque_ref->data; fd = (FrameData*)frame->opaque_ref->data;
fd->dec.frame_num = UINT64_MAX; fd->dec.frame_num = UINT64_MAX;
fd->dec.pts = AV_NOPTS_VALUE; fd->dec.pts = AV_NOPTS_VALUE;
} } else if (writable)
return av_buffer_make_writable(&frame->opaque_ref);
return (FrameData*)frame->opaque_ref->data; return 0;
}
FrameData *frame_data(AVFrame *frame)
{
int ret = frame_data_ensure(frame, 1);
return ret < 0 ? NULL : (FrameData*)frame->opaque_ref->data;
}
const FrameData *frame_data_c(AVFrame *frame)
{
int ret = frame_data_ensure(frame, 0);
return ret < 0 ? NULL : (const FrameData*)frame->opaque_ref->data;
} }
void remove_avoptions(AVDictionary **a, AVDictionary *b) void remove_avoptions(AVDictionary **a, AVDictionary *b)

2
fftools/ffmpeg.h
View file

@ -726,6 +726,8 @@ int subtitle_wrap_frame(AVFrame *frame, AVSubtitle *subtitle, int copy);
*/ */
FrameData *frame_data(AVFrame *frame); FrameData *frame_data(AVFrame *frame);
const FrameData *frame_data_c(AVFrame *frame);
int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference); int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference);
int ifilter_send_eof(InputFilter *ifilter, int64_t pts, AVRational tb); int ifilter_send_eof(InputFilter *ifilter, int64_t pts, AVRational tb);
int ifilter_sub2video(InputFilter *ifilter, const AVFrame *frame); int ifilter_sub2video(InputFilter *ifilter, const AVFrame *frame);

4
fftools/ffmpeg_filter.c
View file

@ -1859,9 +1859,9 @@ static int choose_out_timebase(OutputFilterPriv *ofp, AVFrame *frame)
FPSConvContext *fps = &ofp->fps; FPSConvContext *fps = &ofp->fps;
AVRational tb = (AVRational){ 0, 0 }; AVRational tb = (AVRational){ 0, 0 };
AVRational fr; AVRational fr;
FrameData *fd; const FrameData *fd;
fd = frame_data(frame); fd = frame_data_c(frame);
// apply -enc_time_base // apply -enc_time_base
if (ofp->enc_timebase.num == ENC_TIME_BASE_DEMUX && if (ofp->enc_timebase.num == ENC_TIME_BASE_DEMUX &&