scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 19:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Libavcodec: added support for 10-bit RGB

Browse Source
This commit is contained in:
Martin Pulec
2019-06-03 15:45:40 +02:00
parent 6569548e32
commit 23137ca4b6
2 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/video_compress/libavcodec.cpp
View File

@@ -134,6 +134,7 @@ static void v210_to_yuv444p10le(AVFrame *out_frame, unsigned char *in_data, int
static void v210_to_p010le(AVFrame *out_frame, unsigned char *in_data, int width, int height);
static void rgb_to_bgr0(AVFrame *out_frame, unsigned char *in_data, int width, int height);
static void rgb_to_gbrp(AVFrame *out_frame, unsigned char *in_data, int width, int height);
static void r10k_to_gbrp10le(AVFrame *out_frame, unsigned char *in_data, int width, int height);
typedef void (*pixfmt_callback_t)(AVFrame *out_frame, unsigned char *in_data, int width, int height);
static pixfmt_callback_t select_pixfmt_callback(AVPixelFormat fmt, codec_t src);
@@ -777,6 +778,7 @@ static const struct {
{ UYVY, AV_PIX_FMT_YUVJ444P, to_yuv444p },
{ RGB, AV_PIX_FMT_BGR0, rgb_to_bgr0 },
{ RGB, AV_PIX_FMT_GBRP, rgb_to_gbrp },
{ R10k, AV_PIX_FMT_GBRP10LE, r10k_to_gbrp10le },
};
/**
@@ -1485,6 +1487,26 @@ static void rgb_to_gbrp(AVFrame *out_frame, unsigned char *in_data, int width, i
}
}
static void r10k_to_gbrp10le(AVFrame *out_frame, unsigned char *in_data, int width, int height)
{
int src_linesize = vc_get_linesize(width, R10k);
for (int y = 0; y < height; ++y) {
unsigned char *src = in_data + y * src_linesize;
uint16_t *dst_b = (uint16_t *) (out_frame->data[0] + out_frame->linesize[0] * y);
uint16_t *dst_g = (uint16_t *) (out_frame->data[1] + out_frame->linesize[1] * y);
uint16_t *dst_r = (uint16_t *) (out_frame->data[2] + out_frame->linesize[2] * y);
for (int x = 0; x < width; ++x) {
unsigned char w0 = *src++;
unsigned char w1 = *src++;
unsigned char w2 = *src++;
unsigned char w3 = *src++;
*dst_r++ = w0 << 2 | w1 >> 6;
*dst_g++ = (w1 & 0x3f) << 4 | w2 >> 4;
*dst_b++ = (w2 & 0xf) << 6 | w3 >> 2;
}
}
}
static pixfmt_callback_t select_pixfmt_callback(AVPixelFormat fmt, codec_t src) {
// no conversion needed
if (ug_to_av_pixfmt_map.find(src) != ug_to_av_pixfmt_map.end()

45
src/video_decompress/libavcodec.c
View File

@@ -479,6 +479,41 @@ static void gbrp_to_rgba(char *dst_buffer, AVFrame *frame,
}
}
static void gbrp10le_to_r10k(char *dst_buffer, AVFrame *frame,
int width, int height, int pitch, int rgb_shift[static restrict 3])
{
UNUSED(rgb_shift);
for (int y = 0; y < height; ++y) {
uint16_t *src_b = (uint16_t *) (frame->data[0] + frame->linesize[0] * y);
uint16_t *src_g = (uint16_t *) (frame->data[1] + frame->linesize[1] * y);
uint16_t *src_r = (uint16_t *) (frame->data[2] + frame->linesize[2] * y);
unsigned char *dst = (unsigned char *) dst_buffer + y * pitch;
for (int x = 0; x < width; ++x) {
*dst++ = *src_r >> 2;
*dst++ = (*src_r++ & 0x3) << 6 | *src_g >> 4;
*dst++ = (*src_g++ & 0xf) << 4 | *src_b >> 6;
*dst++ = (*src_b++ & 0x3f) << 2;
}
}
}
static void gbrp10le_to_rgb(char *dst_buffer, AVFrame *frame,
int width, int height, int pitch, int rgb_shift[static restrict 3])
{
UNUSED(rgb_shift);
for (int y = 0; y < height; ++y) {
uint16_t *src_b = (uint16_t *) (frame->data[0] + frame->linesize[0] * y);
uint16_t *src_g = (uint16_t *) (frame->data[1] + frame->linesize[1] * y);
uint16_t *src_r = (uint16_t *) (frame->data[2] + frame->linesize[2] * y);
unsigned char *dst = (unsigned char *) dst_buffer + y * pitch;
for (int x = 0; x < width; ++x) {
*dst++ = *src_r++ >> 2;
*dst++ = *src_g++ >> 2;
*dst++ = *src_b++ >> 2;
}
}
}
static void yuv420p_to_yuv422(char *dst_buffer, AVFrame *in_frame,
int width, int height, int pitch, int rgb_shift[static restrict 3])
{
@@ -1206,6 +1241,8 @@ static const struct {
{AV_PIX_FMT_GBRP, RGBA, gbrp_to_rgba, true},
{AV_PIX_FMT_RGB24, UYVY, rgb24_to_uyvy, false},
{AV_PIX_FMT_RGB24, RGB, rgb24_to_rgb, true},
{AV_PIX_FMT_GBRP10LE, R10k, gbrp10le_to_r10k, true},
{AV_PIX_FMT_GBRP10LE, RGB, gbrp10le_to_rgb, false},
#ifdef HWACC_VDPAU
// HW acceleration
{AV_PIX_FMT_VDPAU, HW_VDPAU, av_vdpau_to_ug_vdpau, false},
@@ -1376,7 +1413,6 @@ static void error_callback(void *ptr, int level, const char *fmt, va_list vl) {
static decompress_status libavcodec_decompress(void *state, unsigned char *dst, unsigned char *src,
unsigned int src_len, int frame_seq, struct video_frame_callbacks *callbacks, codec_t *internal_codec)
{
UNUSED(internal_codec);
struct state_libavcodec_decompress *s = (struct state_libavcodec_decompress *) state;
int len, got_frame = 0;
decompress_status res = DECODER_NO_FRAME;
@@ -1499,12 +1535,13 @@ static decompress_status libavcodec_decompress(void *state, unsigned char *dst,
return DECODER_GOT_CODEC;
}
// codec doesn't call get_format_callback (J2K)
// codec doesn't call get_format_callback (J2K, 10-bit RGB HEVC)
if (s->out_codec == VIDEO_CODEC_NONE && res == DECODER_GOT_FRAME) {
if (has_conversion(s->codec_ctx->pix_fmt, internal_codec)) {
s->internal_codec = *internal_codec;
return DECODER_GOT_CODEC;
}
return DECODER_GOT_CODEC;
return DECODER_CANT_DECODE;
}
if (s->blacklist_vdpau) {
@@ -1560,6 +1597,8 @@ static const struct decode_from_to dec_template[] = {
{ VIDEO_CODEC_NONE, VIDEO_CODEC_NONE, VIDEO_CODEC_NONE, 80 }, // for probe
{ VIDEO_CODEC_NONE, RGB, RGB, 500 },
{ VIDEO_CODEC_NONE, RGB, RGBA, 500 },
{ VIDEO_CODEC_NONE, R10k, RGB, 500 },
{ VIDEO_CODEC_NONE, R10k, R10k, 500 },
//{ VIDEO_CODEC_NONE, UYVY, RGB, 500 }, // there are conversions but don't enable now
{ VIDEO_CODEC_NONE, UYVY, UYVY, 500 },
{ VIDEO_CODEC_NONE, v210, v210, 500 },