comparison parser.c @ 6979:4257fdcf664e libavcodec

Rename last_frame_offset to next_frame_offset. (it was and is the next not the last)

6978:9774d160f014

        s->last_pts = s->pts;
        s->last_dts = s->dts;
        s->dts= s->pts= AV_NOPTS_VALUE;
        s->offset= 0;
        for(i = 0; i < AV_PARSER_PTS_NB; i++) {
            if (   s->last_frame_offset >= s->cur_frame_offset[i]
                &&(s->     frame_offset <  s->cur_frame_offset[i] || !s->frame_offset)
                && s->last_frame_offset <  s->cur_frame_end[i]){
                s->dts= s->cur_frame_dts[i];
                s->pts= s->cur_frame_pts[i];
                s->offset = s->last_frame_offset - s->cur_frame_offset[i];
            }
        }
    }

    /* WARNING: the returned index can be negative */
    index = s->parser->parser_parse(s, avctx, (const uint8_t **)poutbuf, poutbuf_size, buf, buf_size);
//av_log(NULL, AV_LOG_DEBUG, "parser: in:%"PRId64", %"PRId64", out:%"PRId64", %"PRId64", in:%d out:%d id:%d\n", pts, dts, s->last_pts, s->last_dts, buf_size, *poutbuf_size, avctx->codec_id);
    /* update the file pointer */
    if (*poutbuf_size) {
        /* fill the data for the current frame */
        s->frame_offset = s->last_frame_offset;

        /* offset of the next frame */
        s->last_frame_offset = s->cur_offset + index;
            s->fetch_timestamp=1;
    }
    if (index < 0)
        index = 0;
    s->cur_offset += index;

6979:4257fdcf664e

        s->last_pts = s->pts;
        s->last_dts = s->dts;
        s->dts= s->pts= AV_NOPTS_VALUE;
        s->offset= 0;
        for(i = 0; i < AV_PARSER_PTS_NB; i++) {
            if (   s->next_frame_offset >= s->cur_frame_offset[i]
                &&(s->     frame_offset <  s->cur_frame_offset[i] || !s->frame_offset)
                && s->next_frame_offset <  s->cur_frame_end[i]){
                s->dts= s->cur_frame_dts[i];
                s->pts= s->cur_frame_pts[i];
                s->offset = s->next_frame_offset - s->cur_frame_offset[i];
            }
        }
    }

    /* WARNING: the returned index can be negative */
    index = s->parser->parser_parse(s, avctx, (const uint8_t **)poutbuf, poutbuf_size, buf, buf_size);
//av_log(NULL, AV_LOG_DEBUG, "parser: in:%"PRId64", %"PRId64", out:%"PRId64", %"PRId64", in:%d out:%d id:%d\n", pts, dts, s->last_pts, s->last_dts, buf_size, *poutbuf_size, avctx->codec_id);
    /* update the file pointer */
    if (*poutbuf_size) {
        /* fill the data for the current frame */
        s->frame_offset = s->next_frame_offset;

        /* offset of the next frame */
        s->next_frame_offset = s->cur_offset + index;
            s->fetch_timestamp=1;
    }
    if (index < 0)
        index = 0;
    s->cur_offset += index;