[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec internal.h, NONE, 1.1 utils.c, 1.178, 1.179 xvid_rc.c, 1.3, 1.4 xvidff.c, 1.8, 1.9

[Corey Hickey CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv13656/libavcodec

Modified Files:
	utils.c xvid_rc.c xvidff.c 
Added Files:
	internal.h 
Log Message:
- Add new file internal.h for common internal-use-only functions.
- Add new function av_tempfile() for creating temporary files; contains
  workaround for MinGW.
- Make XviD stuff use av_tempfile().


--- NEW FILE: internal.h ---
#ifndef INTERNAL_H
#define INTERNAL_H

/**
 * @file internal.h
 * common functions for internal libavcodec use
 */


int av_tempfile(char *prefix, char **filename);

#endif /* INTERNAL_H */

Index: utils.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/utils.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- utils.c	6 Mar 2006 15:09:04 -0000	1.178
+++ utils.c	30 Mar 2006 04:33:05 -0000	1.179
@@ -33,6 +33,9 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <float.h>
+#ifdef CONFIG_WIN32
+#include <fcntl.h>
+#endif
 
 const uint8_t ff_reverse[256]={
 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
@@ -1349,3 +1352,39 @@
     n++;
     return n;
 }
+
+/* Wrapper to work around the lack of mkstemp() on mingw/cygin.
+ * Also, tries to create file in /tmp first, if possible.
+ * *prefix can be a character constant; *filename will be allocated internally.
+ * Returns file descriptor of opened file (or -1 on error)
+ * and opened file name in **filename. */
+int av_tempfile(char *prefix, char **filename) {
+    int fd=-1;
+#ifdef CONFIG_WIN32
+    *filename = tempnam(".", prefix);
+#else
+    size_t len = strlen(prefix) + 12; /* room for "/tmp/" and "XXXXXX\0" */
+    *filename = av_malloc(len * sizeof(char));
+#endif
+    /* -----common section-----*/
+    if (*filename == NULL) {
+        av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot allocate file name\n");
+        return -1;
+    }
+#ifdef CONFIG_WIN32
+    fd = open(*filename, _O_RDWR | _O_BINARY | _O_CREAT, 0444);
+#else
+    snprintf(*filename, len, "/tmp/%sXXXXXX", prefix);
+    fd = mkstemp(*filename);
+    if (fd < 0) {
+        snprintf(*filename, len, "./%sXXXXXX", prefix);
+        fd = mkstemp(*filename);
+    }
+#endif
+    /* -----common section-----*/
+    if (fd < 0) {
+        av_log(NULL, AV_LOG_ERROR, "ff_tempfile: Cannot open temporary file %s\n", *filename);
+        return -1;
+    }
+    return fd; /* success */
+}

Index: xvid_rc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/xvid_rc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xvid_rc.c	19 Mar 2006 11:49:37 -0000	1.3
+++ xvid_rc.c	30 Mar 2006 04:33:05 -0000	1.4
@@ -21,6 +21,7 @@
 #include <xvid.h>
 #include <unistd.h>
 #include "avcodec.h"
+#include "internal.h"
 //#include "dsputil.h"
 #include "mpegvideo.h"
 
@@ -37,11 +38,10 @@
 
 //xvid_debug=-1;
 
-    tmp_name= av_strdup("/tmp/xvidrc.XXXXXX");
-    fd = mkstemp(tmp_name);
-    if(fd < 0){
-        strcpy(tmp_name, "./xvidrc.XXXXXX");
-        fd = mkstemp(tmp_name);
+    fd=av_tempfile("xvidrc.", &tmp_name);
+    if (fd == -1) {
+        av_log(NULL, AV_LOG_ERROR, "Can't create temporary pass2 file.\n");
+        return -1;
     }
 
     for(i=0; i<s->rc_context.num_entries; i++){

Index: xvidff.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/xvidff.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xvidff.c	18 Mar 2006 02:46:39 -0000	1.8
+++ xvidff.c	30 Mar 2006 04:33:05 -0000	1.9
@@ -27,9 +27,7 @@
 #include <unistd.h>
 #include "common.h"
 #include "avcodec.h"
-#ifdef CONFIG_WIN32
-#include <fcntl.h>
-#endif
+#include "internal.h"
 
 /**
  * Buffer management macros.
@@ -229,39 +227,7 @@
         rc2pass2.version = XVID_VERSION;
         rc2pass2.bitrate = avctx->bit_rate;
 
-#ifdef CONFIG_WIN32 /* Ugly work around */
-        {
-           char *tempname;
-
-           tempname = tempnam(".", "xvidff");
-            fd = -1;
-            if( tempname &&
-                (fd = open(tempname, _O_RDWR | _O_BINARY)) != -1 ) {
-                x->twopassfile = av_strdup(tempname);
-#undef free
-                free(tempname);
-#define free please_use_av_free
-                if( x->twopassfile == NULL ) {
-                    av_log(avctx, AV_LOG_ERROR,
-                        "XviD: Cannot allocate 2-pass buffer\n");
-                    return -1;
-                }
-            }
-       }
-#else
-        x->twopassfile = av_malloc(BUFFER_SIZE);
-        if( x->twopassfile == NULL ) {
-            av_log(avctx, AV_LOG_ERROR,
-                "XviD: Cannot allocate 2-pass buffer\n");
-            return -1;
-        }
-        strcpy(x->twopassfile, "/tmp/xvidff.XXXXXX");
-        fd = mkstemp(x->twopassfile);
-        if(fd < 0){
-            strcpy(x->twopassfile, "./xvidff.XXXXXX");
-            fd = mkstemp(x->twopassfile);
-        }
-#endif
+        fd = av_tempfile("xvidff.", &(x->twopassfile));
         if( fd == -1 ) {
             av_log(avctx, AV_LOG_ERROR,
                 "XviD: Cannot write 2-pass pipe\n");