Commit 6e6eebf9 authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

extract isom_write_avcc into a function

Originally committed as revision 11497 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent de04ad45
...@@ -475,24 +475,20 @@ static int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size) ...@@ -475,24 +475,20 @@ static int avc_parse_nal_units(uint8_t *buf_in, uint8_t **buf, int *size)
return 0; return 0;
} }
static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track) static int isom_write_avcc(ByteIOContext *pb, uint8_t *data, int len)
{ {
offset_t pos = url_ftell(pb); if (len > 6) {
put_be32(pb, 0);
put_tag(pb, "avcC");
if (track->vosLen > 6) {
/* check for h264 start code */ /* check for h264 start code */
if (AV_RB32(track->vosData) == 0x00000001) { if (AV_RB32(data) == 0x00000001) {
uint8_t *buf, *end; uint8_t *buf=NULL, *end;
uint32_t sps_size=0, pps_size=0; uint32_t sps_size=0, pps_size=0;
uint8_t *sps=0, *pps=0; uint8_t *sps=0, *pps=0;
int ret = avc_parse_nal_units(track->vosData, &track->vosData, &track->vosLen); int ret = avc_parse_nal_units(data, &buf, &len);
if (ret < 0) if (ret < 0)
return ret; return ret;
buf = track->vosData; data = buf;
end = track->vosData + track->vosLen; end = buf + len;
/* look for sps and pps */ /* look for sps and pps */
while (buf < end) { while (buf < end) {
...@@ -524,10 +520,21 @@ static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track) ...@@ -524,10 +520,21 @@ static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)
put_byte(pb, 1); /* number of pps */ put_byte(pb, 1); /* number of pps */
put_be16(pb, pps_size); put_be16(pb, pps_size);
put_buffer(pb, pps, pps_size); put_buffer(pb, pps, pps_size);
av_free(data);
} else { } else {
put_buffer(pb, track->vosData, track->vosLen); put_buffer(pb, data, len);
} }
} }
return 0;
}
static int mov_write_avcc_tag(ByteIOContext *pb, MOVTrack *track)
{
offset_t pos = url_ftell(pb);
put_be32(pb, 0);
put_tag(pb, "avcC");
isom_write_avcc(pb, track->vosData, track->vosLen);
return updateSize(pb, pos); return updateSize(pb, pos);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment