diff options
Diffstat (limited to 'libmpdemux/video.c')
-rw-r--r-- | libmpdemux/video.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index fba4077207..b7e8aabb1b 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -132,7 +132,7 @@ switch(video_codec){ videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"Cannot allocate shared memory.\n"); return 0; } } @@ -225,7 +225,7 @@ switch(video_codec){ videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"Cannot allocate shared memory.\n"); return 0; } } @@ -278,7 +278,7 @@ mpeg_header_parser: if(i==0x1B3) break; // found it! if(!i || !skip_video_packet(d_video)){ if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ) mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n"); - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"MPEG: FATAL: EOF while searching for sequence header.\n"); return 0; } } @@ -288,27 +288,27 @@ mpeg_header_parser: videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"Cannot allocate shared memory.\n"); return 0; } } if(!read_video_packet(d_video)){ - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdr); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"FATAL: Cannot read sequence header.\n"); return 0; } if(mp_header_process_sequence_header (&picture, &videobuffer[4])) { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdr); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"MPEG: bad sequence header\n"); goto mpeg_header_parser; } if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext. int pos=videobuf_len; if(!read_video_packet(d_video)){ - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CannotReadMpegSequHdrEx); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"FATAL: Cannot read sequence header extension.\n"); return 0; } if(mp_header_process_extension (&picture, &videobuffer[pos+4])) { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_BadMpegSequHdrEx); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"MPEG: bad sequence header extension\n"); return 0; } } @@ -356,7 +356,7 @@ mpeg_header_parser: videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { - mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); + mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"Cannot allocate shared memory.\n"); return 0; } } @@ -490,14 +490,14 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** if(telecine){ frame_time=1; if(telecine_cnt<-1.5 || telecine_cnt>1.5){ - mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_LeaveTelecineMode); + mp_tmsg(MSGT_DECVIDEO,MSGL_INFO,"\ndemux_mpg: 30000/1001fps NTSC content detected, switching framerate.\n"); telecine=0; } } else if(telecine_cnt>-0.5 && telecine_cnt<0.5 && !force_fps){ sh_video->fps=sh_video->fps*4/5; sh_video->frametime=sh_video->frametime*5/4; - mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_EnterTelecineMode); + mp_tmsg(MSGT_DECVIDEO,MSGL_INFO,"\ndemux_mpg: 24000/1001fps progressive NTSC content detected, switching framerate.\n"); telecine=1; } } else if(video_codec == VIDEO_MPEG4){ @@ -644,4 +644,3 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** if(frame_time_ptr) *frame_time_ptr=frame_time; return in_size; } - |