[FFmpeg-devel] Build fix for MIPS

Submitted by shivraj.patil@imgtec.com on March 31, 2017, 5:32 a.m.

Details

Message ID B05BEC02968F6E4FB0490058C58B5C8FDAE17A7A@PUMAIL01.pu.imgtec.org
State New
Headers show

Commit Message

shivraj.patil@imgtec.com March 31, 2017, 5:32 a.m.
Hi,

On Thu, Mar 30, 2017 at 2:21 AM, <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>> wrote:
From: Shivraj Patil <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>>


Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>>

---
 libavcodec/mips/hevcpred_mips.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Shivraj:- No definition of “HEVCContext” in file hevcpred.h.
Hence observed error following error
./libavcodec/mips/hevcpred_mips.h:70:32: error: unknown type name HEVCContext
void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0, int y0, int c_idx);

Ronald

Comments

Michael Niedermayer March 31, 2017, 9:51 a.m.
On Fri, Mar 31, 2017 at 05:32:55AM +0000, Shivraj Patil wrote:
> 
> 
> Hi,
> 
> On Thu, Mar 30, 2017 at 2:21 AM, <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>> wrote:
> From: Shivraj Patil <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>>
> 
> Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>>
> ---
>  libavcodec/mips/hevcpred_mips.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/mips/hevcpred_mips.h b/libavcodec/mips/hevcpred_mips.h
> index 12f57a2..fcd687b 100644
> --- a/libavcodec/mips/hevcpred_mips.h
> +++ b/libavcodec/mips/hevcpred_mips.h
> @@ -21,7 +21,7 @@
>  #ifndef AVCODEC_MIPS_HEVCPRED_MIPS_H
>  #define AVCODEC_MIPS_HEVCPRED_MIPS_H
> 
> -#include "libavcodec/hevcdsp.h"
> +#include "libavcodec/hevcdec.h"
> 
> Shouldn't this be hevcpred.h?
> 
> Shivraj:- No definition of “HEVCContext” in file hevcpred.h.
> Hence observed error following error
> ./libavcodec/mips/hevcpred_mips.h:70:32: error: unknown type name HEVCContext
> void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0, int y0, int c_idx);

i have a fix for this locally, will be in my next push

thx

[...]
Ronald S. Bultje March 31, 2017, 11:49 a.m.
Hi,

On Fri, Mar 31, 2017 at 1:32 AM, Shivraj Patil <Shivraj.Patil@imgtec.com>
wrote:

>
>
>
>
> Hi,
>
>
>
> On Thu, Mar 30, 2017 at 2:21 AM, <shivraj.patil@imgtec.com> wrote:
>
> From: Shivraj Patil <shivraj.patil@imgtec.com>
>
> Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
> ---
>  libavcodec/mips/hevcpred_mips.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavcodec/mips/hevcpred_mips.h b/libavcodec/mips/hevcpred_
> mips.h
> index 12f57a2..fcd687b 100644
> --- a/libavcodec/mips/hevcpred_mips.h
> +++ b/libavcodec/mips/hevcpred_mips.h
> @@ -21,7 +21,7 @@
>  #ifndef AVCODEC_MIPS_HEVCPRED_MIPS_H
>  #define AVCODEC_MIPS_HEVCPRED_MIPS_H
>
> -#include "libavcodec/hevcdsp.h"
> +#include "libavcodec/hevcdec.h"
>
>
>
> Shouldn't this be hevcpred.h?
>
>
>
> Shivraj:- No *definition* of “HEVCContext” in file hevcpred.h.
>
> Hence observed error following error
>
> *./libavcodec/mips/hevcpred_mips.h:70:32: error: unknown type name
> HEVCContext*
>
> *void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0, int y0, int
> c_idx);*
>

Should be "struct HEVCContext", which is defined in hevcpred.h.

Ronald
shivraj.patil@imgtec.com April 4, 2017, 12:05 p.m.
Hi,
Above patch fixes the mips build bug.

Shivraj.

-----Original Message-----
From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf Of Michael Niedermayer

Sent: 31 March 2017 15:22
To: FFmpeg development discussions and patches
Subject: Re: [FFmpeg-devel] [PATCH] Build fix for MIPS

On Fri, Mar 31, 2017 at 05:32:55AM +0000, Shivraj Patil wrote:
> 

> 

> Hi,

> 

> On Thu, Mar 30, 2017 at 2:21 AM, <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>> wrote:

> From: Shivraj Patil 

> <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>>

> 

> Signed-off-by: Shivraj Patil 

> <shivraj.patil@imgtec.com<mailto:shivraj.patil@imgtec.com>>

> ---

>  libavcodec/mips/hevcpred_mips.h |    2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/libavcodec/mips/hevcpred_mips.h 

> b/libavcodec/mips/hevcpred_mips.h index 12f57a2..fcd687b 100644

> --- a/libavcodec/mips/hevcpred_mips.h

> +++ b/libavcodec/mips/hevcpred_mips.h

> @@ -21,7 +21,7 @@

>  #ifndef AVCODEC_MIPS_HEVCPRED_MIPS_H

>  #define AVCODEC_MIPS_HEVCPRED_MIPS_H

> 

> -#include "libavcodec/hevcdsp.h"

> +#include "libavcodec/hevcdec.h"

> 

> Shouldn't this be hevcpred.h?

> 

> Shivraj:- No definition of “HEVCContext” in file hevcpred.h.

> Hence observed error following error

> ./libavcodec/mips/hevcpred_mips.h:70:32: error: unknown type name 

> HEVCContext void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0, int 

> y0, int c_idx);


i have a fix for this locally, will be in my next push

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If a bugfix only changes things apparently unrelated to the bug with no further explanation, that is a good sign that the bugfix is wrong.
Ronald S. Bultje April 4, 2017, 12:17 p.m.
On Tue, Apr 4, 2017 at 8:05 AM, Shivraj Patil <Shivraj.Patil@imgtec.com>
wrote:

> Hi,
>
> > diff --git a/libavcodec/hevcpred.h b/libavcodec/hevcpred.h
> > [..]
> > @@ -26,6 +26,8 @@
> >  #include <stddef.h>
> >  #include <stdint.h>
> >
> > +#include "get_bits.h"
> > +
>

hevcpred does not depend on get_bits.h and does not use any symbols
(get_bits* or GetBit*) from it. What compiler error does this fix?

diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c
>
[..]

> -#include "libavcodec/hevc.h"
> +#include "libavcodec/hevcdec.h"
>

This looks correct.

Ronald
shivraj.patil@imgtec.com April 5, 2017, 12:38 p.m.
Hi,

Updated the patch as per comments.
As hevcpred_init_mips.c needs definition of HAVE_MSA and av_cold, now I have included config.h & libavutil/attributes.h in this file.

Thanks,
Shivraj


From: Ronald S. Bultje [mailto:rsbultje@gmail.com]

Sent: 04 April 2017 17:47
To: Shivraj Patil
Cc: FFmpeg development discussions and patches
Subject: Re: [FFmpeg-devel] [PATCH] Build fix for MIPS



On Tue, Apr 4, 2017 at 8:05 AM, Shivraj Patil <Shivraj.Patil@imgtec.com<mailto:Shivraj.Patil@imgtec.com>> wrote:
Hi,

> diff --git a/libavcodec/hevcpred.h b/libavcodec/hevcpred.h

> [..]

> @@ -26,6 +26,8 @@

>  #include <stddef.h>

>  #include <stdint.h>

>

> +#include "get_bits.h"

> +


hevcpred does not depend on get_bits.h and does not use any symbols (get_bits* or GetBit*) from it. What compiler error does this fix?

diff --git a/libavcodec/mips/hevcpred_msa.c b/libavcodec/mips/hevcpred_msa.c
[..]
-#include "libavcodec/hevc.h"
+#include "libavcodec/hevcdec.h"

This looks correct.

Ronald
Ronald S. Bultje April 5, 2017, 8:53 p.m.
Hi,

On Wed, Apr 5, 2017 at 8:38 AM, Shivraj Patil <Shivraj.Patil@imgtec.com>
wrote:

> Hi,
>
>
>
> Updated the patch as per comments.
>
> As hevcpred_init_mips.c needs definition of HAVE_MSA and av_cold, now I
> have included config.h & libavutil/attributes.h in this file.
>

Patch LGTM. I'll leave it up for a day for others to comment before I push.

Ronald
Ronald S. Bultje April 6, 2017, 2:17 p.m.
Hi,

On Wed, Apr 5, 2017 at 4:53 PM, Ronald S. Bultje <rsbultje@gmail.com> wrote:

> Hi,
>
> On Wed, Apr 5, 2017 at 8:38 AM, Shivraj Patil <Shivraj.Patil@imgtec.com>
> wrote:
>
>> Hi,
>>
>>
>>
>> Updated the patch as per comments.
>>
>> As hevcpred_init_mips.c needs definition of HAVE_MSA and av_cold, now I
>> have included config.h & libavutil/attributes.h in this file.
>>
>
> Patch LGTM. I'll leave it up for a day for others to comment before I push.
>

Pushed.

Ronald

Patch hide | download patch | download mbox

diff --git a/libavcodec/mips/hevcpred_mips.h b/libavcodec/mips/hevcpred_mips.h
index 12f57a2..fcd687b 100644
--- a/libavcodec/mips/hevcpred_mips.h
+++ b/libavcodec/mips/hevcpred_mips.h
@@ -21,7 +21,7 @@ 
 #ifndef AVCODEC_MIPS_HEVCPRED_MIPS_H
 #define AVCODEC_MIPS_HEVCPRED_MIPS_H

-#include "libavcodec/hevcdsp.h"
+#include "libavcodec/hevcdec.h"

Shouldn't this be hevcpred.h?