virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffmpeg: move OutputStream.next_pts to Encoder

Browse Source 
It is audio/video encoding-only and does not need to be visible outside
of ffmpeg_enc.c
This commit is contained in:
Anton Khirnov
2023-03-27 07:37:29 +02:00
parent 45202556cb
commit 710da200fc
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.h
View File

@@ -571,9 +571,6 @@ typedef struct OutputStream {
InputStream *ist; InputStream *ist;
AVStream *st; /* stream in the output file */ AVStream *st; /* stream in the output file */
/* predicted pts of the next frame to be encoded
* audio/video encoding only */
int64_t next_pts;
/* dts of the last packet sent to the muxing queue, in AV_TIME_BASE_Q */ /* dts of the last packet sent to the muxing queue, in AV_TIME_BASE_Q */
int64_t last_mux_dts; int64_t last_mux_dts;
/* pts of the last frame received from the filters, in AV_TIME_BASE_Q */ /* pts of the last frame received from the filters, in AV_TIME_BASE_Q */

22
fftools/ffmpeg_enc.c
View File

@@ -44,6 +44,9 @@
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
struct Encoder { struct Encoder {
/* predicted pts of the next frame to be encoded */
int64_t next_pts;
AVFrame *last_frame; AVFrame *last_frame;
/* number of frames emitted by the video-encoding sync code */ /* number of frames emitted by the video-encoding sync code */
int64_t vsync_frame_number; int64_t vsync_frame_number;
@@ -761,11 +764,12 @@ static int submit_encode_frame(OutputFile *of, OutputStream *ost,
static void do_audio_out(OutputFile *of, OutputStream *ost, static void do_audio_out(OutputFile *of, OutputStream *ost,
AVFrame *frame) AVFrame *frame)
{ {
Encoder *e = ost->enc;
AVCodecContext *enc = ost->enc_ctx; AVCodecContext *enc = ost->enc_ctx;
int ret; int ret;
if (frame->pts == AV_NOPTS_VALUE) if (frame->pts == AV_NOPTS_VALUE)
frame->pts = ost->next_pts; frame->pts = e->next_pts;
else { else {
int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time; int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
frame->pts = frame->pts =
@@ -777,7 +781,7 @@ static void do_audio_out(OutputFile *of, OutputStream *ost,
if (!check_recording_time(ost, frame->pts, frame->time_base)) if (!check_recording_time(ost, frame->pts, frame->time_base))
return; return;
ost->next_pts = frame->pts + frame->nb_samples; e->next_pts = frame->pts + frame->nb_samples;
ret = submit_encode_frame(of, ost, frame); ret = submit_encode_frame(of, ost, frame);
if (ret < 0 && ret != AVERROR_EOF) if (ret < 0 && ret != AVERROR_EOF)
@@ -840,7 +844,7 @@ static void video_sync_process(OutputFile *of, OutputStream *ost,
double sync_ipts = adjust_frame_pts_to_encoder_tb(of, ost, next_picture); double sync_ipts = adjust_frame_pts_to_encoder_tb(of, ost, next_picture);
/* delta0 is the "drift" between the input frame (next_picture) and /* delta0 is the "drift" between the input frame (next_picture) and
* where it would fall in the output. */ * where it would fall in the output. */
delta0 = sync_ipts - ost->next_pts; delta0 = sync_ipts - e->next_pts;
delta = delta0 + duration; delta = delta0 + duration;
// tracks the number of times the PREVIOUS frame should be duplicated, // tracks the number of times the PREVIOUS frame should be duplicated,
@@ -857,7 +861,7 @@ static void video_sync_process(OutputFile *of, OutputStream *ost,
av_log(ost, AV_LOG_VERBOSE, "Past duration %f too large\n", -delta0); av_log(ost, AV_LOG_VERBOSE, "Past duration %f too large\n", -delta0);
} else } else
av_log(ost, AV_LOG_DEBUG, "Clipping frame in rate conversion by %f\n", -delta0); av_log(ost, AV_LOG_DEBUG, "Clipping frame in rate conversion by %f\n", -delta0);
sync_ipts = ost->next_pts; sync_ipts = e->next_pts;
duration += delta0; duration += delta0;
delta0 = 0; delta0 = 0;
} }
@@ -868,7 +872,7 @@ static void video_sync_process(OutputFile *of, OutputStream *ost,
av_log(ost, AV_LOG_DEBUG, "Not duplicating %d initial frames\n", (int)lrintf(delta0)); av_log(ost, AV_LOG_DEBUG, "Not duplicating %d initial frames\n", (int)lrintf(delta0));
delta = duration; delta = duration;
delta0 = 0; delta0 = 0;
ost->next_pts = llrint(sync_ipts); e->next_pts = llrint(sync_ipts);
} }
case VSYNC_CFR: case VSYNC_CFR:
// FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
@@ -887,13 +891,13 @@ static void video_sync_process(OutputFile *of, OutputStream *ost,
if (delta <= -0.6) if (delta <= -0.6)
*nb_frames = 0; *nb_frames = 0;
else if (delta > 0.6) else if (delta > 0.6)
ost->next_pts = llrint(sync_ipts); e->next_pts = llrint(sync_ipts);
next_picture->duration = duration; next_picture->duration = duration;
break; break;
case VSYNC_DROP: case VSYNC_DROP:
case VSYNC_PASSTHROUGH: case VSYNC_PASSTHROUGH:
next_picture->duration = duration; next_picture->duration = duration;
ost->next_pts = llrint(sync_ipts); e->next_pts = llrint(sync_ipts);
break; break;
default: default:
av_assert0(0); av_assert0(0);
@@ -1031,7 +1035,7 @@ static void do_video_out(OutputFile *of,
if (!in_picture) if (!in_picture)
return; return;
in_picture->pts = ost->next_pts; in_picture->pts = e->next_pts;
if (!check_recording_time(ost, in_picture->pts, ost->enc_ctx->time_base)) if (!check_recording_time(ost, in_picture->pts, ost->enc_ctx->time_base))
return; return;
@@ -1045,7 +1049,7 @@ static void do_video_out(OutputFile *of,
else if (ret < 0) else if (ret < 0)
exit_program(1); exit_program(1);
ost->next_pts++; e->next_pts++;
e->vsync_frame_number++; e->vsync_frame_number++;
} }