a bit more offset

This commit is contained in:
j 2010-06-28 16:17:23 +02:00
parent 2268d4d6c4
commit 941e8602d9
2 changed files with 6 additions and 8 deletions

View file

@ -12,13 +12,11 @@ CFLAGS += -I. -Isrc -Isrc/halloc
INSTALL = install INSTALL = install
INCLUDEFLAGS ?= `pkg-config --cflags oggplay` `imlib2-config --cflags` INCLUDEFLAGS ?= `pkg-config --cflags oggplay nestegg` `imlib2-config --cflags`
LINKFLAGS ?= -L${PREFIX}/lib LINKFLAGS ?= -L${PREFIX}/lib
LINKFLAGS += `imlib2-config --libs` LINKFLAGS += `imlib2-config --libs`
#LINKFLAGS += `pkg-config --libs oggplay` LINKFLAGS += `pkg-config --libs oggplay nestegg`
LINKFLAGS += -L/usr/local/lib /usr/local/lib/liboggplay.a LINKFLAGS += -lvpx
LINKFLAGS += -loggz -lfishsound -ltheora -lvorbisenc -lvorbis -lm -logg -lkate -lpthread
LINKFLAGS += -lvpx -lnestegg
all: ${PROG} all: ${PROG}

View file

@ -267,7 +267,7 @@ int extract_frame_ogv(oxstate *state) {
int fps_num = 25; int fps_num = 25;
int fps_denom = 1; int fps_denom = 1;
int granuleshift = 6; int granuleshift = 6;
long max_num, offset; long offset;
OggPlay * player; OggPlay * player;
OggPlayReader * reader = NULL; OggPlayReader * reader = NULL;
@ -289,8 +289,8 @@ int extract_frame_ogv(oxstate *state) {
} }
oggplay_set_data_callback(player, dump_frame_callback, state); oggplay_set_data_callback(player, dump_frame_callback, state);
max_num = 1 << granuleshift; offset = 500 + 1000 * ((1 << granuleshift) - 1) * fps_denom / fps_num;
offset = (1000 * max_num * fps_denom) / fps_num; fprintf (stderr, "granule: %d offset %ld\n", granuleshift, offset);
state->duration = oggplay_get_duration(player); state->duration = oggplay_get_duration(player);