generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/mpegtsenc: Do not create invalid files from annex b streams without SPS/PPS

Browse Source 
use global headers to create SPS/PPS when they are available

Fixes Ticket4248

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-12 22:31:47 +01:00
parent b6f577dbb2
commit 33650e0e42
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/mpegtsenc.c
View File

@ -1270,26 +1270,35 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if (st->codec->codec_id == AV_CODEC_ID_H264) { if (st->codec->codec_id == AV_CODEC_ID_H264) {
const uint8_t *p = buf, *buf_end = p + size; const uint8_t *p = buf, *buf_end = p + size;
uint32_t state = -1; uint32_t state = -1;
int extradd = (pkt->flags & AV_PKT_FLAG_KEY) ? st->codec->extradata_size : 0;
int ret = ff_check_h264_startcode(s, st, pkt); int ret = ff_check_h264_startcode(s, st, pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (extradd && AV_RB24(st->codec->extradata) > 1)
extradd = 0;
do { do {
p = avpriv_find_start_code(p, buf_end, &state); p = avpriv_find_start_code(p, buf_end, &state);
av_dlog(s, "nal %d\n", state & 0x1f); av_dlog(s, "nal %d\n", state & 0x1f);
if ((state & 0x1f) == 7)
extradd = 0;
} while (p < buf_end && (state & 0x1f) != 9 && } while (p < buf_end && (state & 0x1f) != 9 &&
(state & 0x1f) != 5 && (state & 0x1f) != 1); (state & 0x1f) != 5 && (state & 0x1f) != 1);
if ((state & 0x1f) != 5)
extradd = 0;
if ((state & 0x1f) != 9) { // AUD NAL if ((state & 0x1f) != 9) { // AUD NAL
data = av_malloc(pkt->size + 6); data = av_malloc(pkt->size + 6 + extradd);
if (!data) if (!data)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memcpy(data + 6, pkt->data, pkt->size); memcpy(data + 6, st->codec->extradata, extradd);
memcpy(data + 6 + extradd, pkt->data, pkt->size);
AV_WB32(data, 0x00000001); AV_WB32(data, 0x00000001);
data[4] = 0x09; data[4] = 0x09;
data[5] = 0xf0; // any slice type (0xe) + rbsp stop one bit data[5] = 0xf0; // any slice type (0xe) + rbsp stop one bit
buf = data; buf = data;
size = pkt->size + 6; size = pkt->size + 6 + extradd;
} }
} else if (st->codec->codec_id == AV_CODEC_ID_AAC) { } else if (st->codec->codec_id == AV_CODEC_ID_AAC) {
if (pkt->size < 2) { if (pkt->size < 2) {