fate: cover-art: Add dependencies

Message ID 1354876338-20968-1-git-send-email-diego@biurrun.de
State New
Headers show

Commit Message

Diego Biurrun Dec. 7, 2012, 10:32 a.m.
---
Add missing dependency on MJPEG decoder for the actual cover images.

 tests/fate/cover-art.mak |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Comments

Janne Grunau Dec. 7, 2012, 12:03 p.m. | #1
On 2012-12-07 11:32:18 +0100, Diego Biurrun wrote:
> ---
> Add missing dependency on MJPEG decoder for the actual cover images.
> 
>  tests/fate/cover-art.mak |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak
> index dadfcd8..d3b78ae 100644
> --- a/tests/fate/cover-art.mak
> +++ b/tests/fate/cover-art.mak
> @@ -1,23 +1,23 @@
> -FATE_COVER_ART += fate-cover-art-ape
> +FATE_COVER_ART-$(call DEMDEC, APE, MJPEG) += fate-cover-art-ape
>  fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo
>  fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317
>  
> -FATE_COVER_ART += fate-cover-art-flac
> +FATE_COVER_ART-$(call DEMDEC, FLAC, MJPEG) += fate-cover-art-flac
>  fate-cover-art-flac: CMD = md5 -i $(SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo
>  fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261
>  
> -FATE_COVER_ART += fate-cover-art-m4a
> +FATE_COVER_ART-$(call DEMDEC, MOV, MJPEG) += fate-cover-art-m4a
>  fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo
>  fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e
>  
> -FATE_COVER_ART += fate-cover-art-wma
> +FATE_COVER_ART-$(call DEMDEC, ASF, MJPEG) += fate-cover-art-wma
>  fate-cover-art-wma: CMD = md5 -i $(SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo
>  fate-cover-art-wma: REF = 0808bd0e1b61542a16e1906812dd924b
>  
> -FATE_COVER_ART += fate-cover-art-wv
> +FATE_COVER_ART-$(call DEMDEC, WV, MJPEG) += fate-cover-art-wv
>  fate-cover-art-wv: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo
>  fate-cover-art-wv: REF = 45333c983c45af54449dff10af144317
>  
> -$(FATE_COVER_ART): CMP = oneline
> -FATE_SAMPLES_AVCONV += $(FATE_COVER_ART)
> -fate-cover-art: $(FATE_COVER_ART)
> +$(FATE_COVER_ART-yes): CMP = oneline
> +FATE_SAMPLES_AVCONV += $(FATE_COVER_ART-yes)
> +fate-cover-art: $(FATE_COVER_ART-yes)

I thought the decoder is not necessary because of '-c:v copy'. patch ok
if someone can confirm that the mjpeg decoder is required for '-c copy'
to work.

Janne
Diego Biurrun Dec. 30, 2012, 2:02 p.m. | #2
On Fri, Dec 07, 2012 at 01:03:24PM +0100, Janne Grunau wrote:
> On 2012-12-07 11:32:18 +0100, Diego Biurrun wrote:
> > ---
> > Add missing dependency on MJPEG decoder for the actual cover images.
> > --- a/tests/fate/cover-art.mak
> > +++ b/tests/fate/cover-art.mak
> > @@ -1,23 +1,23 @@
> > -FATE_COVER_ART += fate-cover-art-ape
> > +FATE_COVER_ART-$(call DEMDEC, APE, MJPEG) += fate-cover-art-ape
> >  fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo
> >  fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317
> >  
> > -FATE_COVER_ART += fate-cover-art-flac
> > +FATE_COVER_ART-$(call DEMDEC, FLAC, MJPEG) += fate-cover-art-flac
> >  fate-cover-art-flac: CMD = md5 -i $(SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo
> >  fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261
> >  
> > -FATE_COVER_ART += fate-cover-art-m4a
> > +FATE_COVER_ART-$(call DEMDEC, MOV, MJPEG) += fate-cover-art-m4a
> >  fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo
> >  fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e
> >  
> > -FATE_COVER_ART += fate-cover-art-wma
> > +FATE_COVER_ART-$(call DEMDEC, ASF, MJPEG) += fate-cover-art-wma
> >  fate-cover-art-wma: CMD = md5 -i $(SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo
> >  fate-cover-art-wma: REF = 0808bd0e1b61542a16e1906812dd924b
> >  
> > -FATE_COVER_ART += fate-cover-art-wv
> > +FATE_COVER_ART-$(call DEMDEC, WV, MJPEG) += fate-cover-art-wv
> >  fate-cover-art-wv: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo
> >  fate-cover-art-wv: REF = 45333c983c45af54449dff10af144317
> >  
> > -$(FATE_COVER_ART): CMP = oneline
> > -FATE_SAMPLES_AVCONV += $(FATE_COVER_ART)
> > -fate-cover-art: $(FATE_COVER_ART)
> > +$(FATE_COVER_ART-yes): CMP = oneline
> > +FATE_SAMPLES_AVCONV += $(FATE_COVER_ART-yes)
> > +fate-cover-art: $(FATE_COVER_ART-yes)
> 
> I thought the decoder is not necessary because of '-c:v copy'. patch ok
> if someone can confirm that the mjpeg decoder is required for '-c copy'
> to work.

ping

Diego

Patch

diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak
index dadfcd8..d3b78ae 100644
--- a/tests/fate/cover-art.mak
+++ b/tests/fate/cover-art.mak
@@ -1,23 +1,23 @@ 
-FATE_COVER_ART += fate-cover-art-ape
+FATE_COVER_ART-$(call DEMDEC, APE, MJPEG) += fate-cover-art-ape
 fate-cover-art-ape: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo
 fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317
 
-FATE_COVER_ART += fate-cover-art-flac
+FATE_COVER_ART-$(call DEMDEC, FLAC, MJPEG) += fate-cover-art-flac
 fate-cover-art-flac: CMD = md5 -i $(SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo
 fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261
 
-FATE_COVER_ART += fate-cover-art-m4a
+FATE_COVER_ART-$(call DEMDEC, MOV, MJPEG) += fate-cover-art-m4a
 fate-cover-art-m4a: CMD = md5 -i $(SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo
 fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e
 
-FATE_COVER_ART += fate-cover-art-wma
+FATE_COVER_ART-$(call DEMDEC, ASF, MJPEG) += fate-cover-art-wma
 fate-cover-art-wma: CMD = md5 -i $(SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo
 fate-cover-art-wma: REF = 0808bd0e1b61542a16e1906812dd924b
 
-FATE_COVER_ART += fate-cover-art-wv
+FATE_COVER_ART-$(call DEMDEC, WV, MJPEG) += fate-cover-art-wv
 fate-cover-art-wv: CMD = md5 -i $(SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo
 fate-cover-art-wv: REF = 45333c983c45af54449dff10af144317
 
-$(FATE_COVER_ART): CMP = oneline
-FATE_SAMPLES_AVCONV += $(FATE_COVER_ART)
-fate-cover-art: $(FATE_COVER_ART)
+$(FATE_COVER_ART-yes): CMP = oneline
+FATE_SAMPLES_AVCONV += $(FATE_COVER_ART-yes)
+fate-cover-art: $(FATE_COVER_ART-yes)