Mercurial > mplayer.hg
view libmpcodecs/ve_libdv.c @ 33667:adb10970ec83
Fix bug introduced as a side effect in r33750.
It was no longer possible to start gmplayer from the command line with
a file argument.
Every time gmplayer is called with a file argument this file goes into
the GUI specific playlist. As a side effect, GUI's file(name) to play
and MPlayer's filename point to the same address.
guiInit() pointlessly tries to set GUI's filename (free and strdup) from
MPlayer's filename instead of getting it from its playlist. The previous
memset set GUI's filename to NULL rendering the free() effectless while
now such an operation on the same address to strdup() afterwards isn't a
good idea.
Remove the pointless code.
author | ib |
---|---|
date | Tue, 28 Jun 2011 15:00:05 +0000 |
parents | a86413775fbe |
children |
line wrap: on
line source
/* * requires libdv-0.9.5 !!! * (v0.9.0 is too old and has no encoding functionality exported!) * * 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 "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 <libdv/dv.h> #ifndef DV_WIDTH #define DV_WIDTH 720 #define DV_PAL_HEIGHT 576 #define DV_NTSC_HEIGHT 480 #endif struct vf_priv_s { muxer_stream_t* mux; dv_encoder_t* enc; }; #define mux_v (vf->priv->mux) //===========================================================================// static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ if(width!=DV_WIDTH || (height!=DV_PAL_HEIGHT && height!=DV_NTSC_HEIGHT)){ mp_msg(MSGT_VFILTER,MSGL_ERR,"DV: only 720x480 (NTSC) and 720x576 (PAL) resolutions allowed! Try with -vf scale=720:480\n"); } vf->priv->enc->isPAL=(height==DV_PAL_HEIGHT); vf->priv->enc->is16x9=(d_width/(float)d_height > 1.7); // 16:9=1.777777 vf->priv->enc->vlc_encode_passes=3; vf->priv->enc->static_qno=0; vf->priv->enc->force_dct=0; 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; 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_YUY2) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; if(fmt==IMGFMT_RGB24) return VFCAP_CSP_SUPPORTED; return 0; } static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ dv_encode_full_frame(vf->priv->enc, mpi->planes, (mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb, mux_v->buffer); muxer_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10, pts, pts); return 1; } //===========================================================================// 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->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv,0,sizeof(struct vf_priv_s)); vf->priv->mux=(muxer_stream_t*)args; vf->priv->enc=dv_encoder_new(0,1,1); // FIXME, parse some options! if(!vf->priv->enc) return 0; 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->biCompression=mmioFOURCC('d','v','s','d'); mux_v->bih->biPlanes=1; mux_v->bih->biBitCount=24; return 1; } const vf_info_t ve_info_libdv = { "DV encoder using libdv", "libdv", "A'rpi", "for internal use by mencoder", vf_open }; //===========================================================================//