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

mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing

Browse Source 
Per suggestion by Michael Niedermayer.

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Jindřich Makovička
2012-06-03 06:11:10 +02:00
committed by Martin Storsjö
parent 2b1f105f1b
commit 84e430dd7b
1 changed files with 9 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
libavformat/mpegtsenc.c
View File

@@ -226,10 +226,6 @@ typedef struct MpegTSWriteStream {
int64_t payload_dts; int64_t payload_dts;
int payload_flags; int payload_flags;
uint8_t *payload; uint8_t *payload;
uint8_t *adata;
int adata_pos;
int adata_size;
AVFormatContext *amux; AVFormatContext *amux;
} MpegTSWriteStream; } MpegTSWriteStream;
@@ -464,19 +460,6 @@ static void section_write_packet(MpegTSSection *s, const uint8_t *packet)
avio_write(ctx->pb, packet, TS_PACKET_SIZE); avio_write(ctx->pb, packet, TS_PACKET_SIZE);
} }
/* Write callback for audio packetizer */
static int mpegts_audio_write(void *opaque, uint8_t *buf, int size)
{
MpegTSWriteStream *ts_st = (MpegTSWriteStream *)opaque;
if (ts_st->adata_pos + size > ts_st->adata_size)
return AVERROR(EIO);
memcpy(ts_st->adata + ts_st->adata_pos, buf, size);
ts_st->adata_pos += size;
return 0;
}
static int mpegts_write_header(AVFormatContext *s) static int mpegts_write_header(AVFormatContext *s)
{ {
MpegTSWrite *ts = s->priv_data; MpegTSWrite *ts = s->priv_data;
@@ -577,25 +560,11 @@ static int mpegts_write_header(AVFormatContext *s)
st->codec->extradata_size > 0) st->codec->extradata_size > 0)
{ {
AVStream *ast; AVStream *ast;
uint8_t *buffer;
int buffer_size = 32768;
ts_st->amux = avformat_alloc_context(); ts_st->amux = avformat_alloc_context();
if (!ts_st->amux) { if (!ts_st->amux) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
buffer = av_malloc(buffer_size);
if (!buffer) {
ret = AVERROR(ENOMEM);
goto fail;
}
ts_st->amux->pb = avio_alloc_context(buffer, buffer_size, AVIO_FLAG_WRITE,
ts_st, NULL, mpegts_audio_write, NULL);
if (!ts_st->amux->pb) {
av_free(buffer);
ret = AVERROR(ENOMEM);
goto fail;
}
ts_st->amux->oformat = av_guess_format((ts->flags & MPEGTS_FLAG_AAC_LATM) ? "latm" : "adts", NULL, NULL); ts_st->amux->oformat = av_guess_format((ts->flags & MPEGTS_FLAG_AAC_LATM) ? "latm" : "adts", NULL, NULL);
if (!ts_st->amux->oformat) { if (!ts_st->amux->oformat) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
@@ -676,9 +645,8 @@ static int mpegts_write_header(AVFormatContext *s)
if (ts_st) { if (ts_st) {
av_freep(&ts_st->payload); av_freep(&ts_st->payload);
if (ts_st->amux) { if (ts_st->amux) {
av_free(ts_st->amux->pb->buffer);
av_free(ts_st->amux->pb);
avformat_free_context(ts_st->amux); avformat_free_context(ts_st->amux);
ts_st->amux = NULL;
} }
} }
av_freep(&st->priv_data); av_freep(&st->priv_data);
@@ -1082,24 +1050,20 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
av_init_packet(&pkt2); av_init_packet(&pkt2);
pkt2.data = pkt->data; pkt2.data = pkt->data;
pkt2.size = pkt->size; pkt2.size = pkt->size;
ts_st->adata_size = 1024 + pkt->size; ret = avio_open_dyn_buf(&ts_st->amux->pb);
ts_st->adata = data = av_malloc(ts_st->adata_size); if (ret < 0)
ts_st->adata_pos = 0;
if (!data)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = av_write_frame(ts_st->amux, &pkt2); ret = av_write_frame(ts_st->amux, &pkt2);
if (ret < 0) { if (ret < 0) {
avio_close_dyn_buf(ts_st->amux->pb, &data);
ts_st->amux->pb = NULL;
av_free(data); av_free(data);
return ret; return ret;
} }
avio_flush(ts_st->amux->pb); size = avio_close_dyn_buf(ts_st->amux->pb, &data);
if (ts_st->amux->pb->error < 0) { ts_st->amux->pb = NULL;
av_free(data); buf = data;
return ts_st->amux->pb->error;
}
buf = ts_st->adata;
size = ts_st->adata_pos;
} }
} }
@@ -1180,9 +1144,8 @@ static int mpegts_write_end(AVFormatContext *s)
MpegTSWriteStream *ts_st = st->priv_data; MpegTSWriteStream *ts_st = st->priv_data;
av_freep(&ts_st->payload); av_freep(&ts_st->payload);
if (ts_st->amux) { if (ts_st->amux) {
av_free(ts_st->amux->pb->buffer);
av_free(ts_st->amux->pb);
avformat_free_context(ts_st->amux); avformat_free_context(ts_st->amux);
ts_st->amux = NULL;
} }
} }