ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Promote tpool as libretro-common component

This commit is contained in:
twinaphex 2019-12-18 18:21:03 +01:00
parent 587a56026e
commit 60b182b821
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -1967,7 +1967,7 @@ ifeq ($(HAVE_FFMPEG), 1)
OBJ += record/drivers/record_ffmpeg.o \ OBJ += record/drivers/record_ffmpeg.o \
cores/libretro-ffmpeg/ffmpeg_core.o \ cores/libretro-ffmpeg/ffmpeg_core.o \
cores/libretro-ffmpeg/swsbuffer.o \ cores/libretro-ffmpeg/swsbuffer.o \
cores/libretro-ffmpeg/tpool.o $(LIBRETRO_COMM_DIR)/rthreads/tpool.o
LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS) LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
DEFINES += -DHAVE_FFMPEG DEFINES += -DHAVE_FFMPEG

2
cores/libretro-ffmpeg/Makefile.common
View File

@ -20,7 +20,7 @@ INCFLAGS += -I$(BASE_DIR) -I$(CORE_DIR) -I$(LIBRETRO_COMM_DIR)/include
LIBRETRO_SOURCE += $(CORE_DIR)/ffmpeg_core.c \ LIBRETRO_SOURCE += $(CORE_DIR)/ffmpeg_core.c \
$(CORE_DIR)/swsbuffer.c \ $(CORE_DIR)/swsbuffer.c \
$(CORE_DIR)/tpool.c \ $(LIBRETRO_COMM_DIR)/rthreads/tpool.c \
$(LIBRETRO_COMM_DIR)/queues/fifo_queue.c \ $(LIBRETRO_COMM_DIR)/queues/fifo_queue.c \
$(LIBRETRO_COMM_DIR)/rthreads/rthreads.c $(LIBRETRO_COMM_DIR)/rthreads/rthreads.c

2
cores/libretro-ffmpeg/ffmpeg_core.c
View File

@ -47,10 +47,10 @@ extern "C" {
#include <features/features_cpu.h> #include <features/features_cpu.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include <rthreads/rthreads.h> #include <rthreads/rthreads.h>
#include <rthreads/tpool.h>
#include <queues/fifo_queue.h> #include <queues/fifo_queue.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include "swsbuffer.h" #include "swsbuffer.h"
#include "tpool.h"
#include <libretro.h> #include <libretro.h>
#ifdef RARCH_INTERNAL #ifdef RARCH_INTERNAL

7
cores/libretro-ffmpeg/tpool.h → libretro-common/include/rthreads/tpool.h
View File

@ -1,7 +1,10 @@
/* The MIT License /*
*
* Copyright (c) 2010-2019 The RetroArch team * Copyright (c) 2010-2019 The RetroArch team
* Copyright (c) 2017 John Schember <john@nachtimwald.com> * Copyright (c) 2017 John Schember <john@nachtimwald.com>
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (tpool.h).
* ---------------------------------------------------------------------------------------
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

12
cores/libretro-ffmpeg/tpool.c → libretro-common/rthreads/tpool.c
View File

@ -1,7 +1,10 @@
/* The MIT License /*
*
* Copyright (c) 2010-2019 The RetroArch team * Copyright (c) 2010-2019 The RetroArch team
* Copyright (c) 2017 John Schember <john@nachtimwald.com> * Copyright (c) 2017 John Schember <john@nachtimwald.com>
*
* ---------------------------------------------------------------------------------------
* The following license statement only applies to this file (tpool.c).
* ---------------------------------------------------------------------------------------
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -23,9 +26,10 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <rthreads/rthreads.h> #include <boolean.h>
#include "tpool.h" #include <rthreads/rthreads.h>
#include <rthreads/tpool.h>
/* Work object which will sit in a queue /* Work object which will sit in a queue
* waiting for the pool to process it. * waiting for the pool to process it.