RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_dec: move InputStream.hwaccel_pix_fmt to Decoder 

It is purely decoder-internal state.
This commit is contained in:
Anton Khirnov 2023-06-06 13:00:01 +02:00
parent 174cb3accf
commit 1adad44fc7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -393,8 +393,6 @@ typedef struct InputStream {
char *hwaccel_device;
enum AVPixelFormat hwaccel_output_format;
enum AVPixelFormat hwaccel_pix_fmt;
/* stats */
// number of frames/samples retrieved from the decoder
uint64_t frames_decoded;

8
fftools/ffmpeg_dec.c
View File

@ -35,6 +35,8 @@ struct Decoder {
AVFrame *frame;
AVPacket *pkt;
enum AVPixelFormat hwaccel_pix_fmt;
// pts/estimated duration of the last decoded frame
// * in decoder timebase for video,
// * in last_frame_tb (may change during decoding) for audio
@ -79,6 +81,7 @@ static int dec_alloc(Decoder **pdec)
dec->last_filter_in_rescale_delta = AV_NOPTS_VALUE;
dec->last_frame_pts = AV_NOPTS_VALUE;
dec->last_frame_tb = (AVRational){ 1, 1 };
dec->hwaccel_pix_fmt = AV_PIX_FMT_NONE;
*pdec = dec;
@ -272,7 +275,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame)
if(ist->top_field_first>=0)
frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
if (frame->format == ist->hwaccel_pix_fmt) {
if (frame->format == d->hwaccel_pix_fmt) {
int err = hwaccel_retrieve_data(ist->dec_ctx, frame);
if (err < 0)
return err;
@ -537,6 +540,7 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat *pix_fmts)
{
InputStream *ist = s->opaque;
Decoder *d = ist->decoder;
const enum AVPixelFormat *p;
for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) {
@ -561,7 +565,7 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat
}
}
if (config && config->device_type == ist->hwaccel_device_type) {
ist->hwaccel_pix_fmt = *p;
d->hwaccel_pix_fmt = *p;
break;
}
}

2
fftools/ffmpeg_demux.c
View File

@ -1149,8 +1149,6 @@ static void ist_add(const OptionsContext *o, Demuxer *d, AVStream *st)
if (!ist->hwaccel_device)
report_and_exit(AVERROR(ENOMEM));
}
ist->hwaccel_pix_fmt = AV_PIX_FMT_NONE;
}
ist->dec = choose_decoder(o, ic, st, ist->hwaccel_id, ist->hwaccel_device_type);