highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: shorten a variable name

Browse Source
This commit is contained in:
Anton Khirnov 2023-07-23 10:35:08 +02:00
parent fbcecdec8a
commit d55262704e
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fftools/ffmpeg_filter.c
View File

@ -1745,13 +1745,13 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush)
{ {
FilterGraphPriv *fgp = fgp_from_fg(ofp->ofilter.graph); FilterGraphPriv *fgp = fgp_from_fg(ofp->ofilter.graph);
OutputStream *ost = ofp->ofilter.ost; OutputStream *ost = ofp->ofilter.ost;
AVFrame *filtered_frame = fgp->frame; AVFrame *frame = fgp->frame;
AVFilterContext *filter = ofp->filter; AVFilterContext *filter = ofp->filter;
FrameData *fd; FrameData *fd;
int ret; int ret;
ret = av_buffersink_get_frame_flags(filter, filtered_frame, ret = av_buffersink_get_frame_flags(filter, frame,
AV_BUFFERSINK_FLAG_NO_REQUEST); AV_BUFFERSINK_FLAG_NO_REQUEST);
if (ret < 0) { if (ret < 0) {
if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) { if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
av_log(fgp, AV_LOG_WARNING, av_log(fgp, AV_LOG_WARNING,
@ -1766,26 +1766,23 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush)
return 1; return 1;
} }
if (ost->finished) { if (ost->finished) {
av_frame_unref(filtered_frame); av_frame_unref(frame);
return 0; return 0;
} }
if (filtered_frame->pts != AV_NOPTS_VALUE) { if (frame->pts != AV_NOPTS_VALUE) {
AVRational tb = av_buffersink_get_time_base(filter); AVRational tb = av_buffersink_get_time_base(filter);
ost->filter->last_pts = av_rescale_q(filtered_frame->pts, tb, ost->filter->last_pts = av_rescale_q(frame->pts, tb, AV_TIME_BASE_Q);
AV_TIME_BASE_Q); frame->time_base = tb;
filtered_frame->time_base = tb;
if (debug_ts) if (debug_ts)
av_log(fgp, AV_LOG_INFO, "filter_raw -> pts:%s pts_time:%s time_base:%d/%d\n", av_log(fgp, AV_LOG_INFO, "filter_raw -> pts:%s pts_time:%s time_base:%d/%d\n",
av_ts2str(filtered_frame->pts), av_ts2str(frame->pts), av_ts2timestr(frame->pts, &tb), tb.num, tb.den);
av_ts2timestr(filtered_frame->pts, &tb),
tb.num, tb.den);
} }
fd = frame_data(filtered_frame); fd = frame_data(frame);
if (!fd) { if (!fd) {
av_frame_unref(filtered_frame); av_frame_unref(frame);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -1800,8 +1797,8 @@ static int fg_output_step(OutputFilterPriv *ofp, int flush)
fd->frame_rate_filter = fr; fd->frame_rate_filter = fr;
} }
ret = enc_frame(ost, filtered_frame); ret = enc_frame(ost, frame);
av_frame_unref(filtered_frame); av_frame_unref(frame);
if (ret < 0) if (ret < 0)
return ret; return ret;