November 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r35961 - in trunk: Changelog input/input.c libvo/x11_common.c osdep/getch2.c osdep/keycodes.h
by reimar 13 Feb '14

13 Feb '14

Author: reimar Date: Thu Mar 14 20:59:35 2013 New Revision: 35961 Log: Add support for binding any key in UTF-8 range. X11 part is a bit hackish since we need to use setlocale to get desired behaviour for XLookupString. Modified: trunk/Changelog trunk/input/input.c trunk/libvo/x11_common.c trunk/osdep/getch2.c trunk/osdep/keycodes.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/Changelog Thu Mar 14 20:59:35 2013 (r35961) @@ -13,6 +13,7 @@ MPlayer better than -vo gl (it is in many ways worse). * Fixes for DVB, teletext and closed-caption based subtitles. * Support teletext and CC subtitles in WTV. + * Support binding keys corresponding to non-ASCII characters. 1.1: "We gave up on 1.0" Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/input/input.c Thu Mar 14 20:59:35 2013 (r35961) @@ -38,6 +38,7 @@ #include "osdep/getch2.h" #include "osdep/keycodes.h" #include "osdep/timer.h" +#include "libavutil/common.h" #include "libavutil/avstring.h" #include "mp_msg.h" #include "help_mp.h" @@ -1474,6 +1475,7 @@ mp_input_get_key_name(int key) { int mp_input_get_key_from_name(const char *name) { + uint32_t utf8 = 0; int i,ret = 0,len = strlen(name); if(len == 1) { // Direct key code ret = (unsigned char)name[0]; @@ -1486,6 +1488,10 @@ mp_input_get_key_from_name(const char *n return key_names[i].key; } + GET_UTF8(utf8, (uint8_t)*name++, return -1;) + if (*name == 0 && utf8 < KEY_BASE) + return utf8; + return -1; } Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/libvo/x11_common.c Thu Mar 14 20:59:35 2013 (r35961) @@ -21,6 +21,7 @@ #include <math.h> #include <inttypes.h> #include <limits.h> +#include <locale.h> #include "config.h" #include "mp_msg.h" @@ -427,6 +428,9 @@ int vo_init(void) return 1; // already called } + // Required so that XLookupString returns UTF-8 + if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) + mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will no be handled.\n"); XSetErrorHandler(x11_errorhandler); dispName = XDisplayName(mDisplayName); @@ -810,11 +814,22 @@ static int check_resize(void) return rc; } +static int to_utf8(const uint8_t *in) +{ + uint32_t v = 0; + GET_UTF8(v, *in++, goto err;) + if (*in || v >= KEY_BASE) + goto err; + return v; +err: + return 0; +} + int vo_x11_check_events(Display * mydisplay) { int ret = 0; XEvent Event; - char buf[100]; + uint8_t buf[16] = {0}; KeySym keySym; static XComposeStatus stat; static int ctrl_state; @@ -852,7 +867,7 @@ int vo_x11_check_events(Display * mydisp case KeyPress: case KeyRelease: { - int key; + int key, utf8; #ifdef CONFIG_GUI if ( use_gui ) { break; } @@ -863,6 +878,8 @@ int vo_x11_check_events(Display * mydisp key = ((keySym & 0xff00) != 0 ? ((keySym & 0x00ff) + 256) : (keySym)); + utf8 = to_utf8(buf); + if (utf8) key = 0; if (key == wsLeftCtrl || key == wsRightCtrl) { ctrl_state = Event.type == KeyPress; mplayer_put_key(KEY_CTRL | @@ -880,7 +897,8 @@ int vo_x11_check_events(Display * mydisp (ctrl_state ? MP_KEY_DOWN : 0)); } if (!vo_x11_putkey_ext(keySym)) { - vo_x11_putkey(key); + if (utf8) mplayer_put_key(utf8); + else vo_x11_putkey(key); } ret |= VO_EVENT_KEYPRESS; } Modified: trunk/osdep/getch2.c ============================================================================== --- trunk/osdep/getch2.c Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/getch2.c Thu Mar 14 20:59:35 2013 (r35961) @@ -60,6 +60,7 @@ #include "mp_fifo.h" #include "keycodes.h" #include "getch2.h" +#include "libavutil/common.h" #ifdef HAVE_TERMIOS static struct termios tio_orig; @@ -201,6 +202,14 @@ void getch2(void) len = 2; } code = KEY_ENTER; + } else if (code >= 0xc0) { + uint32_t utf8 = 0; + i = 0; + GET_UTF8(utf8, (i < getch2_len ? getch2_buf[i++] : 0), goto not_utf8;) + if (utf8 < KEY_BASE) { + code = utf8; + len = i; + } } } else if (getch2_len > 1) { @@ -262,6 +271,7 @@ void getch2(void) } } } + not_utf8: found: getch2_len -= len; for (i = 0; i < getch2_len; i++) Modified: trunk/osdep/keycodes.h ============================================================================== --- trunk/osdep/keycodes.h Wed Mar 13 11:13:13 2013 (r35960) +++ trunk/osdep/keycodes.h Thu Mar 14 20:59:35 2013 (r35961) @@ -23,7 +23,7 @@ #ifndef MPLAYER_KEYCODES_H #define MPLAYER_KEYCODES_H -#define KEY_BASE 0x100 +#define KEY_BASE 0x1000000 enum { KEY_TAB = 9, @@ -76,7 +76,7 @@ enum { KEY_VOLUME_DOWN, KEY_MUTE, /* Special internal/virtual keys */ - KEY_CLOSE_WIN = 0x1000, + KEY_CLOSE_WIN = KEY_BASE + 0x1000, }; /* Control keys short name */

3 10

r36526 - in trunk/gui: interface.c win32/interface.c
by ib 29 Nov '13

29 Nov '13

Author: ib Date: Fri Nov 29 14:10:31 2013 New Revision: 36526 Log: Don't discard current DVD track information without cause. In case STREAM_CTRL_GET_CURRENT_TITLE fails, use the information the GUI already has (though it might be inaccurate in extremely rare cases). Modified: trunk/gui/interface.c trunk/gui/win32/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Fri Nov 29 13:41:32 2013 (r36525) +++ trunk/gui/interface.c Fri Nov 29 14:10:31 2013 (r36526) @@ -628,9 +628,8 @@ int gui(int what, void *data) stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Chapters); guiInfo.Angles = 0; stream_control(stream, STREAM_CTRL_GET_NUM_ANGLES, &guiInfo.Angles); - guiInfo.Track = 0; - stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track); - guiInfo.Track++; + if (stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track) == STREAM_OK) + guiInfo.Track++; // guiInfo.Chapter will be set by mplayer guiInfo.Angle = 1; stream_control(stream, STREAM_CTRL_GET_ANGLE, &guiInfo.Angle); Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Fri Nov 29 13:41:32 2013 (r36525) +++ trunk/gui/win32/interface.c Fri Nov 29 14:10:31 2013 (r36526) @@ -664,9 +664,8 @@ int gui(int what, void *data) stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Chapters); guiInfo.Angles = 0; stream_control(stream, STREAM_CTRL_GET_NUM_ANGLES, &guiInfo.Angles); - guiInfo.Track = 0; - stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track); - guiInfo.Track++; + if (stream_control(stream, STREAM_CTRL_GET_CURRENT_TITLE, &guiInfo.Track) == STREAM_OK) + guiInfo.Track++; // guiInfo.Chapter will be set by mplayer guiInfo.Angle = 1; stream_control(stream, STREAM_CTRL_GET_ANGLE, &guiInfo.Angle);

1 0

r36525 - in trunk: Changelog DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/app/app.c gui/app/app.h gui/app/cfg.c gui/app/cfg.h gui/app/gui.h gui/dialog/m...
by ib 29 Nov '13

29 Nov '13

Author: ib Date: Fri Nov 29 13:41:32 2013 New Revision: 36525 Log: Add support for TV/DVB to the GUI. Support is limited to a single (resp. the first) card. At the same time, add the new GUI option 'gui_tv_digital', the new GUI message 'evPlayTV' and the new GUI font symbol 'b'. Additionally, update the documentation. Added: trunk/gui/dialog/pixmaps/tv.xpm Modified: trunk/Changelog trunk/gui/app/app.c trunk/gui/app/app.h trunk/gui/app/cfg.c trunk/gui/app/cfg.h trunk/gui/app/gui.h trunk/gui/dialog/menu.c trunk/gui/dialog/preferences.c trunk/gui/interface.c trunk/gui/ui/actions.c trunk/gui/ui/render.c trunk/gui/util/string.c trunk/gui/win32/skinload.c trunk/gui/win32/skinload.h Changes in other areas also in this revision: Modified: trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/en/mplayer.1 trunk/DOCS/xml/de/skin.xml trunk/DOCS/xml/en/skin.xml trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/Changelog Fri Nov 29 13:41:32 2013 (r36525) @@ -30,6 +30,9 @@ MPlayer * Android: -wid is supported. This should allow using MPlayer in slave mode, a native window pointer needs to be passed as -wid. Untested. + GUI: + * Support for TV/DVB + 1.1: "We gave up on 1.0" Decoders: Modified: trunk/gui/app/app.c ============================================================================== --- trunk/gui/app/app.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/app/app.c Fri Nov 29 13:41:32 2013 (r36525) @@ -57,6 +57,7 @@ static const evName evNames[] = { { evPlayDVD, "evPlayDVD" }, { evLoadURL, "evSetURL" }, // legacy { evLoadURL, "evLoadURL" }, + { evPlayTV, "evPlayTV" }, { evPlaySwitchToPause, "evPlaySwitchToPause" }, { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, { evBackward10sec, "evBackward10sec" }, Modified: trunk/gui/app/app.h ============================================================================== --- trunk/gui/app/app.h Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/app/app.h Fri Nov 29 13:41:32 2013 (r36525) @@ -40,6 +40,7 @@ enum { evPlayVCD, evPlayDVD, evLoadURL, + evPlayTV, evPlaySwitchToPause, evPauseSwitchToPlay, evBackward10sec, Modified: trunk/gui/app/cfg.c ============================================================================== --- trunk/gui/app/cfg.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/app/cfg.c Fri Nov 29 13:41:32 2013 (r36525) @@ -45,6 +45,11 @@ #include "sub/font_load.h" #include "sub/sub.h" +guiTV_t guiTV[2] = { + { STREAMTYPE_TV, "tv" }, + { STREAMTYPE_DVB, "dvb" } +}; + m_config_t *gui_conf; int gtkCacheOn; @@ -93,6 +98,8 @@ int gui_main_pos_y = -3; int gui_video_pos_x = -3; int gui_video_pos_y = -3; +int gui_tv_digital = True; + int guiWinID = -1; char *skinName; @@ -174,6 +181,10 @@ static const m_option_t gui_opts[] = { { "idle", &player_idle_mode, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL }, +#ifdef CONFIG_TV + { "gui_tv_digital", &gui_tv_digital, CONF_TYPE_FLAG, 0, 0, 1, NULL }, +#endif + // NOTE TO MYSELF: Do we really need all/any non-gtkOptions, i.e. override mplayer options? { "gui_skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL }, Modified: trunk/gui/app/cfg.h ============================================================================== --- trunk/gui/app/cfg.h Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/app/cfg.h Fri Nov 29 13:41:32 2013 (r36525) @@ -22,6 +22,13 @@ #include "m_config.h" #include "m_option.h" +typedef struct { + int StreamType; + char *SchemeName; +} guiTV_t; + +extern guiTV_t guiTV[2]; + extern m_config_t *gui_conf; extern int gtkCacheOn; @@ -82,6 +89,7 @@ extern int gui_main_pos_x; extern int gui_main_pos_y; extern int gui_video_pos_x; extern int gui_video_pos_y; +extern int gui_tv_digital; extern int guiWinID; Modified: trunk/gui/app/gui.h ============================================================================== --- trunk/gui/app/gui.h Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/app/gui.h Fri Nov 29 13:41:32 2013 (r36525) @@ -41,6 +41,9 @@ /// StreamTypes that are permitted in a playlist #define isPlaylistStreamtype (guiInfo.StreamType == STREAMTYPE_FILE || guiInfo.StreamType == STREAMTYPE_STREAM) +/// StreamTypes that permit seeking +#define isSeekableStreamtype (guiInfo.StreamType != STREAMTYPE_STREAM && guiInfo.StreamType != STREAMTYPE_TV && guiInfo.StreamType != STREAMTYPE_DVB) + /// Check whether @a x/y is inside the rectangle given by @a top @a x/y and @a bottom @a x/y. #define isInside(x, y, tx, ty, bx, by) ((x) > (tx) && (y) > (ty) && (x) < (bx) && (y) < (by)) Modified: trunk/gui/dialog/menu.c ============================================================================== --- trunk/gui/dialog/menu.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/dialog/menu.c Fri Nov 29 13:41:32 2013 (r36525) @@ -86,6 +86,9 @@ #include "pixmaps/audiolang.xpm" #include "pixmaps/sublang.xpm" #endif +#ifdef CONFIG_TV +#include "pixmaps/tv.xpm" +#endif #include "pixmaps/empty1px.xpm" int gtkPopupMenu; @@ -561,6 +564,9 @@ GtkWidget * CreatePopUpMenu( void ) } #endif AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evLoadURL ); +#ifdef CONFIG_TV + AddMenuItem( window1, (const char*)tv_xpm, SubMenu,MSGTR_MENU_PlayTV, evPlayTV ); +#endif AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_MENU_LoadSubtitle" ", evLoadSubtitle ); AddMenuItem( window1, (const char*)nosub_xpm, SubMenu,MSGTR_MENU_DropSubtitle,evDropSubtitle ); AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_MENU_LoadExternAudioFile, evLoadAudioFile ); Added: trunk/gui/dialog/pixmaps/tv.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/dialog/pixmaps/tv.xpm Fri Nov 29 13:41:32 2013 (r36525) @@ -0,0 +1,28 @@ +/* XPM */ +static const char * const tv_xpm[] = { +"16 16 8 1", +" c #000000", +"! c #FFFFFF", +"# c #666666", +"$ c #999999", +"% c #B3B3B3", +"& c #CCCCCC", +"' c #E6E6E6", +"( c None", +"((((((((((((((((", +"((((((((((((((((", +"( (", +" !!!!!!!!!!!! ", +" ! ! ", +" ! #$%&''&%$# ! ", +" ! #$%&!!&%$# ! ", +" ! #$%&!!&%$# ! ", +" ! #$%&!!&%$# ! ", +" ! #$%&!!&%$# ! ", +" ! #$%&''&%$# ! ", +" ! ! ", +" !!!!!!!!!!!! ", +"( (", +"((((((((((((((((", +"((((((((((((((((" +}; Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/dialog/preferences.c Fri Nov 29 13:41:32 2013 (r36525) @@ -108,6 +108,7 @@ static GtkWidget * CBSaveWinPos; static GtkWidget * CBStopXScreenSaver; static GtkWidget * CBPlayBar; static GtkWidget * CBNoIdle; +static GtkWidget * CBTVDigital; static GtkWidget * SBCache; static GtkAdjustment * SBCacheadj; @@ -333,6 +334,7 @@ static void prButton( GtkButton * button gtkShowVideoWindow=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ); stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) ); gtkEnablePlayBar=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPlayBar ) ); + gui_tv_digital=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBTVDigital ) ); player_idle_mode=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoIdle ) ); mplayer( MPLAYER_SET_AUTO_QUALITY,HSPPQualityadj->value,0 ); @@ -967,6 +969,7 @@ static GtkWidget * CreatePreferences( vo CBSaveWinPos=gtkAddCheckButton( MSGTR_PREFERENCES_SaveWinPos,vbox602 ); CBStopXScreenSaver=gtkAddCheckButton( MSGTR_PREFERENCES_XSCREENSAVER,vbox602 ); CBPlayBar=gtkAddCheckButton( MSGTR_PREFERENCES_PlayBar,vbox602 ); + CBTVDigital=gtkAddCheckButton( MSGTR_PREFERENCES_TV_Digital,vbox602 ); CBNoIdle=gtkAddCheckButton( MSGTR_PREFERENCES_NoIdle,vbox602 ); gtkAddHSeparator( vbox602 ); @@ -1272,6 +1275,10 @@ void ShowPreferences( void ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPlayBar ),0 ); gtk_widget_set_sensitive( CBPlayBar,FALSE ); } + gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBTVDigital ),gui_tv_digital ); +#ifndef CONFIG_TV + gtk_widget_set_sensitive( CBTVDigital,FALSE ); +#endif gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoIdle ),!player_idle_mode ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBCache ),0 ); Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/interface.c Fri Nov 29 13:41:32 2013 (r36525) @@ -23,6 +23,7 @@ #include "interface.h" #include "app/app.h" +#include "app/cfg.h" #include "app/gui.h" #include "dialog/dialog.h" #include "skin/skin.h" @@ -437,6 +438,15 @@ int gui(int what, void *data) dvd_angle = guiInfo.Angle; #endif break; + + case STREAMTYPE_TV: + case STREAMTYPE_DVB: + { + char tmp[512]; + + sprintf(tmp, "%s://", guiTV[gui_tv_digital].SchemeName); + uiSetFile(NULL, tmp, SAME_STREAMTYPE); + } } /* video opts */ @@ -632,6 +642,11 @@ int gui(int what, void *data) memcpy(guiInfo.Subtitle, dvd->subtitles, sizeof(dvd->subtitles)); #endif break; + + case STREAMTYPE_TV: + case STREAMTYPE_DVB: + guiInfo.Tracks = 1; + break; } break; @@ -652,7 +667,7 @@ int gui(int what, void *data) if (guiInfo.sh_video) guiInfo.CodecName = strdup(guiInfo.sh_video->codec->name); - state = (guiInfo.StreamType == STREAMTYPE_STREAM ? btnDisabled : btnReleased); + state = (isSeekableStreamtype ? btnReleased : btnDisabled); btnSet(evForward10sec, state); btnSet(evBackward10sec, state); btnSet(evForward1min, state); Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/ui/actions.c Fri Nov 29 13:41:32 2013 (r36525) @@ -76,6 +76,8 @@ static void MediumPrepare(int type) case STREAMTYPE_CDDA: case STREAMTYPE_VCD: + case STREAMTYPE_TV: + case STREAMTYPE_DVB: listMgr(PLAYLIST_DELETE, 0); case STREAMTYPE_FILE: case STREAMTYPE_STREAM: @@ -175,6 +177,12 @@ void uiEvent(int ev, float param) goto play; #endif +#ifdef CONFIG_TV + case evPlayTV: + guiInfo.StreamType = guiTV[gui_tv_digital].StreamType; + goto play; + +#endif case evPlay: case evPlaySwitchToPause: play: @@ -198,6 +206,8 @@ play: case STREAMTYPE_CDDA: case STREAMTYPE_VCD: case STREAMTYPE_DVD: + case STREAMTYPE_TV: + case STREAMTYPE_DVB: if (!guiInfo.Track) guiInfo.Track = (guiInfo.StreamType == STREAMTYPE_VCD ? 2 : 1); @@ -507,6 +517,8 @@ void uiPlay(void) if (guiInfo.StreamType != STREAMTYPE_CDDA && guiInfo.StreamType != STREAMTYPE_VCD && guiInfo.StreamType != STREAMTYPE_DVD && + guiInfo.StreamType != STREAMTYPE_TV && + guiInfo.StreamType != STREAMTYPE_DVB && (!guiInfo.Filename || (guiInfo.Filename[0] == 0))) return; @@ -721,6 +733,8 @@ void uiCurr(void) case STREAMTYPE_CDDA: case STREAMTYPE_VCD: case STREAMTYPE_DVD: + case STREAMTYPE_TV: + case STREAMTYPE_DVB: break; @@ -786,6 +800,14 @@ void uiPrev(void) break; + case STREAMTYPE_TV: + case STREAMTYPE_DVB: + + if (guiInfo.Playing == GUI_PLAY) + mp_input_queue_cmd(mp_input_parse_cmd("tv_step_channel -1")); + + return; + default: prev = listMgr(PLAYLIST_ITEM_GET_PREV, 0); @@ -846,6 +868,14 @@ void uiNext(void) break; + case STREAMTYPE_TV: + case STREAMTYPE_DVB: + + if (guiInfo.Playing == GUI_PLAY) + mp_input_queue_cmd(mp_input_parse_cmd("tv_step_channel 1")); + + return; + default: next = listMgr(PLAYLIST_ITEM_GET_NEXT, 0); Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/ui/render.c Fri Nov 29 13:41:32 2013 (r36525) @@ -216,6 +216,11 @@ calclengthmmmmss: av_strlcat(trbuf, "d", sizeof(trbuf)); break; + case STREAMTYPE_TV: + case STREAMTYPE_DVB: + av_strlcat(trbuf, "b", sizeof(trbuf)); + break; + default: av_strlcat(trbuf, " ", sizeof(trbuf)); break; Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/util/string.c Fri Nov 29 13:41:32 2013 (r36525) @@ -325,6 +325,17 @@ char *TranslateFilename(int how, char *f break; + case STREAMTYPE_TV: + case STREAMTYPE_DVB: + + p = MSGTR_NoChannelName; + + if (guiInfo.mpcontext->stream) + stream_control(guiInfo.mpcontext->stream, STREAM_CTRL_GET_CURRENT_CHANNEL, &p); + + av_strlcpy(fname, p, maxlen); + break; + default: av_strlcpy(fname, MSGTR_NoMediaOpened, maxlen); Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/win32/skinload.c Fri Nov 29 13:41:32 2013 (r36525) @@ -62,6 +62,7 @@ static const evName evNames[] = { evPlayDVD, "evPlayDVD" }, { evLoadURL, "evSetURL" }, // legacy { evLoadURL, "evLoadURL" }, + { evPlayTV, "evPlayTV" }, { evPlaySwitchToPause, "evPlaySwitchToPause" }, { evPauseSwitchToPlay, "evPauseSwitchToPlay" }, { evBackward10sec, "evBackward10sec" }, Modified: trunk/gui/win32/skinload.h ============================================================================== --- trunk/gui/win32/skinload.h Fri Nov 29 13:34:21 2013 (r36524) +++ trunk/gui/win32/skinload.h Fri Nov 29 13:41:32 2013 (r36525) @@ -150,6 +150,7 @@ enum evPlayVCD, evPlayDVD, evLoadURL, + evPlayTV, evPlaySwitchToPause, evPauseSwitchToPlay, evBackward10sec,

1 0

r36524 - in trunk/stream: cache2.c stream.h stream_dvb.c stream_tv.c
by ib 29 Nov '13

29 Nov '13

Author: ib Date: Fri Nov 29 13:34:21 2013 New Revision: 36524 Log: Add new stream control command STREAM_CTRL_GET_CURRENT_CHANNEL. This provides the name of the currently selected DVB channel. (Unsupported for analog TV though.) Modified: trunk/stream/cache2.c trunk/stream/stream.h trunk/stream/stream_dvb.c trunk/stream/stream_tv.c Modified: trunk/stream/cache2.c ============================================================================== --- trunk/stream/cache2.c Fri Nov 29 01:26:17 2013 (r36523) +++ trunk/stream/cache2.c Fri Nov 29 13:34:21 2013 (r36524) @@ -94,6 +94,7 @@ typedef struct { volatile int control; volatile uint64_t control_uint_arg; volatile double control_double_arg; + volatile char *control_char_p_arg; volatile struct stream_lang_req control_lang_arg; volatile int control_res; volatile double stream_time_length; @@ -327,6 +328,9 @@ static int cache_execute_control(cache_v case STREAM_CTRL_GET_LANG: s->control_res = s->stream->control(s->stream, s->control, (void *)&s->control_lang_arg); break; + case STREAM_CTRL_GET_CURRENT_CHANNEL: + s->control_res = s->stream->control(s->stream, s->control, &s->control_char_p_arg); + break; default: s->control_res = STREAM_UNSUPPORTED; break; @@ -654,6 +658,10 @@ int cache_do_control(stream_t *stream, i case -2: s->control = cmd; break; + case STREAM_CTRL_GET_CURRENT_CHANNEL: + s->control_char_p_arg = *(char **)arg; + s->control = cmd; + break; default: return STREAM_UNSUPPORTED; } @@ -699,6 +707,9 @@ int cache_do_control(stream_t *stream, i case STREAM_CTRL_GET_LANG: *(struct stream_lang_req *)arg = s->control_lang_arg; break; + case STREAM_CTRL_GET_CURRENT_CHANNEL: + *(char **)arg = (char *)s->control_char_p_arg; + break; } return s->control_res; } Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Fri Nov 29 01:26:17 2013 (r36523) +++ trunk/stream/stream.h Fri Nov 29 13:34:21 2013 (r36524) @@ -97,6 +97,7 @@ #define STREAM_CTRL_GET_NUM_TITLES 12 #define STREAM_CTRL_GET_LANG 13 #define STREAM_CTRL_GET_CURRENT_TITLE 14 +#define STREAM_CTRL_GET_CURRENT_CHANNEL 15 enum stream_ctrl_type { stream_ctrl_audio, Modified: trunk/stream/stream_dvb.c ============================================================================== --- trunk/stream/stream_dvb.c Fri Nov 29 01:26:17 2013 (r36523) +++ trunk/stream/stream_dvb.c Fri Nov 29 13:34:21 2013 (r36524) @@ -656,6 +656,25 @@ static int dvb_streaming_start(stream_t +static int dvb_control(stream_t *stream, int cmd, void *arg) +{ + dvb_priv_t *priv = stream->priv; + dvb_channels_list *list; + + switch (cmd) { + case STREAM_CTRL_GET_CURRENT_CHANNEL: + if (priv) { + list = priv->list; + *(char **)arg = list->channels[list->current].name; + return STREAM_OK; + } else + return STREAM_ERROR; + } + + return STREAM_UNSUPPORTED; +} + + static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format) { @@ -734,6 +753,7 @@ static int dvb_open(stream_t *stream, in stream->type = STREAMTYPE_DVB; stream->fill_buffer = dvb_streaming_read; + stream->control = dvb_control; stream->close = dvbin_close; m_struct_free(&stream_opts, opts); Modified: trunk/stream/stream_tv.c ============================================================================== --- trunk/stream/stream_tv.c Fri Nov 29 01:26:17 2013 (r36523) +++ trunk/stream/stream_tv.c Fri Nov 29 13:34:21 2013 (r36524) @@ -106,12 +106,17 @@ tv_stream_close (stream_t *stream) m_struct_free(&stream_opts,stream->priv); stream->priv=NULL; } +static int tv_stream_control(stream_t *stream, int cmd, void *arg) +{ + return STREAM_UNSUPPORTED; +} static int tv_stream_open (stream_t *stream, int mode, void *opts, int *file_format) { stream->type = STREAMTYPE_TV; stream->priv = opts; + stream->control = tv_stream_control; stream->close=tv_stream_close; *file_format = DEMUXER_TYPE_TV;

1 0

r36521 - trunk/stream/stream_dvb.c
by ib 24 Nov '13

24 Nov '13

Author: ib Date: Sun Nov 24 01:44:44 2013 New Revision: 36521 Log: Remove unused definitions. Modified: trunk/stream/stream_dvb.c Modified: trunk/stream/stream_dvb.c ============================================================================== --- trunk/stream/stream_dvb.c Tue Nov 19 19:36:10 2013 (r36520) +++ trunk/stream/stream_dvb.c Sun Nov 24 01:44:44 2013 (r36521) @@ -51,9 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include "dvbin.h" -#define MAX_CHANNELS 8 #define CHANNEL_LINE_LEN 256 -#define min(a, b) ((a) <= (b) ? (a) : (b)) //TODO: CAMBIARE list_ptr e da globale a per_priv

1 0

r36520 - trunk/etc/codecs.conf
by compn 19 Nov '13

19 Nov '13

Author: compn Date: Tue Nov 19 19:36:10 2013 New Revision: 36520 Log: codecs.conf: add DYM4 to mpeg4 Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Nov 19 19:10:47 2013 (r36519) +++ trunk/etc/codecs.conf Tue Nov 19 19:36:10 2013 (r36520) @@ -1531,6 +1531,7 @@ videocodec ffodivx fourcc SIPP ; Samsung SHR-6040 fourcc DreX,DM4V,LMP4,DP02 fourcc QMP4,HV60,PLV1,SM4V + fourcc DYM4 driver ffmpeg dll mpeg4 ;opendivx out YV12,I420,IYUV @@ -1566,6 +1567,7 @@ videocodec ffodivxvdpau fourcc SIPP ; Samsung SHR-6040 fourcc DreX,DM4V,LMP4,DP02 fourcc QMP4 + fourcc DYM4 driver ffmpeg dll mpeg4 out VDPAU_MPEG4 @@ -1601,6 +1603,7 @@ videocodec ffodivxvdpauold fourcc SIPP ; Samsung SHR-6040 fourcc DreX,DM4V,LMP4,DP02 fourcc QMP4 + fourcc DYM4 driver ffmpeg dll mpeg4_vdpau out VDPAU_MPEG4 @@ -1634,6 +1637,7 @@ videocodec ffodivxcrystalhd fourcc EPHV,SN40,WAWV fourcc uldx,ULDX,VSPX fourcc SIPP ; Samsung SHR-6040 + fourcc DYM4 driver ffmpeg dll mpeg4_crystalhd out YUY2

1 0

r36519 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 19 Nov '13

19 Nov '13

Author: reimar Date: Tue Nov 19 19:10:47 2013 New Revision: 36519 Log: Avoid resetting fields when we will never have set them in the first place. Should avoid memleak issues with h264_vda. Untested, and h264_vda should not preferably be changed in FFmpeg to not expose such details of its implementation. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Tue Nov 19 12:03:11 2013 (r36518) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue Nov 19 19:10:47 2013 (r36519) @@ -272,7 +272,7 @@ static void set_dr_slice_settings(struct avctx-> reget_buffer = avctx-> get_buffer = get_buffer; avctx->release_buffer = release_buffer; - } else { + } else if (lavc_codec->capabilities & CODEC_CAP_DR1) { avctx->flags &= ~CODEC_FLAG_EMU_EDGE; avctx-> reget_buffer = avcodec_default_reget_buffer; avctx-> get_buffer = avcodec_default_get_buffer;

1 0

r36517 - trunk/libmpcodecs/dec_video.c
by reimar 18 Nov '13

18 Nov '13

Author: reimar Date: Mon Nov 18 20:54:22 2013 New Revision: 36517 Log: Fix pts handling with -framedrop. Modified: trunk/libmpcodecs/dec_video.c Modified: trunk/libmpcodecs/dec_video.c ============================================================================== --- trunk/libmpcodecs/dec_video.c Sun Nov 17 00:31:56 2013 (r36516) +++ trunk/libmpcodecs/dec_video.c Mon Nov 18 20:54:22 2013 (r36517) @@ -424,6 +424,8 @@ void *decode_video(sh_video_t *sh_video, sh_video->num_buffered_pts++; } } + if (correct_pts && mpi && drop_frame && sh_video->num_buffered_pts > 0) + sh_video->num_buffered_pts--; // some codecs are broken, and doesn't restore MMX state :( // it happens usually with broken/damaged files.

1 0

r36516 - trunk/configure
by reimar 16 Nov '13

16 Nov '13

Author: reimar Date: Sun Nov 17 00:31:56 2013 New Revision: 36516 Log: Improve handling of internal vs. external dvdread/dvdnav Document that switching dvdread to external also switches dvdnav. If dvdnav-config/dvdread-config paths are given, assume the user wants to use external versions. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Nov 17 00:27:16 2013 (r36515) +++ trunk/configure Sun Nov 17 00:31:56 2013 (r36516) @@ -360,7 +360,7 @@ Optional features: --disable-bluray disable Blu-ray support [autodetect] --disable-dvdnav disable libdvdnav [autodetect] --disable-dvdread disable libdvdread [autodetect] - --disable-dvdread-internal disable internal libdvdread [autodetect] + --disable-dvdread-internal disable internal libdvdread and libdvdnav [autodetect] --disable-libdvdcss-internal disable internal libdvdcss [autodetect] --disable-cdparanoia disable cdparanoia [autodetect] --disable-cddb disable cddb [autodetect] @@ -602,8 +602,8 @@ Use these options if autodetection fails --with-glib-config=PATH path to glib*-config --with-gtk-config=PATH path to gtk*-config --with-sdl-config=PATH path to sdl*-config - --with-dvdnav-config=PATH path to dvdnav-config - --with-dvdread-config=PATH path to dvdread-config + --with-dvdnav-config=PATH path to dvdnav-config, also disables internal dvdread and dvdnav + --with-dvdread-config=PATH path to dvdread-config, also disables internal dvdread and dvdnav This configure script is NOT autoconf-based, even though its output is similar. It will try to autodetect all configuration options. If you --enable an option @@ -916,9 +916,11 @@ for ac_option do ;; --with-dvdnav-config=*) _dvdnavconfig=$(option_value $ac_option) + _dvdread_internal=no ;; --with-dvdread-config=*) _dvdreadconfig=$(option_value $ac_option) + _dvdread_internal=no ;; --extra-cflags=*)

1 0

r36515 - trunk/libvo/vo_vdpau.c
by reimar 16 Nov '13

16 Nov '13

Author: reimar Date: Sun Nov 17 00:27:16 2013 New Revision: 36515 Log: Chose cheaper alpha blend equation. We do not care about alpha result, so do not request complicated calculations for it. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Sun Nov 17 00:23:46 2013 (r36514) +++ trunk/libvo/vo_vdpau.c Sun Nov 17 00:27:16 2013 (r36515) @@ -853,9 +853,9 @@ static void draw_osd_I8A8(int x0,int y0, blend_state.struct_version = VDP_OUTPUT_SURFACE_RENDER_BLEND_STATE_VERSION; blend_state.blend_factor_source_color = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE; - blend_state.blend_factor_source_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE; + blend_state.blend_factor_source_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ZERO; blend_state.blend_factor_destination_color = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; - blend_state.blend_factor_destination_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; + blend_state.blend_factor_destination_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ZERO; blend_state.blend_equation_color = VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_ADD; blend_state.blend_equation_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_ADD; @@ -878,9 +878,9 @@ static void draw_eosd(void) blend_state.struct_version = VDP_OUTPUT_SURFACE_RENDER_BLEND_STATE_VERSION; blend_state.blend_factor_source_color = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_SRC_ALPHA; - blend_state.blend_factor_source_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE; + blend_state.blend_factor_source_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ZERO; blend_state.blend_factor_destination_color = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; - blend_state.blend_factor_destination_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_SRC_ALPHA; + blend_state.blend_factor_destination_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_FACTOR_ZERO; blend_state.blend_equation_color = VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_ADD; blend_state.blend_equation_alpha = VDP_OUTPUT_SURFACE_RENDER_BLEND_EQUATION_ADD;

1 0