From patchwork Mon Jun 3 22:21:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonin Gouzer X-Patchwork-Id: 13390 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 DBD50449A55 for ; Tue, 4 Jun 2019 01:22:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADE70689DB2; Tue, 4 Jun 2019 01:22:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 017526898AE for ; Tue, 4 Jun 2019 01:21:57 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id n4so8473562wrw.13 for ; Mon, 03 Jun 2019 15:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=VAJIloYWeexMXenlaHq2LzHALckScn7GiHntpAgxvXU=; b=uCgbnl7I9rc0wq67oRWkxJn9PtilKDNhdJDrrcj+nv4y9CkkayL34pOQ85kwf2SXYZ y/p98nEW5zJkqIRu5GQJLugggYbw4ph7KcJ+jXpwero4h97y5FUMn6waN7ZFeBapWEWP YdCezrJoMwSswkKE3aqR0rGpb0hHLPN4BPddIu6sBpiANyAigHjDANDb/vHJOJdDXY8s K9gniShwW0PZylSIY0fhJJBDEUrvvn4GRi+x+ittBRgpZcmzlKdbqwnjbbksRPl4AQbG i7yq1afVKW6TXnCB7DJ9/011aJ40s7Y+G+pGbeSCeOKrhRwSOoz7zb/9f+lPcnTxccNj xQzw== 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; bh=VAJIloYWeexMXenlaHq2LzHALckScn7GiHntpAgxvXU=; b=Ehj1Xz+4PmpJCblvWuS2DC7tV/Qq7hZXWQRSq1kV6UM6QBafqq0QQVWl48I8erDifG t30xEo/+dfXkbNgBp3FKDnMZ+kNv+pghWqH4394VNPshs3wRaNGABCElUWOCORYqkRMk pHLPPie74yNCnGMLgj5ZaEJkxRA0GGriuf6ZSp6wENfJUkxiYq6toYpcCzgw1pjBnVTs gSzi7VwLsTX9PD6NBZ1hd+kPBFRhOJPpzXh9Q8B7vUVS7J98P2bt5oha4qRDc4nK3Xtr HcIm6XSUZK7hUp3YvWslTcPzInm3gXWvgV326ONVvCQYPJr86KWj7OCZRVwkhQsuLw54 sM0w== X-Gm-Message-State: APjAAAWb8s0nqgSBwt8sdVPlEeIEGJujHAeC9exLJiwLTJ3N8CrPxMJC 9xNee0mDjC5/g8zms0E3vDznvQariLU= X-Google-Smtp-Source: APXvYqzkKD8/mFbZntk6uuNruHFAe7W1452efBK5Dwx5H6Fj0YCSxNZvTOaQ+vYWoMOA31aKVrcv8A== X-Received: by 2002:a5d:5112:: with SMTP id s18mr17172472wrt.111.1559600516836; Mon, 03 Jun 2019 15:21:56 -0700 (PDT) Received: from localhost.localdomain (81-64-226-67.rev.numericable.fr. [81.64.226.67]) by smtp.gmail.com with ESMTPSA id a62sm17805259wmf.19.2019.06.03.15.21.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jun 2019 15:21:56 -0700 (PDT) From: Antonin Gouzer To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2019 00:21:53 +0200 Message-Id: <20190603222153.19810-1-antonin.gouzer@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_sei: Add experimental 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 -strict experimental -print_format xml -show_frames -read_intervals %+0.04 truncated.h264 This (simple) patch add the possibility to read this false truncated SEI data. by setting strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL. The error remain logged. Thanks in advance ! --- libavcodec/h264_sei.c | 19 ++++++++++--------- libavcodec/h264_sei.h | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index d4eb9c0dab..28cd7577ed 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,28 @@ 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", + av_log(avctx, AV_LOG_ERROR, "SEI type %d size %d truncated at %d\n", type, 8*size, get_bits_left(gb)); - return AVERROR_INVALIDDATA; + if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) + 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 +461,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.