Browse files

Cleanup.

  • Loading branch information...
1 parent 4284740 commit 1fdb4f8c52cd6b6b914c3ba057fae6597ae1615d huceke committed Aug 24, 2010
Showing with 7 additions and 21 deletions.
  1. +5 −7 Makefile
  2. +0 −9 configure
  3. +0 −2 crystalhd_decoder.h
  4. +2 −3 crystalhd_hw.c
View
12 Makefile
@@ -3,19 +3,18 @@ XINEPLUGIN = xineplug_decode_crystalhd.so
INSTALL = install
XINEPLUGINDIR = $(shell pkg-config --variable=plugindir libxine)
-CFLAGS = -g -O2 -march=core2 -msse2 -mssse3 -mfpmath=sse -fomit-frame-pointer -pipe -DNOVDPAU -fPIC -Wall
+#CFLAGS = -g -O2 -march=core2 -msse2 -mssse3 -mfpmath=sse -fomit-frame-pointer -pipe -DNOVDPAU -fPIC -Wall
+CFLAGS = -O2 -march=nocona -pipe -DNOVDPAU -fPIC -Wall
CFLAGS += $(shell pkg-config --cflags libxine) -I/usr/include/libcrystalhd
LIBS += $(shell pkg-config --libs libxine) -lcrystalhd
+#LDFLAGS = -shared -fvisibility=hidden -fPIC
LDFLAGS = -shared -fvisibility=hidden -g -fPIC
CFLAGS += -DEXPORTED=__attribute__\(\(visibility\(\"default\"\)\)\)
OBJ = bits_reader.o cpb.o nal.o h264_parser.o crystalhd_hw.o crystalhd_decoder.o crystalhd_h264.o crystalhd_vc1.o crystalhd_mpeg.o
-all: clean configure $(XINEPLUGIN)
-
-configure:
- ./configure
+all: clean $(XINEPLUGIN)
$(XINEPLUGIN): $(OBJ)
$(CC) $(LDFLAGS) $(LIBS) $(OBJ) -o $@
@@ -30,6 +29,5 @@ install: all
clean:
@-rm -f $(XINEPLUGIN) *.o
- @rm -f config.h
-.PHONY: $(XINEPLUGIN) configure
+.PHONY: $(XINEPLUGIN)
View
9 configure
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -e /usr/include/libcrystalhd/libcrystalhd_version.h ]; then
- echo "#include <libcrystalhd_version.h>" > config.h
-else
- echo "" > config.h
- echo "#define DIL_MINOR_VERSION 4" >> config.h
- echo "#define DIL_REVISION 0" >> config.h
-fi
View
2 crystalhd_decoder.h
@@ -46,8 +46,6 @@
#include <semaphore.h>
-#include "config.h"
-
#include "bits_reader.h"
#include "cpb.h"
View
5 crystalhd_hw.c
@@ -273,7 +273,7 @@ uint64_t set_video_step(uint32_t frame_rate) {
uint64_t video_step;
-#if DIL_MINOR_VERSION == 5 && DIL_REVISION >= 0
+ /*
switch(frame_rate) {
case vdecFrameRate23_97:
case 23970:
@@ -320,7 +320,7 @@ uint64_t set_video_step(uint32_t frame_rate) {
video_step = 90000/23.976;
break;
}
-#else
+ */
switch(frame_rate) {
case vdecRESOLUTION_720p:
case vdecRESOLUTION_576p:
@@ -386,7 +386,6 @@ uint64_t set_video_step(uint32_t frame_rate) {
video_step = 90000/25;
break;
}
-#endif
return video_step;
}

0 comments on commit 1fdb4f8

Please sign in to comment.