highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpegtsenc: use AVERROR() for return codes

Browse Source 
Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Jindrich Makovicka 2012-06-01 11:44:56 +02:00 committed by Martin Storsjö
parent dbaf79c9d7
commit d1a3a3d4b2
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/mpegtsenc.c
View File

@ -459,6 +459,7 @@ static int mpegts_write_header(AVFormatContext *s)
const char *service_name; const char *service_name;
const char *provider_name; const char *provider_name;
int *pids; int *pids;
int ret;
if (s->max_delay < 0) /* Not set by the caller */ if (s->max_delay < 0) /* Not set by the caller */
s->max_delay = 0; s->max_delay = 0;
@ -499,12 +500,16 @@ static int mpegts_write_header(AVFormatContext *s)
st = s->streams[i]; st = s->streams[i];
avpriv_set_pts_info(st, 33, 1, 90000); avpriv_set_pts_info(st, 33, 1, 90000);
ts_st = av_mallocz(sizeof(MpegTSWriteStream)); ts_st = av_mallocz(sizeof(MpegTSWriteStream));
if (!ts_st) if (!ts_st) {
ret = AVERROR(ENOMEM);
goto fail; goto fail;
}
st->priv_data = ts_st; st->priv_data = ts_st;
ts_st->payload = av_mallocz(ts->pes_payload_size); ts_st->payload = av_mallocz(ts->pes_payload_size);
if (!ts_st->payload) if (!ts_st->payload) {
ret = AVERROR(ENOMEM);
goto fail; goto fail;
}
ts_st->service = service; ts_st->service = service;
/* MPEG pid values < 16 are reserved. Applications which set st->id in /* MPEG pid values < 16 are reserved. Applications which set st->id in
* this range are assigned a calculated pid. */ * this range are assigned a calculated pid. */
@ -514,15 +519,18 @@ static int mpegts_write_header(AVFormatContext *s)
ts_st->pid = st->id; ts_st->pid = st->id;
} else { } else {
av_log(s, AV_LOG_ERROR, "Invalid stream id %d, must be less than 8191\n", st->id); av_log(s, AV_LOG_ERROR, "Invalid stream id %d, must be less than 8191\n", st->id);
ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
if (ts_st->pid == service->pmt.pid) { if (ts_st->pid == service->pmt.pid) {
av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid);
ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
for (j = 0; j < i; j++) for (j = 0; j < i; j++)
if (pids[j] == ts_st->pid) { if (pids[j] == ts_st->pid) {
av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid);
ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
pids[i] = ts_st->pid; pids[i] = ts_st->pid;
@ -615,7 +623,7 @@ static int mpegts_write_header(AVFormatContext *s)
} }
av_freep(&st->priv_data); av_freep(&st->priv_data);
} }
return -1; return ret;
} }
/* send SDT, PAT and PMT tables regulary */ /* send SDT, PAT and PMT tables regulary */
@ -959,7 +967,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) { if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) {
av_log(s, AV_LOG_ERROR, "first pts value must set\n"); av_log(s, AV_LOG_ERROR, "first pts value must set\n");
return -1; return AVERROR(EINVAL);
} }
ts_st->first_pts_check = 0; ts_st->first_pts_check = 0;
@ -970,7 +978,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) { if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, " av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, "
"no startcode found, use -bsf h264_mp4toannexb\n"); "no startcode found, use -bsf h264_mp4toannexb\n");
return -1; return AVERROR(EINVAL);
} }
do { do {
@ -982,7 +990,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if ((state & 0x1f) != 9) { // AUD NAL if ((state & 0x1f) != 9) { // AUD NAL
data = av_malloc(pkt->size+6); data = av_malloc(pkt->size+6);
if (!data) if (!data)
return -1; return AVERROR(ENOMEM);
memcpy(data+6, pkt->data, pkt->size); memcpy(data+6, pkt->data, pkt->size);
AV_WB32(data, 0x00000001); AV_WB32(data, 0x00000001);
data[4] = 0x09; data[4] = 0x09;