RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use ff_avc_parse_nal_units_buf because output size might differ from input size 

Originally committed as revision 16626 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-01-16 01:22:30 +00:00
parent c844520e73
commit 71e685b018
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/flvenc.c
View File

@ -309,6 +309,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
FLVContext *flv = s->priv_data; FLVContext *flv = s->priv_data;
unsigned ts; unsigned ts;
int size= pkt->size; int size= pkt->size;
uint8_t *data= NULL;
int flags, flags_size; int flags, flags_size;
// av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", enc->codec_type, timestamp, size); // av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", enc->codec_type, timestamp, size);
@ -341,6 +342,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
} }
if (enc->codec_id == CODEC_ID_H264) { if (enc->codec_id == CODEC_ID_H264) {
/* check if extradata looks like mp4 formated */
if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {
if (ff_avc_parse_nal_units_buf(pkt->data, &data, &size) < 0)
return -1;
}
if (!flv->delay && pkt->dts < 0) if (!flv->delay && pkt->dts < 0)
flv->delay = -pkt->dts; flv->delay = -pkt->dts;
} }
@ -361,17 +367,16 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
put_byte(pb,1); // AVC NALU put_byte(pb,1); // AVC NALU
put_be24(pb,pkt->pts - pkt->dts); put_be24(pb,pkt->pts - pkt->dts);
} }
if (enc->codec_id == CODEC_ID_H264 &&
/* check if extradata looks like mp4 formated */ put_buffer(pb, data ? data : pkt->data, size);
enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1) {
ff_avc_parse_nal_units(pb, pkt->data, pkt->size);
} else {
put_buffer(pb, pkt->data, size);
}
put_be32(pb,size+flags_size+11); // previous tag size put_be32(pb,size+flags_size+11); // previous tag size
flv->duration = FFMAX(flv->duration, pkt->pts + flv->delay + pkt->duration); flv->duration = FFMAX(flv->duration, pkt->pts + flv->delay + pkt->duration);
put_flush_packet(pb); put_flush_packet(pb);
av_free(data);
return 0; return 0;
} }