Commit 6edc9411 authored by Aaron Holtzman's avatar Aaron Holtzman

Build fixes from HH and I moved the framecounter to the proper

location so it shows how fast it's really going (so some
people will stop complaining about slowness :). Right now
instead of displaying the b,p frames we write the last i-frame
to the display.

aaron
parent b98e3176
......@@ -8,19 +8,17 @@ noinst_LIBRARIES = libmpeg2.a
libmpeg2_a_LIBADD = @LIB_CONFIG_OBJS@
libmpeg2_a_SOURCES = getvlc.c mb_buffer.c motion.c parse.c stats.c\
idct.c motion_comp.c inv_quantize.c decode.c bitstream.c debug.c\
yuv2rgb.c
idct.c motion_comp.c inv_quantize.c decode.c bitstream.c debug.c
libmpeg2_a_DEPENDENCIES = @LIB_CONFIG_OBJS@
mpeg2dec_LDADD= -L. -lmpeg2 @CONFIG_OBJS@ @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11\
mpeg2dec_LDADD= libmpeg2.a @CONFIG_OBJS@ @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11\
@X_EXTRA_LIBS@ -lm
mpeg2dec_SOURCES = mpeg2dec.c
mpeg2dec_DEPENDENCIES = libmpeg2.a @CONFIG_OBJS@
EXTRA_mpeg2dec_SOURCES = display_gatos.c display_mga_vid.c display_x11.c\
display_xil.c idct_mmx.c idct_block_mmx.S idct_mlib.c\
motion_comp_mmx.c yuv2rgb_mlib.c
motion_comp_mmx.c yuv2rgb.c yuv2rgb_mlib.c
noinst_HEADERS = config.h getvlc.h stats.h parse.h slice.h mb_buffer.h\
motion_comp.h inv_quantize.h mpeg2.h mpeg2_internal.h display.h idct.h\
......
......@@ -22,7 +22,7 @@ dnl
AC_ARG_ENABLE(mga,
[ --disable-mga make a version not using MGA],
enable_mga=no, enable_mga=yes)
if test x$DISPLAY_DRIVER = x -a x$enable_mga = xyes; then
if test "x$DISPLAY_DRIVER" = x -a x$enable_mga = xyes; then
AC_MSG_CHECKING(for /dev/mga_vid)
if test -c "/dev/mga_vid"; then
AC_MSG_RESULT(found)
......@@ -33,22 +33,24 @@ if test x$DISPLAY_DRIVER = x -a x$enable_mga = xyes; then
fi
fi
AC_ARG_ENABLE(gatos, [ --disable-gatos make a version not using GATOS],
AC_ARG_ENABLE(gatos,
[ --disable-gatos make a version not using GATOS],
enable_gatos=no, enable_gatos=yes)
if test x$DISPLAY_DRIVER = x -a x$enable_gatos = xyes; then
if test "x$DISPLAY_DRIVER" = x -a x$enable_gatos = xyes; then
AC_CHECK_LIB(gatos, main, [ DISPLAY_DRIVER=display_gatos.o
LIBS="$LIBS -lgatos" ], , -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib)
fi
AC_ARG_ENABLE(xil, [ --disable-xil make a version not using XIL],
enable_xil=no, enable_xil=yes)
if test x$DISPLAY_DRIVER = x -a x$enable_xil = xyes; then
AC_CHECK_LIB(xil, main, [ DISPLAY_DRIVER=display_xil.o LIBS="$LIBS -lxil" ])
if test "x$DISPLAY_DRIVER" = x -a x$enable_xil = xyes; then
AC_CHECK_LIB(xil, main, [ DISPLAY_DRIVER="display_xil.o yuv2rgb.o"
LIBS="$LIBS -lxil" ])
fi
if test x$DISPLAY_DRIVER = x; then
if test "x$DISPLAY_DRIVER" = x; then
AC_MSG_WARN(no accelerated display driver found -> using X11)
DISPLAY_DRIVER=display_x11.o
DISPLAY_DRIVER="display_x11.o yuv2rgb.o"
fi
dnl
......@@ -60,7 +62,8 @@ AC_ARG_ENABLE(mlib,
enable_mlib=no, enable_mlib=yes)
if test x$enable_mlib = xyes; then
AC_CHECK_LIB(mlib, main,
[ EXTENSION_DRIVER="$EXTENSION_DRIVER yuv2rgb_mlib.o idct_mlib.o"
[ EXTENSION_DRIVER="$EXTENSION_DRIVER yuv2rgb_mlib.o"
LIB_CONFIG_OBJS="$LIB_CONFIG_OBJS idct_mlib.o"
LIBS="$LIBS -L/opt/SUNWmlib/lib -R/opt/SUNWmlib/lib -lmlib"
CFLAGS="$CFLAGS -I/opt/SUNWmlib/include"
AC_DEFINE(HAVE_MLIB)], , -L/opt/SUNWmlib/lib )
......
......@@ -155,7 +155,6 @@ mpeg2_init(void)
}
uint_32 frame_counter = 0;
void
decode_reorder_frames(void)
......@@ -309,8 +308,6 @@ mpeg2_decode_frame(void)
if(bitstream_show(32) == SEQUENCE_END_CODE)
is_sequence_needed = 1;
printf("frame_counter = %d\n",frame_counter++);
return &mpeg2_frame;
}
......@@ -46,6 +46,7 @@ void fill_buffer(uint_32 **start,uint_32 **end)
int main(int argc,char *argv[])
{
uint_32 frame_counter = 0;
mpeg2_frame_t *my_frame;
if(argc < 2)
......@@ -79,6 +80,7 @@ int main(int argc,char *argv[])
{
my_frame = mpeg2_decode_frame();
display_frame(my_frame->frame);
printf("frame_counter = %d\n",frame_counter++);
}
return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment