comparison mpegtsenc.c @ 4914:75a9c3042800 libavformat

remove useless max_payload_size variable

4913:5d22e1946275

}

static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
{
    AVStream *st = s->streams[pkt->stream_index];
    int size= pkt->size;
    uint8_t *buf= pkt->data;
    uint8_t *data= NULL;
    MpegTSWriteStream *ts_st = st->priv_data;
    int len, max_payload_size;
    const uint8_t *access_unit_index = NULL;
    const uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
    int64_t dts = AV_NOPTS_VALUE, pts = AV_NOPTS_VALUE;

    if (pkt->pts != AV_NOPTS_VALUE)

    if (st->codec->codec_id == CODEC_ID_DIRAC) {
        /* for Dirac, a single PES packet must be generated */
        mpegts_write_pes(s, st, buf, size, pts, dts);
        return 0;
    }
    max_payload_size = DEFAULT_PES_PAYLOAD_SIZE;
    if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO ||
        st->codec->codec_id == CODEC_ID_MPEG1VIDEO) {
        const uint8_t *p = pkt->data;
        const uint8_t *end = pkt->data+pkt->size;
        uint32_t state = -1;

        av_log(s, AV_LOG_ERROR, "error, could not find access unit start\n");
        return -1;
    }

    while (size > 0) {
        len = max_payload_size - ts_st->payload_index;
        if (len > size)
            len = size;
        memcpy(ts_st->payload + ts_st->payload_index, buf, len);
        buf += len;
        size -= len;

            ts_st->payload_pts == AV_NOPTS_VALUE &&
            ts_st->payload_dts == AV_NOPTS_VALUE) {
            ts_st->payload_dts = dts;
            ts_st->payload_pts = pts;
        }
        if (ts_st->payload_index >= max_payload_size) {
            mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index,
                             ts_st->payload_pts, ts_st->payload_dts);
            ts_st->payload_pts = AV_NOPTS_VALUE;
            ts_st->payload_dts = AV_NOPTS_VALUE;
            ts_st->payload_index = 0;

4914:75a9c3042800

}

static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)
{
    AVStream *st = s->streams[pkt->stream_index];
    int len, size = pkt->size;
    uint8_t *buf= pkt->data;
    uint8_t *data= NULL;
    MpegTSWriteStream *ts_st = st->priv_data;
    const uint8_t *access_unit_index = NULL;
    const uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
    int64_t dts = AV_NOPTS_VALUE, pts = AV_NOPTS_VALUE;

    if (pkt->pts != AV_NOPTS_VALUE)

    if (st->codec->codec_id == CODEC_ID_DIRAC) {
        /* for Dirac, a single PES packet must be generated */
        mpegts_write_pes(s, st, buf, size, pts, dts);
        return 0;
    }

    if (st->codec->codec_id == CODEC_ID_MPEG2VIDEO ||
        st->codec->codec_id == CODEC_ID_MPEG1VIDEO) {
        const uint8_t *p = pkt->data;
        const uint8_t *end = pkt->data+pkt->size;
        uint32_t state = -1;

        av_log(s, AV_LOG_ERROR, "error, could not find access unit start\n");
        return -1;
    }

    while (size > 0) {
        len = DEFAULT_PES_PAYLOAD_SIZE - ts_st->payload_index;
        if (len > size)
            len = size;
        memcpy(ts_st->payload + ts_st->payload_index, buf, len);
        buf += len;
        size -= len;

            ts_st->payload_pts == AV_NOPTS_VALUE &&
            ts_st->payload_dts == AV_NOPTS_VALUE) {
            ts_st->payload_dts = dts;
            ts_st->payload_pts = pts;
        }
        if (ts_st->payload_index >= DEFAULT_PES_PAYLOAD_SIZE) {
            mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index,
                             ts_st->payload_pts, ts_st->payload_dts);
            ts_st->payload_pts = AV_NOPTS_VALUE;
            ts_st->payload_dts = AV_NOPTS_VALUE;
            ts_st->payload_index = 0;