From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 98F404E79A for ; Wed, 11 Jun 2025 18:52:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 66DDC688FDA; Wed, 11 Jun 2025 21:52:20 +0300 (EEST) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 387CA687DD0 for ; Wed, 11 Jun 2025 21:52:13 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4508287895dso8578185e9.1 for ; Wed, 11 Jun 2025 11:52:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749667932; x=1750272732; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=HPZEBAMqd5Bbymv3g7PTtz0KFJ3DqKrQXUlwCgvY7rg=; b=NBMUhhLLZZOW/PwIM68tlSIaCsceudhesm3Uke139vQcg9DbMPkmYeTyWsKVA/1VgC m//1sgpl+0gCpsXuNB5+VG/E/OOFHvJSsP9uzQxxftAS3/N5bHrSr4txe+4/iXlelEfP qVDfaq2Dluo7Cu3zdcrbldeTQSMrGRYast7fg4XRPGtkdik0PmWaRsJR0QLPKA2UkB6T pEarF9A7C0vvfWV49S8o4tl3dErt5BhmRG8Yxd/IuvVMJj8RAa4SkvJt5cpwbAT0m2oQ ZzD1WXOI9pmbGlkzb8xaSSdL3zd2eZso1BwEqFMpGofD4bwg4YkqOy3Fm9yjpCMEAhtQ KnGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749667932; x=1750272732; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HPZEBAMqd5Bbymv3g7PTtz0KFJ3DqKrQXUlwCgvY7rg=; b=tPRPg9We6b/tiaPnOHtJCWLYUKKFIShmYk6TJD2m9BflFWXDsy8gKS878WHPe+oQ8l 7+QEfoQaIk4kwh/H16p8VGpJQFDSBmp7H6Q96ogVUhJV/H7KP61VSmueyOjdCieSpUcV GnzjQEL6x8rQ79mjAAvDYepCmpUYJGrzfbdeAE5ZXHg4CRSYXhoAP48XXJyNPZ4uuB2W IvFCv9I9mf9fpcuBriyLMSzlHRGCiyL4iwsWzmmU0425HV8YLik53Ay0xcUl8ctR0/9V KuEbF1+rvMxI8DaxeL04c+ksujaLK3xLZoZcL1ISfYBrtU/dZJhcfD1YQfZovocDDWx7 +2+g== X-Gm-Message-State: AOJu0YytX/ke60tlAyxxp+bZeZSU8KSuENLqxld8EFAPSJCoo067CzER frK/oNq/3HgB6ZheyEkpauvP3aAfOtd+xsm/vNPjOdrETP6OPBt8ifzeu/eA6A== X-Gm-Gg: ASbGnct2ahwcrR8mHP3C9kvTDpr9Q6Dyb0EMt8Twzn1JF20plZ7aXWUd+rHmkSNfg8Z 6bVIm01joMHaj2lKfVi6dCjfimItBBx0WPigWaq6PyWvZqWa6KyqPfgO3YT5FuYS5UlRcKcywx/ vLufzpV9sumNheczyOFWLr7u6kyImc5oiG1FJOpOJSzznYZEKAjrxp8kaGNOSxtnjJwyzgWAYJj zs9OTuil4ue7NgXd24GDhuY94pJ7Lkwke7B6xPI500gw0LqIvShH7b9IKCFJoovsGtfDEsXxKP+ F2p39pOnUBvZTSLfINUD8hmx84ztq/ePdnwrfGY6nT2SMT6VQp4ElV5fKoMqEDYs1QNnrPUCkZ5 XHoB7ZXTD8XP4zjgflhbiGif0DIjzywn2fEgjLV+VGujTRAfQMV0f7dUMWgcnpKDxIYoOOCbShX MsTes9XQ== X-Google-Smtp-Source: AGHT+IEYq+hq/r3CFEivLga5ljgtqqwZcwURRHNa5WEiH9/G10yHfMZ147/iv/B/OdCGLwUFyiFG8Q== X-Received: by 2002:a05:600c:c48f:b0:439:8878:5029 with SMTP id 5b1f17b1804b1-4532c2479a0mr5410095e9.2.1749667932320; Wed, 11 Jun 2025 11:52:12 -0700 (PDT) Received: from localhost.localdomain (p200301023700450060f2a9d7350ce887.dip0.t-ipconnect.de. [2003:102:3700:4500:60f2:a9d7:350c:e887]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4532518dc00sm28959475e9.27.2025.06.11.11.52.11 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Jun 2025 11:52:11 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Jun 2025 20:52:06 +0200 Message-Id: <20250611185206.92984-1-epirat07@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/vvc: parse all SEI messages X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: While the current code iterated over the messages, it always returned in the first iteration. Instead keep iterating and warn for failure to parse. At time of writing, none of the parsing functions seems to actually return an error, ever. Fix CID 1648348 --- libavcodec/vvc/sei.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/libavcodec/vvc/sei.c b/libavcodec/vvc/sei.c index d8ab2bf245..cd202edb2a 100644 --- a/libavcodec/vvc/sei.c +++ b/libavcodec/vvc/sei.c @@ -184,6 +184,7 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon return AVERROR_INVALIDDATA; for (int i = 0; i < sei->message_list.nb_messages; i++) { + int ret = 0; SEIRawMessage *message = &sei->message_list.messages[i]; void *payload = message->payload; @@ -193,25 +194,32 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon c->film_grain_characteristics = av_refstruct_allocz(sizeof(*c->film_grain_characteristics)); if (!c->film_grain_characteristics) return AVERROR(ENOMEM); - return decode_film_grain_characteristics(c->film_grain_characteristics, payload, fc); + ret = decode_film_grain_characteristics(c->film_grain_characteristics, payload, fc); + break; case SEI_TYPE_DECODED_PICTURE_HASH: - return decode_decoded_picture_hash(&s->picture_hash, payload); + ret = decode_decoded_picture_hash(&s->picture_hash, payload); + break; case SEI_TYPE_DISPLAY_ORIENTATION: - return decode_display_orientation(&s->common.display_orientation, payload); + ret = decode_display_orientation(&s->common.display_orientation, payload); + break; case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: - return decode_content_light_level_info(&s->common.content_light, payload); + ret = decode_content_light_level_info(&s->common.content_light, payload); + break; case SEI_TYPE_FRAME_FIELD_INFO: - return decode_frame_field_info(&s->frame_field_info, payload); + ret = decode_frame_field_info(&s->frame_field_info, payload); + break; case SEI_TYPE_AMBIENT_VIEWING_ENVIRONMENT: - return decode_ambient_viewing_environment(&s->common.ambient_viewing_environment, payload); + ret = decode_ambient_viewing_environment(&s->common.ambient_viewing_environment, payload); + break; case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: - return decode_mastering_display_colour_volume(&s->common.mastering_display, payload); + ret = decode_mastering_display_colour_volume(&s->common.mastering_display, payload); + break; default: av_log(fc->log_ctx, AV_LOG_DEBUG, "Skipped %s SEI %d\n", @@ -219,6 +227,13 @@ int ff_vvc_sei_decode(VVCSEI *s, const H266RawSEI *sei, const struct VVCFrameCon "PREFIX" : "SUFFIX", message->payload_type); return FF_H2645_SEI_MESSAGE_UNHANDLED; } + + if (ret == AVERROR(ENOMEM)) + return ret; + if (ret < 0) + av_log(fc->log_ctx, AV_LOG_WARNING, "Failure to parse %s SEI %d: %s\n", + sei->nal_unit_header.nal_unit_type == VVC_PREFIX_SEI_NUT ? + "PREFIX" : "SUFFIX", message->payload_type, av_err2str(ret)); } return 0; -- 2.39.5 (Apple Git-154) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".