X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=src%2Fmedia%2Fmedia.c;h=51d53d373093c186d03576eba0a458ab4aaf943e;hb=56e1696c05484849c12dd4d3a5c3c015c895ee4a;hp=977743397039a15c76557bc5b2de1b734c3a3807;hpb=c879e5b17b3d5fef34ab58fc66e1cbb4269e5bb4;p=sxemacs

diff --git a/src/media/media.c b/src/media/media.c
index 9777433..51d53d3 100644
--- a/src/media/media.c
+++ b/src/media/media.c
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include "lisp.h"
+#include <ent/ent.h>
 
 #include "buffer.h"
 
@@ -49,12 +50,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 #endif
 
 Lisp_Object Qmedia_streamp;
-Lisp_Object Qunknown;
+Lisp_Object Qunavailable;
 /* media property syms */
 Lisp_Object Qdemux, Qcodec, Qnchannels, Qsamplerate;
 Lisp_Object Qbitrate, Qabitrate, Qvbitrate;
-Lisp_Object Qwidth, Qheight, Qaspect, Qdriver, Qkind, Qfifo, Quri, Qtype;
-Lisp_Object Qaudio, Qvideo, Qimage;
+Lisp_Object Qaspect, Qdriver, Qkind, Qfifo, Quri;
+Lisp_Object Qaudio, Qvideo;
 
 static void determine_stream_type(Lisp_Media_Stream *ms, media_driver);
 static void media_stream_print(Lisp_Object, Lisp_Object, int);
@@ -137,7 +138,7 @@ static void determine_stream_type(Lisp_Media_Stream *ms, media_driver preferred)
 
 
 /*****************************************************************/
-/* 			    media streams			 */
+/*			    media streams			 */
 /*****************************************************************/
 static Lisp_Object media_stream_mark(Lisp_Object obj)
 {
@@ -168,6 +169,8 @@ media_stream_finalise(void *header, int for_disksave)
 	Lisp_Media_Stream *ms = (Lisp_Media_Stream*)header;
 	media_substream *mss = NULL;
 
+	if(ms == NULL)
+		return;
 	if (media_stream_meths(ms) &&
 	    media_stream_meth(ms, close))
 		media_stream_meth(ms, close)(media_stream_data(ms));
@@ -349,12 +352,12 @@ media_stream_hash (Lisp_Object obj, int depth)
 }
 
 static const struct lrecord_description media_stream_description[] = {
-        { XD_LISP_OBJECT, offsetof(Lisp_Media_Stream, first) },
-        { XD_LISP_OBJECT, offsetof(Lisp_Media_Stream, last) },
+	{ XD_LISP_OBJECT, offsetof(Lisp_Media_Stream, first) },
+	{ XD_LISP_OBJECT, offsetof(Lisp_Media_Stream, last) },
 	{ XD_INT, offsetof(Lisp_Media_Stream, kind) },
 	{ XD_INT, offsetof(Lisp_Media_Stream, driver) },
-        { XD_OPAQUE_PTR, offsetof(Lisp_Media_Stream, kind_properties) },
-        { XD_OPAQUE_PTR, offsetof(Lisp_Media_Stream, stream_data) },
+	{ XD_OPAQUE_PTR, offsetof(Lisp_Media_Stream, kind_properties) },
+	{ XD_OPAQUE_PTR, offsetof(Lisp_Media_Stream, stream_data) },
 	{ XD_END }
 };
 
@@ -367,7 +370,7 @@ DEFINE_LRECORD_IMPLEMENTATION("media_stream", media_stream,
 
 
 /*****************************************************************/
-/* 			    media substreams			 */
+/*			    media substreams			 */
 /*****************************************************************/
 
 static void
@@ -409,16 +412,13 @@ media_substream_print_audio(media_substream *mss, Lisp_Object printcharfun)
 
 	write_c_string("#<audio ", printcharfun);
 	if (mtap->name || mtap->codec_name) {
-		char *buf = alloca(64);
 		if (mtap->name && mtap->codec_name)
-			snprintf(buf, 63, "%s (%s)",
-				 mtap->name, mtap->codec_name);
+			write_fmt_str(printcharfun, "%s (%s)",
+				      mtap->name, mtap->codec_name);
 		else if (mtap->name)
-			snprintf(buf, 63, "%s [???]", mtap->name);
+			write_fmt_str(printcharfun, "%s [???]", mtap->name);
 		else if (mtap->codec_name)
-			snprintf(buf, 63, "??? (%s)", mtap->codec_name);
-
-		write_c_string(buf, printcharfun);
+			write_fmt_str(printcharfun, "??? (%s)", mtap->codec_name);
 	} else
 		write_c_string("???", printcharfun);
 
@@ -440,21 +440,13 @@ media_substream_print_audio(media_substream *mss, Lisp_Object printcharfun)
 		break;
 	}
 
-	if (mtap->samplerate) {
-		char *buf;
-		buf = alloca(48);
-		snprintf(buf, 47, ", %d Hz, %d Bit",
-			 mtap->samplerate,
-			 mtap->samplewidth);
-		write_c_string(buf, printcharfun);
-	}
+	if (mtap->samplerate)
+		write_fmt_str(printcharfun, ", %d Hz, %d Bit",
+			      mtap->samplerate,
+			      mtap->samplewidth);
 
-	if (mtap->bitrate) {
-		char *buf;
-		buf = alloca(24);
-		snprintf(buf, 23, ", %d kb/s", mtap->bitrate/1000);
-		write_c_string(buf, printcharfun);
-	}
+	if (mtap->bitrate)
+		write_fmt_str(printcharfun, ", %d kb/s", mtap->bitrate/1000);
 
 	write_c_string(">", printcharfun);
 }
@@ -467,36 +459,28 @@ media_substream_print_video(media_substream *mss, Lisp_Object printcharfun)
 
 	write_c_string("#<video ", printcharfun);
 	if (mtvp->name || mtvp->codec_name) {
-		char *buf = alloca(64);
 		if (mtvp->name && mtvp->codec_name)
-			snprintf(buf, 63, "%s (%s)",
-				 mtvp->name, mtvp->codec_name);
+			write_fmt_str(printcharfun, "%s (%s)",
+				      mtvp->name, mtvp->codec_name);
 		else if (mtvp->name)
-			snprintf(buf, 63, "%s [???]", mtvp->name);
+			write_fmt_str(printcharfun, "%s [???]", mtvp->name);
 		else if (mtvp->codec_name)
-			snprintf(buf, 63, "??? (%s)", mtvp->codec_name);
-
-		write_c_string(buf, printcharfun);
+			write_fmt_str(printcharfun, "??? (%s)", mtvp->codec_name);
 	} else
 		write_c_string("???", printcharfun);
 
-	if (mtvp->bitrate) {
-		char *buf = alloca(24);
-		snprintf(buf, 23, ", %d kb/s", mtvp->bitrate);
-		write_c_string(buf, printcharfun);
-	}
+	if (mtvp->bitrate)
+		write_fmt_str(printcharfun, ", %d kb/s", mtvp->bitrate);
 
 	if (mtvp->width && mtvp->height) {
-		char *buf = alloca(48);
 		if (mtvp->aspect_num > 1 && mtvp->aspect_den >= 1)
-			snprintf(buf, 47, ", %dx%d (%d/%d)",
-				 mtvp->width, mtvp->height,
-				 mtvp->aspect_num, mtvp->aspect_den);
+			write_fmt_str(printcharfun, ", %dx%d (%d/%d)",
+				      mtvp->width, mtvp->height,
+				      mtvp->aspect_num, mtvp->aspect_den);
 		else
-			snprintf(buf, 47, ", %dx%d (%.2f/1)",
-				 mtvp->width, mtvp->height,
-				 (double)mtvp->width/(double)mtvp->height);
-		write_c_string(buf, printcharfun);
+			write_fmt_str(printcharfun, ", %dx%d (%.2f/1)",
+				      mtvp->width, mtvp->height,
+				      (double)mtvp->width/(double)mtvp->height);
 	}
 	write_c_string(">", printcharfun);
 }
@@ -718,27 +702,30 @@ detecting a suitable one.  It is one of `ffmpeg', `sndfile',
 	}
 	case DATA_IS_DATA: {
 		mkind_string_properties *sprops;
-		char *data_ext;
+		char *data_ext = NULL;
 		int data_len = 0;
 
-		media_stream_kind(ms) = MKIND_STRING;
-
-		/* initialise a new file properties structure */
-		sprops = xnew_and_zero(mkind_string_properties);
-
 		/* copy the filename also as C string */
 		TO_EXTERNAL_FORMAT(LISP_STRING, data,
 				   MALLOC, (data_ext, data_len),
 				   Qbinary);
-		data_ext[data_len] = '\0';
-		sprops->name = NULL;
-		sprops->stream_data = data_ext;
-		sprops->size = data_len;
 
-		/* assign the file properties */
-		media_stream_kind_properties(ms).sprops = sprops;
+		if (data_ext != NULL) {
+			media_stream_kind(ms) = MKIND_STRING;
 
-		determine_stream_type(ms, pref);
+			/* initialise a new file properties structure */
+			sprops = xnew_and_zero(mkind_string_properties);
+
+			data_ext[data_len] = '\0';
+			sprops->name = NULL;
+			sprops->stream_data = data_ext;
+			sprops->size = data_len;
+
+			/* assign the file properties */
+			media_stream_kind_properties(ms).sprops = sprops;
+
+			determine_stream_type(ms, pref);
+		}
 		break;
 	}
 	case DATA_IS_URL: {
@@ -817,7 +804,7 @@ Return a list of input formats in the underlying media libraries.
 	temp = media_ffmpeg_available_formats();
 #endif
 	formats = recons(formats, temp);
-	
+
 #ifdef HAVE_SNDFILE
 	temp = Qnil;
 #endif
@@ -826,7 +813,7 @@ Return a list of input formats in the underlying media libraries.
 	return formats;
 }
 
-static inline void __attribute__((always_inline, artificial))
+static inline void __attribute__((always_inline))
 __add_prop(Lisp_Object *reslist, Lisp_Object key, Lisp_Object val)
 {
 	*reslist = Fcons(Fcons(key, val), *reslist);
@@ -1008,6 +995,7 @@ in the result alist.
 		break;
 	}
 
+	__add_prop(&resdl, Qdriver, Qunavailable);
 	switch (media_stream_driver(ms)) {
 	case MDRIVER_INTERNAL:
 		__add_prop(&resdl, Qdriver, Qinternal);
@@ -1036,6 +1024,12 @@ in the result alist.
 #endif
 		break;
 
+	case MDRIVER_XINE:
+		break;
+
+	case MDRIVER_GSTREAMER:
+		break;
+
 	case MDRIVER_UNKNOWN:
 	case NUMBER_OF_MEDIA_DRIVERS:
 	default:
@@ -1085,7 +1079,7 @@ the second element to the second one and so on.
 	     (mss = media_substream_next(mss))) {
 		mtype_video_properties *mtvp;
 		long int num = 0, den = 0;
-		Lisp_Object tmp;
+		Lisp_Object tmp = Qnil;
 
 		if (LIKELY(media_substream_type(mss) != MTYPE_VIDEO)) {
 			continue;
@@ -1107,10 +1101,12 @@ the second element to the second one and so on.
 			num = mtvp->width;
 			den = mtvp->height;
 		}
-			
+
 		if (LIKELY(NILP(quotientp))) {
-			tmp = make_float((fpfloat)num / (fpfloat)den);
-		} 
+			assert(den != 0);
+			if( den != 0)
+				tmp = make_float((fpfloat)num / (fpfloat)den);
+		}
 #if defined HAVE_MPQ && defined WITH_GMP
 		else {
 			tmp = make_bigq(num, den);
@@ -1303,6 +1299,47 @@ sxe_msf_FLT_down(void *d, void *s, size_t len)
 	return;
 }
 
+DEFINE_MEDIA_SAMPLE_FORMAT_SIMPLE(sxe_msf_DBL);
+
+static void
+sxe_msf_DBL_up(void *d, void *s, size_t len)
+{
+	/* convert double samples to internal format (S24in32) */
+	size_t i;
+	int32_t *dst = d;
+	double *src = s;
+
+	/* len is the number of samples (== #frame * #channels) */
+	MEDIA_DEBUG_FMT("upsampling DBL->internal: %u samples\n", len);
+
+	for (i = 0; i < len; i++) {
+		dst[i] = (int32_t)(src[i] * SXE_MAX_S24);
+	}
+	MEDIA_DEBUG_FMT("s00:%f d00:%d  s01:%f d01:%d\n",
+			src[0], dst[0], src[1], dst[1]);
+
+	return;
+}
+
+static void
+sxe_msf_DBL_down(void *d, void *s, size_t len)
+{
+	/* convert samples from internal format (S24in32) to double */
+	int i;
+	float *dst = d;
+	int32_t *src = s;
+
+	/* len is the number of samples (== #frame * #channels) */
+	MEDIA_DEBUG_FMT("downsampling internal->DBL: %u samples\n", len);
+
+	for (i = len-1; i >= 0; i--) {
+		dst[i] = (double)(src[i]) / SXE_MAX_S24;
+	}
+	MEDIA_DEBUG_FMT("d00:%f  d01:%f\n", dst[0], dst[1]);
+
+	return;
+}
+
 /* `effects' */
 DEFINE_MEDIA_SAMPLE_EFFECT(sxe_mse_1ch_to_2ch, _sxe_mse_1ch_to_2ch);
 
@@ -1483,6 +1520,7 @@ void syms_of_media(void)
 	defsymbol(&Qsndfile, "sndfile");
 #endif
 	defsymbol(&Qunknown, "unknown");
+	defsymbol(&Qunavailable, "unavailable");
 }
 
 void vars_of_media(void)