videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-13 02:35:50 +02:00
Code Releases Activity

Allow setting streamid when muxing mpegts.

Browse Source 
Patch by Mike Scheutzow, scheutzow alcatel-lucent com

Originally committed as revision 23918 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Mike Scheutzow 2010-06-30 22:39:13 +00:00 committed by Carl Eugen Hoyos
parent 006e8108de
commit 5fd4857354
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavformat/mpegtsenc.c
View File

@ -387,8 +387,9 @@ static int mpegts_write_header(AVFormatContext *s)
MpegTSService *service; MpegTSService *service;
AVStream *st, *pcr_st = NULL; AVStream *st, *pcr_st = NULL;
AVMetadataTag *title; AVMetadataTag *title;
int i; int i, j;
const char *service_name; const char *service_name;
int *pids;
ts->tsid = DEFAULT_TSID; ts->tsid = DEFAULT_TSID;
ts->onid = DEFAULT_ONID; ts->onid = DEFAULT_ONID;
@ -411,6 +412,10 @@ static int mpegts_write_header(AVFormatContext *s)
ts->sdt.write_packet = section_write_packet; ts->sdt.write_packet = section_write_packet;
ts->sdt.opaque = s; ts->sdt.opaque = s;
pids = av_malloc(s->nb_streams);
if (!pids)
return AVERROR(ENOMEM);
/* assign pids to each stream */ /* assign pids to each stream */
for(i = 0;i < s->nb_streams; i++) { for(i = 0;i < s->nb_streams; i++) {
st = s->streams[i]; st = s->streams[i];
@ -419,7 +424,26 @@ static int mpegts_write_header(AVFormatContext *s)
goto fail; goto fail;
st->priv_data = ts_st; st->priv_data = ts_st;
ts_st->service = service; ts_st->service = service;
ts_st->pid = DEFAULT_START_PID + i; /* MPEG pid values < 16 are reserved. Applications which set st->id in
* this range are assigned a calculated pid. */
if (st->id < 16) {
ts_st->pid = DEFAULT_START_PID + i;
} else if (st->id < 0x1FFF) {
ts_st->pid = st->id;
} else {
av_log(s, AV_LOG_ERROR, "Invalid stream id %d, must be less than 8191\n", st->id);
goto fail;
}
if (ts_st->pid == service->pmt.pid) {
av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid);
goto fail;
}
for (j = 0; j < i; j++)
if (pids[j] == ts_st->pid) {
av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid);
goto fail;
}
pids[i] = ts_st->pid;
ts_st->payload_pts = AV_NOPTS_VALUE; ts_st->payload_pts = AV_NOPTS_VALUE;
ts_st->payload_dts = AV_NOPTS_VALUE; ts_st->payload_dts = AV_NOPTS_VALUE;
ts_st->first_pts_check = 1; ts_st->first_pts_check = 1;
@ -441,6 +465,8 @@ static int mpegts_write_header(AVFormatContext *s)
} }
} }
av_free(pids);
/* if no video stream, use the first stream as PCR */ /* if no video stream, use the first stream as PCR */
if (service->pcr_pid == 0x1fff && s->nb_streams > 0) { if (service->pcr_pid == 0x1fff && s->nb_streams > 0) {
pcr_st = s->streams[0]; pcr_st = s->streams[0];
@ -496,6 +522,7 @@ static int mpegts_write_header(AVFormatContext *s)
return 0; return 0;
fail: fail:
av_free(pids);
for(i = 0;i < s->nb_streams; i++) { for(i = 0;i < s->nb_streams; i++) {
st = s->streams[i]; st = s->streams[i];
av_free(st->priv_data); av_free(st->priv_data);