February 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpdemux demux_mf.c,1.4,1.5
by Zoltan Ponekker 11 Feb '02

11 Feb '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv5427/libmpdemux Modified Files: demux_mf.c Log Message: add initial mPNG support Index: demux_mf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mf.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- demux_mf.c 10 Feb 2002 18:09:52 -0000 1.4 +++ demux_mf.c 11 Feb 2002 09:15:32 -0000 1.5 @@ -76,7 +76,7 @@ // go back to the beginning stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); +// stream_seek(demuxer->stream, 0); demuxer->movi_start = 0; demuxer->movi_end = mf->nr_of_files - 1; dmf->nr_of_frames= mf->nr_of_files; @@ -93,9 +93,11 @@ // video_read_properties() will choke sh_video->ds = demuxer->video; - if ( !strcasecmp( mf_type,"jpg" ) || - !(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('M', 'J', 'P', 'G'); - else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( dmf ); return NULL; } + if ( !strcasecmp( mf_type,"jpg" ) || + !(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('M', 'J', 'P', 'G'); + else + if ( !strcasecmp( mf_type,"png" )) sh_video->format = mmioFOURCC('M', 'P', 'N', 'G' ); + else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( dmf ); return NULL; } sh_video->disp_w = mf_w; sh_video->disp_h = mf_h;

1 0

CVS: main/etc codecs.conf,1.137,1.138
by Zoltan Ponekker 11 Feb '02

11 Feb '02

Update of /cvsroot/mplayer/main/etc In directory mplayer:/var/tmp.root/cvs-serv5427/etc Modified Files: codecs.conf Log Message: add initial mPNG support Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- codecs.conf 10 Feb 2002 23:56:01 -0000 1.137 +++ codecs.conf 11 Feb 2002 09:15:31 -0000 1.138 @@ -347,6 +347,13 @@ driver ducktm1 out BGR32,BGR24,BGR16,BGR15 +videocodec mpng + info "mPNG codec" + status buggy + fourcc mpng,MPNG + driver mpng + out BGR24 + videocodec roqvideo info "Id RoQ File Video Decoder" status buggy

1 0

CVS: main Makefile,1.152,1.153 codec-cfg.c,1.66,1.67 codec-cfg.h,1.40,1.41 configure,1.387,1.388 dec_video.c,1.101,1.102
by Zoltan Ponekker 11 Feb '02

11 Feb '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv5427 Modified Files: Makefile codec-cfg.c codec-cfg.h configure dec_video.c Log Message: add initial mPNG support Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- Makefile 9 Feb 2002 20:05:49 -0000 1.152 +++ Makefile 11 Feb 2002 09:15:30 -0000 1.153 @@ -34,6 +34,10 @@ OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) +ifeq ($(PNG),yes) +SRCS_COMMON += mpng.c +endif + ifeq ($(VO2),yes) VO_LIBS = -Llibvo2 -lvo2 VO_INC = -Ilibvo2 Index: codec-cfg.c =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- codec-cfg.c 9 Feb 2002 20:05:49 -0000 1.66 +++ codec-cfg.c 11 Feb 2002 09:15:30 -0000 1.67 @@ -246,6 +246,7 @@ "ducktm1", "roqvideo", "qtrpza", + "mpng", NULL }; char **drv=audioflag?audiodrv:videodrv; Index: codec-cfg.h =================================================================== RCS file: /cvsroot/mplayer/main/codec-cfg.h,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- codec-cfg.h 9 Feb 2002 20:05:49 -0000 1.40 +++ codec-cfg.h 11 Feb 2002 09:15:30 -0000 1.41 @@ -58,6 +58,7 @@ #define VFM_DUCKTM1 18 #define VFM_ROQVIDEO 19 #define VFM_QTRPZA 20 +#define VFM_MPNG 21 #ifndef GUID_TYPE #define GUID_TYPE Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.387 retrieving revision 1.388 diff -u -r1.387 -r1.388 --- configure 10 Feb 2002 11:25:14 -0000 1.387 +++ configure 11 Feb 2002 09:15:30 -0000 1.388 @@ -1935,8 +1935,10 @@ _ld_png='-lpng -lz' _vosrc="$_vosrc vo_png.c" _vomodules="png $_vomodules" + _mkf_png="yes" else _def_png='#undef HAVE_PNG' + _mkf_png="no" fi @@ -2947,6 +2949,8 @@ OPENDIVX = $_opendivx VO2 = $_vo2 + +PNG = $_mkf_png EXTRA_LIB = $_ld_extra Z_LIB = $_ld_static $_ld_zlib Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_video.c,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- dec_video.c 10 Feb 2002 01:23:36 -0000 1.101 +++ dec_video.c 11 Feb 2002 09:15:30 -0000 1.102 @@ -180,6 +180,16 @@ int height, int bytes_per_pixel); +#ifdef HAVE_PNG +void decode_mpng( + unsigned char *encoded, + int encoded_size, + unsigned char *decoded, + int width, + int height, + int bytes_per_pixel); +#endif + void qt_decode_rpza( unsigned char *encoded, int encoded_size, @@ -706,6 +716,9 @@ case VFM_FLI: case VFM_QTRLE: case VFM_DUCKTM1: +#ifdef HAVE_PNG + case VFM_MPNG: +#endif case VFM_QTRPZA: { #ifdef USE_MP_IMAGE @@ -1139,6 +1152,16 @@ ((out_fmt&255)+7)/8); blit_frame = 3; break; +#ifdef HAVE_PNG + case VFM_MPNG: + decode_mpng( + start, in_size, sh_video->our_out_buffer, + sh_video->disp_w,sh_video->disp_h, + 24 + ); + blit_frame = 3; + break; +#endif case VFM_CYUV: decode_cyuv(start, in_size, sh_video->our_out_buffer, sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255));

1 0

CVS: main mplayer.c,1.390,1.391
by Nick Kurshev 11 Feb '02

11 Feb '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv10543/main Modified Files: mplayer.c Log Message: Unroll -ni usage for deint. Anyway it doesn't help :( Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- mplayer.c 9 Feb 2002 14:53:49 -0000 1.390 +++ mplayer.c 11 Feb 2002 07:30:05 -0000 1.391 @@ -118,7 +118,6 @@ Video accelerated architecture **************************************************************************/ vo_vaa_t vo_vaa; -extern int force_ni; //**************************************************************************// // Config file @@ -1400,13 +1399,7 @@ } init_video_vaa(); fflush(stdout); - /* Temporary solution for disabling deinterlacing */ - if(vo_vaa.set_deint && force_ni) - { - vidix_deinterlace_t deint; - deint.flags = CFG_NON_INTERLACED; - vo_vaa.set_deint(&deint); - } + //================== MAIN: ========================== main: if(!sh_video) osd_level = 0;

1 0

CVS: main/libvo vosub_vidix.c,1.27,1.28
by Nick Kurshev 11 Feb '02

11 Feb '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv8610/main/libvo Modified Files: vosub_vidix.c Log Message: tell to driver doublebuffering Index: vosub_vidix.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- vosub_vidix.c 9 Feb 2002 00:47:26 -0000 1.27 +++ vosub_vidix.c 11 Feb 2002 07:19:18 -0000 1.28 @@ -544,7 +544,7 @@ vidix_play.dest.y = y_org; vidix_play.dest.w = dst_width; vidix_play.dest.h = dst_height; - vidix_play.num_frames=NUM_FRAMES; + vidix_play.num_frames=vo_doublebuffering?NUM_FRAMES:1; vidix_play.src.pitch.y = vidix_play.src.pitch.u = vidix_play.src.pitch.v = 0; if(info) {

1 0

CVS: main/libmpdemux url.h,1.6,1.7 url.c,1.12,1.13
by Bertrand Baudet 11 Feb '02

11 Feb '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv23935 Modified Files: url.h url.c Log Message: Removed the url_copy function , since it was badly implemented, and a url_new can do the job. Index: url.h =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/url.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- url.h 12 Jan 2002 21:02:00 -0000 1.6 +++ url.h 11 Feb 2002 05:19:11 -0000 1.7 @@ -20,7 +20,6 @@ } URL_t; URL_t* url_new(char* url); -URL_t* url_copy(URL_t* url); void url_free(URL_t* url); void url_unescape_string(char *outbuf, char *inbuf); Index: url.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/url.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- url.c 12 Jan 2002 21:02:00 -0000 1.12 +++ url.c 11 Feb 2002 05:19:11 -0000 1.13 @@ -19,6 +19,8 @@ URL_t* Curl; char *ptr1, *ptr2, *ptr3; + if( url==NULL ) return NULL; + // Create the URL container Curl = (URL_t*)malloc(sizeof(URL_t)); if( Curl==NULL ) { @@ -104,22 +106,6 @@ return Curl; } - -URL_t * -url_copy(URL_t* url) { - URL_t *dup_url; - - if( url==NULL ) return NULL; - dup_url = (URL_t*)malloc(sizeof(URL_t)); - if( dup_url==NULL ) { - printf("Memory allocation failed!\n"); - return NULL; - } - memcpy( dup_url, url, sizeof(URL_t) ); - - return dup_url; -} - void url_free(URL_t* url) {

1 0

CVS: main/libmpdemux network.c,1.32,1.33
by Bertrand Baudet 11 Feb '02

11 Feb '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv23401 Modified Files: network.c Log Message: Cleaned up the way proxies checking was done. Index: network.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- network.c 6 Feb 2002 20:30:34 -0000 1.32 +++ network.c 11 Feb 2002 05:16:09 -0000 1.33 @@ -182,10 +182,12 @@ URL_t* check4proxies( URL_t *url ) { + URL_t *url_out = NULL; if( url==NULL ) return NULL; + url_out = url_new( url->url ); if( !strcasecmp(url->protocol, "http_proxy") ) { - printf("Using HTTP proxy: http://%s:%d\n", url->hostname, url->port ); - return url; + printf("Using HTTP proxy: http://%s:%d\n", url->hostname, url->port ); + return url_out; } // Check if the http_proxy environment variable is set. if( !strcasecmp(url->protocol, "http") ) { @@ -200,7 +202,7 @@ if( proxy_url==NULL ) { printf("Invalid proxy setting...Trying without proxy.\n"); - return url; + return url_out; } printf("Using HTTP proxy: %s\n", proxy_url->url ); @@ -208,20 +210,20 @@ new_url = malloc( len+1 ); if( new_url==NULL ) { printf("Memory allocation failed\n"); - return url; + return url_out; } - sprintf( new_url, "http_proxy://%s:%d/%s", proxy_url->hostname, proxy_url->port, url->url); + sprintf( new_url, "http_proxy://%s:%d/%s", proxy_url->hostname, proxy_url->port, url->url ); tmp_url = url_new( new_url ); if( tmp_url==NULL ) { - return url; + return url_out; } - url_free( url ); - url = tmp_url; + url_free( url_out ); + url_out = tmp_url; free( new_url ); url_free( proxy_url ); } } - return url; + return url_out; } int @@ -311,13 +313,12 @@ int autodetectProtocol(streaming_ctrl_t *streaming_ctrl, int *fd_out, int *file_format) { HTTP_header_t *http_hdr; + unsigned int i; int fd=-1; - int i; int redirect; char *extension; char *content_type; char *next_url; - char response[1024]; URL_t *url = streaming_ctrl->url; *file_format = DEMUXER_TYPE_UNKNOWN; @@ -665,7 +666,7 @@ if( stream->streaming_ctrl==NULL ) { return -1; } - stream->streaming_ctrl->url = check4proxies( url_copy(url) ); + stream->streaming_ctrl->url = check4proxies( url ); ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, &demuxer_type ); if( ret<0 ) { return -1; @@ -712,7 +713,7 @@ if( ret<0 ) { streaming_ctrl_free( stream->streaming_ctrl ); stream->streaming_ctrl = NULL; - } else if( stream->streaming_ctrl->buffering) { + } else if( stream->streaming_ctrl->buffering ) { int cache_size = 0; int ret, val; ret = m_config_is_option_set(mconfig,"cache"); @@ -722,6 +723,7 @@ // cache option not set, will use the our computed value. // buffer in KBytes, *5 because the prefill is 20% of the buffer. val = (stream->streaming_ctrl->prebuffer_size/1024)*5; + if( val<16 ) val = 16; // 16KBytes min buffer if( m_config_set_int( mconfig, "cache", val )<0 ) { printf("Unable to set the cache size option\n"); } else {

1 0

CVS: main/libvo jpeg_enc.h,NONE,1.1 jpeg_enc.c,1.1,1.2 vo_zr.c,1.9,1.10
by Arpi of Ize 10 Feb '02

10 Feb '02

Update of /cvsroot/mplayer/main/libvo In directory mplayer:/var/tmp.root/cvs-serv11003 Modified Files: jpeg_enc.c vo_zr.c Added Files: jpeg_enc.h Log Message: mjpeg encoder cleanup - patch by Rik Snel <rsnel(a)cube.dyndns.org> --- NEW FILE --- /* Straightforward (to be) optimized JPEG encoder for the YUV422 format * based on mjpeg code from ffmpeg. * * Copyright (c) 2002, Rik Snel * Parts from ffmpeg Copyright (c) 2000, 2001 Gerard Lantau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * For an excellent introduction to the JPEG format, see: * http://www.ece.purdue.edu/~bourman/grad-labs/lab8/pdf/lab.pdf */ typedef struct { struct MpegEncContext *s; int cheap_upsample; int bw; int y_ps; int u_ps; int v_ps; int y_rs; int u_rs; int v_rs; } jpeg_enc_t; jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize, int u_psize, int u_rsize, int v_psize, int v_rsize, int cu, int q, int b); int jpeg_enc_frame(jpeg_enc_t *j, unsigned char *y_data, unsigned char *u_data, unsigned char *v_data, char *bufr); void jpeg_enc_uninit(jpeg_enc_t *j); Index: jpeg_enc.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jpeg_enc.c 26 Jan 2002 00:52:59 -0000 1.1 +++ jpeg_enc.c 11 Feb 2002 01:24:56 -0000 1.2 @@ -19,11 +19,10 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * For an excellent introduction to the JPEG format, see: - * http://www.ece.purdue.edu/~bourman/grad-labs/lab8/pdf/lab.pdf + * http://www.ece.purdue.edu/~bouman/grad-labs/lab8/pdf/lab.pdf */ -/* stuff from libavcodec/common.h */ #include <sys/types.h> [...1118 lines suppressed...] +int quant_store[MBR+1][MBC+1]; +unsigned char buf[W*H*3/2]; +char code[256*1024]; + + +main() { + int i, size; + FILE *fp; + + memset(buf, 0, W*H); + memset(buf+W*H, 255, W*H/4); + memset(buf+5*W*H/4, 0, W*H/4); + mjpeg_encoder_init(W, H, 1, W, 1, W/2, 1, W/2, 1, 1, 0); + + size = mjpeg_encode_frame(buf, buf+W*H, buf+5*W*H/4, code); + fp = fopen("test.jpg", "w"); + fwrite(code, 1, size, fp); + fclose(fp); +} +#endif Index: vo_zr.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vo_zr.c 9 Feb 2002 01:21:48 -0000 1.9 +++ vo_zr.c 11 Feb 2002 01:24:56 -0000 1.10 @@ -25,6 +25,8 @@ #include "../cfgparser.h" #include "fastmemcpy.h" +#include "jpeg_enc.h" + LIBVO_EXTERN (zr) static vo_info_t vo_info = @@ -47,7 +49,9 @@ static int vdec = 1; static int hdec = 1; static int size; -static int quality = 1; +static int quality = 2; +static unsigned char *y_data, *u_data, *v_data; +static int y_stride, u_stride, v_stride; typedef struct { int width; @@ -61,6 +65,7 @@ static uint8_t *image=NULL; static uint8_t *buf=NULL; +static jpeg_enc_t *j; /* Variables needed for Zoran */ @@ -80,13 +85,6 @@ #endif char *device = NULL; - -extern int mjpeg_encode_frame(char *bufr, int field); -extern void mjpeg_encoder_init(int w, int h, unsigned char *y, - int y_psize, int y_rsize, unsigned char *u, - int u_psize, int u_rsize, unsigned char *v, - int v_psize, int v_rsize, int f, int cu, int q, int b); - int zoran_getcap() { char* dev = device ? device : VO_ZR_DEFAULT_DEVICE; vdes = open(dev, O_RDWR); @@ -197,7 +195,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *info) { - int j, stretchx, stretchy; + int i, stretchx, stretchy; /* this allows to crop parts from incoming picture, * for easy 512x240 -> 352x240 */ /* These values must be multples of 2 */ @@ -294,17 +292,17 @@ * width 720 (exactly right for the Buz) after decimation 360, * after padding up to a multiple of 16 368, display 736 -> too * large). In these situations we auto(re)crop. */ - j = 16*((g.width - 1)/(hdec*16) + 1); - if (stretchx*j > vc.maxwidth) { - g.xoff += 2*((g.width - hdec*(j-16))/4); + i = 16*((g.width - 1)/(hdec*16) + 1); + if (stretchx*i > vc.maxwidth) { + g.xoff += 2*((g.width - hdec*(i-16))/4); /* g.off must be a multiple of 2 */ - g.width = hdec*(j - 16); + g.width = hdec*(i - 16); g.set = 0; /* we abuse this field to report that g has changed*/ } - j = 8*fields*((g.height - 1)/(vdec*fields*8) + 1); - if (stretchy*j > vc.maxheight) { - g.yoff += 2*((g.height - vdec*(j - 8*fields))/4); - g.height = vdec*(j - 8*fields); + i = 8*fields*((g.height - 1)/(vdec*fields*8) + 1); + if (stretchy*i > vc.maxheight) { + g.yoff += 2*((g.height - vdec*(i - 8*fields))/4); + g.height = vdec*(i - 8*fields); g.set = 0; } if (!g.set) @@ -338,32 +336,54 @@ memset(image, 0, image_width*image_height); memset(image + size, 0x80, image_width*image_height/4); memset(image + 3*size/2, 0x80, image_width*image_height/4); - mjpeg_encoder_init(image_width/hdec, image_height, - image, hdec, image_width, - image + image_width*image_height, - hdec, image_width/2, - image + 3*image_width*image_height/2, - hdec, image_width/2, fields, 1, - quality, bw); + y_data = image; + u_data = image + image_width*image_height; + v_data = image + 3*image_width*image_height/2; + + y_stride = image_width; + u_stride = image_width/2; + v_stride = image_width/2; + + j = jpeg_enc_init(image_width/hdec, + image_height/fields, + hdec, y_stride*fields, + hdec, u_stride*fields, + hdec, v_stride*fields, + 1, quality, bw); break; case IMGFMT_YUY2: - for (j = 0; j < 2*size; j+=4) { - image[j] = 0; - image[j+1] = 0x80; - image[j+2] = 0; - image[j+3] = 0x80; + for (i = 0; i < 2*size; i+=4) { + image[i] = 0; + image[i+1] = 0x80; + image[i+2] = 0; + image[i+3] = 0x80; } - mjpeg_encoder_init(image_width/hdec, image_height, - image, hdec*2, image_width*2, - image + 1, hdec*4, image_width*2, - image + 3, hdec*4, image_width*2, - fields, 0, quality, bw); + + y_data = image; + u_data = image + 1; + v_data = image + 3; + + y_stride = 2*image_width; + u_stride = 2*image_width; + v_stride = 2*image_width; + + j = jpeg_enc_init(image_width/hdec, + image_height/fields, + hdec*2, y_stride*fields, + hdec*4, u_stride*fields, + hdec*4, v_stride*fields, + 0, quality, bw); break; default: mp_msg(MSGT_VO, MSGL_FATAL, "internal inconsistency in vo_zr\n"); } + if (j == NULL) { + mp_msg(MSGT_VO, MSGL_ERR, "Error initializing the jpeg encoder\n"); + return 1; + } + if (init_zoran(stretchx, stretchy)) { return 1; } @@ -379,9 +399,9 @@ } static void flip_page (void) { - int i, j, k; - /*FILE *fp; - char filename[100];*/ + int i, k; + //FILE *fp; + //char filename[100]; /* do we have a free buffer? */ if (queue-synco < zrq.count) { frame = queue; @@ -393,9 +413,12 @@ } k=0; for (i = 0; i < fields; i++) - k+=mjpeg_encode_frame(buf+frame*zrq.size+k, i); - /* Warning, Quantization and Huffman tables are only - * written in the first frame by default (to preserver bandwidth) */ + k+=jpeg_enc_frame(j, y_data + i*y_stride, + u_data + i*u_stride, v_data + i*v_stride, + buf+frame*zrq.size+k); + /* Warning: Only the first jpeg image contains huffman- and + * quantisation tables, so don't expect files other than + * test0001.jpg to be readable */ /*sprintf(filename, "test%04d.jpg", framenum); fp = fopen(filename, "w"); if (!fp) exit(1); @@ -418,7 +441,7 @@ int i; char *source, *dest; //printf("draw frame called\n"); - source = src[0] + 2*g.yoff*image_width + 2*g.xoff; + source = src[0] + 2*g.yoff*vdec*stride + 2*g.xoff; dest = image + 2*off_y; for (i = 0; i < g.height/vdec; i++) { memcpy(dest, source, image_width*2); @@ -435,6 +458,7 @@ } static void uninit(void) { + jpeg_enc_uninit(j); uninit_zoran(); } @@ -563,7 +587,7 @@ return 1; }else if (!strcasecmp(opt, "zrquality")) { i = atoi(param); - if (i < 1 || i > 20) return ERR_OUT_OF_RANGE; + if (i < 2 || i > 20) return ERR_OUT_OF_RANGE; quality = i; return 1; }else if (!strcasecmp(opt, "zrnorm")) { @@ -595,7 +619,7 @@ " this switch allows you to see the effects\n" " of too much decimation\n" " -zrbw display in black&white (speed increase)\n" - " -zrquality jpeg compression quality [BEST] 1 - 20 [VERY BAD]\n" + " -zrquality jpeg compression quality [BEST] 2 - 20 [VERY BAD]\n" " -zrdev playback device (example -zrdev /dev/video1\n" " -zrnorm specify norm PAL/NTSC [dev: leave at current setting]\n" "\n" @@ -623,7 +647,7 @@ else if (!strcasecmp(param, "zrvdec")) vdec = 1; else if (!strcasecmp(param, "zrquality")) - quality = 1; + quality = 2; else if (!strcasecmp(param, "zrnorm")) norm = VIDEO_MODE_AUTO;

1 0

CVS: main/DOCS/tech TODO,1.30,1.31
by Arpi of Ize 10 Feb '02

10 Feb '02

Update of /cvsroot/mplayer/main/DOCS/tech In directory mplayer:/var/tmp.root/cvs-serv9236 Modified Files: TODO Log Message: updated. please check... Index: TODO =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/tech/TODO,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- TODO 8 Jan 2002 15:06:27 -0000 1.30 +++ TODO 11 Feb 2002 01:15:22 -0000 1.31 @@ -5,29 +5,18 @@ FOR THE RELEASE: ~~~~~~~~~~~~~~~~ -URGENT: -- prebuffering to cache2 (req. for MMS) - URGENT! -- mencoder: implement VBR audio copy -- mencoder: Estimated Size and Time - -decoders: -- fix cvid on ppc -- getting mss1 (Windows Screen Video) DLL codec working... - kabi -- getting PIM1 codec (DLL) working... - kabi -- getting 3ivX DLL working (CoCreateFreeThreadedMarshaler call required) -- optimize liba52 (downmix.c in 3dnow, imdct 3dnowex runtime detection?) - i dont have a 3dnow(ex) cpu so i dont want to do it (michael) -- fix seeking with libmad audio codec (codec lost sync and can't resync?) - -mencoder: -- mencoder: image cut/crop/extend filter -- add some kind of "-ss" option, to start at e.g. 1:0:0 at the video -- add a endpoint for encoding, like above -- finish 3-pass encoding (audio, video1, video2) -- add win32 encoders support +AVI demuxer: +- fix AVI index offset base position handling ('no video steram found' bug) +- implement hardcore bruteforce avi re-sync for broken files (-forceidx) +- fix for growing avi files (movi_end pos > stream->end_pos) +- implement forward seeking in indexed avi streams -other: -- fix DVB a-v sync problems, switch to mp1e +URGENT: +- finish mencoder -ovc vfw (bitrate setting, codec selection etc) +- mencoder: image cut/crop/extend filter, colorspace conversion +- codec priority option +- implement software scaling to vo_mpegpes +- ./configure support for XviD runtime: - add --enable-runtime or something (should change VERSION header and enable @@ -36,19 +25,22 @@ vo_dga.c (asm stuff may be removed and replaced by fastmemcpy?) libac3 (should be ported to liba52) - test(fix?) mp3lib cpu detection code - FUTURE: ~~~~~~~ +decoders: +- fix cvid on ppc +- getting mss1 (Windows Screen Video) DLL codec working... - kabi +- getting PIM1 codec (DLL) working... - kabi +- fix seeking with libmad audio codec (codec lost sync and can't resync?) + demuxer: -- implement forward seeking in indexed avi streams -- implement brute-force broken avi fixer - demux_mpg: support for VDR's index files for more accurate seeking - implement seeking for YUV4MPEG_2_, NuppelVideo and Real +- implement Ogg demuxer decoders: -- check and import videodecoding.de stuff - qtx support? - define some common api for native audio and video codecs and move them to seperated place (hopefully will allow adding new

1 0

CVS: main/postproc swscale.c,1.80,1.81
by Michael Niedermayer 10 Feb '02

10 Feb '02

Update of /cvsroot/mplayer/main/postproc In directory mplayer:/var/tmp.root/cvs-serv20940 Modified Files: swscale.c Log Message: unscaled memcpy variant bugfix (negative strides) Index: swscale.c =================================================================== RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- swscale.c 10 Feb 2002 00:43:31 -0000 1.80 +++ swscale.c 10 Feb 2002 23:57:47 -0000 1.81 @@ -1297,8 +1297,8 @@ int length=0; /* universal length finder */ - while(length+c->srcW <= dstStride[0] - && length+c->srcW <= srcStride[0]) length+= c->srcW; + while(length+c->srcW <= ABS(dstStride[0]) + && length+c->srcW <= ABS(srcStride[0])) length+= c->srcW; ASSERT(length!=0); for(i=0; i<srcSliceH; i++)

1 0