avcodec/mpegvideo_enc: Move H.263p? encoders to ituh263enc.c
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
parent
2098d1f4c5
commit
e17ceeba3c
@ -874,3 +874,75 @@ void ff_h263_encode_mba(MpegEncContext *s)
|
|||||||
mb_pos= s->mb_x + s->mb_width*s->mb_y;
|
mb_pos= s->mb_x + s->mb_width*s->mb_y;
|
||||||
put_bits(&s->pb, ff_mba_length[i], mb_pos);
|
put_bits(&s->pb, ff_mba_length[i], mb_pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define OFFSET(x) offsetof(MpegEncContext, x)
|
||||||
|
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
|
||||||
|
static const AVOption h263_options[] = {
|
||||||
|
{ "obmc", "use overlapped block motion compensation.", OFFSET(obmc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
||||||
|
{ "mb_info", "emit macroblock info for RFC 2190 packetization, the parameter value is the maximum payload size", OFFSET(mb_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
|
||||||
|
FF_MPV_COMMON_OPTS
|
||||||
|
#if FF_API_MPEGVIDEO_OPTS
|
||||||
|
FF_MPV_DEPRECATED_MPEG_QUANT_OPT
|
||||||
|
FF_MPV_DEPRECATED_A53_CC_OPT
|
||||||
|
FF_MPV_DEPRECATED_MATRIX_OPT
|
||||||
|
FF_MPV_DEPRECATED_BFRAME_OPTS
|
||||||
|
#endif
|
||||||
|
{ NULL },
|
||||||
|
};
|
||||||
|
|
||||||
|
static const AVClass h263_class = {
|
||||||
|
.class_name = "H.263 encoder",
|
||||||
|
.item_name = av_default_item_name,
|
||||||
|
.option = h263_options,
|
||||||
|
.version = LIBAVUTIL_VERSION_INT,
|
||||||
|
};
|
||||||
|
|
||||||
|
const AVCodec ff_h263_encoder = {
|
||||||
|
.name = "h263",
|
||||||
|
.long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"),
|
||||||
|
.type = AVMEDIA_TYPE_VIDEO,
|
||||||
|
.id = AV_CODEC_ID_H263,
|
||||||
|
.pix_fmts= (const enum AVPixelFormat[]){AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE},
|
||||||
|
.priv_class = &h263_class,
|
||||||
|
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
|
||||||
|
.priv_data_size = sizeof(MpegEncContext),
|
||||||
|
.init = ff_mpv_encode_init,
|
||||||
|
.encode2 = ff_mpv_encode_picture,
|
||||||
|
.close = ff_mpv_encode_end,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const AVOption h263p_options[] = {
|
||||||
|
{ "umv", "Use unlimited motion vectors.", OFFSET(umvplus), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
||||||
|
{ "aiv", "Use alternative inter VLC.", OFFSET(alt_inter_vlc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
||||||
|
{ "obmc", "use overlapped block motion compensation.", OFFSET(obmc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
||||||
|
{ "structured_slices", "Write slice start position at every GOB header instead of just GOB number.", OFFSET(h263_slice_structured), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE},
|
||||||
|
FF_MPV_COMMON_OPTS
|
||||||
|
#if FF_API_MPEGVIDEO_OPTS
|
||||||
|
FF_MPV_DEPRECATED_MPEG_QUANT_OPT
|
||||||
|
FF_MPV_DEPRECATED_A53_CC_OPT
|
||||||
|
FF_MPV_DEPRECATED_MATRIX_OPT
|
||||||
|
FF_MPV_DEPRECATED_BFRAME_OPTS
|
||||||
|
#endif
|
||||||
|
{ NULL },
|
||||||
|
};
|
||||||
|
static const AVClass h263p_class = {
|
||||||
|
.class_name = "H.263p encoder",
|
||||||
|
.item_name = av_default_item_name,
|
||||||
|
.option = h263p_options,
|
||||||
|
.version = LIBAVUTIL_VERSION_INT,
|
||||||
|
};
|
||||||
|
|
||||||
|
const AVCodec ff_h263p_encoder = {
|
||||||
|
.name = "h263p",
|
||||||
|
.long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"),
|
||||||
|
.type = AVMEDIA_TYPE_VIDEO,
|
||||||
|
.id = AV_CODEC_ID_H263P,
|
||||||
|
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
|
||||||
|
.priv_class = &h263p_class,
|
||||||
|
.capabilities = AV_CODEC_CAP_SLICE_THREADS,
|
||||||
|
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
|
||||||
|
.priv_data_size = sizeof(MpegEncContext),
|
||||||
|
.init = ff_mpv_encode_init,
|
||||||
|
.encode2 = ff_mpv_encode_picture,
|
||||||
|
.close = ff_mpv_encode_end,
|
||||||
|
};
|
||||||
|
|||||||
@ -4556,75 +4556,3 @@ int ff_dct_quantize_c(MpegEncContext *s,
|
|||||||
|
|
||||||
return last_non_zero;
|
return last_non_zero;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define OFFSET(x) offsetof(MpegEncContext, x)
|
|
||||||
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
|
|
||||||
static const AVOption h263_options[] = {
|
|
||||||
{ "obmc", "use overlapped block motion compensation.", OFFSET(obmc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
|
||||||
{ "mb_info", "emit macroblock info for RFC 2190 packetization, the parameter value is the maximum payload size", OFFSET(mb_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
|
|
||||||
FF_MPV_COMMON_OPTS
|
|
||||||
#if FF_API_MPEGVIDEO_OPTS
|
|
||||||
FF_MPV_DEPRECATED_MPEG_QUANT_OPT
|
|
||||||
FF_MPV_DEPRECATED_A53_CC_OPT
|
|
||||||
FF_MPV_DEPRECATED_MATRIX_OPT
|
|
||||||
FF_MPV_DEPRECATED_BFRAME_OPTS
|
|
||||||
#endif
|
|
||||||
{ NULL },
|
|
||||||
};
|
|
||||||
|
|
||||||
static const AVClass h263_class = {
|
|
||||||
.class_name = "H.263 encoder",
|
|
||||||
.item_name = av_default_item_name,
|
|
||||||
.option = h263_options,
|
|
||||||
.version = LIBAVUTIL_VERSION_INT,
|
|
||||||
};
|
|
||||||
|
|
||||||
const AVCodec ff_h263_encoder = {
|
|
||||||
.name = "h263",
|
|
||||||
.long_name = NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"),
|
|
||||||
.type = AVMEDIA_TYPE_VIDEO,
|
|
||||||
.id = AV_CODEC_ID_H263,
|
|
||||||
.priv_data_size = sizeof(MpegEncContext),
|
|
||||||
.init = ff_mpv_encode_init,
|
|
||||||
.encode2 = ff_mpv_encode_picture,
|
|
||||||
.close = ff_mpv_encode_end,
|
|
||||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
|
|
||||||
.pix_fmts= (const enum AVPixelFormat[]){AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE},
|
|
||||||
.priv_class = &h263_class,
|
|
||||||
};
|
|
||||||
|
|
||||||
static const AVOption h263p_options[] = {
|
|
||||||
{ "umv", "Use unlimited motion vectors.", OFFSET(umvplus), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
|
||||||
{ "aiv", "Use alternative inter VLC.", OFFSET(alt_inter_vlc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
|
||||||
{ "obmc", "use overlapped block motion compensation.", OFFSET(obmc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
|
|
||||||
{ "structured_slices", "Write slice start position at every GOB header instead of just GOB number.", OFFSET(h263_slice_structured), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE},
|
|
||||||
FF_MPV_COMMON_OPTS
|
|
||||||
#if FF_API_MPEGVIDEO_OPTS
|
|
||||||
FF_MPV_DEPRECATED_MPEG_QUANT_OPT
|
|
||||||
FF_MPV_DEPRECATED_A53_CC_OPT
|
|
||||||
FF_MPV_DEPRECATED_MATRIX_OPT
|
|
||||||
FF_MPV_DEPRECATED_BFRAME_OPTS
|
|
||||||
#endif
|
|
||||||
{ NULL },
|
|
||||||
};
|
|
||||||
static const AVClass h263p_class = {
|
|
||||||
.class_name = "H.263p encoder",
|
|
||||||
.item_name = av_default_item_name,
|
|
||||||
.option = h263p_options,
|
|
||||||
.version = LIBAVUTIL_VERSION_INT,
|
|
||||||
};
|
|
||||||
|
|
||||||
const AVCodec ff_h263p_encoder = {
|
|
||||||
.name = "h263p",
|
|
||||||
.long_name = NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"),
|
|
||||||
.type = AVMEDIA_TYPE_VIDEO,
|
|
||||||
.id = AV_CODEC_ID_H263P,
|
|
||||||
.priv_data_size = sizeof(MpegEncContext),
|
|
||||||
.init = ff_mpv_encode_init,
|
|
||||||
.encode2 = ff_mpv_encode_picture,
|
|
||||||
.close = ff_mpv_encode_end,
|
|
||||||
.capabilities = AV_CODEC_CAP_SLICE_THREADS,
|
|
||||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
|
|
||||||
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE },
|
|
||||||
.priv_class = &h263p_class,
|
|
||||||
};
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user