comparison mplayer.c @ 20904:e5456123de82

Fix statement-before-declaration warnings. Having a look at the gcc output before committing is a good idea btw.

20903:b8d8e7ca7410

    int in_size;
    int hit_eof=0;
    double pts;

    while (1) {
	current_module = "decode video";
	// XXX Time used in this call is not counted in any performance
	// timer now, OSD is not updated correctly for filter-added frames
	if (vf_output_queued_frame(sh_video->vfilter))
	    break;

	if (in_size > max_framesize)
	    max_framesize = in_size;
	if (pts == MP_NOPTS_VALUE)
	    mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n");
	current_module = "decode video";
	void *decoded_frame = decode_video(sh_video, start, in_size, 0, pts);
	if (decoded_frame) {
	    update_osd_msg();
	    if (filter_video(sh_video, decoded_frame, sh_video->pts))
		break;
	}

    return 1;
}

int sleep_until_update(float *time_frame, float *aq_sleep_time)
{
    current_module="calc_sleep_time";

    int frame_time_remaining = 0;
    *time_frame -= GetRelativeTime(); // reset timer

    if (sh_audio && !d_audio->eof) {
	float delay = audio_out->get_delay();
	mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay);

  if(!frame_time_remaining){
    //--------------------  Decode a frame: -----------------------
    blit_frame = 0; // Don't blit if we hit EOF
    if (!correct_pts) while(1)
    {   unsigned char* start=NULL;
	int in_size;
	// get it!
	current_module="video_read_frame";
        in_size=video_read_frame(sh_video,&next_frame_time,&start,force_fps);
	if(in_size<0){ eof=1; break; }

	}
	// decode:
	current_module="decode_video";
//	printf("Decode! %p  %d  \n",start,in_size);
	update_osd_msg();
	void *decoded_frame = decode_video(sh_video,start,in_size,drop_frame, sh_video->pts);
	blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame,
						    sh_video->pts));
	break;
    }
    else while (1) {

20904:e5456123de82

    int in_size;
    int hit_eof=0;
    double pts;

    while (1) {
	void *decoded_frame;
	current_module = "decode video";
	// XXX Time used in this call is not counted in any performance
	// timer now, OSD is not updated correctly for filter-added frames
	if (vf_output_queued_frame(sh_video->vfilter))
	    break;

	if (in_size > max_framesize)
	    max_framesize = in_size;
	if (pts == MP_NOPTS_VALUE)
	    mp_msg(MSGT_CPLAYER, MSGL_ERR, "pts value from demuxer MISSING\n");
	current_module = "decode video";
	decoded_frame = decode_video(sh_video, start, in_size, 0, pts);
	if (decoded_frame) {
	    update_osd_msg();
	    if (filter_video(sh_video, decoded_frame, sh_video->pts))
		break;
	}

    return 1;
}

int sleep_until_update(float *time_frame, float *aq_sleep_time)
{
    int frame_time_remaining = 0;
    current_module="calc_sleep_time";

    *time_frame -= GetRelativeTime(); // reset timer

    if (sh_audio && !d_audio->eof) {
	float delay = audio_out->get_delay();
	mp_dbg(MSGT_AVSYNC, MSGL_DBG2, "delay=%f\n", delay);

  if(!frame_time_remaining){
    //--------------------  Decode a frame: -----------------------
    blit_frame = 0; // Don't blit if we hit EOF
    if (!correct_pts) while(1)
    {   unsigned char* start=NULL;
	void *decoded_frame;
	int in_size;
	// get it!
	current_module="video_read_frame";
        in_size=video_read_frame(sh_video,&next_frame_time,&start,force_fps);
	if(in_size<0){ eof=1; break; }

	}
	// decode:
	current_module="decode_video";
//	printf("Decode! %p  %d  \n",start,in_size);
	update_osd_msg();
	decoded_frame = decode_video(sh_video,start,in_size,drop_frame, sh_video->pts);
	blit_frame = (decoded_frame && filter_video(sh_video, decoded_frame,
						    sh_video->pts));
	break;
    }
    else while (1) {