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

r31887 - trunk/libvo/vo_gl.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 19:37:38 2010 New Revision: 31887 Log: Use early return instead of large if block. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun Aug 1 19:36:15 2010 (r31886) +++ trunk/libvo/vo_gl.c Sun Aug 1 19:37:38 2010 (r31887) @@ -760,7 +760,8 @@ static void create_osd_texture(int x0, i static void do_render_osd(int type) { int draw_osd = (type & RENDER_OSD) && osdtexCnt > 0; int draw_eosd = (type & RENDER_EOSD) && eosdDispList; - if (draw_osd || draw_eosd) { + if (!draw_osd && !draw_eosd) + return; // set special rendering parameters if (!scaled_osd) { mpglMatrixMode(GL_PROJECTION); @@ -788,7 +789,6 @@ static void do_render_osd(int type) { if (!scaled_osd) mpglPopMatrix(); mpglBindTexture(gl_target, 0); - } } static void draw_osd(void)

1 0

r31886 - trunk/libvo/vo_gl.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 19:36:15 2010 New Revision: 31886 Log: More readable OSD rendering code. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun Aug 1 15:58:35 2010 (r31885) +++ trunk/libvo/vo_gl.c Sun Aug 1 19:36:15 2010 (r31886) @@ -751,11 +751,16 @@ static void create_osd_texture(int x0, i osdtexCnt++; } +#define RENDER_OSD 1 +#define RENDER_EOSD 2 + /** * \param type bit 0: render OSD, bit 1: render EOSD */ static void do_render_osd(int type) { - if (((type & 1) && osdtexCnt > 0) || ((type & 2) && eosdDispList)) { + int draw_osd = (type & RENDER_OSD) && osdtexCnt > 0; + int draw_eosd = (type & RENDER_EOSD) && eosdDispList; + if (draw_osd || draw_eosd) { // set special rendering parameters if (!scaled_osd) { mpglMatrixMode(GL_PROJECTION); @@ -764,11 +769,11 @@ static void do_render_osd(int type) { mpglOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); } mpglEnable(GL_BLEND); - if ((type & 2) && eosdDispList) { + if (draw_eosd) { mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); mpglCallList(eosdDispList); } - if ((type & 1) && osdtexCnt > 0) { + if (draw_osd) { mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); // draw OSD #ifndef FAST_OSD @@ -797,7 +802,7 @@ static void draw_osd(void) vo_draw_text_ext(osd_w, osd_h, ass_border_x, ass_border_y, ass_border_x, ass_border_y, image_width, image_height, create_osd_texture); } - if (vo_doublebuffering) do_render_osd(1); + if (vo_doublebuffering) do_render_osd(RENDER_OSD); } static void do_render(void) { @@ -840,14 +845,14 @@ static void flip_page(void) { mpglClear(GL_COLOR_BUFFER_BIT); } else { do_render(); - do_render_osd(3); + do_render_osd(RENDER_OSD | RENDER_EOSD); if (use_glFinish) mpglFinish(); else mpglFlush(); } } static void redraw(void) { - if (vo_doublebuffering) { do_render(); do_render_osd(3); } + if (vo_doublebuffering) { do_render(); do_render_osd(RENDER_OSD | RENDER_EOSD); } flip_page(); } @@ -1314,7 +1319,7 @@ static int control(uint32_t request, voi if (!data) return VO_FALSE; genEOSD(data); - if (vo_doublebuffering) do_render_osd(2); + if (vo_doublebuffering) do_render_osd(RENDER_EOSD); return VO_TRUE; case VOCTRL_GET_EOSD_RES: {

1 0

r31885 - trunk/cfg-common.h
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 15:58:35 2010 New Revision: 31885 Log: Also allow setting msglevel for MSGT_FIXME. Modified: trunk/cfg-common.h Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Sun Aug 1 15:53:04 2010 (r31884) +++ trunk/cfg-common.h Sun Aug 1 15:58:35 2010 (r31885) @@ -238,6 +238,7 @@ const m_option_t msgl_config[]={ { "identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, { "ass", &mp_msg_levels[MSGT_ASS], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, { "statusline", &mp_msg_levels[MSGT_STATUSLINE], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, + { "fixme", &mp_msg_levels[MSGT_FIXME], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, {"help", "Available msg modules:\n" " global - common player errors/information\n" " cplayer - console player (mplayer.c)\n" @@ -283,6 +284,7 @@ const m_option_t msgl_config[]={ " identify - identify output\n" " ass - libass messages\n" " statusline - playback/encoding status line\n" + " fixme - messages not yet fixed to map to module\n" "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL}

1 0

r31884 - trunk/libdvdcss/css.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 15:53:04 2010 New Revision: 31884 Log: Fix typo in documentation. Modified: trunk/libdvdcss/css.c Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c Sun Aug 1 15:52:17 2010 (r31883) +++ trunk/libdvdcss/css.c Sun Aug 1 15:53:04 2010 (r31884) @@ -90,7 +90,7 @@ static int AttackPadding ( uint8_t co /***************************************************************************** * _dvdcss_test: check if the disc is encrypted or not ***************************************************************************** - * Sets b_scrambled, b_ioctl + * Sets b_scrambled, b_ioctls *****************************************************************************/ void _dvdcss_test( dvdcss_t dvdcss ) {

1 0

r31882 - trunk/command.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 15:30:26 2010 New Revision: 31882 Log: Fix subtitle selection: make selecting -sid 0 work again by replacing the M_PROPERTY_STEP_UP hack by M_PROPERTY_SET and set the global sub pos also when we do not yet have a subtitle stream but do know the number of subs from out-of-band as e.g. for DVD. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Sun Aug 1 14:48:38 2010 (r31881) +++ trunk/command.c Sun Aug 1 15:30:26 2010 (r31882) @@ -159,10 +159,16 @@ static void update_global_sub_size(MPCon mpctx->global_sub_size += mpctx->sub_counts[i]; // update global_sub_pos if we auto-detected a demuxer sub - if (mpctx->global_sub_pos == -1 && - mpctx->demuxer->sub && mpctx->demuxer->sub->id >= 0) - mpctx->global_sub_pos = sub_pos_by_source(mpctx, SUB_SOURCE_DEMUX) + - mpctx->demuxer->sub->id; + if (mpctx->global_sub_pos == -1) { + int sub_id = -1; + if (mpctx->demuxer->sub) + sub_id = mpctx->demuxer->sub->id; + if (sub_id < 0) + sub_id = dvdsub_id; + if (sub_id >= 0 && sub_id < mpctx->sub_counts[SUB_SOURCE_DEMUX]) + mpctx->global_sub_pos = sub_pos_by_source(mpctx, SUB_SOURCE_DEMUX) + + sub_id; + } } /** @@ -1666,7 +1672,7 @@ static int mp_property_sub_source(m_opti static int mp_property_sub_by_type(m_option_t *prop, int action, void *arg, MPContext *mpctx) { - int source, is_cur_source, offset; + int source, is_cur_source, offset, new_pos; update_global_sub_size(mpctx); if (!mpctx->sh_video || mpctx->global_sub_size <= 0) return M_PROPERTY_UNAVAILABLE; @@ -1685,6 +1691,7 @@ static int mp_property_sub_by_type(m_opt return M_PROPERTY_UNAVAILABLE; is_cur_source = sub_source(mpctx) == source; + new_pos = mpctx->global_sub_pos; switch (action) { case M_PROPERTY_GET: if (!arg) @@ -1713,14 +1720,14 @@ static int mp_property_sub_by_type(m_opt int index = *(int *)arg; if (source == SUB_SOURCE_VOBSUB) index = vobsub_get_index_by_id(vo_vobsub, index); - mpctx->global_sub_pos = offset + index; + new_pos = offset + index; if (index < 0 || index > mpctx->sub_counts[source]) { - mpctx->global_sub_pos = -1; + new_pos = -1; *(int *) arg = -1; } } else - mpctx->global_sub_pos = -1; + new_pos = -1; break; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: { @@ -1729,27 +1736,27 @@ static int mp_property_sub_by_type(m_opt int step = (step_all > 0) ? 1 : -1; int max_sub_pos_for_source = -1; if (!is_cur_source) - mpctx->global_sub_pos = -1; + new_pos = -1; while (step_all) { - if (mpctx->global_sub_pos == -1) { + if (new_pos == -1) { if (step > 0) - mpctx->global_sub_pos = offset; + new_pos = offset; else if (max_sub_pos_for_source == -1) { // Find max pos for specific source - mpctx->global_sub_pos = mpctx->global_sub_size - 1; - while (mpctx->global_sub_pos >= 0 + new_pos = mpctx->global_sub_size - 1; + while (new_pos >= 0 && sub_source(mpctx) != source) - --mpctx->global_sub_pos; + new_pos--; } else - mpctx->global_sub_pos = max_sub_pos_for_source; + new_pos = max_sub_pos_for_source; } else { - mpctx->global_sub_pos += step; - if (mpctx->global_sub_pos < offset || - mpctx->global_sub_pos >= mpctx->global_sub_size || + new_pos += step; + if (new_pos < offset || + new_pos >= mpctx->global_sub_size || sub_source(mpctx) != source) - mpctx->global_sub_pos = -1; + new_pos = -1; } step_all -= step; } @@ -1758,8 +1765,7 @@ static int mp_property_sub_by_type(m_opt default: return M_PROPERTY_NOT_IMPLEMENTED; } - --mpctx->global_sub_pos; - return mp_property_sub(prop, M_PROPERTY_STEP_UP, NULL, mpctx); + return mp_property_sub(prop, M_PROPERTY_SET, &new_pos, mpctx); } /// Subtitle delay (RW)

1 0

r31881 - trunk/libdvdcss/css.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 14:48:38 2010 New Revision: 31881 Log: Fix DVD playback with region-free drives. Modified: trunk/libdvdcss/css.c Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c Sun Aug 1 00:15:49 2010 (r31880) +++ trunk/libdvdcss/css.c Sun Aug 1 14:48:38 2010 (r31881) @@ -94,7 +94,6 @@ static int AttackPadding ( uint8_t co * 1: DVD is scrambled but can be read * 0: DVD is not scrambled and can be read * -1: could not get "copyright" information - * -2: could not get RPC information (reading the disc might be possible) * -3: drive is RPC-II, region is not set, and DVD is scrambled: the RPC * scheme will prevent us from reading the scrambled data *****************************************************************************/ @@ -139,7 +138,9 @@ int _dvdcss_test( dvdcss_t dvdcss ) if( i_ret < 0 ) { print_error( dvdcss, "css error: could not get RPC status" ); - return -2; + // do not return an error, the drive might be a region-free one + // and we definitely should not just fail for that case. + return i_copyright ? 1 : 0; } switch( i_rpc )

1 0