comparison libmpdemux/demux_avs.c @ 19213:606d2f7cd307

Move more stuff under if (avs_has_video... to simplify later patches.

19212:6b8bbb271594

    AVS_T *AVS = (AVS_T *) demuxer->priv;

    demux_stream_t *d_video=demuxer->video;
    sh_video_t *sh_video=d_video->sh;

    if (AVS->video_info->num_frames < AVS->frameno) return 0; // EOF
    
    curr_frame = AVS->avs_get_frame(AVS->clip, AVS->frameno);
    if (!curr_frame)
    {
        mp_msg(MSGT_DEMUX, MSGL_V, "AVS: error getting frame -- EOF??\n");
        return 0;
    }

    if (avs_has_video(AVS->video_info))
    {
        dp = new_demux_packet(curr_frame->vfb->data_size);
        sh_video->num_frames_decoded++;
        sh_video->num_frames++;

        dp->pts=AVS->frameno / sh_video->fps;

        memcpy(dp->buffer, curr_frame->vfb->data + curr_frame->offset, curr_frame->vfb->data_size);
        ds_add_packet(demuxer->video, dp);

    }
    
#ifdef ENABLE_AUDIO
    /* Audio */
    if (avs_has_audio(AVS->video_info))

        }
        ds_add_packet(demuxer->audio, dp);
    }
#endif
    
    AVS->frameno++;
    AVS->avs_release_video_frame(curr_frame);
    return 1;
}

static demuxer_t* demux_open_avs(demuxer_t* demuxer)
{

19213:606d2f7cd307

    AVS_T *AVS = (AVS_T *) demuxer->priv;

    demux_stream_t *d_video=demuxer->video;
    sh_video_t *sh_video=d_video->sh;

    if (avs_has_video(AVS->video_info))
    {
    if (AVS->video_info->num_frames < AVS->frameno) return 0; // EOF
    
    curr_frame = AVS->avs_get_frame(AVS->clip, AVS->frameno);
    if (!curr_frame)
    {
        mp_msg(MSGT_DEMUX, MSGL_V, "AVS: error getting frame -- EOF??\n");
        return 0;
    }

        dp = new_demux_packet(curr_frame->vfb->data_size);
        sh_video->num_frames_decoded++;
        sh_video->num_frames++;

        dp->pts=AVS->frameno / sh_video->fps;

        memcpy(dp->buffer, curr_frame->vfb->data + curr_frame->offset, curr_frame->vfb->data_size);
        ds_add_packet(demuxer->video, dp);

    AVS->frameno++;
    AVS->avs_release_video_frame(curr_frame);
    }
    
#ifdef ENABLE_AUDIO
    /* Audio */
    if (avs_has_audio(AVS->video_info))

        }
        ds_add_packet(demuxer->audio, dp);
    }
#endif
    
    return 1;
}

static demuxer_t* demux_open_avs(demuxer_t* demuxer)
{