Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libobs/build/libobs.graphics-image-max-size+.h.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/* Unity group (BUILD.md): private image dependency, separate archive member. */
#include "libobs/build/libobs-graphics.pch.h"

#include "libobs/graphics/graphics-image-max-size.c.h"
2 changes: 0 additions & 2 deletions libobs/build/libobs.media+.h.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
#include "libobs/build/libobs-media.pch.h"

#include "libobs/graphics/graphics-ffmpeg-init-adapter.c.h"
#include "libobs/graphics/graphics-ffmpeg-orientation-adapter.c.h"
#include "libobs/graphics/graphics-ffmpeg-orientation-fields.c.h"
#include "libobs/graphics/graphics-ffmpeg.c.h"
#include "libobs/graphics/graphics-texture-file-data.c.h"
#include "libobs/media-io/media-remux-ffmpeg.c.h"
Expand Down
4 changes: 4 additions & 0 deletions libobs/build/libobs.media-image-orientation-fields+.h.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/* Unity group (BUILD.md): private image dependency, separate archive member. */
#include "libobs/build/libobs-media.pch.h"

#include "libobs/graphics/graphics-ffmpeg-orientation-fields.c.h"
5 changes: 5 additions & 0 deletions libobs/build/libobs.media-texture-file-data-convert+.h.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/* Unity group (BUILD.md): private image dependency, separate archive member. */
#include "libobs/build/libobs-media.pch.h"

#include "libobs/graphics/graphics-ffmpeg-orientation-adapter.c.h"
#include "libobs/graphics/graphics-texture-file-data-convert.c.h"
4 changes: 4 additions & 0 deletions libobs/build/libobs.media-texture-file-data-session+.h.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/* Unity group (BUILD.md): private image dependency, separate archive member. */
#include "libobs/build/libobs-media.pch.h"

#include "libobs/graphics/graphics-texture-file-data-adapter.c.h"
1 change: 1 addition & 0 deletions libobs/build/modules.d/graphics.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"groups": [
"effect-parser-funcs",
"graphics",
"graphics-image-max-size",
"graphics-linear-srgb",
"graphics-stencil-adapter",
"graphics-texture-creators-fields"
Expand Down
5 changes: 4 additions & 1 deletion libobs/build/modules.d/media.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"description": "libobs/media-io.",
"groups": [
"media",
"media-resampler-kernel"
"media-image-orientation-fields",
"media-resampler-kernel",
"media-texture-file-data-convert",
"media-texture-file-data-session"
],
"depends": []
}
4 changes: 4 additions & 0 deletions libobs/build/source-sets.d/LIBOBS_SOURCES.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,15 @@
"build/libobs.effect-parser-funcs+.h.c",
"build/libobs.util-cf+.h.c",
"build/libobs.graphics+.h.c",
"build/libobs.graphics-image-max-size+.h.c",
"build/libobs.graphics-linear-srgb+.h.c",
"build/libobs.graphics-stencil-adapter+.h.c",
"build/libobs.graphics-texture-creators-fields+.h.c",
"build/libobs.image-decode-adapter+.h.c",
"build/libobs.media+.h.c",
"build/libobs.media-image-orientation-fields+.h.c",
"build/libobs.media-texture-file-data-convert+.h.c",
"build/libobs.media-texture-file-data-session+.h.c",
"build/libobs.media-resampler-kernel+.h.c",
"build/libobs.source-private-settings+.h.c"
]
181 changes: 1 addition & 180 deletions libobs/graphics/graphics-ffmpeg.c.h
Original file line number Diff line number Diff line change
@@ -1,183 +1,4 @@
#include "build/libobs-media.pch.h"

static void *ffmpeg_image_copy_data_straight(struct ffmpeg_image *info, AVFrame *frame)
{
const size_t linesize = (size_t)info->cx * 4;
const size_t totalsize = (size_t)info->cy * linesize;
void *data = bmalloc(totalsize);

gs_ffmpeg_image_copy_rows(data, frame->data[0], (size_t)info->cx, (size_t)info->cy, (size_t)frame->linesize[0]);

return data;
}

static void *ffmpeg_image_orient(struct ffmpeg_image *info, void *in_data, int orient)
{
const size_t sx = (size_t)info->cx;
const size_t sy = (size_t)info->cy;
uint8_t *data = NULL;

if (!gs_ffmpeg_image_orient_needed(orient))
return in_data;

data = bmalloc(sx * 4 * sy);

if (gs_ffmpeg_image_orient_swaps(orient)) {
info->cx = (int)sy;
info->cy = (int)sx;
}

gs_ffmpeg_image_orient_copy(data, in_data, sx, sy, orient);

bfree(in_data);
return data;
}

/* graphics-ffmpeg-route.c gives the pixel formats, the texture formats and
* the alpha modes as their values. */
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUV420P == AV_PIX_FMT_YUV420P, "AV_PIX_FMT_YUV420P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUV422P == AV_PIX_FMT_YUV422P, "AV_PIX_FMT_YUV422P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUV444P == AV_PIX_FMT_YUV444P, "AV_PIX_FMT_YUV444P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUV411P == AV_PIX_FMT_YUV411P, "AV_PIX_FMT_YUV411P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUVJ420P == AV_PIX_FMT_YUVJ420P, "AV_PIX_FMT_YUVJ420P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUVJ422P == AV_PIX_FMT_YUVJ422P, "AV_PIX_FMT_YUVJ422P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUVJ444P == AV_PIX_FMT_YUVJ444P, "AV_PIX_FMT_YUVJ444P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_RGBA == AV_PIX_FMT_RGBA, "AV_PIX_FMT_RGBA");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_BGRA == AV_PIX_FMT_BGRA, "AV_PIX_FMT_BGRA");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUV440P == AV_PIX_FMT_YUV440P, "AV_PIX_FMT_YUV440P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUVJ440P == AV_PIX_FMT_YUVJ440P, "AV_PIX_FMT_YUVJ440P");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_RGBA64BE == AV_PIX_FMT_RGBA64BE, "AV_PIX_FMT_RGBA64BE");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_BGR0 == AV_PIX_FMT_BGR0, "AV_PIX_FMT_BGR0");
_Static_assert(GS_FFMPEG_IMAGE_PIX_FMT_YUVJ411P == AV_PIX_FMT_YUVJ411P, "AV_PIX_FMT_YUVJ411P");
_Static_assert(GS_FFMPEG_IMAGE_GS_RGBA == GS_RGBA, "GS_RGBA");
_Static_assert(GS_FFMPEG_IMAGE_GS_BGRX == GS_BGRX, "GS_BGRX");
_Static_assert(GS_FFMPEG_IMAGE_GS_BGRA == GS_BGRA, "GS_BGRA");
_Static_assert(GS_FFMPEG_IMAGE_GS_RGBA16 == GS_RGBA16, "GS_RGBA16");
_Static_assert(GS_FFMPEG_IMAGE_ALPHA_STRAIGHT == GS_IMAGE_ALPHA_STRAIGHT, "GS_IMAGE_ALPHA_STRAIGHT");
_Static_assert(GS_FFMPEG_IMAGE_ALPHA_PREMULTIPLY_SRGB == GS_IMAGE_ALPHA_PREMULTIPLY_SRGB,
"GS_IMAGE_ALPHA_PREMULTIPLY_SRGB");
_Static_assert(GS_FFMPEG_IMAGE_ALPHA_PREMULTIPLY == GS_IMAGE_ALPHA_PREMULTIPLY, "GS_IMAGE_ALPHA_PREMULTIPLY");

/* graphics-ffmpeg-rgba64.c gives the alpha modes as their values. */
_Static_assert(GS_FFMPEG_RGBA64_ALPHA_STRAIGHT == GS_IMAGE_ALPHA_STRAIGHT, "GS_IMAGE_ALPHA_STRAIGHT");
_Static_assert(GS_FFMPEG_RGBA64_ALPHA_PREMULTIPLY_SRGB == GS_IMAGE_ALPHA_PREMULTIPLY_SRGB,
"GS_IMAGE_ALPHA_PREMULTIPLY_SRGB");
_Static_assert(GS_FFMPEG_RGBA64_ALPHA_PREMULTIPLY == GS_IMAGE_ALPHA_PREMULTIPLY, "GS_IMAGE_ALPHA_PREMULTIPLY");

void *ffmpeg_image_reformat_frame(struct ffmpeg_image *info, AVFrame *frame, enum gs_image_alpha_mode alpha_mode)
{
struct SwsContext *sws_ctx = NULL;
void *data = NULL;
int ret = 0;

const int orient = ffmpeg_image_get_orientation(frame);
const struct gs_ffmpeg_image_plan plan = gs_ffmpeg_image_plan(info->format, (int)alpha_mode);

switch (plan.route) {
case GS_FFMPEG_IMAGE_ROUTE_COPY:
data = ffmpeg_image_copy_data_straight(info, frame);
break;
case GS_FFMPEG_IMAGE_ROUTE_PREMULTIPLY_ROWS: {
const size_t linesize = (size_t)info->cx * 4;
const size_t totalsize = (size_t)info->cy * linesize;
data = bmalloc(totalsize);
const size_t src_linesize = (size_t)frame->linesize[0];
const size_t min_line = linesize < src_linesize ? linesize : src_linesize;
uint8_t *dst = data;
const uint8_t *src = frame->data[0];
const size_t row_elements = min_line >> 2;
if (plan.premultiply == GS_FFMPEG_IMAGE_PREMULTIPLY_SRGB) {
for (int y = 0; y < info->cy; y++) {
gs_premultiply_xyza_srgb_loop_restrict(dst, src, row_elements);
dst += linesize;
src += src_linesize;
}
} else if (plan.premultiply == GS_FFMPEG_IMAGE_PREMULTIPLY_LINEAR) {
for (int y = 0; y < info->cy; y++) {
gs_premultiply_xyza_loop_restrict(dst, src, row_elements);
dst += linesize;
src += src_linesize;
}
}
break;
}
case GS_FFMPEG_IMAGE_ROUTE_RGBA64: {
const size_t dst_linesize = (size_t)info->cx * 4;
data = bmalloc((size_t)info->cy * dst_linesize);
gs_ffmpeg_image_rgba64be_rows(data, frame->data[0], info->cx, info->cy, (size_t)frame->linesize[0],
(int)alpha_mode);

info->format = (enum AVPixelFormat)plan.out_format;
break;
}
default: {
/* GS_FFMPEG_IMAGE_ROUTE_SWS */
static const enum AVPixelFormat format = AV_PIX_FMT_BGRA;

sws_ctx = sws_getContext(info->cx, info->cy, (enum AVPixelFormat)plan.sws_format, info->cx, info->cy,
format, SWS_POINT, NULL, NULL, NULL);
if (!sws_ctx) {
blog(LOG_WARNING,
"Failed to create scale context "
"for '%s'",
info->file);
goto fail;
}

if (plan.full_range) {
/* What swscale sets up for a YUVJ format itself:
* full range in, its default (BT.601) matrix. */
const int *coeff = sws_getCoefficients(SWS_CS_DEFAULT);
sws_setColorspaceDetails(sws_ctx, coeff, 1, coeff, 0, 0, 1 << 16, 1 << 16);
}

uint8_t *pointers[4];
int linesizes[4];
ret = av_image_alloc(pointers, linesizes, info->cx, info->cy, format, 32);
if (ret < 0) {
blog(LOG_WARNING, "av_image_alloc failed for '%s': %s", info->file, av_err2str(ret));
sws_freeContext(sws_ctx);
goto fail;
}

ret = sws_scale(sws_ctx, (const uint8_t *const *)frame->data, frame->linesize, 0, info->cy, pointers,
linesizes);
sws_freeContext(sws_ctx);

if (ret < 0) {
blog(LOG_WARNING, "sws_scale failed for '%s': %s", info->file, av_err2str(ret));
av_freep(pointers);
goto fail;
}

const size_t linesize = (size_t)info->cx * 4;
data = bmalloc((size_t)info->cy * linesize);
const uint8_t *src = pointers[0];
uint8_t *dst = data;
for (size_t y = 0; y < (size_t)info->cy; y++) {
memcpy(dst, src, linesize);
dst += linesize;
src += linesizes[0];
}

av_freep(pointers);

if (plan.premultiply == GS_FFMPEG_IMAGE_PREMULTIPLY_SRGB) {
gs_premultiply_xyza_srgb_loop(data, (size_t)info->cx * (size_t)info->cy);
} else if (plan.premultiply == GS_FFMPEG_IMAGE_PREMULTIPLY_LINEAR) {
gs_premultiply_xyza_loop(data, (size_t)info->cx * (size_t)info->cy);
}

info->format = (enum AVPixelFormat)plan.out_format;
break;
}
}

data = ffmpeg_image_orient(info, data, orient);

fail:
return data;
}
#include "libobs/build/libobs-media.pch.h"

void gs_init_image_deps(void);
void gs_free_image_deps(void);
Expand Down
17 changes: 17 additions & 0 deletions libobs/graphics/graphics-image-max-size.c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#include "libobs/build/libobs-graphics.pch.h"

/* Shared by the real graphics lifecycle and CPU image loading. Keep the
* atomic state with its callback so standalone consumers need no runtime. */
static volatile long image_max_texture_size;

void gs_image_set_max_texture_size(uint32_t size);

uint32_t gs_image_max_texture_size(void)
{
return (uint32_t)os_atomic_load_long(&image_max_texture_size);
}

void gs_image_set_max_texture_size(uint32_t size)
{
os_atomic_set_long(&image_max_texture_size, (long)size);
}
49 changes: 49 additions & 0 deletions libobs/graphics/graphics-texture-file-data-adapter.c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#include "libobs/build/libobs-media.pch.h"

/* Private C/Rust session ABI, deliberately opaque outside this file. */
void *obs_texture_file_data_open(const char *file);
void *obs_texture_file_data_decode(void *session);
int obs_texture_file_data_format(void *session);
uint32_t obs_texture_file_data_width(void *session);
uint32_t obs_texture_file_data_height(void *session);
void obs_texture_file_data_close(void *session);

/* Private opaque session: FFmpeg's layout never crosses the Rust boundary.
* Initialization already releases FFmpeg resources on failure. */
void *obs_texture_file_data_open(const char *file)
{
struct ffmpeg_image *image = bzalloc(sizeof(*image));
if (!ffmpeg_image_init(image, file, gs_image_max_texture_size)) {
bfree(image);
return NULL;
}
return image;
}

void *obs_texture_file_data_decode(void *session)
{
struct gs_image_decode_context decode = {session, ffmpeg_image_too_large, ffmpeg_image_reformat_frame};
return gs_ffmpeg_image_decode(&decode, (int)GS_IMAGE_ALPHA_STRAIGHT);
}

int obs_texture_file_data_format(void *session)
{
const struct ffmpeg_image *image = session;
return gs_ffmpeg_image_color_format(image->format);
}

uint32_t obs_texture_file_data_width(void *session)
{
return (uint32_t)((struct ffmpeg_image *)session)->cx;
}

uint32_t obs_texture_file_data_height(void *session)
{
return (uint32_t)((struct ffmpeg_image *)session)->cy;
}

void obs_texture_file_data_close(void *session)
{
ffmpeg_image_free(session);
bfree(session);
}
Loading
Loading