0x2620/oxframe
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

enable vp9 by default

Browse source
This commit is contained in:
j 2015-08-28 15:40:49 +02:00
parent 44d68e19d7
commit 3ac81e2860
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -6,7 +6,7 @@ BINDIR ?= ${DESTDIR}${PREFIX}/bin
MAN1DIR ?= ${DESTDIR}${PREFIX}/man/man1 MAN1DIR ?= ${DESTDIR}${PREFIX}/man/man1
CC ?= gcc CC ?= gcc
CFLAGS ?= -Wall -Wno-parantheses -O3 CFLAGS ?= -Wall -Wno-parantheses -O3 -DHAVE_VP9=1
FLAGS += -ffast-math -fsigned-char -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops FLAGS += -ffast-math -fsigned-char -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops
FLAGS = ${CFLAGS} FLAGS = ${CFLAGS}
FLAGS += -I. -Isrc -Isrc/halloc FLAGS += -I. -Isrc -Isrc/halloc

6
src/oxframe.c
View file

@ -381,12 +381,14 @@ int extract_frame_webm(oxstate *state) {
if (type == NESTEGG_TRACK_VIDEO) { if (type == NESTEGG_TRACK_VIDEO) {
/* Initialize codec */ /* Initialize codec */
if (codec_id == NESTEGG_CODEC_VP8) { if (codec_id == NESTEGG_CODEC_VP8) {
if(vpx_codec_dec_init(&codec, &vpx_codec_vp8_dx_algo, NULL, flags)) if(vpx_codec_dec_init(&codec, &vpx_codec_vp8_dx_algo, NULL, flags)) {
die_codec(&codec, "Failed to initialize decoder"); die_codec(&codec, "Failed to initialize decoder");
}
#ifdef HAVE_VP9 #ifdef HAVE_VP9
} else if (codec_id == NESTEGG_CODEC_VP9) { } else if (codec_id == NESTEGG_CODEC_VP9) {
if(vpx_codec_dec_init(&codec, &vpx_codec_vp9_dx_algo, NULL, flags)) if(vpx_codec_dec_init(&codec, &vpx_codec_vp9_dx_algo, NULL, flags)) {
die_codec(&codec, "Failed to initialize decoder"); die_codec(&codec, "Failed to initialize decoder");
}
#endif #endif
} else { } else {
fprintf(stderr, "unsupported video codec %d\n", codec_id); fprintf(stderr, "unsupported video codec %d\n", codec_id);