generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libx264: Implement rgb24 support through a seperate AVCodec.

Browse Source 
This avoids people mistakely encoding in a way that many players dont support.
Fixes Ticket658

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-01 21:02:57 +01:00
parent 4a8e3324fb
commit dd974c1bc1
2 changed files with 30 additions and 4 deletions

1
libavcodec/allcodecs.c

@ -402,6 +402,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER (LIBVORBIS, libvorbis); REGISTER_ENCODER (LIBVORBIS, libvorbis);
REGISTER_ENCDEC (LIBVPX, libvpx); REGISTER_ENCDEC (LIBVPX, libvpx);
REGISTER_ENCODER (LIBX264, libx264); REGISTER_ENCODER (LIBX264, libx264);
REGISTER_ENCODER (LIBX264RGB, libx264rgb);
REGISTER_ENCODER (LIBXAVS, libxavs); REGISTER_ENCODER (LIBXAVS, libxavs);
REGISTER_ENCODER (LIBXVID, libxvid); REGISTER_ENCODER (LIBXVID, libxvid);

33
libavcodec/libx264.c

@ -563,10 +563,6 @@ static const enum PixelFormat pix_fmts_8bit[] = {
PIX_FMT_YUVJ420P, PIX_FMT_YUVJ420P,
PIX_FMT_YUV422P, PIX_FMT_YUV422P,
PIX_FMT_YUV444P, PIX_FMT_YUV444P,
#ifdef X264_CSP_BGR
PIX_FMT_BGR24,
PIX_FMT_RGB24,
#endif
PIX_FMT_NONE PIX_FMT_NONE
}; };
static const enum PixelFormat pix_fmts_9bit[] = { static const enum PixelFormat pix_fmts_9bit[] = {
@ -580,6 +576,13 @@ static const enum PixelFormat pix_fmts_10bit[] = {
PIX_FMT_YUV444P10, PIX_FMT_YUV444P10,
PIX_FMT_NONE PIX_FMT_NONE
}; };
static const enum PixelFormat pix_fmts_8bit_rgb[] = {
#ifdef X264_CSP_BGR
PIX_FMT_BGR24,
PIX_FMT_RGB24,
#endif
PIX_FMT_NONE
};
static av_cold void X264_init_static(AVCodec *codec) static av_cold void X264_init_static(AVCodec *codec)
{ {
@ -650,6 +653,13 @@ static const AVClass class = {
.version = LIBAVUTIL_VERSION_INT, .version = LIBAVUTIL_VERSION_INT,
}; };
static const AVClass rgbclass = {
.class_name = "libx264rgb",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
static const AVCodecDefault x264_defaults[] = { static const AVCodecDefault x264_defaults[] = {
{ "b", "0" }, { "b", "0" },
{ "bf", "-1" }, { "bf", "-1" },
@ -690,3 +700,18 @@ AVCodec ff_libx264_encoder = {
.defaults = x264_defaults, .defaults = x264_defaults,
.init_static_data = X264_init_static, .init_static_data = X264_init_static,
}; };
AVCodec ff_libx264rgb_encoder = {
.name = "libx264rgb",
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H264,
.priv_data_size = sizeof(X264Context),
.init = X264_init,
.encode = X264_frame,
.close = X264_close,
.capabilities = CODEC_CAP_DELAY,
.long_name = NULL_IF_CONFIG_SMALL("libx264 H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10 RGB"),
.priv_class = &rgbclass,
.defaults = x264_defaults,
.pix_fmts = pix_fmts_8bit_rgb,
};