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

r30129 - trunk/libmpdemux/stheader.h
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:42:37 2009 New Revision: 30129 Log: Remove currently unneeded members accidentally added in the last revision. Modified: trunk/libmpdemux/stheader.h Modified: trunk/libmpdemux/stheader.h ============================================================================== --- trunk/libmpdemux/stheader.h Sun Dec 27 15:40:56 2009 (r30128) +++ trunk/libmpdemux/stheader.h Sun Dec 27 15:42:37 2009 (r30129) @@ -31,10 +31,6 @@ unsigned int format; \ int initialized; \ float stream_delay; /* number of seconds stream should be delayed (according to dwStart or similar) */ \ - /* things needed for parsing */ \ - int needs_parsing; \ - struct AVCodecContext *avctx; \ - struct AVCodecParserContext *parser; \ /* audio: last known pts value in output from decoder \ * video: predicted/interpolated PTS of the current frame */ \ double pts; \

1 0

r30128 - trunk/libmpdemux/stheader.h
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:40:56 2009 New Revision: 30128 Log: Introduce a sh_common struct that contains the parts in common by the audio, video and sub "stream headers". One reason for this is to help avoid/make more obvious things like members with the same function but different name (extradata vs. codecdata etc.), or members with the same name but different semantics (pts for audio vs. pts for video). Modified: trunk/libmpdemux/stheader.h Modified: trunk/libmpdemux/stheader.h ============================================================================== --- trunk/libmpdemux/stheader.h Sun Dec 27 15:35:09 2009 (r30127) +++ trunk/libmpdemux/stheader.h Sun Dec 27 15:40:56 2009 (r30128) @@ -25,13 +25,31 @@ // Stream headers: +#define SH_COMMON \ + demux_stream_t *ds; \ + struct codecs_st *codec; \ + unsigned int format; \ + int initialized; \ + float stream_delay; /* number of seconds stream should be delayed (according to dwStart or similar) */ \ + /* things needed for parsing */ \ + int needs_parsing; \ + struct AVCodecContext *avctx; \ + struct AVCodecParserContext *parser; \ + /* audio: last known pts value in output from decoder \ + * video: predicted/interpolated PTS of the current frame */ \ + double pts; \ + /* codec-specific: */ \ + void* context; /* codec-specific stuff (usually HANDLE or struct pointer) */ \ + char* lang; /* track language */ \ + int default_track; \ + +typedef struct { + SH_COMMON +} sh_common_t; + typedef struct { + SH_COMMON int aid; - demux_stream_t *ds; - struct codecs_st *codec; - unsigned int format; - int initialized; - float stream_delay; // number of seconds stream should be delayed (according to dwStart or similar) // output format: int sample_format; int samplerate; @@ -63,28 +81,19 @@ typedef struct { AVIStreamHeader audio; WAVEFORMATEX* wf; // codec-specific: - void* context; // codec-specific stuff (usually HANDLE or struct pointer) unsigned char* codecdata; // extra header data passed from demuxer to codec int codecdata_len; - double pts; // last known pts value in output from decoder int pts_bytes; // bytes output by decoder after last known pts - char* lang; // track language - int default_track; } sh_audio_t; typedef struct { + SH_COMMON int vid; - demux_stream_t *ds; - struct codecs_st *codec; - unsigned int format; - int initialized; float timer; // absolute time in video stream, since last start/seek - float stream_delay; // number of seconds stream should be delayed (according to dwStart or similar) // frame counters: float num_frames; // number of frames played int num_frames_decoded; // number of frames decoded // timing (mostly for mpeg): - double pts; // predicted/interpolated PTS of the current frame double i_pts; // PTS for the _next_ I/P frame float next_frame_time; double last_pts; @@ -108,11 +117,10 @@ typedef struct { AVIStreamHeader video; BITMAPINFOHEADER* bih; void* ImageDesc; // for quicktime codecs - // codec-specific: - void* context; // codec-specific stuff (usually HANDLE or struct pointer) } sh_video_t; typedef struct { + SH_COMMON int sid; char type; // t = text, v = VobSub, a = SSA/ASS unsigned char* extradata; // extra header data passed from demuxer @@ -120,8 +128,6 @@ typedef struct { #ifdef CONFIG_ASS ass_track_t* ass_track; // for SSA/ASS streams (type == 'a') #endif - char* lang; // track language - int default_track; } sh_sub_t; // demuxer.c:

1 0

r30127 - trunk/libmpdemux/demux_mkv.c
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:35:09 2009 New Revision: 30127 Log: Remove one more incorrect direct ass.h include. Modified: trunk/libmpdemux/demux_mkv.c Modified: trunk/libmpdemux/demux_mkv.c ============================================================================== --- trunk/libmpdemux/demux_mkv.c Sun Dec 27 15:31:13 2009 (r30126) +++ trunk/libmpdemux/demux_mkv.c Sun Dec 27 15:35:09 2009 (r30127) @@ -41,7 +41,6 @@ #include "subreader.h" #include "libvo/sub.h" -#include "libass/ass.h" #include "libass/ass_mp.h" #include "libavutil/common.h"

1 0

r30126 - trunk/libvo/vo_gl.c
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:31:13 2009 New Revision: 30126 Log: Move do_render_osd function to avoid a forward declaration. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun Dec 27 15:19:48 2009 (r30125) +++ trunk/libvo/vo_gl.c Sun Dec 27 15:31:13 2009 (r30126) @@ -287,8 +287,6 @@ static void clearEOSD(void) { eosdtex = NULL; } -static void do_render_osd(int); - static inline int is_tinytex(ass_image_t *i, int tinytexcur) { return i->w < TINYTEX_SIZE && i->h < TINYTEX_SIZE && tinytexcur < TINYTEX_MAX; } @@ -660,36 +658,6 @@ static void create_osd_texture(int x0, i osdtexCnt++; } -static void draw_osd(void) -{ - if (!use_osd) return; - if (vo_osd_changed(0)) { - int osd_h, osd_w; - clearOSD(); - osd_w = scaled_osd ? image_width : vo_dwidth; - osd_h = scaled_osd ? image_height : vo_dheight; - 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); -} - -static void do_render(void) { -// Enable(GL_TEXTURE_2D); -// BindTexture(GL_TEXTURE_2D, texture_id); - - Color3f(1,1,1); - if (image_format == IMGFMT_YV12 || custom_prog) - glEnableYUVConversion(gl_target, yuvconvtype); - glDrawTex(0, 0, image_width, image_height, - 0, 0, image_width, image_height, - texture_width, texture_height, - use_rectangle == 1, image_format == IMGFMT_YV12, - mpi_flipped ^ vo_flipped); - if (image_format == IMGFMT_YV12 || custom_prog) - glDisableYUVConversion(gl_target, yuvconvtype); -} - /** * \param type bit 0: render OSD, bit 1: render EOSD */ @@ -725,6 +693,36 @@ static void do_render_osd(int type) { } } +static void draw_osd(void) +{ + if (!use_osd) return; + if (vo_osd_changed(0)) { + int osd_h, osd_w; + clearOSD(); + osd_w = scaled_osd ? image_width : vo_dwidth; + osd_h = scaled_osd ? image_height : vo_dheight; + 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); +} + +static void do_render(void) { +// Enable(GL_TEXTURE_2D); +// BindTexture(GL_TEXTURE_2D, texture_id); + + Color3f(1,1,1); + if (image_format == IMGFMT_YV12 || custom_prog) + glEnableYUVConversion(gl_target, yuvconvtype); + glDrawTex(0, 0, image_width, image_height, + 0, 0, image_width, image_height, + texture_width, texture_height, + use_rectangle == 1, image_format == IMGFMT_YV12, + mpi_flipped ^ vo_flipped); + if (image_format == IMGFMT_YV12 || custom_prog) + glDisableYUVConversion(gl_target, yuvconvtype); +} + static void flip_page(void) { if (vo_doublebuffering) { if (use_glFinish) Finish();

1 0

r30125 - in trunk/libvo: x11_common.c x11_common.h
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:19:48 2009 New Revision: 30125 Log: vo_x11_classhint name argument should be const, since we pass string constants there. Modified: trunk/libvo/x11_common.c trunk/libvo/x11_common.h Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Sun Dec 27 15:13:06 2009 (r30124) +++ trunk/libvo/x11_common.c Sun Dec 27 15:19:48 2009 (r30125) @@ -733,7 +733,7 @@ void vo_x11_decoration(Display * vo_Disp } } -void vo_x11_classhint(Display * display, Window window, char *name) +void vo_x11_classhint(Display * display, Window window, const char *name) { XClassHint wmClass; pid_t pid = getpid(); Modified: trunk/libvo/x11_common.h ============================================================================== --- trunk/libvo/x11_common.h Sun Dec 27 15:13:06 2009 (r30124) +++ trunk/libvo/x11_common.h Sun Dec 27 15:19:48 2009 (r30125) @@ -63,7 +63,7 @@ void vo_uninit( void ); void vo_hidecursor ( Display* , Window ); void vo_showcursor( Display *disp, Window win ); void vo_x11_decoration( Display * vo_Display,Window w,int d ); -void vo_x11_classhint( Display * display,Window window,char *name ); +void vo_x11_classhint( Display * display,Window window,const char *name ); void vo_x11_nofs_sizepos(int x, int y, int width, int height); void vo_x11_sizehint( int x, int y, int width, int height, int max ); int vo_x11_check_events(Display *mydisplay);

1 0

r30124 - trunk/command.c
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:13:06 2009 New Revision: 30124 Log: Return the actually playing audio/video id for get_property, not the one selected e.g. via commandline (which resulted in -1 being returned most of the time). Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Sun Dec 27 15:09:38 2009 (r30123) +++ trunk/command.c Sun Dec 27 15:13:06 2009 (r30124) @@ -795,21 +795,22 @@ static int mp_property_balance(m_option_ static int mp_property_audio(m_option_t * prop, int action, void *arg, MPContext * mpctx) { - int current_id = -1, tmp; + int current_id, tmp; if (!mpctx->demuxer || !mpctx->demuxer->audio) return M_PROPERTY_UNAVAILABLE; + current_id = mpctx->demuxer->audio->id; switch (action) { case M_PROPERTY_GET: if (!arg) return M_PROPERTY_ERROR; - *(int *) arg = audio_id; + *(int *) arg = current_id; return M_PROPERTY_OK; case M_PROPERTY_PRINT: if (!arg) return M_PROPERTY_ERROR; - if (audio_id < 0) + if (current_id < 0) *(char **) arg = strdup(MSGTR_Disabled); else { char lang[40] = MSGTR_Unknown; @@ -818,7 +819,7 @@ static int mp_property_audio(m_option_t av_strlcpy(lang, sh->lang, 40); #ifdef CONFIG_DVDREAD else if (mpctx->stream->type == STREAMTYPE_DVD) { - int code = dvd_lang_from_aid(mpctx->stream, audio_id); + int code = dvd_lang_from_aid(mpctx->stream, current_id); if (code) { lang[0] = code >> 8; lang[1] = code; @@ -829,10 +830,10 @@ static int mp_property_audio(m_option_t #ifdef CONFIG_DVDNAV else if (mpctx->stream->type == STREAMTYPE_DVDNAV) - mp_dvdnav_lang_from_aid(mpctx->stream, audio_id, lang); + mp_dvdnav_lang_from_aid(mpctx->stream, current_id, lang); #endif *(char **) arg = malloc(64); - snprintf(*(char **) arg, 64, "(%d) %s", audio_id, lang); + snprintf(*(char **) arg, 64, "(%d) %s", current_id, lang); } return M_PROPERTY_OK; @@ -842,7 +843,6 @@ static int mp_property_audio(m_option_t tmp = *((int *) arg); else tmp = -1; - current_id = mpctx->demuxer->audio->id; audio_id = demuxer_switch_audio(mpctx->demuxer, tmp); if (audio_id == -2 || (audio_id > -1 @@ -869,26 +869,27 @@ static int mp_property_audio(m_option_t static int mp_property_video(m_option_t * prop, int action, void *arg, MPContext * mpctx) { - int current_id = -1, tmp; + int current_id, tmp; if (!mpctx->demuxer || !mpctx->demuxer->video) return M_PROPERTY_UNAVAILABLE; + current_id = mpctx->demuxer->video->id; switch (action) { case M_PROPERTY_GET: if (!arg) return M_PROPERTY_ERROR; - *(int *) arg = video_id; + *(int *) arg = current_id; return M_PROPERTY_OK; case M_PROPERTY_PRINT: if (!arg) return M_PROPERTY_ERROR; - if (video_id < 0) + if (current_id < 0) *(char **) arg = strdup(MSGTR_Disabled); else { char lang[40] = MSGTR_Unknown; *(char **) arg = malloc(64); - snprintf(*(char **) arg, 64, "(%d) %s", video_id, lang); + snprintf(*(char **) arg, 64, "(%d) %s", current_id, lang); } return M_PROPERTY_OK; @@ -898,7 +899,6 @@ static int mp_property_video(m_option_t tmp = *((int *) arg); else tmp = -1; - current_id = mpctx->demuxer->video->id; video_id = demuxer_switch_video(mpctx->demuxer, tmp); if (video_id == -2 || (video_id > -1 && mpctx->demuxer->video->id != current_id

1 0

r30123 - trunk/etc/codecs.conf
by kostya 27 Dec '09

27 Dec '09

Author: kostya Date: Sun Dec 27 15:09:38 2009 New Revision: 30123 Log: lavc Interplay Video decoder now supports 16-bit mode too Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Dec 27 15:07:29 2009 (r30122) +++ trunk/etc/codecs.conf Sun Dec 27 15:09:38 2009 (r30123) @@ -2891,7 +2891,7 @@ videocodec ffinterplay fourcc INPV ; internal MPlayer FourCC driver ffmpeg dll "interplayvideo" - out BGR8 + out BGR8,BGR15 videocodec ffvqa info "FFmpeg VQA Video"

1 0

r30122 - trunk/command.c
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:07:29 2009 New Revision: 30122 Log: Subtitle are now also available without video, so remove that check from the subtitle property handling. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Sun Dec 27 15:06:47 2009 (r30121) +++ trunk/command.c Sun Dec 27 15:07:29 2009 (r30122) @@ -1288,9 +1288,6 @@ static int mp_property_aspect(m_option_t static int mp_property_sub_pos(m_option_t * prop, int action, void *arg, MPContext * mpctx) { - if (!mpctx->sh_video) - return M_PROPERTY_UNAVAILABLE; - switch (action) { case M_PROPERTY_SET: if (!arg)

1 0

r30121 - trunk/command.c
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:06:47 2009 New Revision: 30121 Log: Use the same condition to decide if the audio/video id property is not available for all commands (get, set and print). Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Sun Dec 27 15:02:20 2009 (r30120) +++ trunk/command.c Sun Dec 27 15:06:47 2009 (r30121) @@ -796,18 +796,16 @@ static int mp_property_audio(m_option_t MPContext * mpctx) { int current_id = -1, tmp; + if (!mpctx->demuxer || !mpctx->demuxer->audio) + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_GET: - if (!mpctx->sh_audio) - return M_PROPERTY_UNAVAILABLE; if (!arg) return M_PROPERTY_ERROR; *(int *) arg = audio_id; return M_PROPERTY_OK; case M_PROPERTY_PRINT: - if (!mpctx->sh_audio) - return M_PROPERTY_UNAVAILABLE; if (!arg) return M_PROPERTY_ERROR; @@ -840,8 +838,6 @@ static int mp_property_audio(m_option_t case M_PROPERTY_STEP_UP: case M_PROPERTY_SET: - if (!mpctx->demuxer || !mpctx->demuxer->audio) - return M_PROPERTY_UNAVAILABLE; if (action == M_PROPERTY_SET && arg) tmp = *((int *) arg); else @@ -874,18 +870,16 @@ static int mp_property_video(m_option_t MPContext * mpctx) { int current_id = -1, tmp; + if (!mpctx->demuxer || !mpctx->demuxer->video) + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_GET: - if (!mpctx->sh_video) - return M_PROPERTY_UNAVAILABLE; if (!arg) return M_PROPERTY_ERROR; *(int *) arg = video_id; return M_PROPERTY_OK; case M_PROPERTY_PRINT: - if (!mpctx->sh_video) - return M_PROPERTY_UNAVAILABLE; if (!arg) return M_PROPERTY_ERROR; @@ -900,8 +894,6 @@ static int mp_property_video(m_option_t case M_PROPERTY_STEP_UP: case M_PROPERTY_SET: - if (!mpctx->demuxer || !mpctx->demuxer->video) - return M_PROPERTY_UNAVAILABLE; if (action == M_PROPERTY_SET && arg) tmp = *((int *) arg); else

1 0

r30120 - trunk/command.c
by reimar 27 Dec '09

27 Dec '09

Author: reimar Date: Sun Dec 27 15:02:20 2009 New Revision: 30120 Log: When setting audio or video track make sure we will not try to dereference a NULL pointer, e.g. because there is no video stream. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Sun Dec 27 14:56:51 2009 (r30119) +++ trunk/command.c Sun Dec 27 15:02:20 2009 (r30120) @@ -840,7 +840,7 @@ static int mp_property_audio(m_option_t case M_PROPERTY_STEP_UP: case M_PROPERTY_SET: - if (!mpctx->demuxer) + if (!mpctx->demuxer || !mpctx->demuxer->audio) return M_PROPERTY_UNAVAILABLE; if (action == M_PROPERTY_SET && arg) tmp = *((int *) arg); @@ -900,11 +900,13 @@ static int mp_property_video(m_option_t case M_PROPERTY_STEP_UP: case M_PROPERTY_SET: - current_id = mpctx->demuxer->video->id; + if (!mpctx->demuxer || !mpctx->demuxer->video) + return M_PROPERTY_UNAVAILABLE; if (action == M_PROPERTY_SET && arg) tmp = *((int *) arg); else tmp = -1; + current_id = mpctx->demuxer->video->id; video_id = demuxer_switch_video(mpctx->demuxer, tmp); if (video_id == -2 || (video_id > -1 && mpctx->demuxer->video->id != current_id

1 0