August 2022 - MPlayer-cvslog - lists.mplayerhq.hu

r38400 - in trunk/libmpcodecs: ve_lavc.c ve_libdv.c ve_nuv.c ve_qtvideo.c ve_raw.c ve_vfw.c ve_x264.c ve_xvid4.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 23:40:03 2022 New Revision: 38400 Log: libmpcodecs/ve_*.c: fix put_image prototypes. An extra endpts argument was added, and while none of the encoders uses that currently, the functions should have the proper types. Modified: trunk/libmpcodecs/ve_lavc.c trunk/libmpcodecs/ve_libdv.c trunk/libmpcodecs/ve_nuv.c trunk/libmpcodecs/ve_qtvideo.c trunk/libmpcodecs/ve_raw.c trunk/libmpcodecs/ve_vfw.c trunk/libmpcodecs/ve_x264.c trunk/libmpcodecs/ve_xvid4.c Modified: trunk/libmpcodecs/ve_lavc.c ============================================================================== --- trunk/libmpcodecs/ve_lavc.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_lavc.c Tue Aug 30 23:40:03 2022 (r38400) @@ -710,7 +710,7 @@ static double psnr(double d){ return -10.0*log(d)/log(10); } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ AVFrame *pic= vf->priv->pic; pic->data[0]=mpi->planes[0]; Modified: trunk/libmpcodecs/ve_libdv.c ============================================================================== --- trunk/libmpcodecs/ve_libdv.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_libdv.c Tue Aug 30 23:40:03 2022 (r38400) @@ -88,7 +88,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ dv_encode_full_frame(vf->priv->enc, mpi->planes, (mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb, Modified: trunk/libmpcodecs/ve_nuv.c ============================================================================== --- trunk/libmpcodecs/ve_nuv.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_nuv.c Tue Aug 30 23:40:03 2022 (r38400) @@ -120,7 +120,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ uint8_t *header = vf->priv->buffer; uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE; uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE; Modified: trunk/libmpcodecs/ve_qtvideo.c ============================================================================== --- trunk/libmpcodecs/ve_qtvideo.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_qtvideo.c Tue Aug 30 23:40:03 2022 (r38400) @@ -188,7 +188,7 @@ static int query_format(struct vf_instan static int codec_initialized = 0; -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ OSErr cres; long framesizemax; Modified: trunk/libmpcodecs/ve_raw.c ============================================================================== --- trunk/libmpcodecs/ve_raw.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_raw.c Tue Aug 30 23:40:03 2022 (r38400) @@ -150,7 +150,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts) { mux_v->buffer = mpi->planes[0]; muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, pts, pts); return 1; Modified: trunk/libmpcodecs/ve_vfw.c ============================================================================== --- trunk/libmpcodecs/ve_vfw.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_vfw.c Tue Aug 30 23:40:03 2022 (r38400) @@ -303,7 +303,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts){ long flags=0; int ret; // flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack Modified: trunk/libmpcodecs/ve_x264.c ============================================================================== --- trunk/libmpcodecs/ve_x264.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_x264.c Tue Aug 30 23:40:03 2022 (r38400) @@ -62,7 +62,6 @@ typedef struct h264_module_t { static x264_param_t param; static int parse_error = 0; -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts); static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in); void x264enc_set_param(const m_option_t* opt, char* arg) @@ -234,7 +233,7 @@ static int query_format(struct vf_instan return 0; } -static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts) { h264_module_t *mod=(h264_module_t*)vf->priv; int i; Modified: trunk/libmpcodecs/ve_xvid4.c ============================================================================== --- trunk/libmpcodecs/ve_xvid4.c Tue Aug 30 23:26:51 2022 (r38399) +++ trunk/libmpcodecs/ve_xvid4.c Tue Aug 30 23:40:03 2022 (r38400) @@ -523,7 +523,7 @@ query_format(struct vf_instance *vf, uns *==========================================================================*/ static int -put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) +put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double endpts) { int size; xvid_enc_stats_t stats;

1 0

r38399 - in trunk: libmpdemux/muxer.c libmpdemux/muxer.h mencoder.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 23:26:51 2022 New Revision: 38399 Log: mencoder.c/muxer.c: add functions to close and free muxer. Makes behaviour clearer than mencoder using low-level functions directly and frees some more memory before exit to make leaks easier to spot. Modified: trunk/libmpdemux/muxer.c trunk/libmpdemux/muxer.h trunk/mencoder.c Modified: trunk/libmpdemux/muxer.c ============================================================================== --- trunk/libmpdemux/muxer.c Tue Aug 30 22:48:45 2022 (r38398) +++ trunk/libmpdemux/muxer.c Tue Aug 30 23:26:51 2022 (r38399) @@ -69,6 +69,34 @@ fail: return NULL; } +off_t muxer_close(muxer_t *muxer) +{ + off_t size; + /* flush muxer just in case, this is a no-op unless + * we created a stream but never wrote frames to it... */ + muxer_flush(muxer); + if (muxer->cont_write_index) muxer_write_index(muxer); + size=stream_tell(muxer->stream); + stream_seek(muxer->stream,0); + if (muxer->cont_write_header) muxer_write_header(muxer); // update header + return size; +} + +void muxer_free(muxer_t *muxer) +{ + int num; + for (num = 0; muxer->streams[num]; ++num) { + free(muxer->streams[num]->priv); + muxer->streams[num]->priv = NULL; + free(muxer->streams[num]); + muxer->streams[num] = NULL; + } + free(muxer->idx); + muxer->idx = NULL; + muxer->idx_size = 0; + free(muxer); +} + /* Flush the internal muxer buffer. * This is normally called from muxer_write_chunk() once all streams * have seen frames. */ Modified: trunk/libmpdemux/muxer.h ============================================================================== --- trunk/libmpdemux/muxer.h Tue Aug 30 22:48:45 2022 (r38398) +++ trunk/libmpdemux/muxer.h Tue Aug 30 23:26:51 2022 (r38399) @@ -133,6 +133,8 @@ extern const m_option_t mpegopts_conf[]; extern const m_option_t nuvopts_conf[]; muxer_t *muxer_new_muxer(int type,stream_t *stream); +off_t muxer_close(muxer_t *muxer); +void muxer_free(muxer_t *muxer); void muxer_flush(muxer_t *m); #define muxer_new_stream(muxer,a) muxer->cont_new_stream(muxer,a) #define muxer_stream_fix_parameters(muxer, a) muxer->fix_stream_parameters(a) Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Tue Aug 30 22:48:45 2022 (r38398) +++ trunk/mencoder.c Tue Aug 30 23:26:51 2022 (r38399) @@ -1699,13 +1699,7 @@ if(aencoder) if(aencoder->fixup) aencoder->fixup(aencoder); -/* flush muxer just in case, this is a no-op unless - * we created a stream but never wrote frames to it... */ -muxer_flush(muxer); -if (muxer->cont_write_index) muxer_write_index(muxer); -muxer_f_size=stream_tell(muxer->stream); -stream_seek(muxer->stream,0); -if (muxer->cont_write_header) muxer_write_header(muxer); // update header +muxer_f_size=muxer_close(muxer); #if 0 if(ferror(muxer_f) || fclose(muxer_f) != 0) { mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename); @@ -1730,6 +1724,9 @@ if(sh_audio) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_AudioStreamResult, (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (uint64_t)mux_a->size, (float)mux_a->timer); +muxer_free(muxer); +muxer=NULL; +mux_v=mux_a=NULL; m_config_free(mconfig); m_entry_list_free(filelist); if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; }

1 0

r38398 - trunk/mencoder.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 22:48:45 2022 New Revision: 38398 Log: mencoder.c: free options list and output stream. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Tue Aug 30 22:40:47 2022 (r38397) +++ trunk/mencoder.c Tue Aug 30 22:48:45 2022 (r38398) @@ -1730,11 +1730,13 @@ if(sh_audio) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_AudioStreamResult, (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (uint64_t)mux_a->size, (float)mux_a->timer); +m_config_free(mconfig); m_entry_list_free(filelist); if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; } if(sh_video){ uninit_video(sh_video);sh_video=NULL; } if(demuxer) free_demuxer(demuxer); if(stream) free_stream(stream); // kill cache thread +if(ostream) free_stream(ostream); // Do not free mux_v->buffer, it may have been overwritten // with something we should not free. if(mux_v) free(mux_v_buffer);

1 0

r38397 - trunk/mpcommon.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 22:40:47 2022 New Revision: 38397 Log: mpcommon.c: free vo_spudec on common_uninit. mplayer frees it separately so it makes no difference (but does not hurt either), but it fixes a memleak for mencoder. Modified: trunk/mpcommon.c Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Tue Aug 30 22:27:29 2022 (r38396) +++ trunk/mpcommon.c Tue Aug 30 22:40:47 2022 (r38397) @@ -643,6 +643,8 @@ int common_init(void) void common_uninit(void) { + spudec_free(vo_spudec); + vo_spudec = NULL; #ifdef CONFIG_FREETYPE current_module = "uninit_font"; if (sub_font && sub_font != vo_font)

1 0

r38396 - in trunk/libmpcodecs: vf.c vf_ass.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 22:27:29 2022 New Revision: 38396 Log: vf.c: Fix minor memleak in filters. When filters use vf_opts, vf.c allocates vf->priv. Most filters then free it in uninit. However when there is no uninit function, vf.c must free it. Also fix vf_ass.c to free vf->priv in its uninit. Modified: trunk/libmpcodecs/vf.c trunk/libmpcodecs/vf_ass.c Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Tue Aug 30 22:24:16 2022 (r38395) +++ trunk/libmpcodecs/vf.c Tue Aug 30 22:27:29 2022 (r38396) @@ -770,6 +770,7 @@ vf_instance_t* append_filters(vf_instanc void vf_uninit_filter(vf_instance_t* vf){ if(vf->uninit) vf->uninit(vf); + else free(vf->priv); free_mp_image(vf->imgctx.static_images[0]); free_mp_image(vf->imgctx.static_images[1]); free_mp_image(vf->imgctx.temp_images[0]); Modified: trunk/libmpcodecs/vf_ass.c ============================================================================== --- trunk/libmpcodecs/vf_ass.c Tue Aug 30 22:24:16 2022 (r38395) +++ trunk/libmpcodecs/vf_ass.c Tue Aug 30 22:27:29 2022 (r38396) @@ -879,6 +879,7 @@ static void uninit(struct vf_instance *v for (i = 0; i < MP_MAX_PLANES; i++) av_free(vf->priv->alphas[i]); av_free(vf->priv->dirty_rows); + free(vf->priv); } static const unsigned int fmt_list[] = {

1 0

r38395 - trunk/mencoder.c
by reimar 30 Aug '22

30 Aug '22

Author: reimar Date: Tue Aug 30 22:24:16 2022 New Revision: 38395 Log: mencoder.c: free filelist, fixing minor memleak. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Sat Aug 27 11:40:45 2022 (r38394) +++ trunk/mencoder.c Tue Aug 30 22:24:16 2022 (r38395) @@ -1730,6 +1730,7 @@ if(sh_audio) mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_AudioStreamResult, (float)(mux_a->size/mux_a->timer*8.0f/1000.0f), (int)(mux_a->size/mux_a->timer), (uint64_t)mux_a->size, (float)mux_a->timer); +m_entry_list_free(filelist); if(sh_audio){ uninit_audio(sh_audio);sh_audio=NULL; } if(sh_video){ uninit_video(sh_video);sh_video=NULL; } if(demuxer) free_demuxer(demuxer);

1 0

r38394 - trunk/libmpdemux/mpeg_hdr.c
by reimar 27 Aug '22

27 Aug '22

Author: reimar Date: Sat Aug 27 11:40:45 2022 New Revision: 38394 Log: mpeg_hdr.c: Improve read_golomb code. Limit how much it reads at most and simplify shift. Modified: trunk/libmpdemux/mpeg_hdr.c Modified: trunk/libmpdemux/mpeg_hdr.c ============================================================================== --- trunk/libmpdemux/mpeg_hdr.c Sat Aug 27 11:37:31 2022 (r38393) +++ trunk/libmpdemux/mpeg_hdr.c Sat Aug 27 11:40:45 2022 (r38394) @@ -286,7 +286,9 @@ static unsigned int read_golomb(unsigned { unsigned int x, v = 0, v2 = 0, m, len = 0, n = *init; - while(getbits(buffer, n++, 1) == 0) + // TODO: check exact length limit. + // Remaining code breaks values > 31 anyway though + while(getbits(buffer, n++, 1) == 0 && len < 31) len++; x = len + n; @@ -299,9 +301,7 @@ static unsigned int read_golomb(unsigned v <<= 8; } - v2 = 1; - for(n = 0; n < len; n++) - v2 <<= 1; + v2 = 1u << len; v2 = (v2 - 1) + v; //fprintf(stderr, "READ_GOLOMB(%u), V=2^%u + %u-1 = %u\n", *init, len, v, v2);

1 0

r38393 - trunk/libmpdemux/mpeg_hdr.c
by reimar 27 Aug '22

27 Aug '22

Author: reimar Date: Sat Aug 27 11:37:31 2022 New Revision: 38393 Log: mpeg_hdr.c: Allocate 0xff initialized padding. Avoids SPS parsing overreading the buffer. Fixes trac issue #2405. Modified: trunk/libmpdemux/mpeg_hdr.c Modified: trunk/libmpdemux/mpeg_hdr.c ============================================================================== --- trunk/libmpdemux/mpeg_hdr.c Sat Aug 27 11:33:54 2022 (r38392) +++ trunk/libmpdemux/mpeg_hdr.c Sat Aug 27 11:37:31 2022 (r38393) @@ -399,7 +399,15 @@ int h264_parse_sps(mp_mpeg_header_t * pi { unsigned int n = 0, v, i, k, mbh; int frame_mbs_only; - uint8_t *buf = malloc(len); + uint8_t *buf; + // Sanity check, should not happen in MPlayer due to limited video buffer + if (len > 100*1024*1024) len = 100*1024*1024; + // Allocate more to allow for overread. + // Initialize to 0xff to minimize golomb length + // 4kB is more than necessary, but calculating the exact + // value or adding more range checks is more pain than worth it. + buf = malloc(len + 4096); + memset(buf, 0xff, len + 4096); len = mp_unescape03(buf, inbuf, len);

1 0

r38392 - trunk/mplayer.c
by reimar 27 Aug '22

27 Aug '22

Author: reimar Date: Sat Aug 27 11:33:54 2022 New Revision: 38392 Log: mplayer.c: Fix crash introduced in r38380. When we fail to read video properties we need to ensure sh_video is set to NULL so we do not try to play video. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Aug 27 11:07:11 2022 (r38391) +++ trunk/mplayer.c Sat Aug 27 11:33:54 2022 (r38392) @@ -2436,6 +2436,9 @@ int reinit_video_chain(void) err_out: uninit_player(INITIALIZED_VCODEC); + // ensure we do not try to play video even if we + // failed before vfilter creation. + mpctx->sh_video = NULL; return 0; }

1 0

r38391 - trunk/libmpdemux/mpeg_hdr.c
by reimar 27 Aug '22

27 Aug '22

Author: reimar Date: Sat Aug 27 11:07:11 2022 New Revision: 38391 Log: mpeg_hdr.c: Fix unescape code. For escape codes near the end of the buffer it would produce incorrect results. Fixes trac issue #2406. Modified: trunk/libmpdemux/mpeg_hdr.c Modified: trunk/libmpdemux/mpeg_hdr.c ============================================================================== --- trunk/libmpdemux/mpeg_hdr.c Fri Aug 26 23:22:36 2022 (r38390) +++ trunk/libmpdemux/mpeg_hdr.c Sat Aug 27 11:07:11 2022 (r38391) @@ -374,9 +374,9 @@ static int mp_unescape03(uint8_t *dest, return 0; j = i = skip = 0; - while(i <= len-3) + while(i < len) { - if(buf[i] == 0 && buf[i+1] == 0 && buf[i+2] == 3) + if(i <= len-3 && buf[i] == 0 && buf[i+1] == 0 && buf[i+2] == 3) { dest[j] = dest[j+1] = 0; j += 2; @@ -390,8 +390,6 @@ static int mp_unescape03(uint8_t *dest, i++; } } - dest[j] = buf[len-2]; - dest[j+1] = buf[len-1]; len -= skip; return len;

1 0