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

ffv1enc: move plane info init into a separate function

This commit is contained in:
Lynne 2024-10-06 06:17:02 +02:00
parent f4b5068c3b
commit 12ea1cde57
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libavcodec/ffv1enc.c
View File

@ -767,22 +767,14 @@ av_cold int ff_ffv1_encode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static int encode_init_internal(AVCodecContext *avctx) av_cold int ff_ffv1_encode_setup_plane_info(AVCodecContext *avctx,
enum AVPixelFormat pix_fmt)
{ {
int ret;
FFV1Context *s = avctx->priv_data; FFV1Context *s = avctx->priv_data;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
if ((ret = ff_ffv1_common_init(avctx)) < 0)
return ret;
if (s->ac == 1) // Compatbility with common command line usage
s->ac = AC_RANGE_CUSTOM_TAB;
else if (s->ac == AC_RANGE_DEFAULT_TAB_FORCE)
s->ac = AC_RANGE_DEFAULT_TAB;
s->plane_count = 3; s->plane_count = 3;
switch(avctx->pix_fmt) { switch(pix_fmt) {
case AV_PIX_FMT_GRAY9: case AV_PIX_FMT_GRAY9:
case AV_PIX_FMT_YUV444P9: case AV_PIX_FMT_YUV444P9:
case AV_PIX_FMT_YUV422P9: case AV_PIX_FMT_YUV422P9:
@ -910,11 +902,32 @@ static int encode_init_internal(AVCodecContext *avctx)
s->version = FFMAX(s->version, 1); s->version = FFMAX(s->version, 1);
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "format not supported\n"); av_log(avctx, AV_LOG_ERROR, "format %s not supported\n",
av_get_pix_fmt_name(pix_fmt));
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
av_assert0(s->bits_per_raw_sample >= 8); av_assert0(s->bits_per_raw_sample >= 8);
return av_pix_fmt_get_chroma_sub_sample(pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift);
}
static int encode_init_internal(AVCodecContext *avctx)
{
int ret;
FFV1Context *s = avctx->priv_data;
if ((ret = ff_ffv1_common_init(avctx)) < 0)
return ret;
if (s->ac == 1) // Compatbility with common command line usage
s->ac = AC_RANGE_CUSTOM_TAB;
else if (s->ac == AC_RANGE_DEFAULT_TAB_FORCE)
s->ac = AC_RANGE_DEFAULT_TAB;
ret = ff_ffv1_encode_setup_plane_info(avctx, avctx->pix_fmt);
if (ret < 0)
return ret;
if (s->bits_per_raw_sample > (s->version > 3 ? 16 : 8)) { if (s->bits_per_raw_sample > (s->version > 3 ? 16 : 8)) {
if (s->ac == AC_GOLOMB_RICE) { if (s->ac == AC_GOLOMB_RICE) {
av_log(avctx, AV_LOG_INFO, av_log(avctx, AV_LOG_INFO,

2
libavcodec/ffv1enc.h
View File

@ -27,5 +27,7 @@
av_cold int ff_ffv1_encode_init(AVCodecContext *avctx); av_cold int ff_ffv1_encode_init(AVCodecContext *avctx);
av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx); av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx);
av_cold int ff_ffv1_encode_setup_plane_info(AVCodecContext *avctx,
enum AVPixelFormat pix_fmt);
#endif /* AVCODEC_FFV1ENC_H */ #endif /* AVCODEC_FFV1ENC_H */