| Message ID | 20200430195728.32671-2-andriy.gelman@gmail.com |
|---|---|
| State | Accepted |
| Commit | 0776cb7083c34b4593c62f068f4371169f987e7b |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avformat/mpegtsenc: Don't use heap allocated array to store pids | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On Thu, 30 Apr 2020, Andriy Gelman wrote: > From: Andriy Gelman <andriy.gelman@gmail.com> > > ts->{tsid,onid} stores the values of ts->{transport_stream_id,original_network_id} > > Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com> > --- > libavformat/mpegtsenc.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) LGTM, thanks. Marton > > diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c > index 8ca1ddf003..bf1a7ee13f 100644 > --- a/libavformat/mpegtsenc.c > +++ b/libavformat/mpegtsenc.c > @@ -79,8 +79,6 @@ typedef struct MpegTSWrite { > int64_t sdt_period; /* SDT period in PCR time base */ > int64_t pat_period; /* PAT/PMT period in PCR time base */ > int nb_services; > - int onid; > - int tsid; > int64_t first_pcr; > int64_t next_pcr; > int mux_rate; ///< set to 1 when VBR > @@ -261,7 +259,7 @@ static void mpegts_write_pat(AVFormatContext *s) > put16(&q, service->sid); > put16(&q, 0xe000 | service->pmt.pid); > } > - mpegts_write_section1(&ts->pat, PAT_TID, ts->tsid, ts->tables_version, 0, 0, > + mpegts_write_section1(&ts->pat, PAT_TID, ts->transport_stream_id, ts->tables_version, 0, 0, > data, q - data); > } > > @@ -731,7 +729,7 @@ static void mpegts_write_sdt(AVFormatContext *s) > int i, running_status, free_ca_mode, val; > > q = data; > - put16(&q, ts->onid); > + put16(&q, ts->original_network_id); > *q++ = 0xff; > for (i = 0; i < ts->nb_services; i++) { > service = ts->services[i]; > @@ -757,7 +755,7 @@ static void mpegts_write_sdt(AVFormatContext *s) > desc_list_len_ptr[0] = val >> 8; > desc_list_len_ptr[1] = val; > } > - mpegts_write_section1(&ts->sdt, SDT_TID, ts->tsid, ts->tables_version, 0, 0, > + mpegts_write_section1(&ts->sdt, SDT_TID, ts->transport_stream_id, ts->tables_version, 0, 0, > data, q - data); > } > > @@ -960,8 +958,6 @@ static int mpegts_init(AVFormatContext *s) > // round up to a whole number of TS packets > ts->pes_payload_size = (ts->pes_payload_size + 14 + 183) / 184 * 184 - 14; > > - ts->tsid = ts->transport_stream_id; > - ts->onid = ts->original_network_id; > if (!s->nb_programs) { > /* allocate a single DVB service */ > if (!mpegts_add_service(s, ts->service_id, s->metadata, NULL)) > -- > 2.25.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 8ca1ddf003..bf1a7ee13f 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -79,8 +79,6 @@ typedef struct MpegTSWrite { int64_t sdt_period; /* SDT period in PCR time base */ int64_t pat_period; /* PAT/PMT period in PCR time base */ int nb_services; - int onid; - int tsid; int64_t first_pcr; int64_t next_pcr; int mux_rate; ///< set to 1 when VBR @@ -261,7 +259,7 @@ static void mpegts_write_pat(AVFormatContext *s) put16(&q, service->sid); put16(&q, 0xe000 | service->pmt.pid); } - mpegts_write_section1(&ts->pat, PAT_TID, ts->tsid, ts->tables_version, 0, 0, + mpegts_write_section1(&ts->pat, PAT_TID, ts->transport_stream_id, ts->tables_version, 0, 0, data, q - data); } @@ -731,7 +729,7 @@ static void mpegts_write_sdt(AVFormatContext *s) int i, running_status, free_ca_mode, val; q = data; - put16(&q, ts->onid); + put16(&q, ts->original_network_id); *q++ = 0xff; for (i = 0; i < ts->nb_services; i++) { service = ts->services[i]; @@ -757,7 +755,7 @@ static void mpegts_write_sdt(AVFormatContext *s) desc_list_len_ptr[0] = val >> 8; desc_list_len_ptr[1] = val; } - mpegts_write_section1(&ts->sdt, SDT_TID, ts->tsid, ts->tables_version, 0, 0, + mpegts_write_section1(&ts->sdt, SDT_TID, ts->transport_stream_id, ts->tables_version, 0, 0, data, q - data); } @@ -960,8 +958,6 @@ static int mpegts_init(AVFormatContext *s) // round up to a whole number of TS packets ts->pes_payload_size = (ts->pes_payload_size + 14 + 183) / 184 * 184 - 14; - ts->tsid = ts->transport_stream_id; - ts->onid = ts->original_network_id; if (!s->nb_programs) { /* allocate a single DVB service */ if (!mpegts_add_service(s, ts->service_id, s->metadata, NULL))