| Message ID | 20230330082827.245115-1-jianfeng.zheng@mthreads.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] doc/examples/vaapi_transcode: fix null framerate | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Do, 2023-03-30 at 16:28 +0800, jianfeng.zheng wrote: > When framerate in codec layer is null, guess from stream. > > Signed-off-by: jianfeng.zheng <jianfeng.zheng@mthreads.com> > --- > doc/examples/vaapi_transcode.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c > index 8367cb3040..cdcc4e263a 100644 > --- a/doc/examples/vaapi_transcode.c > +++ b/doc/examples/vaapi_transcode.c > @@ -103,6 +103,10 @@ static int open_input_file(const char *filename) > fprintf(stderr, "Failed to open codec for decoding. Error code: > %s\n", > av_err2str(ret)); > > + if (decoder_ctx->framerate.num == 0 && > + video->r_frame_rate.num > 0 && video->r_frame_rate.den > > 0) > + decoder_ctx->framerate = video->r_frame_rate; > + > return ret; > } > LGTM, will apply, Thanks Haihao >
Quoting jianfeng.zheng (2023-03-30 10:28:27) > When framerate in codec layer is null, guess from stream. > > Signed-off-by: jianfeng.zheng <jianfeng.zheng@mthreads.com> > --- > doc/examples/vaapi_transcode.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c > index 8367cb3040..cdcc4e263a 100644 > --- a/doc/examples/vaapi_transcode.c > +++ b/doc/examples/vaapi_transcode.c > @@ -103,6 +103,10 @@ static int open_input_file(const char *filename) > fprintf(stderr, "Failed to open codec for decoding. Error code: %s\n", > av_err2str(ret)); > > + if (decoder_ctx->framerate.num == 0 && > + video->r_frame_rate.num > 0 && video->r_frame_rate.den > 0) > + decoder_ctx->framerate = video->r_frame_rate; This field is to be set by decoder, not the API caller.
Hi Anton, Haihao, Please review patch v2. Thanks, Jianfeng Anton Khirnov <anton@khirnov.net> 于2023年3月31日周五 23:04写道： > > Quoting jianfeng.zheng (2023-03-30 10:28:27) > > When framerate in codec layer is null, guess from stream. > > > > Signed-off-by: jianfeng.zheng <jianfeng.zheng@mthreads.com> > > --- > > doc/examples/vaapi_transcode.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c > > index 8367cb3040..cdcc4e263a 100644 > > --- a/doc/examples/vaapi_transcode.c > > +++ b/doc/examples/vaapi_transcode.c > > @@ -103,6 +103,10 @@ static int open_input_file(const char *filename) > > fprintf(stderr, "Failed to open codec for decoding. Error code: %s\n", > > av_err2str(ret)); > > > > + if (decoder_ctx->framerate.num == 0 && > > + video->r_frame_rate.num > 0 && video->r_frame_rate.den > 0) > > + decoder_ctx->framerate = video->r_frame_rate; > > This field is to be set by decoder, not the API caller. > > -- > Anton Khirnov > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/doc/examples/vaapi_transcode.c b/doc/examples/vaapi_transcode.c index 8367cb3040..cdcc4e263a 100644 --- a/doc/examples/vaapi_transcode.c +++ b/doc/examples/vaapi_transcode.c @@ -103,6 +103,10 @@ static int open_input_file(const char *filename) fprintf(stderr, "Failed to open codec for decoding. Error code: %s\n", av_err2str(ret)); + if (decoder_ctx->framerate.num == 0 && + video->r_frame_rate.num > 0 && video->r_frame_rate.den > 0) + decoder_ctx->framerate = video->r_frame_rate; + return ret; }
When framerate in codec layer is null, guess from stream. Signed-off-by: jianfeng.zheng <jianfeng.zheng@mthreads.com> --- doc/examples/vaapi_transcode.c | 4 ++++ 1 file changed, 4 insertions(+)