From patchwork Sat Jun 8 13:21:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonin Gouzer X-Patchwork-Id: 13466 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A0452448EE6 for ; Sat, 8 Jun 2019 16:28:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C439689E14; Sat, 8 Jun 2019 16:28:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A1B9680C0D for ; Sat, 8 Jun 2019 16:28:19 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id 22so4311217wmg.2 for ; Sat, 08 Jun 2019 06:28:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ACcTGzkpft5C3/TECUSYBuoiIRQBNHcsq4Sfc07swsE=; b=BhluRDcGZBuhcXf6FPOW6SuWEQh/Au26zVBhp6h7UsPVCWaXAKs5YvehoaAYEuJoyO Pq4OuoWHjeyEyqK3qpg5HSm/ZQlyroUWeN/zUsHNZCXNMiXA1B3Kn/HqYZIPINXVS3z2 6jx0Ry7kO2hTc6h+O7z6QCZse0/62FYKIPROIwtAdx03UIUihK8aj0graFeGuKh1DakS ttEGHNWhxeA5T6Up5Lm5KS9TMYYVJzj4f8vmXCNr98p4Jxsm4KfKe0twZgCFZA8V3rj5 pwLo8d/xW9vzf+J7Wk6vgE6cM4Xn0B3gqnr9w9x2hFXd1FT+/KQo9PsaTr9DPczqUAmf xtxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ACcTGzkpft5C3/TECUSYBuoiIRQBNHcsq4Sfc07swsE=; b=JaTUIEE2IFj2T3LpkjUKz3ewG/W9DwTIbzBJLGUsV3eBg2TwNdUomtEgoLvSwKTunx iOvDzC2D+5/obpcsZerHKjPmrWRPD3MHvT0jlvwsXtXOSskrMoZzdJOOSYfgifnjnJM4 WMlV3ZfcpJa1QBA/ohp86NK9lF07TjrbI5JZPU9Zz/3JsB0xrQ5dx31rZTVHMjWAkRWC gkKZWGiLKt0bpwg3wPSH9Wg7CKyoOK9AELYWh157mUUnA39Psd3WcZtKnHjhXW9tfC8b YqZcQybEo0GSuEA7rrssyS4dfiWYUeeYDvYMqjc70ytgYOTKKJGggOQSomwtIlQYwGJm krTg== X-Gm-Message-State: APjAAAXqKzY4KH95G8j5iFIps07CzveoUCeZzayRQk0oUM077EX7gDLq PRTc69n8KhUT+ESnTN6xX2V9yjHIADg= X-Google-Smtp-Source: APXvYqzRhdFhLqykUFoTS9G5839qKrUQ3y/XK5eSf681Amt/TMLkor9DMx3XzbAx3EBmeD5omsOXhg== X-Received: by 2002:a1c:cb43:: with SMTP id b64mr6947906wmg.135.1560000110195; Sat, 08 Jun 2019 06:21:50 -0700 (PDT) Received: from localhost.localdomain (81-64-226-67.rev.numericable.fr. [81.64.226.67]) by smtp.gmail.com with ESMTPSA id h84sm5971183wmf.43.2019.06.08.06.21.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Jun 2019 06:21:49 -0700 (PDT) From: Antonin Gouzer To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Jun 2019 15:21:45 +0200 Message-Id: <20190608132145.10567-1-antonin.gouzer@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190603222153.19810-1-antonin.gouzer@gmail.com> References: <20190603222153.19810-1-antonin.gouzer@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avcodec/h264_sei: Add acces to truncated SEI data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- Some codecs editors had miss interpreted the H264 standart and have coded a wrong size in the SEI data. size = SEI size + 1. The SEI data is detected as "truncated" Ex: https://drive.google.com/file/d/1cNtLwnfPnyJnYqE7OYhU3SCoLRtuXIUM/view?usp=sharing Command: ffprobe -print_format xml -show_frames -read_intervals %+0.04 truncated.h264 This (simple) patch add the possibility to read this false truncated SEI data with the default stric_std_compliance or less. The error remain logged in both cases. V2: Modifiy the patch for only the off by one values Thanks in advance ! --- libavcodec/h264_sei.c | 24 +++++++++++++++--------- libavcodec/h264_sei.h | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index d4eb9c0dab..7871cf87ed 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -402,7 +402,7 @@ static int decode_alternative_transfer(H264SEIAlternativeTransfer *h, } int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, - const H264ParamSets *ps, void *logctx) + const H264ParamSets *ps, AVCodecContext *avctx) { int master_ret = 0; @@ -425,27 +425,33 @@ int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, } while (get_bits(gb, 8) == 255); if (size > get_bits_left(gb) / 8) { - av_log(logctx, AV_LOG_ERROR, "SEI type %d size %d truncated at %d\n", + + if (size == get_bits_left(gb) / 8 + 1 && avctx->strict_std_compliance <= FF_COMPLIANCE_NORMAL){ + av_log(avctx, AV_LOG_WARNING, "SEI type %d size %d truncated at %d\n", type, 8*size, get_bits_left(gb)); - return AVERROR_INVALIDDATA; + } else { + av_log(avctx, AV_LOG_ERROR, "SEI type %d size %d truncated at %d, data will not be read\n", + type, 8*size, get_bits_left(gb)); + return AVERROR_INVALIDDATA; + } } next = get_bits_count(gb) + 8 * size; switch (type) { case H264_SEI_TYPE_PIC_TIMING: // Picture timing SEI - ret = decode_picture_timing(&h->picture_timing, gb, ps, logctx); + ret = decode_picture_timing(&h->picture_timing, gb, ps, avctx); break; case H264_SEI_TYPE_USER_DATA_REGISTERED: - ret = decode_registered_user_data(h, gb, logctx, size); + ret = decode_registered_user_data(h, gb, avctx, size); break; case H264_SEI_TYPE_USER_DATA_UNREGISTERED: - ret = decode_unregistered_user_data(&h->unregistered, gb, logctx, size); + ret = decode_unregistered_user_data(&h->unregistered, gb, avctx, size); break; case H264_SEI_TYPE_RECOVERY_POINT: - ret = decode_recovery_point(&h->recovery_point, gb, logctx); + ret = decode_recovery_point(&h->recovery_point, gb, avctx); break; case H264_SEI_TYPE_BUFFERING_PERIOD: - ret = decode_buffering_period(&h->buffering_period, gb, ps, logctx); + ret = decode_buffering_period(&h->buffering_period, gb, ps, avctx); break; case H264_SEI_TYPE_FRAME_PACKING: ret = decode_frame_packing_arrangement(&h->frame_packing, gb); @@ -460,7 +466,7 @@ int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, ret = decode_alternative_transfer(&h->alternative_transfer, gb); break; default: - av_log(logctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); + av_log(avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type); } if (ret < 0 && ret != AVERROR_PS_NOT_FOUND) return ret; diff --git a/libavcodec/h264_sei.h b/libavcodec/h264_sei.h index a75c3aa175..32f3d67096 100644 --- a/libavcodec/h264_sei.h +++ b/libavcodec/h264_sei.h @@ -190,7 +190,7 @@ typedef struct H264SEIContext { struct H264ParamSets; int ff_h264_sei_decode(H264SEIContext *h, GetBitContext *gb, - const struct H264ParamSets *ps, void *logctx); + const struct H264ParamSets *ps, AVCodecContext *avctx); /** * Reset SEI values at the beginning of the frame.