- max_payload_size = DEFAULT_PES_PAYLOAD_SIZE;
- while (size > 0) {
- len = max_payload_size - ts_st->payload_index;
- if (len > size)
- len = size;
- memcpy(ts_st->payload + ts_st->payload_index, buf, len);
- buf += len;
- size -= len;
- ts_st->payload_index += len;
- if (ts_st->payload_pts == AV_NOPTS_VALUE)
- ts_st->payload_pts = pkt->pts;
- if (ts_st->payload_dts == AV_NOPTS_VALUE)
- ts_st->payload_dts = pkt->dts;
- if (ts_st->payload_index >= max_payload_size) {
- mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index,
- ts_st->payload_pts, ts_st->payload_dts);
- ts_st->payload_pts = AV_NOPTS_VALUE;
- ts_st->payload_dts = AV_NOPTS_VALUE;
- ts_st->payload_index = 0;
+ if (st->codec->codec_id == CODEC_ID_H264) {
+ const uint8_t *p = buf, *buf_end = p+size;
+ uint32_t state = -1;
+
+ if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
+ av_log(s, AV_LOG_ERROR, "h264 bitstream malformated, "
+ "no startcode found, use -vbsf h264_mp4toannexb\n");
+ return -1;
+ }
+
+ do {
+ p = ff_find_start_code(p, buf_end, &state);
+ //av_log(s, AV_LOG_INFO, "nal %d\n", state & 0x1f);
+ } while (p < buf_end && (state & 0x1f) != 9 &&
+ (state & 0x1f) != 5 && (state & 0x1f) != 1);
+
+ if ((state & 0x1f) != 9) { // AUD NAL
+ data = av_malloc(pkt->size+6);
+ if (!data)
+ return -1;
+ memcpy(data+6, pkt->data, pkt->size);
+ AV_WB32(data, 0x00000001);
+ data[4] = 0x09;
+ data[5] = 0xe0; // any slice type
+ buf = data;
+ size = pkt->size+6;
+ }
+ } else if (st->codec->codec_id == CODEC_ID_AAC) {
+ if (pkt->size < 2)
+ return -1;
+ if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) {
+ ADTSContext *adts = ts_st->adts;
+ int new_size;
+ if (!adts) {
+ av_log(s, AV_LOG_ERROR, "aac bitstream not in adts format "
+ "and extradata missing\n");
+ return -1;
+ }
+ new_size = ADTS_HEADER_SIZE+adts->pce_size+pkt->size;
+ if ((unsigned)new_size >= INT_MAX)
+ return -1;
+ data = av_malloc(new_size);
+ if (!data)
+ return AVERROR_NOMEM;
+ ff_adts_write_frame_header(adts, data, pkt->size, adts->pce_size);
+ if (adts->pce_size) {
+ memcpy(data+ADTS_HEADER_SIZE, adts->pce_data, adts->pce_size);
+ adts->pce_size = 0;
+ }
+ memcpy(data+ADTS_HEADER_SIZE+adts->pce_size, pkt->data, pkt->size);
+ buf = data;
+ size = new_size;