Mercurial > mplayer.hg
view libmpcodecs/ve_nuv.c @ 32893:c873777e957d
Get rid of needless listItems variable and pointer.
The tmpList structure variable was only used to check whether a skin can be
read without error. After the check tmpList was erased and the same skin read
once again into another structure - the appropriate target structure. Now
error checking is done with skin reading into the target structure.
The separate skinAppMPlayer pointer was needless, because a skin will only be
read into the one global listItems structure appMPlayer, so that its address
can be used right away.
Freeing the listItems was done twice before and is now performed at a single
place, where the fonts are freed now as well - in skinRead() right before
skin reading starts.
As a result there is now only one listItems variable - the global appMPlayer;
memory is saved, passing around global variables and pointless double actions
are avoided.
author | ib |
---|---|
date | Sun, 27 Feb 2011 17:41:05 +0000 |
parents | 8fa2f43cb760 |
children |
line wrap: on
line source
/* * This file is part of MPlayer. * * MPlayer 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. * * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include <stdio.h> #include <stdlib.h> #include <string.h> #include "config.h" #include "mp_msg.h" #include "m_option.h" #include "codec-cfg.h" #include "stream/stream.h" #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" #include "stream/stream.h" #include "libmpdemux/muxer.h" #include "img_format.h" #include "mp_image.h" #include "vf.h" #include "libavutil/intreadwrite.h" #include <lzo/lzo1x.h> #include "native/rtjpegn.h" #define LZO_AL(size) (((size) + (sizeof(long) - 1)) / sizeof(long)) #define LZO_OUT_LEN(in) ((in) + (in) / 64 + 16 + 3) //===========================================================================// struct vf_priv_s { int raw; // Do not use RTjpeg int lzo; // Use lzo unsigned int l,c,q; // Mjpeg param muxer_stream_t* mux; uint8_t* buffer; int buf_size; int tbl_wrote; lzo_byte *zbuffer; long __LZO_MMODEL *zmem; }; #define mux_v (vf->priv->mux) struct vf_priv_s nuv_priv_dflt = { 0, // raw 1, // lzo 1,1, // l,c 255, // q NULL, NULL, 0,0, NULL,NULL }; const m_option_t nuvopts_conf[] = { {"raw", &nuv_priv_dflt.raw, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"rtjpeg", &nuv_priv_dflt.raw, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"lzo", &nuv_priv_dflt.lzo, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nolzo", &nuv_priv_dflt.lzo, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"q", &nuv_priv_dflt.q, CONF_TYPE_INT, M_OPT_RANGE,3,255, NULL}, {"l", &nuv_priv_dflt.l, CONF_TYPE_INT, M_OPT_RANGE,0,20, NULL}, {"c", &nuv_priv_dflt.c, CONF_TYPE_INT, M_OPT_RANGE,0,20, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; //===========================================================================// #define COMPDATASIZE (128*4) #define FRAMEHEADERSIZE 12 static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ // We need a buffer wich can holda header and a whole YV12 picture // or a RTJpeg table vf->priv->buf_size = width*height*3/2+FRAMEHEADERSIZE; if(vf->priv->buf_size < COMPDATASIZE + FRAMEHEADERSIZE) vf->priv->buf_size = COMPDATASIZE + FRAMEHEADERSIZE; mux_v->bih->biWidth=width; mux_v->bih->biHeight=height; mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); mux_v->aspect = (float)d_width/d_height; vf->priv->buffer = realloc(vf->priv->buffer,vf->priv->buf_size); if (vf->priv->lzo) vf->priv->zbuffer = realloc(vf->priv->zbuffer, FRAMEHEADERSIZE + LZO_OUT_LEN(vf->priv->buf_size)); vf->priv->tbl_wrote = 0; return 1; } static int control(struct vf_instance *vf, int request, void* data){ return CONTROL_UNKNOWN; } static int query_format(struct vf_instance *vf, unsigned int fmt){ if(fmt==IMGFMT_I420) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; return 0; } static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ uint8_t *header = vf->priv->buffer; uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE; uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE; int len = 0, r; size_t zlen = 0; memset(header, 0, FRAMEHEADERSIZE); // Reset the header if(vf->priv->lzo) memset(vf->priv->zbuffer,0,FRAMEHEADERSIZE); // This has to be don here otherwise tv with sound doesn't work if(!vf->priv->tbl_wrote) { RTjpeg_init_compress((uint32_t *)data,mpi->width,mpi->height,vf->priv->q); RTjpeg_init_mcompress(); header[0] = 'D'; // frametype: compressor data header[1] = 'R'; // comptype: compressor data for RTjpeg AV_WL32(header + 8, COMPDATASIZE); // packetlength mux_v->buffer=vf->priv->buffer; muxer_write_chunk(mux_v,FRAMEHEADERSIZE + COMPDATASIZE, 0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); vf->priv->tbl_wrote = 1; memset(header, 0, FRAMEHEADERSIZE); // Reset the header } // Raw picture if(vf->priv->raw) { len = mpi->width*mpi->height*3/2; // Try lzo ??? if(vf->priv->lzo) { r = lzo1x_1_compress(mpi->planes[0],len, zdata,&zlen,vf->priv->zmem); if(r != LZO_E_OK) { mp_msg(MSGT_VFILTER,MSGL_ERR,"LZO compress error\n"); zlen = 0; } } if(zlen <= 0 || zlen > len) { memcpy(data,mpi->planes[0],len); header[1] = '0'; // comptype: uncompressed } else { // Use lzo only if it's littler header = vf->priv->zbuffer; header[1] = '3'; //comptype: lzo len = zlen; } } else { // RTjpeg compression len = RTjpeg_mcompressYUV420(data,mpi->planes[0],vf->priv->l, vf->priv->c); if(len <= 0) { mp_msg(MSGT_VFILTER,MSGL_ERR,"RTjpeg_mcompressYUV420 error (%d)\n",len); return 0; } if(vf->priv->lzo) { r = lzo1x_1_compress(data,len,zdata,&zlen,vf->priv->zmem); if(r != LZO_E_OK) { mp_msg(MSGT_VFILTER,MSGL_ERR,"LZO compress error\n"); zlen = 0; } } if(zlen <= 0 || zlen > len) header[1] = '1'; // comptype: RTjpeg else { header = vf->priv->zbuffer; header[1] = '2'; // comptype: RTjpeg + LZO len = zlen; } } header[0] = 'V'; // frametype: video frame AV_WL32(header + 8, len); // packetlength mux_v->buffer = header; muxer_write_chunk(mux_v, len + FRAMEHEADERSIZE, 0x10, pts, pts); return 1; } static void uninit(struct vf_instance *vf) { free(vf->priv->buffer); free(vf->priv->zbuffer); free(vf->priv->zmem); } //===========================================================================// static int vf_open(vf_instance_t *vf, char* args){ vf->config=config; vf->default_caps=VFCAP_CONSTANT; vf->control=control; vf->query_format=query_format; vf->put_image=put_image; vf->uninit = uninit; vf->priv=malloc(sizeof(struct vf_priv_s)); memcpy(vf->priv, &nuv_priv_dflt,sizeof(struct vf_priv_s)); vf->priv->mux=(muxer_stream_t*)args; mux_v->bih=calloc(1, sizeof(*mux_v->bih)); mux_v->bih->biSize=sizeof(*mux_v->bih); mux_v->bih->biWidth=0; mux_v->bih->biHeight=0; mux_v->bih->biPlanes=1; mux_v->bih->biBitCount=12; mux_v->bih->biCompression = mmioFOURCC('N','U','V','1'); if(vf->priv->lzo) { if(lzo_init() != LZO_E_OK) { mp_msg(MSGT_VFILTER,MSGL_WARN,"LZO init failed: no lzo compression\n"); vf->priv->lzo = 0; } else vf->priv->zmem = malloc(sizeof(long)*LZO_AL(LZO1X_1_MEM_COMPRESS)); } return 1; } const vf_info_t ve_info_nuv = { "nuv encoder", "nuv", "Albeu", "for internal use by mencoder", vf_open }; //===========================================================================//