changeset 10302:f8b0d1d14d39

lossless ff mjpeg encoding
author michael
date Tue, 17 Jun 2003 22:52:57 +0000
parents 82c26f554cd0
children 2c0b6ec77d39
files etc/codecs.conf libmpcodecs/ve_lavc.c
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Tue Jun 17 22:34:20 2003 +0000
+++ b/etc/codecs.conf	Tue Jun 17 22:52:57 2003 +0000
@@ -575,6 +575,7 @@
   fourcc ijpg,IJPG  ; -mf type=jpeg
   fourcc JPEG       ; SGI's AVI Photo-jpeg
   fourcc JPGL       ; lossless jpeg (pegasus codec)
+  fourcc LJPG       ; lossless jpeg
   driver ffmpeg
   dll mjpeg
   out 444P
--- a/libmpcodecs/ve_lavc.c	Tue Jun 17 22:34:20 2003 +0000
+++ b/libmpcodecs/ve_lavc.c	Tue Jun 17 22:52:57 2003 +0000
@@ -426,10 +426,13 @@
         lavc_venc_context->pix_fmt= PIX_FMT_YUV411P;
     else if(!strcasecmp(lavc_param_format, "YVU9"))
         lavc_venc_context->pix_fmt= PIX_FMT_YUV410P;
+    else if(!strcasecmp(lavc_param_format, "BGR32"))
+        lavc_venc_context->pix_fmt= PIX_FMT_RGBA32;
     else{
         mp_msg(MSGT_MENCODER,MSGL_ERR,"%s is not a supported format\n", lavc_param_format);
         return 0;
     }
+
     /* lavc internal 2pass bitrate control */
     switch(lavc_param_vpass){
     case 1: 
@@ -526,6 +529,10 @@
         if(!strcasecmp(lavc_param_format, "YVU9"))
             return VFCAP_CSP_SUPPORTED | VFCAP_ACCEPT_STRIDE;
         break;
+    case IMGFMT_BGR32:
+        if(!strcasecmp(lavc_param_format, "BGR32"))
+            return VFCAP_CSP_SUPPORTED | VFCAP_ACCEPT_STRIDE;
+        break;
     }
     return 0;
 }
@@ -707,6 +714,8 @@
 	mux_v->bih->biCompression = mmioFOURCC('R', 'V', '1', '0');
     else if (!strcasecmp(lavc_param_vcodec, "mjpeg"))
 	mux_v->bih->biCompression = mmioFOURCC('M', 'J', 'P', 'G');
+    else if (!strcasecmp(lavc_param_vcodec, "ljpeg"))
+	mux_v->bih->biCompression = mmioFOURCC('L', 'J', 'P', 'G');
     else if (!strcasecmp(lavc_param_vcodec, "mpeg4"))
 	mux_v->bih->biCompression = mmioFOURCC('D', 'I', 'V', 'X');
     else if (!strcasecmp(lavc_param_vcodec, "msmpeg4"))