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

moved i420_to_uyvy conv from dshow to video_codec

Browse Source 
the conversion is quite generic, so provide it externally

\+ instantly use it in testcard
This commit is contained in:
Martin Pulec
2024-01-24 11:50:10 +01:00
parent f4dedb0ffc
commit 055c165ac0
4 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/video_capture/DirectShowGrabber.cpp
View File

@@ -1243,30 +1243,6 @@ nv12_to_uyvy(int width, int height, const unsigned char *in, unsigned char *out)
}
}
static void
i420_to_uyvy(int width, int height, const unsigned char *in, unsigned char *out)
{
const int uyvy_linesize = vc_get_linesize(width, UYVY);
const unsigned char *const cb = in + (ptrdiff_t) width * height;
const unsigned char *const cr =
cb + (ptrdiff_t) (width / 2) * (height / 2);
for (ptrdiff_t y = 0; y < height; ++y) {
const unsigned char *src_y = in + width * y;
const unsigned char *src_cb = cb + (width / 2) * (y / 2);
const unsigned char *src_cr = cr + (width / 2) * (y / 2);
unsigned char *dst = out + y * uyvy_linesize;
OPTIMIZED_FOR(int x = 0; x < width / 2; ++x)
{
*dst++ = *src_cb++;
*dst++ = *src_y++;
*dst++ = *src_cr++;
*dst++ = *src_y++;
}
}
}
/// Apparently DirectShow uses bottom-to-top line ordering so we want make
/// it top-to-bottom
static void
@@ -1314,7 +1290,7 @@ static const struct {
{ &MEDIASUBTYPE_RGB32, "RGB 32", RGBA, abgr_flip_and_swap},
{ &MEDIASUBTYPE_ARGB32, "ARGB 32", VC_NONE, nullptr },
{ &MEDIASUBTYPE_Overlay, "Overlay", VC_NONE, nullptr },
{ &GUID_I420, "I420", UYVY, i420_to_uyvy },
{ &GUID_I420, "I420", UYVY, i420_8_to_uyvy },
{ &MEDIASUBTYPE_YUY2, "YUY2", YUYV, nullptr },
{ &GUID_R210, "r210", VC_NONE, nullptr },
{ &GUID_v210, "v210", v210, nullptr },

4
src/video_capture/testcard.c
View File

@@ -360,6 +360,10 @@ static size_t testcard_load_from_file_y4m(const char *filename, struct video_des
unsigned char *converted = malloc(data_len);
if (info.bitdepth == 8) {
switch (info.subsampling) {
case Y4M_SUBS_420:
i420_8_to_uyvy(desc->width, desc->height, data,
converted);
break;
case Y4M_SUBS_422:
i422_8_to_uyvy(desc->width, desc->height, data,
converted);

24
src/video_codec.c
View File

@@ -994,6 +994,30 @@ i444_16_to_y416(int width, int height, const unsigned char *in,
}
}
void
i420_8_to_uyvy(int width, int height, const unsigned char *in, unsigned char *out)
{
const int uyvy_linesize = vc_get_linesize(width, UYVY);
const unsigned char *const cb = in + (ptrdiff_t) width * height;
const unsigned char *const cr =
cb + (ptrdiff_t) (width / 2) * (height / 2);
for (ptrdiff_t y = 0; y < height; ++y) {
const unsigned char *src_y = in + width * y;
const unsigned char *src_cb = cb + (width / 2) * (y / 2);
const unsigned char *src_cr = cr + (width / 2) * (y / 2);
unsigned char *dst = out + y * uyvy_linesize;
OPTIMIZED_FOR(int x = 0; x < width / 2; ++x)
{
*dst++ = *src_cb++;
*dst++ = *src_y++;
*dst++ = *src_cr++;
*dst++ = *src_y++;
}
}
}
void
i422_8_to_uyvy(int width, int height, const unsigned char *in,
unsigned char *out)

2
src/video_codec.h
View File

@@ -112,6 +112,8 @@ void y416_to_i444(int width, int height, const unsigned char *in,
unsigned char *out, int depth);
void i444_16_to_y416(int width, int height, const unsigned char *in,
unsigned char *out, int in_depth);
void i420_8_to_uyvy(int width, int height, const unsigned char *in,
unsigned char *out);
void i422_8_to_uyvy(int width, int height, const unsigned char *in,
unsigned char *out);
void i444_8_to_uyvy(int width, int height, const unsigned char *in,