June 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r29391 - trunk/libvo/geometry.c
by reimar 26 Jun '09

26 Jun '09

Author: reimar Date: Fri Jun 26 15:34:40 2009 New Revision: 29391 Log: 100l, RESET_GEOMETRY must reset values to INT_MIN, not -1, -1 is a valid value for e.g. the offsets. Patch by Benson Mitchell [benson mitchell gmail com] Modified: trunk/libvo/geometry.c Modified: trunk/libvo/geometry.c ============================================================================== --- trunk/libvo/geometry.c Thu Jun 25 22:06:03 2009 (r29390) +++ trunk/libvo/geometry.c Fri Jun 26 15:34:40 2009 (r29391) @@ -30,7 +30,7 @@ char *vo_geometry = NULL; int geometry_wh_changed = 0; int geometry_xy_changed = 0; -#define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = -1; +#define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = INT_MIN; // xpos,ypos: position of the left upper corner // widw,widh: width and height of the window

1 0

r29387 - trunk/configure
by diego 24 Jun '09

24 Jun '09

Author: diego Date: Thu Jun 25 01:31:17 2009 New Revision: 29387 Log: Modern Solaris versions have different default CD-ROM devices. patch by Pawel Tecza, ptecza uw.edu pl Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jun 24 10:13:52 2009 (r29386) +++ trunk/configure Thu Jun 25 01:31:17 2009 (r29387) @@ -5770,6 +5770,9 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0a" elif sunos ; then default_cdrom_device="/vol/dev/aliases/cdrom0" + # Modern Solaris versions use HAL instead of the vold daemon, the volfs + # file system and the volfs service. + test -r "/cdrom/cdrom0" && default_cdrom_device="/cdrom/cdrom0" elif amigaos ; then default_cdrom_device="a1ide.device:2" else

1 0

r29386 - trunk/libmpdemux/demux_lavf.c
by reimar 24 Jun '09

24 Jun '09

Author: reimar Date: Wed Jun 24 10:13:52 2009 New Revision: 29386 Log: AVStream.language is deprecated, switch to av_get_metadata instead. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Wed Jun 24 10:06:46 2009 (r29385) +++ trunk/libmpdemux/demux_lavf.c Wed Jun 24 10:13:52 2009 (r29386) @@ -220,6 +220,7 @@ static void handle_stream(demuxer_t *dem lavf_priv_t *priv= demuxer->priv; AVStream *st= avfc->streams[i]; AVCodecContext *codec= st->codec; + AVMetadataTag *lang = av_metadata_get(st->metadata, "language", NULL, 0); int g; switch(codec->codec_type){ @@ -290,8 +291,8 @@ static void handle_stream(demuxer_t *dem sh_audio->format = 0x7; break; } - if (st->language) { - sh_audio->lang = strdup(st->language); + if (lang && lang->value) { + sh_audio->lang = strdup(lang->value); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", i, sh_audio->lang); } if (st->disposition & AV_DISPOSITION_DEFAULT) @@ -396,8 +397,8 @@ static void handle_stream(demuxer_t *dem memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size); sh_sub->extradata_len = codec->extradata_size; } - if (st->language) { - sh_sub->lang = strdup(st->language); + if (lang && lang->value) { + sh_sub->lang = strdup(lang->value); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", priv->sub_streams, sh_sub->lang); } if (st->disposition & AV_DISPOSITION_DEFAULT)

1 0

r29385 - trunk/libmpdemux/demux_lavf.c
by reimar 24 Jun '09

24 Jun '09

Author: reimar Date: Wed Jun 24 10:06:46 2009 New Revision: 29385 Log: Move allocation to avoid a possible memleak if new_sh_audio fails. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Wed Jun 24 10:04:38 2009 (r29384) +++ trunk/libmpdemux/demux_lavf.c Wed Jun 24 10:06:46 2009 (r29385) @@ -225,7 +225,7 @@ static void handle_stream(demuxer_t *dem switch(codec->codec_type){ case CODEC_TYPE_AUDIO:{ int override_tag; - WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); + WAVEFORMATEX *wf; sh_audio_t* sh_audio; sh_audio=new_sh_audio(demuxer, i); mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "lavf", i); @@ -233,6 +233,7 @@ static void handle_stream(demuxer_t *dem break; priv->astreams[priv->audio_streams] = i; priv->audio_streams++; + wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); // For some formats (like PCM) always trust CODEC_ID_* more than codec_tag override_tag= av_codec_get_tag(mp_wav_override_taglists, codec->codec_id); if (override_tag)

1 0

r29384 - trunk/libmpdemux/demux_lavf.c
by reimar 24 Jun '09

24 Jun '09

Author: reimar Date: Wed Jun 24 10:04:38 2009 New Revision: 29384 Log: Remove pointless stream count checks, new_sh_* already checks for that. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Wed Jun 24 09:49:04 2009 (r29383) +++ trunk/libmpdemux/demux_lavf.c Wed Jun 24 10:04:38 2009 (r29384) @@ -227,8 +227,6 @@ static void handle_stream(demuxer_t *dem int override_tag; WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); sh_audio_t* sh_audio; - if(priv->audio_streams >= MAX_A_STREAMS) - break; sh_audio=new_sh_audio(demuxer, i); mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "lavf", i); if(!sh_audio) @@ -309,8 +307,6 @@ static void handle_stream(demuxer_t *dem case CODEC_TYPE_VIDEO:{ sh_video_t* sh_video; BITMAPINFOHEADER *bih; - if(priv->video_streams >= MAX_V_STREAMS) - break; sh_video=new_sh_video(demuxer, i); mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "lavf", i); if(!sh_video) break; @@ -378,8 +374,6 @@ static void handle_stream(demuxer_t *dem case CODEC_TYPE_SUBTITLE:{ sh_sub_t* sh_sub; char type; - if(priv->sub_streams >= MAX_S_STREAMS) - break; /* only support text subtitles for now */ if(codec->codec_id == CODEC_ID_TEXT) type = 't';

1 0

r29383 - trunk/libmpdemux/demux_lavf.c
by reimar 24 Jun '09

24 Jun '09

Author: reimar Date: Wed Jun 24 09:49:04 2009 New Revision: 29383 Log: Print ID_AID_???_LANG and ID_SID_???_LANG in lavf demuxer so that frontends can correctly display the languages of audio and subtitle tracks. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Tue Jun 23 19:50:08 2009 (r29382) +++ trunk/libmpdemux/demux_lavf.c Wed Jun 24 09:49:04 2009 (r29383) @@ -291,8 +291,10 @@ static void handle_stream(demuxer_t *dem sh_audio->format = 0x7; break; } - if (st->language) + if (st->language) { sh_audio->lang = strdup(st->language); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AID_%d_LANG=%s\n", i, sh_audio->lang); + } if (st->disposition & AV_DISPOSITION_DEFAULT) sh_audio->default_track = 1; if(mp_msg_test(MSGT_HEADER,MSGL_V) ) print_wave_header(sh_audio->wf, MSGL_V); @@ -399,8 +401,10 @@ static void handle_stream(demuxer_t *dem memcpy(sh_sub->extradata, codec->extradata, codec->extradata_size); sh_sub->extradata_len = codec->extradata_size; } - if (st->language) + if (st->language) { sh_sub->lang = strdup(st->language); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SID_%d_LANG=%s\n", priv->sub_streams, sh_sub->lang); + } if (st->disposition & AV_DISPOSITION_DEFAULT) sh_sub->default_track = 1; priv->sub_streams++;

1 0

r29382 - trunk/libmpdemux/mp_taglists.c
by reimar 23 Jun '09

23 Jun '09

Author: reimar Date: Tue Jun 23 19:50:08 2009 New Revision: 29382 Log: Fix compilation: codec_wav_tags/codec_bmp_tags were renamed to ff_codec_wav_tags/ff_codec_bmp_tags. Modified: trunk/libmpdemux/mp_taglists.c Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Tue Jun 23 11:35:20 2009 (r29381) +++ trunk/libmpdemux/mp_taglists.c Tue Jun 23 19:50:08 2009 (r29382) @@ -51,7 +51,7 @@ static const AVCodecTag mp_wav_tags[] = { 0, 0 }, }; -const struct AVCodecTag *mp_wav_taglists[] = {codec_wav_tags, mp_wav_tags, 0}; +const struct AVCodecTag *mp_wav_taglists[] = {ff_codec_wav_tags, mp_wav_tags, 0}; static const AVCodecTag mp_wav_override_tags[] = { { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, @@ -96,5 +96,5 @@ static const AVCodecTag mp_bmp_tags[] = { 0, 0 }, }; -const struct AVCodecTag *mp_bmp_taglists[] = {codec_bmp_tags, mp_bmp_tags, 0}; +const struct AVCodecTag *mp_bmp_taglists[] = {ff_codec_bmp_tags, mp_bmp_tags, 0};

1 0

r29381 - trunk/libmpdemux/demux_ts.c
by reimar 23 Jun '09

23 Jun '09

Author: reimar Date: Tue Jun 23 11:35:20 2009 New Revision: 29381 Log: Move printing of ID_AID_???_LANG to ts_add_stream instead of ts_detect_streams. This makes sure it is printed only once per track and after ID_AUDIO_ID. Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Tue Jun 23 11:33:42 2009 (r29380) +++ trunk/libmpdemux/demux_ts.c Tue Jun 23 11:35:20 2009 (r29381) @@ -286,6 +286,7 @@ try_fec: } static int parse_avc_sps(uint8_t *buf, int len, int *w, int *h); +static inline uint8_t *pid_lang_from_pmt(ts_priv_t *priv, int pid); static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es) { @@ -300,6 +301,7 @@ static void ts_add_stream(demuxer_t * de sh_audio_t *sh = new_sh_audio_aid(demuxer, priv->last_aid, es->pid); if(sh) { + const char *lang = pid_lang_from_pmt(priv, es->pid); sh->format = IS_AUDIO(es->type) ? es->type : es->subtype; sh->ds = demuxer->audio; @@ -307,6 +309,8 @@ static void ts_add_stream(demuxer_t * de priv->ts.streams[es->pid].sh = sh; priv->ts.streams[es->pid].type = TYPE_AUDIO; mp_msg(MSGT_DEMUX, MSGL_V, "\r\nADDED AUDIO PID %d, type: %x stream n. %d\r\n", es->pid, sh->format, priv->last_aid); + if (lang && lang[0]) + mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_AID_%d_LANG=%s\n", es->pid, lang); priv->last_aid++; } @@ -706,8 +710,6 @@ static off_t ts_detect_streams(demuxer_t } else if(is_audio) { - if (es.lang[0] > 0) - mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_AID_%d_LANG=%s\n", es.pid, es.lang); if(req_apid > 0) { chosen_pid = (req_apid == es.pid);

1 0

r29380 - trunk/libmpdemux/demux_ts.c
by reimar 23 Jun '09

23 Jun '09

Author: reimar Date: Tue Jun 23 11:33:42 2009 New Revision: 29380 Log: Initialize es->lang to ensure a previous value does not get misattributed to a different track. Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Tue Jun 23 01:35:13 2009 (r29379) +++ trunk/libmpdemux/demux_ts.c Tue Jun 23 11:33:42 2009 (r29380) @@ -2722,6 +2722,7 @@ static int ts_parse(demuxer_t *demuxer , rap_flag = 0; mp4_dec = NULL; es->is_synced = 0; + es->lang[0] = 0; si = NULL; junk = priv->ts.packet_size - TS_PACKET_SIZE;

1 0

r29379 - trunk/configure
by diego 22 Jun '09

22 Jun '09

Author: diego Date: Tue Jun 23 01:35:13 2009 New Revision: 29379 Log: Do not use -rdynamic on Solaris, where the flag is unsupported. patch by Niklas Edmundsson, nikke acc.umu se, Bugzilla #1496 Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 21 12:55:41 2009 (r29378) +++ trunk/configure Tue Jun 23 01:35:13 2009 (r29379) @@ -7954,7 +7954,7 @@ fi # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly) _ld_dl_dynamic='' freebsd || netbsd || openbsd || dragonfly || bsdos && _ld_dl_dynamic='-rdynamic' -if test "$_real" = yes || test "$_xanim" = yes && ! win32 && ! qnx && ! darwin && ! os2 ; then +if test "$_real" = yes || test "$_xanim" = yes && ! win32 && ! qnx && ! darwin && ! os2 && ! sunos; then _ld_dl_dynamic='-rdynamic' fi

1 0