[FFmpeg-devel] [PATCH v2] movenc-test: Pad the packet data start with 0s

[Derek Buitenhuis]

This way, it never starts with 0xFFF0, and never trips the
ADTS "Detection" code in movenc.c.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>
---
 libavformat/movenc-test.c |  6 +++---
 tests/ref/fate/movenc     | 40 ++++++++++++++++++++--------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/libavformat/movenc-test.c b/libavformat/movenc-test.c
index 8132bab..d9c7a1a 100644
--- a/libavformat/movenc-test.c
+++ b/libavformat/movenc-test.c
@@ -215,7 +215,7 @@ static void mux_frames(int n)
     int end_frames = frames + n;
     while (1) {
         AVPacket pkt;
-        uint8_t pktdata[4];
+        uint8_t pktdata[8] = { 0 };
         av_init_packet(&pkt);
 
         if (av_compare_ts(audio_dts, audio_st->time_base, video_dts, video_st->time_base) < 0) {
@@ -257,9 +257,9 @@ static void mux_frames(int n)
 
         if (clear_duration)
             pkt.duration = 0;
-        AV_WB32(pktdata, pkt.pts);
+        AV_WB32(pktdata + 4, pkt.pts);
         pkt.data = pktdata;
-        pkt.size = 4;
+        pkt.size = 8;
         if (skip_write)
             continue;
         if (skip_write_audio && pkt.stream_index == 1)
diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc
index dffb30c..3e7fe34 100644
--- a/tests/ref/fate/movenc
+++ b/tests/ref/fate/movenc
@@ -1,24 +1,24 @@
-167647a7019bb1f134329b22bd4ddcdf 2681 non-empty-moov
-8a7595021c11a848ac20ec4f77c9d0bf 3113 non-empty-moov-elst
-f9d6b8fce9404a8d2a947badcf65fba6 3049 non-empty-moov-no-elst
-d43b8a181c074d94f152e6f03f83abb2 9115 ismv
-204d141d70e4801333ab516bb9e1d3fc 2303 empty-moov
-5af446fd5e0a7978e8dff9511938ddab 2703 empty-moov-no-elst
-ad43cfb415822a0d70db0f11a87ced66 2535 empty-moov-no-elst-no-adjust
-204d141d70e4801333ab516bb9e1d3fc 2303 delay-moov
-0cf964a5e0908cfb3a023d5c48776ac6 2607 delay-moov-elst
-9a6a892af043f1d77b2f5ee6deaadcd7 1858 delay-moov-empty-track
-7453fb089ad8799669259cbf559bdb37 1761 delay-moov-empty-track-flush
+249e02e3645ea5ca2c74397c62c53314 3269 non-empty-moov
+3281ff664e9a06e5a03ec6ea1729696c 3721 non-empty-moov-elst
+b408a545b1963a5ea82cf37208b66548 3629 non-empty-moov-no-elst
+f717c240ddfc036ed8a635b0af55bac2 11459 ismv
+176a315a5385cb2e082d863e0fb22bf1 2891 empty-moov
+10eb3fdf6ed1400a1eec50746537159f 3283 empty-moov-no-elst
+bcd4d6d22f828f1061e13f3af459644f 3115 empty-moov-no-elst-no-adjust
+176a315a5385cb2e082d863e0fb22bf1 2891 delay-moov
+1398c80f1f5fd7f8e127bb5b17311016 3203 delay-moov-elst
+ed6dd0e0fd6d0d9d1145b201674325f6 2098 delay-moov-empty-track
+7f1dabd680135708c6ff359e4ab27165 2001 delay-moov-empty-track-flush
 39d798aa11a265c7906f9e11d4f303c0 1159 empty-moov-header
-473d94ed152c332015f7e1d327fa855d 996 empty-moov-content
+a0165f4a26a409212b0946e981bdefb9 1584 empty-moov-content
 39d798aa11a265c7906f9e11d4f303c0 1159 delay-moov-header
-473d94ed152c332015f7e1d327fa855d 996 delay-moov-content
-64e38d416e9344c8046e37426cdf2807 584 empty-moov-second-frag
-64e38d416e9344c8046e37426cdf2807 584 empty-moov-second-frag-discont
-64e38d416e9344c8046e37426cdf2807 584 delay-moov-second-frag-discont
+a0165f4a26a409212b0946e981bdefb9 1584 delay-moov-content
+272a474cfd2a68cc5f05b426b14a2b7d 876 empty-moov-second-frag
+272a474cfd2a68cc5f05b426b14a2b7d 876 empty-moov-second-frag-discont
+272a474cfd2a68cc5f05b426b14a2b7d 876 delay-moov-second-frag-discont
 6256445b9595de78be493e0faf2bc5d7 1219 delay-moov-elst-init
-5bcd7237855218554de38044dbd31cda 704 delay-moov-elst-second-frag
+fcae8f40e015b59aabc8d4a99a759ca1 996 delay-moov-elst-second-frag
 6256445b9595de78be493e0faf2bc5d7 1219 delay-moov-elst-init-discont
-5bcd7237855218554de38044dbd31cda 704 delay-moov-elst-second-frag-discont
-da0d89d03fa601b40f6a653c8314e333 3615 vfr
-da0d89d03fa601b40f6a653c8314e333 3615 vfr-noduration
+fcae8f40e015b59aabc8d4a99a759ca1 996 delay-moov-elst-second-frag-discont
+6cd6085f4f0ff536acfcb77cb658eb47 4935 vfr
+6cd6085f4f0ff536acfcb77cb658eb47 4935 vfr-noduration
-- 
2.6.2