[vlc-commits] aom: fix compilation with latest git

2018-04-06 Thread Jean-Baptiste Kempf 
vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf  | Thu 
Apr  5 20:15:35 2018 +0200| [571ee879ead9e5f40fcb22635810e735e45835d7] | 
committer: Jean-Baptiste Kempf

aom: fix compilation with latest git

(cherry picked from commit 5702b5c3d7177144b840240e2ea98c16dea0027d)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=571ee879ead9e5f40fcb22635810e735e45835d7
---

 modules/codec/aom.c | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/modules/codec/aom.c b/modules/codec/aom.c
index dfde098ecd..f1ae7c8304 100644
--- a/modules/codec/aom.c
+++ b/modules/codec/aom.c
@@ -86,7 +86,6 @@ static const struct
 { VLC_CODEC_I420, AOM_IMG_FMT_I420, 8, 0 },
 { VLC_CODEC_I422, AOM_IMG_FMT_I422, 8, 0 },
 { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, 0 },
-{ VLC_CODEC_I440, AOM_IMG_FMT_I440, 8, 0 },
 
 { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
 { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
@@ -118,7 +117,7 @@ static const struct
 
 static vlc_fourcc_t FindVlcChroma( struct aom_image *img )
 {
-uint8_t hack = (img->fmt & AOM_IMG_FMT_I444) && (img->cs == AOM_CS_SRGB);
+uint8_t hack = (img->fmt & AOM_IMG_FMT_I444) && (img->tc == 
AOM_CICP_TC_SRGB);
 
 for( unsigned int i = 0; i < ARRAY_SIZE(chroma_table); i++ )
 if( chroma_table[i].i_chroma_id == img->fmt &&
@@ -197,19 +196,17 @@ static int Decode(decoder_t *dec, block_t *block)
 
 v->b_color_range_full = img->range == AOM_CR_FULL_RANGE;
 
-switch( img->cs )
+switch( img->mc )
 {
-case AOM_CS_SRGB:
-case AOM_CS_BT_709:
+case AOM_CICP_MC_BT_709:
 v->space = COLOR_SPACE_BT709;
 break;
-case AOM_CS_BT_601:
-case AOM_CS_SMPTE_170:
-case AOM_CS_SMPTE_240:
+case AOM_CICP_MC_BT_601:
+case AOM_CICP_MC_SMPTE_240:
 v->space = COLOR_SPACE_BT601;
 break;
-case AOM_CS_BT_2020_CL:
-case AOM_CS_BT_2020_NCL:
+case AOM_CICP_MC_BT_2020_CL:
+case AOM_CICP_MC_BT_2020_NCL:
 v->space = COLOR_SPACE_BT2020;
 break;
 default:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] aom: fix compilation with latest git

2018-04-05 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Thu Apr  5 
20:15:35 2018 +0200| [5702b5c3d7177144b840240e2ea98c16dea0027d] | committer: 
Jean-Baptiste Kempf

aom: fix compilation with latest git

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5702b5c3d7177144b840240e2ea98c16dea0027d
---

 modules/codec/aom.c | 17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/modules/codec/aom.c b/modules/codec/aom.c
index 25a6b02dce..11252f8ddd 100644
--- a/modules/codec/aom.c
+++ b/modules/codec/aom.c
@@ -106,7 +106,6 @@ static const struct
 { VLC_CODEC_I420, AOM_IMG_FMT_I420, 8, 0 },
 { VLC_CODEC_I422, AOM_IMG_FMT_I422, 8, 0 },
 { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, 0 },
-{ VLC_CODEC_I440, AOM_IMG_FMT_I440, 8, 0 },
 
 { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
 { VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
@@ -138,7 +137,7 @@ static const struct
 
 static vlc_fourcc_t FindVlcChroma( struct aom_image *img )
 {
-uint8_t hack = (img->fmt & AOM_IMG_FMT_I444) && (img->cs == AOM_CS_SRGB);
+uint8_t hack = (img->fmt & AOM_IMG_FMT_I444) && (img->tc == 
AOM_CICP_TC_SRGB);
 
 for( unsigned int i = 0; i < ARRAY_SIZE(chroma_table); i++ )
 if( chroma_table[i].i_chroma_id == img->fmt &&
@@ -217,19 +216,17 @@ static int Decode(decoder_t *dec, block_t *block)
 
 v->b_color_range_full = img->range == AOM_CR_FULL_RANGE;
 
-switch( img->cs )
+switch( img->mc )
 {
-case AOM_CS_SRGB:
-case AOM_CS_BT_709:
+case AOM_CICP_MC_BT_709:
 v->space = COLOR_SPACE_BT709;
 break;
-case AOM_CS_BT_601:
-case AOM_CS_SMPTE_170:
-case AOM_CS_SMPTE_240:
+case AOM_CICP_MC_BT_601:
+case AOM_CICP_MC_SMPTE_240:
 v->space = COLOR_SPACE_BT601;
 break;
-case AOM_CS_BT_2020_CL:
-case AOM_CS_BT_2020_NCL:
+case AOM_CICP_MC_BT_2020_CL:
+case AOM_CICP_MC_BT_2020_NCL:
 v->space = COLOR_SPACE_BT2020;
 break;
 default:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits