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

fftools: use the new AVFrame interlace flags

Browse source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-04-12 11:42:35 -03:00
parent 36827ea783
commit 3675dd0e0c
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fftools/ffmpeg.c
View file

@ -1098,7 +1098,7 @@ static int decode_video(InputStream *ist, const AVPacket *pkt, int *got_output,
return ret; return ret;
if(ist->top_field_first>=0) if(ist->top_field_first>=0)
decoded_frame->top_field_first = ist->top_field_first; decoded_frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
ist->frames_decoded++; ist->frames_decoded++;

15
fftools/ffmpeg_enc.c
View file

@ -257,13 +257,16 @@ int enc_open(OutputStream *ost, AVFrame *frame)
if (frame) { if (frame) {
if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) && if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
ost->top_field_first >= 0) ost->top_field_first >= 0)
frame->top_field_first = !!ost->top_field_first; if (ost->top_field_first)
frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
if (frame->interlaced_frame) {
if (enc->id == AV_CODEC_ID_MJPEG)
enc_ctx->field_order = frame->top_field_first ? AV_FIELD_TT:AV_FIELD_BB;
else else
enc_ctx->field_order = frame->top_field_first ? AV_FIELD_TB:AV_FIELD_BT; frame->flags &= ~AV_FRAME_FLAG_TOP_FIELD_FIRST;
if (frame->flags & AV_FRAME_FLAG_INTERLACED) {
if (enc->id == AV_CODEC_ID_MJPEG)
enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TT:AV_FIELD_BB;
else
enc_ctx->field_order = (frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST) ? AV_FIELD_TB:AV_FIELD_BT;
} else } else
enc_ctx->field_order = AV_FIELD_PROGRESSIVE; enc_ctx->field_order = AV_FIELD_PROGRESSIVE;
} }

4
fftools/ffprobe.c
View file

@ -2640,8 +2640,8 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
print_int("display_picture_number", frame->display_picture_number); print_int("display_picture_number", frame->display_picture_number);
) )
#endif #endif
print_int("interlaced_frame", frame->interlaced_frame); print_int("interlaced_frame", !!(frame->flags & AV_FRAME_FLAG_INTERLACED));
print_int("top_field_first", frame->top_field_first); print_int("top_field_first", !!(frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST));
print_int("repeat_pict", frame->repeat_pict); print_int("repeat_pict", frame->repeat_pict);
print_color_range(w, frame->color_range); print_color_range(w, frame->color_range);