[FFmpeg-cvslog] avformat/imfdec: check if Asset/Id exists before trying to read it

[Pierre-Anthony Lemieux]

ffmpeg | branch: master | Pierre-Anthony Lemieux  | Thu Aug 
25 20:21:53 2022 -0700| [6e91d405be3c8a1ded025498085e0e606e337030] | committer: 
Andreas Rheinhardt

avformat/imfdec: check if Asset/Id exists before trying to read it

Fixes Coverity issue #1512406

Signed-off-by: Andreas Rheinhardt 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e91d405be3c8a1ded025498085e0e606e337030
---

 libavformat/imfdec.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
index 5bbe7a53f8..fde91a6419 100644
--- a/libavformat/imfdec.c
+++ b/libavformat/imfdec.c
@@ -233,7 +233,12 @@ static int 
parse_imf_asset_map_from_xml_dom(AVFormatContext *s,
 
 asset = &(asset_map->assets[asset_map->asset_count]);
 
-if 
(ff_imf_xml_read_uuid(ff_imf_xml_get_child_element_by_name(asset_element, 
"Id"), asset->uuid)) {
+if (!(node = ff_imf_xml_get_child_element_by_name(asset_element, 
"Id"))) {
+av_log(s, AV_LOG_ERROR, "Unable to parse asset map XML - missing 
Id node\n");
+return AVERROR_INVALIDDATA;
+}
+
+if (ff_imf_xml_read_uuid(node, asset->uuid)) {
 av_log(s, AV_LOG_ERROR, "Could not parse UUID from asset in asset 
map.\n");
 return AVERROR_INVALIDDATA;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/mips: Fix MMI macro replaces in HEVC Decoder

[Qi Tiezheng]

ffmpeg | branch: master | Qi Tiezheng  | Thu Aug 18 14:27:44 
2022 +0800| [e4c127271198ebb799f19cb96cc1a6b62506e0d1] | committer: Michael 
Niedermayer

avcodec/mips: Fix MMI macro replaces in HEVC Decoder

The latest commit of Loongson MMI macro replaces were incorrect.
It makes a mass of green tints on HEVC videos when playing. I've
compared it with the older MMI implementation, and found out that
several lines have been replaced by wrong macros.

Signed-off-by: Qi Tiezheng 
Reviewed-by: Shiyou Yin 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4c127271198ebb799f19cb96cc1a6b62506e0d1
---

 libavcodec/mips/hevcdsp_mmi.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavcodec/mips/hevcdsp_mmi.c b/libavcodec/mips/hevcdsp_mmi.c
index 0ea88a7c08..1da56d3d87 100644
--- a/libavcodec/mips/hevcdsp_mmi.c
+++ b/libavcodec/mips/hevcdsp_mmi.c
@@ -80,7 +80,7 @@ void ff_hevc_put_hevc_qpel_h##w##_8_mmi(int16_t *dst, const 
uint8_t *_src, \
 "paddh%[ftmp3],  %[ftmp3],  %[ftmp4]\n\t"\
 "paddh%[ftmp5],  %[ftmp5],  %[ftmp6]\n\t"\
 "paddh%[ftmp3],  %[ftmp3],  %[ftmp5]\n\t"\
-MMI_ULDC1(%[ftmp3], %[dst], 0x00)\
+MMI_USDC1(%[ftmp3], %[dst], 0x00)\
  \
 "daddi%[x],  %[x], -0x01\n\t"\
 PTR_ADDIU"%[src],%[src],0x04\n\t"\
@@ -178,7 +178,7 @@ void ff_hevc_put_hevc_qpel_hv##w##_8_mmi(int16_t *dst, 
const uint8_t *_src,\
 "paddh%[ftmp3],  %[ftmp3],  %[ftmp4]\n\t"\
 "paddh%[ftmp5],  %[ftmp5],  %[ftmp6]\n\t"\
 "paddh%[ftmp3],  %[ftmp3],  %[ftmp5]\n\t"\
-MMI_ULDC1(%[ftmp3], %[tmp], 0x00)\
+MMI_USDC1(%[ftmp3], %[tmp], 0x00)\
  \
 "daddi%[x],  %[x], -0x01\n\t"\
 PTR_ADDIU"%[src],%[src],0x04\n\t"\
@@ -690,10 +690,10 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t 
*_dst,  \
 \
 "1: \n\t"   \
 "2: \n\t"   \
-MMI_ULDC1(%[ftmp3], %[src], 0x00)   \
-MMI_ULDC1(%[ftmp4], %[src], 0x01)   \
-MMI_ULDC1(%[ftmp5], %[src], 0x02)   \
-MMI_ULDC1(%[ftmp6], %[src], 0x03)   \
+MMI_ULWC1(%[ftmp2], %[src], 0x00)   \
+MMI_ULWC1(%[ftmp3], %[src], 0x01)   \
+MMI_ULWC1(%[ftmp4], %[src], 0x02)   \
+MMI_ULWC1(%[ftmp5], %[src], 0x03)   \
 "punpcklbh%[ftmp2],  %[ftmp2],  %[ftmp0]\n\t"   \
 "pmullh   %[ftmp2],  %[ftmp2],  %[ftmp1]\n\t"   \
 "punpcklbh%[ftmp3],  %[ftmp3],  %[ftmp0]\n\t"   \
@@ -707,7 +707,7 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t *_dst,  
\
 "paddh%[ftmp2],  %[ftmp2],  %[ftmp3]\n\t"   \
 "paddh%[ftmp4],  %[ftmp4],  %[ftmp5]\n\t"   \
 "paddh%[ftmp2],  %[ftmp2],  %[ftmp4]\n\t"   \
-MMI_ULDC1(%[ftmp2], %[tmp], 0x00)   \
+MMI_USDC1(%[ftmp2], %[tmp], 0x00)   \
 \
 "daddi%[x],  %[x], -0x01\n\t"   \
 PTR_ADDIU"%[src],%[src],0x04\n\t"   \
@@ -773,7 +773,7 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t *_dst,  
\
 "paddw%[ftmp5],  %[ftmp5],  %[ftmp6]\n\t"   \
 "psraw%[ftmp5],  %[ftmp5],  %[ftmp0]\n\t"   \
 "packsswh %[ftmp3],  %[ftmp3],  %[ftmp5]\n\t"   \
-MMI_ULDC1(%[ftmp4], %[tmp], 0x02)   \
+MMI_ULDC1(%[ftmp4], %[src2], 0x00)   \
 "li   %[rtmp0],  0x10   \n\t"   \
 "dmtc1%[rtmp0],  %[ftmp8]   \n\t"   \
 "punpcklhw%[ftmp5],  %[ftmp2],  %[ftmp3]\n\t"   \

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.