[FFmpeg-cvslog] r22020 - in trunk: libavformat/mpegtsenc.c tests/ref/lavf/ts
cehoyos
subversion
Wed Feb 24 11:56:13 CET 2010
Author: cehoyos
Date: Wed Feb 24 11:56:13 2010
New Revision: 22020
Log:
Correctly increment continuity_counter in PCR packets.
Patch by Yann Coupin, yann.coupin+ffmpeg gmail
Modified:
trunk/libavformat/mpegtsenc.c
trunk/tests/ref/lavf/ts
Modified: trunk/libavformat/mpegtsenc.c
==============================================================================
--- trunk/libavformat/mpegtsenc.c Wed Feb 24 08:34:12 2010 (r22019)
+++ trunk/libavformat/mpegtsenc.c Wed Feb 24 11:56:13 2010 (r22020)
@@ -89,8 +89,8 @@ static void mpegts_write_section(MpegTSS
b |= 0x40;
*q++ = b;
*q++ = s->pid;
- *q++ = 0x10 | s->cc;
s->cc = (s->cc + 1) & 0xf;
+ *q++ = 0x10 | s->cc;
if (first)
*q++ = 0; /* 0 offset */
len1 = TS_PACKET_SIZE - (q - packet);
@@ -399,12 +399,12 @@ static int mpegts_write_header(AVFormatC
service->pmt.opaque = s;
ts->pat.pid = PAT_PID;
- ts->pat.cc = 0;
+ ts->pat.cc = 15; // Initialize at 15 so that it wraps and be equal to 0 for the first packet we write
ts->pat.write_packet = section_write_packet;
ts->pat.opaque = s;
ts->sdt.pid = SDT_PID;
- ts->sdt.cc = 0;
+ ts->sdt.cc = 15;
ts->sdt.write_packet = section_write_packet;
ts->sdt.opaque = s;
@@ -647,8 +647,8 @@ static void mpegts_write_pes(AVFormatCon
val |= 0x40;
*q++ = val;
*q++ = ts_st->pid;
- *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0);
ts_st->cc = (ts_st->cc + 1) & 0xf;
+ *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0);
if (write_pcr) {
// add 11, pcr references the last byte of program clock reference base
pcr = ts->cur_pcr + (4+7)*8*90000LL / ts->mux_rate;
Modified: trunk/tests/ref/lavf/ts
==============================================================================
--- trunk/tests/ref/lavf/ts Wed Feb 24 08:34:12 2010 (r22019)
+++ trunk/tests/ref/lavf/ts Wed Feb 24 11:56:13 2010 (r22020)
@@ -1,3 +1,3 @@
-a1a799fe07b3b9944aad8455a9706c5f *./tests/data/b-lavf.ts
-430144 ./tests/data/b-lavf.ts
+3ecdc566c525d58bc287ce1baffd9407 *./tests/data/b-lavf.ts
+ 430144 ./tests/data/b-lavf.ts
./tests/data/b-lavf.ts CRC=0x133216c1
More information about the ffmpeg-cvslog
mailing list