[FFmpeg-devel] [PATCH] avformat/movenc: add support for syncframes concatenation for E-AC-3.
Benoit Fouet
benoit.fouet at free.fr
Thu Oct 9 10:02:14 CEST 2014
E-AC-3 samples should contain 6 audio blocks, so concatenate syncframes
in order to achieve this.
---
libavformat/movenc.c | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 18c5955..4f4f1cb 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -294,7 +294,9 @@ static int mov_write_ac3_tag(AVIOContext *pb, MOVTrack *track)
}
struct eac3_info {
+ AVPacket pkt;
uint8_t ec3_done;
+ uint8_t num_blocks;
/* Layout of the EC3SpecificBox */
/* maximum bitrate */
@@ -405,11 +407,32 @@ static int handle_eac3(AVPacket *pkt, MOVTrack *track)
}
}
-/* TODO: concatenate syncframes to have 6 blocks per entry */
concatenate:
- if (num_blocks != 6) {
- avpriv_request_sample(track->enc, "%d block(s) in syncframe", num_blocks);
- return AVERROR_PATCHWELCOME;
+ if (!info->num_blocks && num_blocks == 6)
+ return pkt->size;
+ else if (info->num_blocks + num_blocks > 6)
+ return AVERROR_INVALIDDATA;
+
+ if (!info->num_blocks) {
+ if ((ret = av_copy_packet(&info->pkt, pkt)) < 0)
+ return ret;
+ info->num_blocks = num_blocks;
+ return 0;
+ } else {
+ 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;
@@ -429,8 +452,8 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track)
size = 2 + 4 * (info->num_ind_sub + 1);
buf = av_malloc(size);
if (!buf) {
- av_freep(&track->eac3_priv);
- return AVERROR(ENOMEM);
+ size = AVERROR(ENOMEM);
+ goto end;
}
init_put_bits(&pbc, buf, size);
@@ -460,6 +483,9 @@ static int mov_write_eac3_tag(AVIOContext *pb, MOVTrack *track)
avio_write(pb, buf, size);
av_free(buf);
+
+end:
+ av_free_packet(&info->pkt);
av_freep(&track->eac3_priv);
return size;
@@ -3783,6 +3809,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
size = handle_eac3(pkt, trk);
if (size < 0)
return size;
+ else if (!size)
+ goto end;
avio_write(pb, pkt->data, size);
} else {
avio_write(pb, pkt->data, size);
@@ -3856,6 +3884,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
if (trk->hint_track >= 0 && trk->hint_track < mov->nb_streams)
ff_mov_add_hinted_packet(s, pkt, trk->hint_track, trk->entry,
reformatted_data, size);
+end:
av_free(reformatted_data);
return 0;
}
--
2.1.0.127.g0c72b98
More information about the ffmpeg-devel
mailing list