sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close #1529: 

- replaced obsoleted SDL constants SDL_*_OVERLAY
 - updated build config/scripts



git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@4157 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Nanang Izzuddin 2012-06-06 09:37:25 +00:00
parent 96f829e374
commit 08b20fe01b
3 changed files with 396 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

671
aconfigure
View File

File diff suppressed because it is too large Load Diff

29
aconfigure.ac
View File

@ -852,23 +852,26 @@ AC_ARG_ENABLE(sdl,
fi
],
[
SDL_CONFIG="sdl-config"
if test "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then
SDL_CONFIG=$with_sdl/bin/sdl-config
AC_MSG_RESULT([Using SDL prefix... $with_sdl])
AC_PATH_PROGS(SDL_CONFIG,sdl-config sdl2-config,,$with_sdl/bin)
else
AC_PATH_PROGS(SDL_CONFIG, sdl-config sdl2-config)
fi
AC_MSG_CHECKING([SDL availability..])
if (sh -c "$SDL_CONFIG --version" | grep 1.3) then
AC_SUBST(ac_sdl_cflags)
AC_SUBST(ac_sdl_ldflags)
ac_sdl_cflags=`$SDL_CONFIG --cflags`
ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
ac_sdl_ldflags=`$SDL_CONFIG --libs`
LIBS="$LIBS $ac_sdl_ldflags"
else
AC_MSG_CHECKING([SDL availability])
if test "x$SDL_CONFIG" = "x"; then
AC_MSG_RESULT([not found])
elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then
AC_SUBST(ac_sdl_cflags)
AC_SUBST(ac_sdl_ldflags)
ac_sdl_cflags=`$SDL_CONFIG --cflags`
ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
ac_sdl_ldflags=`$SDL_CONFIG --libs`
LIBS="$LIBS $ac_sdl_ldflags"
else
AC_MSG_RESULT([Unsupported SDL version])
fi
fi
])

20
pjmedia/src/pjmedia-videodev/sdl_dev.c
View File

@ -76,13 +76,13 @@ static sdl_fmt_info sdl_fmts[] =
{PJMEDIA_FORMAT_DIB , (Uint32)SDL_PIXELFORMAT_RGB24,
0xFF0000, 0xFF00, 0xFF, 0} ,
{PJMEDIA_FORMAT_YUY2, SDL_YUY2_OVERLAY, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_UYVY, SDL_UYVY_OVERLAY, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_YVYU, SDL_YVYU_OVERLAY, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_I420, SDL_IYUV_OVERLAY, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_YV12, SDL_YV12_OVERLAY, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_I420JPEG, SDL_IYUV_OVERLAY, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_I422JPEG, SDL_YV12_OVERLAY, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_YUY2, SDL_PIXELFORMAT_YUY2, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_UYVY, SDL_PIXELFORMAT_UYVY, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_YVYU, SDL_PIXELFORMAT_YVYU, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_I420, SDL_PIXELFORMAT_IYUV, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_YV12, SDL_PIXELFORMAT_YV12, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_I420JPEG, SDL_PIXELFORMAT_IYUV, 0, 0, 0, 0} ,
{PJMEDIA_FORMAT_I422JPEG, SDL_PIXELFORMAT_YV12, 0, 0, 0, 0}
};
/* sdl_ device info */
@ -1418,7 +1418,11 @@ static pj_status_t job_queue_destroy(job_queue *jq)
}
#ifdef _MSC_VER
# pragma comment( lib, "sdl.lib")
# if SDL_VERSION_ATLEAST(2,0,0)
# pragma comment( lib, "sdl2.lib")
# elif SDL_VERSION_ATLEAST(1,3,0)
# pragma comment( lib, "sdl.lib")
# endif
# if PJMEDIA_VIDEO_DEV_SDL_HAS_OPENGL
# pragma comment(lib, "OpenGL32.lib")
# endif /* PJMEDIA_VIDEO_DEV_SDL_HAS_OPENGL */