January 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r36635 - trunk/sub/vobsub.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 14:14:42 2014 New Revision: 36635 Log: vobsub: fix indentation. Modified: trunk/sub/vobsub.c Modified: trunk/sub/vobsub.c ============================================================================== --- trunk/sub/vobsub.c Sun Jan 19 14:14:41 2014 (r36634) +++ trunk/sub/vobsub.c Sun Jan 19 14:14:42 2014 (r36635) @@ -1236,27 +1236,27 @@ void *vobsub_out_open(const char *basena free(result); return NULL; } - result->aid = index; - strcpy(filename, basename); - strcat(filename, ".sub"); - result->fsub = fopen(filename, "ab"); - if (result->fsub == NULL) - perror("Error: vobsub_out_open subtitle file open failed"); - strcpy(filename, basename); - strcat(filename, ".idx"); - result->fidx = fopen(filename, "ab"); - if (result->fidx) { - if (ftell(result->fidx) == 0) { - create_idx(result, palette, orig_width, orig_height); - /* Make the selected language the default language */ - fprintf(result->fidx, "\n# Language index in use\nlangidx: %u\n", index); - } - fprintf(result->fidx, "\nid: %s, index: %u\n", id ? id : "xx", index); - /* So that we can check the file now */ - fflush(result->fidx); - } else - perror("Error: vobsub_out_open index file open failed"); - free(filename); + result->aid = index; + strcpy(filename, basename); + strcat(filename, ".sub"); + result->fsub = fopen(filename, "ab"); + if (result->fsub == NULL) + perror("Error: vobsub_out_open subtitle file open failed"); + strcpy(filename, basename); + strcat(filename, ".idx"); + result->fidx = fopen(filename, "ab"); + if (result->fidx) { + if (ftell(result->fidx) == 0) { + create_idx(result, palette, orig_width, orig_height); + /* Make the selected language the default language */ + fprintf(result->fidx, "\n# Language index in use\nlangidx: %u\n", index); + } + fprintf(result->fidx, "\nid: %s, index: %u\n", id ? id : "xx", index); + /* So that we can check the file now */ + fflush(result->fidx); + } else + perror("Error: vobsub_out_open index file open failed"); + free(filename); return result; }

1 0

r36634 - trunk/sub/vobsub.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 14:14:41 2014 New Revision: 36634 Log: vobsub: Simplify and fix memleak. Modified: trunk/sub/vobsub.c Modified: trunk/sub/vobsub.c ============================================================================== --- trunk/sub/vobsub.c Sun Jan 19 13:06:04 2014 (r36633) +++ trunk/sub/vobsub.c Sun Jan 19 14:14:41 2014 (r36634) @@ -1229,12 +1229,13 @@ void *vobsub_out_open(const char *basena unsigned int orig_width, unsigned int orig_height, const char *id, unsigned int index) { - vobsub_out_t *result = NULL; - char *filename; - filename = malloc(strlen(basename) + 5); - if (filename) { - result = malloc(sizeof(vobsub_out_t)); - if (result) { + vobsub_out_t *result = calloc(1, sizeof(*result)); + char *filename = malloc(strlen(basename) + 5); + if (!filename || !result) { + free(filename); + free(result); + return NULL; + } result->aid = index; strcpy(filename, basename); strcat(filename, ".sub"); @@ -1256,8 +1257,6 @@ void *vobsub_out_open(const char *basena } else perror("Error: vobsub_out_open index file open failed"); free(filename); - } - } return result; }

1 0

r36633 - trunk/libvo/vo_bl.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 13:06:04 2014 New Revision: 36633 Log: vo_bl: update copyright header. Patch by Stefan Schuermans [stefan blinkenarea org]. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sun Jan 19 13:06:03 2014 (r36632) +++ trunk/libvo/vo_bl.c Sun Jan 19 13:06:04 2014 (r36633) @@ -7,7 +7,8 @@ * Sven Neumann <sven(a)gimp.org> * Michael Natterer <mitch(a)gimp.org> * Daniel Mack <daniel(a)yoobay.net> - * copyright (C) 2004 Stefan Schuermans <1stein(a)schuermans.info> + * some patches: copyright (C) 2004,2014 Stefan Schuermans + * <stefan(a)blinkenarea.org> * other stuff: copyright (C) 2002 Rik Snel * * This file is part of MPlayer.

1 0

r36632 - trunk/libvo/vo_bl.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 13:06:03 2014 New Revision: 36632 Log: vo_bl: RGB output support. Patch by Stefan Schuermans [stefan blinkenarea org]. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sun Jan 19 13:06:02 2014 (r36631) +++ trunk/libvo/vo_bl.c Sun Jan 19 13:06:03 2014 (r36632) @@ -213,7 +213,7 @@ static void udp_close(bl_host_t *h) { h->fd = -1; } -#define NO_BLS 3 +#define NO_BLS 4 static const bl_properties_t bls[NO_BLS] = { { "hdl", IMGFMT_Y8, 1, 18, 8, 8, @@ -224,6 +224,9 @@ static const bl_properties_t bls[NO_BLS] &udp_init, &udp_send, &udp_close }, { "grayscale", IMGFMT_Y8, 1, -1, -1, 8, /* use width and height of movie */ &bml_init, &bml_write_frame, &bml_close, + &udp_init, &udp_send, &udp_close }, + { "rgb", IMGFMT_RGB24, 3, -1, -1, 8, /* use width and height of movie */ + &bml_init, &bml_write_frame, &bml_close, &udp_init, &udp_send, &udp_close } }; static int config(uint32_t width, uint32_t height, uint32_t d_width, @@ -269,7 +272,7 @@ static int config(uint32_t width, uint32 bl_packet->maxval = htons((1 << bl->bpc) - 1); framenum = 0; - if (format != IMGFMT_Y8) { + if (format != bl->img_format) { mp_msg(MSGT_VO, MSGL_ERR, "vo_bl called with wrong format"); goto err_out; }

1 0

r36631 - trunk/libvo/vo_bl.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 13:06:02 2014 New Revision: 36631 Log: vo_bl: Fix bpc variable documentation. Patch by Stefan Schuermans [stefan blinkenarea org]. Modified: trunk/libvo/vo_bl.c Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c Sun Jan 19 12:32:51 2014 (r36630) +++ trunk/libvo/vo_bl.c Sun Jan 19 13:06:02 2014 (r36631) @@ -92,7 +92,7 @@ typedef struct { int channels; int width; int height; - int bpc; /* bits per component: bpc = 3, channels = 3 => bpp = 24*/ + int bpc; /* bits per component: bpc = 8, channels = 3 => bpp = 24*/ /* file output functions */ int (*init_file)(bl_file_t *file);

1 0

r36630 - trunk/libmpdemux/demux_mkv.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 12:32:51 2014 New Revision: 36630 Log: mkv: replace a missed "return 0" by "goto err_out". Fixes a memory leak in this error case. Modified: trunk/libmpdemux/demux_mkv.c Modified: trunk/libmpdemux/demux_mkv.c ============================================================================== --- trunk/libmpdemux/demux_mkv.c Sun Jan 19 12:30:06 2014 (r36629) +++ trunk/libmpdemux/demux_mkv.c Sun Jan 19 12:32:51 2014 (r36630) @@ -788,7 +788,7 @@ static int demux_mkv_read_trackentry(dem { uint64_t num = ebml_read_uint(s, &l); if (num == EBML_UINT_INVALID) - return 0; + goto err_out; track->type = num; mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Track type: "); switch (track->type) {

1 0

r36629 - trunk/libmpdemux/demux_film.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 12:30:06 2014 New Revision: 36629 Log: film: various small code improvements. Modified: trunk/libmpdemux/demux_film.c Modified: trunk/libmpdemux/demux_film.c ============================================================================== --- trunk/libmpdemux/demux_film.c Sun Jan 19 12:30:05 2014 (r36628) +++ trunk/libmpdemux/demux_film.c Sun Jan 19 12:30:06 2014 (r36629) @@ -63,7 +63,7 @@ typedef struct film_data_t static void demux_seek_film(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags) { - film_data_t *film_data = (film_data_t *)demuxer->priv; + film_data_t *film_data = demuxer->priv; int new_current_chunk=(flags&SEEK_ABSOLUTE)?0:film_data->current_chunk; if(flags&SEEK_FACTOR) @@ -100,14 +100,10 @@ mp_msg(MSGT_DECVIDEO, MSGL_INFO," (flag // 1 = successfully read a packet static int demux_film_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) { - int i; - unsigned char byte_swap; - int cvid_size; sh_video_t *sh_video = demuxer->video->sh; sh_audio_t *sh_audio = demuxer->audio->sh; - film_data_t *film_data = (film_data_t *)demuxer->priv; + film_data_t *film_data = demuxer->priv; film_chunk_t film_chunk; - int length_fix_bytes; demux_packet_t* dp = NULL; // see if the end has been reached @@ -124,6 +120,7 @@ static int demux_film_fill_buffer(demuxe // (all ones in syncinfo1 indicates an audio chunk) if (film_chunk.syncinfo1 == 0xFFFFFFFF) { + int i; if(demuxer->audio->id>=-1){ // audio not disabled dp = new_demux_packet(film_chunk.chunk_size); if (stream_read(demuxer->stream, dp->buffer, film_chunk.chunk_size) != @@ -142,7 +139,7 @@ static int demux_film_fill_buffer(demuxe else for (i = 0; i < film_chunk.chunk_size; i += 2) { - byte_swap = dp->buffer[i]; + unsigned char byte_swap = dp->buffer[i]; dp->buffer[i] = dp->buffer[i + 1]; dp->buffer[i + 1] = byte_swap; } @@ -174,18 +171,14 @@ static int demux_film_fill_buffer(demuxe dp = NULL; } } - else - { // if the demuxer is dealing with CVID data, deal with it a special way - if (sh_video->format == mmioFOURCC('c', 'v', 'i', 'd')) + else if (sh_video->format == mmioFOURCC('c', 'v', 'i', 'd')) { - if (film_data->film_version) - length_fix_bytes = 2; - else - length_fix_bytes = 6; + int length_fix_bytes = film_data->film_version ? 2 : 6; + int cvid_size = film_chunk.chunk_size - length_fix_bytes; // account for the fix bytes when allocating the buffer - dp = new_demux_packet(film_chunk.chunk_size - length_fix_bytes); + dp = new_demux_packet(cvid_size); // these CVID data chunks have a few extra bytes; skip them if (stream_read(demuxer->stream, dp->buffer, 10) != 10) @@ -193,8 +186,7 @@ static int demux_film_fill_buffer(demuxe stream_skip(demuxer->stream, length_fix_bytes); if (stream_read(demuxer->stream, dp->buffer + 10, - film_chunk.chunk_size - (10 + length_fix_bytes)) != - (film_chunk.chunk_size - (10 + length_fix_bytes))) + cvid_size - 10) != cvid_size - 10) goto err_out; dp->pts = film_chunk.pts; @@ -202,7 +194,6 @@ static int demux_film_fill_buffer(demuxe dp->flags = (film_chunk.syncinfo1 & 0x80000000) ? 1 : 0; // fix the CVID chunk size - cvid_size = film_chunk.chunk_size - length_fix_bytes; dp->buffer[1] = (cvid_size >> 16) & 0xFF; dp->buffer[2] = (cvid_size >> 8) & 0xFF; dp->buffer[3] = (cvid_size >> 0) & 0xFF; @@ -217,21 +208,19 @@ static int demux_film_fill_buffer(demuxe film_chunk.pts, film_chunk.chunk_offset, (film_chunk.syncinfo1 & 0x80000000) ? 1 : 0); } - } film_data->current_chunk++; return 1; err_out: if (dp) free_demux_packet(dp); - return NULL; + return 0; } static demuxer_t* demux_open_film(demuxer_t* demuxer) { sh_video_t *sh_video = NULL; sh_audio_t *sh_audio = NULL; - film_data_t *film_data; film_chunk_t film_chunk; int header_size; unsigned int chunk_type; @@ -242,11 +231,7 @@ static demuxer_t* demux_open_film(demuxe int counting_chunks; unsigned int total_audio_bytes = 0; - film_data = malloc(sizeof(film_data_t)); - film_data->total_chunks = 0; - film_data->current_chunk = 0; - film_data->chunks = NULL; - film_data->chunks_per_second = 0; + film_data_t *film_data = calloc(1, sizeof(*film_data)); // go back to the beginning stream_reset(demuxer->stream);

1 0

r36628 - trunk/libmpdemux/demux_film.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 12:30:05 2014 New Revision: 36628 Log: film: Fix memory leaks in error cases. Modified: trunk/libmpdemux/demux_film.c Modified: trunk/libmpdemux/demux_film.c ============================================================================== --- trunk/libmpdemux/demux_film.c Sun Jan 19 12:13:04 2014 (r36627) +++ trunk/libmpdemux/demux_film.c Sun Jan 19 12:30:05 2014 (r36628) @@ -108,7 +108,7 @@ static int demux_film_fill_buffer(demuxe film_data_t *film_data = (film_data_t *)demuxer->priv; film_chunk_t film_chunk; int length_fix_bytes; - demux_packet_t* dp; + demux_packet_t* dp = NULL; // see if the end has been reached if (film_data->current_chunk >= film_data->total_chunks) @@ -128,7 +128,7 @@ static int demux_film_fill_buffer(demuxe dp = new_demux_packet(film_chunk.chunk_size); if (stream_read(demuxer->stream, dp->buffer, film_chunk.chunk_size) != film_chunk.chunk_size) - return 0; + goto err_out; dp->pts = film_chunk.pts; dp->pos = film_chunk.chunk_offset; dp->flags = 0; @@ -171,6 +171,7 @@ static int demux_film_fill_buffer(demuxe // append packet to DS stream ds_add_packet(demuxer->audio, dp); + dp = NULL; } } else @@ -188,13 +189,13 @@ static int demux_film_fill_buffer(demuxe // these CVID data chunks have a few extra bytes; skip them if (stream_read(demuxer->stream, dp->buffer, 10) != 10) - return 0; + goto err_out; stream_skip(demuxer->stream, length_fix_bytes); if (stream_read(demuxer->stream, dp->buffer + 10, film_chunk.chunk_size - (10 + length_fix_bytes)) != (film_chunk.chunk_size - (10 + length_fix_bytes))) - return 0; + goto err_out; dp->pts = film_chunk.pts; dp->pos = film_chunk.chunk_offset; @@ -208,6 +209,7 @@ static int demux_film_fill_buffer(demuxe // append packet to DS stream ds_add_packet(demuxer->video, dp); + dp = NULL; } else { @@ -219,6 +221,10 @@ static int demux_film_fill_buffer(demuxe film_data->current_chunk++; return 1; + +err_out: + if (dp) free_demux_packet(dp); + return NULL; } static demuxer_t* demux_open_film(demuxer_t* demuxer)

1 0

r36627 - trunk/asxparser.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 12:13:04 2014 New Revision: 36627 Log: asxparser: Declare variables in the blocks that need them. Modified: trunk/asxparser.c Modified: trunk/asxparser.c ============================================================================== --- trunk/asxparser.c Sun Jan 19 12:13:03 2014 (r36626) +++ trunk/asxparser.c Sun Jan 19 12:13:04 2014 (r36627) @@ -98,13 +98,14 @@ asx_parser_free(ASX_Parser_t* parser) { int asx_parse_attribs(ASX_Parser_t* parser,char* buffer,char*** _attribs) { - char *ptr1, *ptr2, *ptr3; + char *ptr1; int n_attrib = 0; char **attribs = NULL; - char *attrib, *val; ptr1 = buffer; while(1) { + char *ptr2, *ptr3; + char *attrib, *val; for( ; strchr(SPACE,*ptr1) != NULL; ptr1++) { // Skip space if(*ptr1 == '\0') break; } @@ -481,14 +482,14 @@ asx_parse_entryref(ASX_Parser_t* parser, static play_tree_t* asx_parse_entry(ASX_Parser_t* parser,char* buffer,char** _attribs) { - char *element,*body,**attribs; - int r,nref=0; + int nref=0; play_tree_t *ref; ref = play_tree_new(); while(buffer && buffer[0] != '\0') { - r = asx_get_element(parser,&buffer,&element,&body,&attribs); + char *element,*body,**attribs; + int r = asx_get_element(parser,&buffer,&element,&body,&attribs); if(r < 0) { asx_warning_body_parse_error(parser,"ENTRY"); return NULL; @@ -516,10 +517,8 @@ asx_parse_entry(ASX_Parser_t* parser,cha static play_tree_t* asx_parse_repeat(ASX_Parser_t* parser,char* buffer,char** _attribs) { - char *element,*body,**attribs; play_tree_t *repeat, *list=NULL, *entry; char* count; - int r; repeat = play_tree_new(); @@ -535,7 +534,8 @@ asx_parse_repeat(ASX_Parser_t* parser,ch } while(buffer && buffer[0] != '\0') { - r = asx_get_element(parser,&buffer,&element,&body,&attribs); + char *element,*body,**attribs; + int r = asx_get_element(parser,&buffer,&element,&body,&attribs); if(r < 0) { asx_warning_body_parse_error(parser,"REPEAT"); return NULL;

1 0

r36626 - trunk/libmpdemux/demux_rawdv.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 12:13:03 2014 New Revision: 36626 Log: rawdv: various small code improvements. Modified: trunk/libmpdemux/demux_rawdv.c Modified: trunk/libmpdemux/demux_rawdv.c ============================================================================== --- trunk/libmpdemux/demux_rawdv.c Sun Jan 19 12:13:02 2014 (r36625) +++ trunk/libmpdemux/demux_rawdv.c Sun Jan 19 12:13:03 2014 (r36626) @@ -98,10 +98,7 @@ static int rawdv_check_file(demuxer_t *d && ((td->height==576) || (td->height==480))) result=1; dv_decoder_free(td); - if (result) - return DEMUXER_TYPE_RAWDV; - else - return 0; + return result ? DEMUXER_TYPE_RAWDV : 0; } // return value: @@ -146,7 +143,7 @@ static demuxer_t* demux_open_rawdv(demux { unsigned char dv_frame[DV_PAL_FRAME_SIZE]; sh_video_t *sh_video = NULL; - rawdv_frames_t *frames = malloc(sizeof(rawdv_frames_t)); + rawdv_frames_t *frames = calloc(1, sizeof(*frames)); dv_decoder_t *dv_decoder=NULL; mp_msg(MSGT_DEMUXER,MSGL_V,"demux_open_rawdv() end_pos %"PRId64"\n",(int64_t)demuxer->stream->end_pos); @@ -237,11 +234,8 @@ static demuxer_t* demux_open_rawdv(demux static void demux_close_rawdv(demuxer_t* demuxer) { - rawdv_frames_t *frames = demuxer->priv; - - if(frames==0) - return; - free(frames); + free(demuxer->priv); + demuxer->priv = NULL; } static int demux_rawdv_control(demuxer_t *demuxer,int cmd, void *arg) { @@ -250,11 +244,11 @@ static int demux_rawdv_control(demuxer_t switch(cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: - *((double *)arg)=(double)frames->frame_number / sh_video->fps; + *(double *)arg=(double)frames->frame_number / sh_video->fps; return DEMUXER_CTRL_OK; case DEMUXER_CTRL_GET_PERCENT_POS: - *((int *)arg)=(int)(frames->current_frame * 100. / frames->frame_number); + *(int *)arg=(int)(frames->current_frame * 100. / frames->frame_number); return DEMUXER_CTRL_OK; default:

1 0