Fallback to builtin (generated from etc/codecs.conf at compile time)

codecs.conf if no ext configfile found.
Based on patch by Sidik Isani <lksi@cfht.hawaii.edu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8468 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 130 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 10ce849545..4a3163b66e 100644
--- a/Makefile
+++ b/Makefile
@@ -223,6 +223,11 @@ $(PRG_MENCODER): $(MENCODER_DEP)
 	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(COMMON_LIBS) $(EXTRA_LIB) $(ENCORE_LIB) $(MLIB_LIB) $(LIRC_LIB) $(ARCH_LIB) -lm 
 endif
 
+codecs.conf.h: $(PRG_CFG)
+	./$(PRG_CFG) ./etc/codecs.conf > $@
+
+codec-cfg.o: codecs.conf.h
+
 # Every mplayer dependency depends on version.h, to force building version.h
 # first (in serial mode) before any other of the dependencies for a parallel make
 # run.  This is necessary, because the make rule for version.h removes objects
@@ -293,11 +298,11 @@ uninstall:
 	@echo "Uninstall completed"
 
 clean:
-	-rm -f *.o *~ $(OBJS)
+	-rm -f *.o *~ $(OBJS) codecs.conf.h
 
 distclean:
 	-rm -f *~ $(PRG) $(PRG_FIBMAP) $(PRG_MENCODER) $(OBJS)
-	-rm -f *.o *.a .depend configure.log
+	-rm -f *.o *.a .depend configure.log codecs.conf.h
 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
 
 strip:
@@ -307,7 +312,7 @@ dep:	depend
 
 depend:
 	./version.sh `$(CC) -dumpversion`
-	$(CC) -MM $(CFLAGS) mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend
+	$(CC) -MM $(CFLAGS) -DCODECS2HTML mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend
 	@for a in $(PARTS); do $(MAKE) -C $$a dep; done
 
 # ./configure must be run if it changed in CVS
diff --git a/codec-cfg.c b/codec-cfg.c
index 5ac8ea9713..49301f7a4e 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -32,6 +32,10 @@
 #include "libvo/img_format.h"
 #include "codec-cfg.h"
 
+#ifndef CODECS2HTML
+#include "codecs.conf.h"
+#endif
+
 #define PRINT_LINENUM mp_msg(MSGT_CODECCFG,MSGL_ERR," at line %d\n", line_num)
 
 #define MAX_NR_TOKEN	16
@@ -480,7 +484,17 @@ int parse_codec_cfg(char *cfgfile)
 	nr_vcodecs = 0;
 	nr_acodecs = 0;
 
-	if(cfgfile==NULL)return 0; 
+	if(cfgfile==NULL) {
+#ifdef CODECS2HTML
+	  	return 0; 
+#else
+		video_codecs = builtin_video_codecs;
+		audio_codecs = builtin_audio_codecs;
+		nr_vcodecs = sizeof(builtin_video_codecs)/sizeof(codecs_t) - 1;
+		nr_acodecs = sizeof(builtin_audio_codecs)/sizeof(codecs_t) - 1;
+		return 1;
+#endif
+	}
 	
 	mp_msg(MSGT_CODECCFG,MSGL_INFO,"Reading %s: ", cfgfile);
 
@@ -909,7 +923,35 @@ void skiphtml(FILE *f1){
         }
 }
 
-int main(void)
+static void print_int_array(const int* a, int size)
+{
+	printf("{ ");
+	while (size--)
+	    if(abs(*a)<256)
+		printf("%d%s", *a++, size?", ":"");
+	    else
+		printf("0x%X%s", *a++, size?", ":"");
+	printf(" }");
+}
+
+static void print_char_array(const unsigned char* a, int size)
+{
+	printf("{ ");
+	while (size--) 
+	    if((*a)<10)
+		printf("%d%s", *a++, size?", ":"");
+	    else
+		printf("0x%02x%s", *a++, size?", ":"");
+	printf(" }");
+}
+
+static void print_string(const char* s)
+{
+	if (!s) printf("NULL");
+	else printf("\"%s\"", s);
+}
+
+int main(int argc, char* argv[])
 {
 	codecs_t *cl;
         FILE *f1;
@@ -922,8 +964,74 @@ int main(void)
         int dshow=-1;
         int win32ex=-1;
 
-	if (!(nr_codecs = parse_codec_cfg("etc/codecs.conf")))
-		return 0;
+	/*
+	 * Take path to codecs.conf from command line, or fall back on
+	 * etc/codecs.conf
+	 */
+	if (!(nr_codecs = parse_codec_cfg((argc>1)?argv[1]:"etc/codecs.conf")))
+		exit(1);
+
+	if (argc > 1) {
+		int i, j;
+		const char* nm[2];
+		codecs_t* cod[2];
+		int nr[2];
+
+		nm[0] = "builtin_video_codecs";
+		cod[0] = video_codecs;
+		nr[0] = nr_vcodecs;
+		
+		nm[1] = "builtin_audio_codecs";
+		cod[1] = audio_codecs;
+		nr[1] = nr_acodecs;
+		
+		printf("/* GENERATED FROM %s, DO NOT EDIT! */\n\n",argv[1]);
+		
+		for (i=0; i<2; i++) {
+		  	printf("codecs_t %s[] = {\n", nm[i]);
+			for (j = 0; j <= nr[i]; j++) {
+			  	printf("{");
+
+				print_int_array(cod[i][j].fourcc, CODECS_MAX_FOURCC);
+				printf(", /* fourcc */\n");
+				
+				print_int_array(cod[i][j].fourccmap, CODECS_MAX_FOURCC);
+				printf(", /* fourccmap */\n");
+				
+				print_int_array(cod[i][j].outfmt, CODECS_MAX_OUTFMT);
+				printf(", /* outfmt */\n");
+				
+				print_char_array(cod[i][j].outflags, CODECS_MAX_OUTFMT);
+				printf(", /* outflags */\n");
+				
+				print_int_array(cod[i][j].infmt, CODECS_MAX_INFMT);
+				printf(", /* infmt */\n");
+				
+				print_char_array(cod[i][j].inflags, CODECS_MAX_INFMT);
+				printf(", /* inflags */\n");
+				
+				print_string(cod[i][j].name);    printf(", /* name */\n");
+				print_string(cod[i][j].info);    printf(", /* info */\n");
+				print_string(cod[i][j].comment); printf(", /* comment */\n");
+				print_string(cod[i][j].dll);     printf(", /* dll */\n");
+				print_string(cod[i][j].drv);     printf(", /* drv */\n");
+				
+				printf("{ 0x%08lx, %hu, %hu,",
+				       cod[i][j].guid.f1,
+				       cod[i][j].guid.f2,
+				       cod[i][j].guid.f3);
+				print_char_array(cod[i][j].guid.f4, sizeof(cod[i][j].guid.f4));
+				printf(" }, /* GUID */\n");
+				printf("%hd /* flags */, %hd /* status */, %hd /* cpuflags */ }\n",
+				       cod[i][j].flags,
+				       cod[i][j].status,
+				       cod[i][j].cpuflags);
+				if (j < nr[i]) printf(",\n");
+			}
+			printf("};\n\n");
+		}
+		exit(0);
+	}
 
         f1=fopen("DOCS/codecs-in.html","rb"); if(!f1) exit(1);
         f2=fopen("DOCS/codecs-status.html","wb"); if(!f2) exit(1);
diff --git a/mencoder.c b/mencoder.c
index 7c5c2d7b92..91ef4c28c6 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -369,8 +369,11 @@ unsigned int timer_start;
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){
   if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
-    mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
-    mencoder_exit(1,NULL);
+    if(!parse_codec_cfg(NULL)){
+      mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
+      exit(0);
+    }
+    mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
   }
 }
 
diff --git a/mplayer.c b/mplayer.c
index ba43f759b7..e01b951e8f 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -686,8 +686,11 @@ int gui_no_filename=0;
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){
   if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
-    mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
-    exit(0);  // From unknown reason a hangup occurs here :((((((
+    if(!parse_codec_cfg(NULL)){
+      mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
+      exit(0);
+    }
+    mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
   }
 }