Mercurial > mplayer.hg
view libmpcodecs/vd_mpegpes.c @ 32972:fbaae7fe1a13
Fix several issues with Translate().
1. The "Unsafe!" comment has been removed, because the strings passed
to the function are strcpy'd.
2. The needless memsets (one of which with wrong size) have been removed
in favor of a sufficiently simple initialization of trbuf.
3. The array indices are unsigned now, and the manual optimization of
having strlen() outside the for loop has been removed in favor of
optimization performed by the compiler.
4. There is a check now to prevent an out-of-bounds array access.
author | ib |
---|---|
date | Tue, 08 Mar 2011 20:56:51 +0000 |
parents | cc27da5d7286 |
children | d32f75f79517 |
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 "config.h" #include "mp_msg.h" #include "libmpdemux/mpeg_hdr.h" #include "vd_internal.h" static const vd_info_t info = { "MPEG 1/2 Video passthrough", "mpegpes", "A'rpi", "A'rpi", "for hw decoders" }; LIBVD_EXTERN(mpegpes) //#include "libmpdemux/parse_es.h" #include "libvo/video_out.h" // to set/get/query special features/parameters static int control(sh_video_t *sh,int cmd,void* arg,...){ return CONTROL_UNKNOWN; } // init driver static int init(sh_video_t *sh){ return mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_MPEGPES); } // uninit driver static void uninit(sh_video_t *sh){ } // decode a frame static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ mp_image_t* mpi; static vo_mpegpes_t packet; mp_mpeg_header_t picture; const unsigned char *d = data; if(len>10 && !d[0] && !d[1] && d[2]==1 && d[3]==0xB3) { float old_aspect = sh->aspect; int oldw = sh->disp_w, oldh = sh->disp_h; mp_header_process_sequence_header(&picture, &d[4]); sh->aspect = mpeg12_aspect_info(&picture); sh->disp_w = picture.display_picture_width; sh->disp_h = picture.display_picture_height; if(sh->aspect != old_aspect || sh->disp_w != oldw || sh->disp_h != oldh) { if(!mpcodecs_config_vo(sh, sh->disp_w,sh->disp_h,IMGFMT_MPEGPES)) return 0; } } mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, 0, sh->disp_w, sh->disp_h); packet.data=data; packet.size=len; packet.timestamp=sh->timer*90000.0; packet.id=0x1E0; //+sh_video->ds->id; mpi->planes[0]=(uint8_t*)(&packet); return mpi; }