diff mbox

[FFmpeg-devel] lavf/mov.c: Parse upto 2 keyframes after the edit list end in mov_fix_index.

Message ID 20171102001155.GL6009@nb4
State Superseded
Headers show

Commit Message

Michael Niedermayer Nov. 2, 2017, 12:11 a.m. UTC
On Wed, Nov 01, 2017 at 02:26:45PM -0700, Sasi Inguva wrote:
> Partially fixes t/6699.
> ---
>  libavformat/mov.c                         | 32 ++++++++++++++++++++-----------
>  tests/fate/mov.mak                        |  4 ++++
>  tests/ref/fate/mov-elst-ends-betn-b-and-i | 31 ++++++++++++++++++++++++++++++
>  3 files changed, 56 insertions(+), 11 deletions(-)
>  create mode 100644 tests/ref/fate/mov-elst-ends-betn-b-and-i

Is this inteded as an alternaive to your other patch ?
both together fail fate:

[...]
TEST    mp3-float-conf-si
Test mov-elst-ends-betn-b-and-i failed. Look at tests/data/fate/mov-elst-ends-betn-b-and-i.err for details.
make: *** [fate-mov-elst-ends-betn-b-and-i] Error 1
make: *** Waiting for unfinished jobs....


[...]

Comments

Sasi Inguva Nov. 2, 2017, 1:46 a.m. UTC | #1
This patch is not an alternative. Both patches are required to fix
t/6699 . Once
one of the patches is submitted, i will update the fate tests in the other
patch.

On Wed, Nov 1, 2017 at 5:11 PM, Michael Niedermayer <michael@niedermayer.cc>
wrote:

> On Wed, Nov 01, 2017 at 02:26:45PM -0700, Sasi Inguva wrote:
> > Partially fixes t/6699.
> > ---
> >  libavformat/mov.c                         | 32
> ++++++++++++++++++++-----------
> >  tests/fate/mov.mak                        |  4 ++++
> >  tests/ref/fate/mov-elst-ends-betn-b-and-i | 31
> ++++++++++++++++++++++++++++++
> >  3 files changed, 56 insertions(+), 11 deletions(-)
> >  create mode 100644 tests/ref/fate/mov-elst-ends-betn-b-and-i
>
> Is this inteded as an alternaive to your other patch ?
> both together fail fate:
>
> [...]
> --- ./tests/ref/fate/mov-elst-ends-betn-b-and-i 2017-11-02
> 00:56:36.199196931 +0100
> +++ tests/data/fate/mov-elst-ends-betn-b-and-i  2017-11-02
> 01:03:01.739201528 +0100
> @@ -7,25 +7,27 @@
>  #dimensions 0: 320x240
>  #sar 0: 1/1
>  #stream#, dts,        pts, duration,     size, hash
> -0,          0,          0,        1,   115200,
> 4e5dc2b806e394cd666c968f736fecd0
> -0,          1,          1,        1,   115200,
> 7a3c7473d44c5f60c07655f6fc0c2ac3
> -0,          2,          2,        1,   115200,
> 038254422a603a3270c09cdcd149707b
> -0,          3,          3,        1,   115200,
> 7553b6b4547cb23ef8f0392ed5a5d4b0
> -0,          4,          4,        1,   115200,
> 6d017ede7f446124af7308667cb0dc41
> -0,          5,          5,        1,   115200,
> 77752f0288ae64f857732b8e62e47457
> -0,          6,          6,        1,   115200,
> d656833951af99330625f7c6de7685c4
> -0,          7,          7,        1,   115200,
> 14338b833e431e566ac98da841600bfe
> -0,          8,          8,        1,   115200,
> 07ea95d1659f3c4424a470a546d0df6e
> -0,          9,          9,        1,   115200,
> fd05b8cc83072f813e89d394d1f6efc6
> -0,         10,         10,        1,   115200,
> 750b82ca5c7e901545e7b1aa69692426
> -0,         11,         11,        1,   115200,
> 7347679ab09bc936047368b8caebcaff
> -0,         12,         12,        1,   115200,
> 63a23fdd57ac8462b9ffbcb12ab717b3
> -0,         13,         13,        1,   115200,
> 705257a1c99693db233e2a3ee027adcf
> -0,         14,         14,        1,   115200,
> df861a2ec7a4ef70e82b1c28025e5a48
> -0,         15,         15,        1,   115200,
> 2a8b403c077b6b43aa71eaf7d1537713
> -0,         16,         16,        1,   115200,
> 973b5cd3ce473e3970dfa96045553172
> -0,         17,         17,        1,   115200,
> fc612c0afeae3b6576b5ee2f3f119832
> -0,         18,         18,        1,   115200,
> 97074fe5a0b6e7e8470729654092e56c
> -0,         19,         19,        1,   115200,
> 8cf9337201065335b3aa4da21dc9b37a
> -0,         20,         20,        1,   115200,
> 93ff3589294cc0673af3daee1e7fe42a
> -0,         21,         21,        1,   115200,
> c0b6fd870a022f374f9d6c697e8e293d
> +0,          0,          0,        1,   115200,
> e10741e5457e9326d5e992e6c05c3e32
> +0,          1,          1,        1,   115200,
> 7e20f8729b6b53dc11791927bf4a5aec
> +0,          2,          2,        1,   115200,
> 4e5dc2b806e394cd666c968f736fecd0
> +0,          3,          3,        1,   115200,
> 7a3c7473d44c5f60c07655f6fc0c2ac3
> +0,          4,          4,        1,   115200,
> 038254422a603a3270c09cdcd149707b
> +0,          5,          5,        1,   115200,
> 7553b6b4547cb23ef8f0392ed5a5d4b0
> +0,          6,          6,        1,   115200,
> 6d017ede7f446124af7308667cb0dc41
> +0,          7,          7,        1,   115200,
> 77752f0288ae64f857732b8e62e47457
> +0,          8,          8,        1,   115200,
> d656833951af99330625f7c6de7685c4
> +0,          9,          9,        1,   115200,
> 14338b833e431e566ac98da841600bfe
> +0,         10,         10,        1,   115200,
> 07ea95d1659f3c4424a470a546d0df6e
> +0,         11,         11,        1,   115200,
> fd05b8cc83072f813e89d394d1f6efc6
> +0,         12,         12,        1,   115200,
> 750b82ca5c7e901545e7b1aa69692426
> +0,         13,         13,        1,   115200,
> 7347679ab09bc936047368b8caebcaff
> +0,         14,         14,        1,   115200,
> 63a23fdd57ac8462b9ffbcb12ab717b3
> +0,         15,         15,        1,   115200,
> 705257a1c99693db233e2a3ee027adcf
> +0,         16,         16,        1,   115200,
> df861a2ec7a4ef70e82b1c28025e5a48
> +0,         17,         17,        1,   115200,
> 2a8b403c077b6b43aa71eaf7d1537713
> +0,         18,         18,        1,   115200,
> 973b5cd3ce473e3970dfa96045553172
> +0,         19,         19,        1,   115200,
> fc612c0afeae3b6576b5ee2f3f119832
> +0,         20,         20,        1,   115200,
> 97074fe5a0b6e7e8470729654092e56c
> +0,         21,         21,        1,   115200,
> 8cf9337201065335b3aa4da21dc9b37a
> +0,         22,         22,        1,   115200,
> 93ff3589294cc0673af3daee1e7fe42a
> +0,         23,         23,        1,   115200,
> c0b6fd870a022f374f9d6c697e8e293d
> TEST    mp3-float-conf-si
> Test mov-elst-ends-betn-b-and-i failed. Look at
> tests/data/fate/mov-elst-ends-betn-b-and-i.err for details.
> make: *** [fate-mov-elst-ends-betn-b-and-i] Error 1
> make: *** Waiting for unfinished jobs....
>
>
> [...]
>
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> it is not once nor twice but times without number that the same ideas make
> their appearance in the world. -- Aristotle
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
>
diff mbox

Patch

--- ./tests/ref/fate/mov-elst-ends-betn-b-and-i 2017-11-02 00:56:36.199196931 +0100
+++ tests/data/fate/mov-elst-ends-betn-b-and-i  2017-11-02 01:03:01.739201528 +0100
@@ -7,25 +7,27 @@ 
 #dimensions 0: 320x240
 #sar 0: 1/1
 #stream#, dts,        pts, duration,     size, hash
-0,          0,          0,        1,   115200, 4e5dc2b806e394cd666c968f736fecd0
-0,          1,          1,        1,   115200, 7a3c7473d44c5f60c07655f6fc0c2ac3
-0,          2,          2,        1,   115200, 038254422a603a3270c09cdcd149707b
-0,          3,          3,        1,   115200, 7553b6b4547cb23ef8f0392ed5a5d4b0
-0,          4,          4,        1,   115200, 6d017ede7f446124af7308667cb0dc41
-0,          5,          5,        1,   115200, 77752f0288ae64f857732b8e62e47457
-0,          6,          6,        1,   115200, d656833951af99330625f7c6de7685c4
-0,          7,          7,        1,   115200, 14338b833e431e566ac98da841600bfe
-0,          8,          8,        1,   115200, 07ea95d1659f3c4424a470a546d0df6e
-0,          9,          9,        1,   115200, fd05b8cc83072f813e89d394d1f6efc6
-0,         10,         10,        1,   115200, 750b82ca5c7e901545e7b1aa69692426
-0,         11,         11,        1,   115200, 7347679ab09bc936047368b8caebcaff
-0,         12,         12,        1,   115200, 63a23fdd57ac8462b9ffbcb12ab717b3
-0,         13,         13,        1,   115200, 705257a1c99693db233e2a3ee027adcf
-0,         14,         14,        1,   115200, df861a2ec7a4ef70e82b1c28025e5a48
-0,         15,         15,        1,   115200, 2a8b403c077b6b43aa71eaf7d1537713
-0,         16,         16,        1,   115200, 973b5cd3ce473e3970dfa96045553172
-0,         17,         17,        1,   115200, fc612c0afeae3b6576b5ee2f3f119832
-0,         18,         18,        1,   115200, 97074fe5a0b6e7e8470729654092e56c
-0,         19,         19,        1,   115200, 8cf9337201065335b3aa4da21dc9b37a
-0,         20,         20,        1,   115200, 93ff3589294cc0673af3daee1e7fe42a
-0,         21,         21,        1,   115200, c0b6fd870a022f374f9d6c697e8e293d
+0,          0,          0,        1,   115200, e10741e5457e9326d5e992e6c05c3e32
+0,          1,          1,        1,   115200, 7e20f8729b6b53dc11791927bf4a5aec
+0,          2,          2,        1,   115200, 4e5dc2b806e394cd666c968f736fecd0
+0,          3,          3,        1,   115200, 7a3c7473d44c5f60c07655f6fc0c2ac3
+0,          4,          4,        1,   115200, 038254422a603a3270c09cdcd149707b
+0,          5,          5,        1,   115200, 7553b6b4547cb23ef8f0392ed5a5d4b0
+0,          6,          6,        1,   115200, 6d017ede7f446124af7308667cb0dc41
+0,          7,          7,        1,   115200, 77752f0288ae64f857732b8e62e47457
+0,          8,          8,        1,   115200, d656833951af99330625f7c6de7685c4
+0,          9,          9,        1,   115200, 14338b833e431e566ac98da841600bfe
+0,         10,         10,        1,   115200, 07ea95d1659f3c4424a470a546d0df6e
+0,         11,         11,        1,   115200, fd05b8cc83072f813e89d394d1f6efc6
+0,         12,         12,        1,   115200, 750b82ca5c7e901545e7b1aa69692426
+0,         13,         13,        1,   115200, 7347679ab09bc936047368b8caebcaff
+0,         14,         14,        1,   115200, 63a23fdd57ac8462b9ffbcb12ab717b3
+0,         15,         15,        1,   115200, 705257a1c99693db233e2a3ee027adcf
+0,         16,         16,        1,   115200, df861a2ec7a4ef70e82b1c28025e5a48
+0,         17,         17,        1,   115200, 2a8b403c077b6b43aa71eaf7d1537713
+0,         18,         18,        1,   115200, 973b5cd3ce473e3970dfa96045553172
+0,         19,         19,        1,   115200, fc612c0afeae3b6576b5ee2f3f119832
+0,         20,         20,        1,   115200, 97074fe5a0b6e7e8470729654092e56c
+0,         21,         21,        1,   115200, 8cf9337201065335b3aa4da21dc9b37a
+0,         22,         22,        1,   115200, 93ff3589294cc0673af3daee1e7fe42a
+0,         23,         23,        1,   115200, c0b6fd870a022f374f9d6c697e8e293d