virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avformat/movenc: add support for syncframes concatenation for E-AC-3.

Browse Source 
E-AC-3 samples should contain 6 audio blocks, so concatenate syncframes
in order to achieve this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Benoit Fouet 2014-10-13 09:35:11 +02:00 committed by Michael Niedermayer
parent 4da7111eb8
commit f87134c7a1
1 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libavformat/movenc.c
View File

@ -295,7 +295,9 @@ static int mov_write_ac3_tag(AVIOContext *pb, MOVTrack *track)
} }
struct eac3_info { struct eac3_info {
AVPacket pkt;
uint8_t ec3_done; uint8_t ec3_done;
uint8_t num_blocks;
/* Layout of the EC3SpecificBox */ /* Layout of the EC3SpecificBox */
/* maximum bitrate */ /* maximum bitrate */
@ -412,11 +414,34 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
} }
} }
/* TODO: concatenate syncframes to have 6 blocks per entry */
concatenate: concatenate:
if (num_blocks != 6) { if (!info->num_blocks && num_blocks == 6)
avpriv_request_sample(track->enc, "%d block(s) in syncframe", num_blocks); return pkt->size;
return AVERROR_PATCHWELCOME; else if (info->num_blocks + num_blocks > 6)
return AVERROR_INVALIDDATA;
if (!info->num_blocks) {
int ret;
if ((ret = av_copy_packet(&info->pkt, pkt)) < 0)
return ret;
info->num_blocks = num_blocks;
return 0;
} else {
int ret;
if ((ret = av_grow_packet(&info->pkt, pkt->size)) < 0)
return ret;
memcpy(info->pkt.data + info->pkt.size - pkt->size, pkt->data, pkt->size);
info->num_blocks += num_blocks;
info->pkt.duration += pkt->duration;
if ((ret = av_copy_packet_side_data(&info->pkt, pkt)) < 0)
return ret;
if (info->num_blocks != 6)
return 0;
av_free_packet(pkt);
if ((ret = av_copy_packet(pkt, &info->pkt)) < 0)
return ret;
av_free_packet(&info->pkt);
info->num_blocks = 0;
} }
return pkt->size; return pkt->size;
@ -436,8 +461,8 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track)
size = 2 + 4 * (info->num_ind_sub + 1); size = 2 + 4 * (info->num_ind_sub + 1);
buf = av_malloc(size); buf = av_malloc(size);
if (!buf) { if (!buf) {
av_freep(&track->eac3_priv); size = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto end;
} }
init_put_bits(&pbc, buf, size); init_put_bits(&pbc, buf, size);
@ -467,6 +492,9 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track)
avio_write(pb, buf, size); avio_write(pb, buf, size);
av_free(buf); av_free(buf);
end:
av_free_packet(&info->pkt);
av_freep(&track->eac3_priv); av_freep(&track->eac3_priv);
return size; return size;
@ -3810,6 +3838,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
size = handle_eac3(mov, pkt, trk); size = handle_eac3(mov, pkt, trk);
if (size < 0) if (size < 0)
return size; return size;
else if (!size)
goto end;
avio_write(pb, pkt->data, size); avio_write(pb, pkt->data, size);
} else { } else {
avio_write(pb, pkt->data, size); avio_write(pb, pkt->data, size);
@ -3889,6 +3919,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams) if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams)
ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry, ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry,
reformatted_data, size); reformatted_data, size);
end:
av_free(reformatted_data); av_free(reformatted_data);
return 0; return 0;
} }