diff options
| -rw-r--r-- | libavformat/latmenc.c | 15 | ||||
| -rwxr-xr-x | tests/lavf-regression.sh | 4 | ||||
| -rw-r--r-- | tests/ref/lavf-fate/latm | 3 |
3 files changed, 21 insertions, 1 deletions
diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 3ee277d701..c296a1b116 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -166,8 +166,21 @@ static int latm_write_packet(AVFormatContext *s, AVPacket *pkt) /* The LATM payload is written unaligned */ + i = 0; + if (pkt->size && (pkt->data[0] & 0xe1) == 0x81) { + // Convert byte-aligned DSE to non-aligned. + // Due to the input format encoding we know that + // it is naturally byte-aligned in the input stream, + // so there are no padding bits to account for. + // To avoid having to add padding bits and rearrange + // the whole stream we just remove the byte-align flag. + // This allows us to remux our FATE AAC samples into latm + // files that are still playable with minimal effort. + put_bits(&bs, 8, pkt->data[0] & 0xfe); + i++; + } /* PayloadMux() */ - for (i = 0; i < pkt->size; i++) + for (; i < pkt->size; i++) put_bits(&bs, 8, pkt->data[i]); avpriv_align_put_bits(&bs); diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 66e394c687..24a0c64ce8 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -139,6 +139,10 @@ if [ -n "$do_mp3" ] ; then do_lavf_fate mp3 "mp3-conformance/he_32khz.bit" "-acodec copy" fi +if [ -n "$do_latm" ] ; then +do_lavf_fate latm "aac/al04_44.mp4" "-acodec copy" +fi + if [ -n "$do_ogg_vp3" ] ; then # -idct simple causes different results on different systems DEC_OPTS="$DEC_OPTS -idct auto" diff --git a/tests/ref/lavf-fate/latm b/tests/ref/lavf-fate/latm new file mode 100644 index 0000000000..36792773a7 --- /dev/null +++ b/tests/ref/lavf-fate/latm @@ -0,0 +1,3 @@ +9c8d1afdb2d336976102f175ba577471 *./tests/data/lavf-fate/lavf.latm +71926 ./tests/data/lavf-fate/lavf.latm +./tests/data/lavf-fate/lavf.latm CRC=0xd846c4b3 |