diff options
| -rw-r--r-- | libavformat/mpegtsenc.c | 31 | ||||
| -rw-r--r-- | tests/lavf.regression.ref | 2 |
2 files changed, 12 insertions, 21 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 148507f5f6..be30e68a84 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -775,7 +775,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) { AVStream *st = s->streams[pkt->stream_index]; - int len, size = pkt->size; + int size = pkt->size; uint8_t *buf= pkt->data; uint8_t *data= NULL; MpegTSWriteStream *ts_st = st->priv_data; @@ -818,29 +818,20 @@ static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt) return 0; } - if (ts_st->payload_pts == AV_NOPTS_VALUE) { - ts_st->payload_dts = dts; - ts_st->payload_pts = pts; + if (ts_st->payload_index + size > 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_index = 0; } - // audio - 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_index += len; - 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; - } + if (!ts_st->payload_index) { + ts_st->payload_pts = pts; + ts_st->payload_dts = dts; } + memcpy(ts_st->payload + ts_st->payload_index, buf, size); + ts_st->payload_index += size; + return 0; } diff --git a/tests/lavf.regression.ref b/tests/lavf.regression.ref index 83be8dbedf..8b5110ad43 100644 --- a/tests/lavf.regression.ref +++ b/tests/lavf.regression.ref @@ -15,7 +15,7 @@ e36a005ecca9add8bda6e0655d03716f *./tests/data/b-lavf.mpg b3174e2db508564c1cce0b5e3c1bc1bd *./tests/data/b-lavf.mxf_d10 5330989 ./tests/data/b-lavf.mxf_d10 ./tests/data/b-lavf.mxf_d10 CRC=0xc3f4f92e -da0d4fea54e7473e3cddb1607294c9e2 *./tests/data/b-lavf.ts +a1a799fe07b3b9944aad8455a9706c5f *./tests/data/b-lavf.ts 430144 ./tests/data/b-lavf.ts ./tests/data/b-lavf.ts CRC=0x133216c1 62c5aeb636fc82cf6ba6277d36e42cb5 *./tests/data/b-lavf.swf |