From patchwork Wed Aug 30 10:05:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 4892 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp357399jao; Wed, 30 Aug 2017 03:06:03 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6k0o8i9AulMJEvPF+3Acu+GXTumeEs1lfZtofNv/SMkgQpQBdbLQ5nZ1sAUh5OhLy9oaV3 X-Received: by 10.28.32.14 with SMTP id g14mr1188187wmg.24.1504087563491; Wed, 30 Aug 2017 03:06:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504087563; cv=none; d=google.com; s=arc-20160816; b=CVc4+yfEJt4K+PVZQn+u2riMxnU5yZHJ47N7Prq6ksneZgmM3azj7t1BhQSbZ/xVpg s26itLadtyBtyxo5D6YWSO8h0tR0tEKhNHx/WNES2CUO5eT9gn26hfBCfh1ptIh9xWG6 +1UjMZnEE2V+6K5V7obokm8gvN1RgEp4ZXGsAYUVxSYjTcKvS2xCLk6v/ABy4y9ryrNW cOCWJx+ohlB+H5CkGKT0NsYkjB6/bUhvYLZ3RQfFM9FldP+t4hY0oBN2bHll/WeTcNMh EhwPRSv5G9WZaOgg/k+k6t54apeLXFwEwtaP0pJlAzlNE7h0b8kdgIYJlgNmh7nZ1ktA SzDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=h56i1bOGHRcjxBmMDDFEw9A4VcluqZdPM/pZOMEgnHU=; b=cUsXSkWCatD4I0TYugZSy5C4U5pnDiLXQPH9kNyCDgKmG+NUB1HnKApvVKZ2+Fpwem Y+ERL+dSx/96ml8AUaVXnU8FFphsuqycBqrqVoW/Ce32PeoJCEFbpVK1luT/7DiEb9lJ Px30gjNNIJufSWHKjOSzrTVpsv+2/+E/N6i+p5ahcUMS3sGxidA3oaUAjUmsoAi/TfUa OpD7Wz6hROBZRBDB/DSPnf2ZYvQ+hV/Eagv74pGWKJqLZqcd4qgMSk3rnZr6G6qVEhbn Z+NEj5Z4fHFxf6zFykdFbzniUWGtF0wT0ycEy5cAURqAIPTZyNbZaGhlr3LMp8TLuKin hvjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=N3wf9WE/; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 32si3930552wrk.550.2017.08.30.03.06.03; Wed, 30 Aug 2017 03:06:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=N3wf9WE/; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72D9A68A263; Wed, 30 Aug 2017 13:06:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1F47689DF3 for ; Wed, 30 Aug 2017 13:05:53 +0300 (EEST) Received: by mail-wm0-f52.google.com with SMTP id 137so431091wmj.1 for ; Wed, 30 Aug 2017 03:05:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=2lya4MJx+eJuvEEKPhDP8bDeuYGYftB21KkVkFqzK7w=; b=N3wf9WE/iPQcFGE5PEFEdtha5pbfrJtyTj29qIv+flIhG48H58yWYqTfyB21Fq9gQI 2FC2fNrHSq+Az9WF8i4gZy+ADxcANJK+UubFGdlw/LVBL4eytHOgHHW/kpA/XizWyXpl BHGHG7D8MD6nqLYqNf8F0Dzx7HBoUTNgXnbe7MYfvIOlyG/cEPBgQuMO5BNnsjZ5B1+r bKoT67PBdS8W1kwZctAPzb8Hdr6q3obNfLoxD6IoM2u8eueZ8JuEED0lCZiVyyJR9Usg l9SqH7PV0uGzGt6kxUeEb8I0nkrFreqyTdUxYohzZcTORAaXtj6Kxfn3fPDrYuSe87k9 72gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=2lya4MJx+eJuvEEKPhDP8bDeuYGYftB21KkVkFqzK7w=; b=d687Q5D6IzzMshWiq89gcVrSSoV3FdNHG4gREccSiDpmwoqGeR+6BYQiA0biLKOftA L+gm02pYM9YdtPkkhpDp76iAdcjXmawCK1L11NBr+OnyQ/McTn/v7s4t/LSVdIk9rt7s Y687rMW/oWeAj2coalW6uxzAqTxLzbb7ieh1fIzmKmDV2W729YehWN0WJCfMsEBsmy7n 1v8h2LpEfnDe+K0uAQHWOle6eQ2eb7sup14EWxUzxwCJSK4mxuZwmPfLIMVNmIpi1X6G zzUbZZIGSuvhy4Eu4FBxXrJIozYnK2SpVgycAYawQp7fx9cQdJKYmXmowDEWyCCbK7vl Q/ng== X-Gm-Message-State: AHYfb5ikkzgR7SH3RnaF1GsRVvvZ+cta0UfHgMKYHwQ3QSpoUShKK1DL vWs4kDS+jC7glzMGdWPGcz3xSIiluA== X-Received: by 10.80.182.73 with SMTP id c9mr1265968ede.185.1504087553582; Wed, 30 Aug 2017 03:05:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.80.132.6 with HTTP; Wed, 30 Aug 2017 03:05:32 -0700 (PDT) From: Carl Eugen Hoyos Date: Wed, 30 Aug 2017 12:05:32 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/hevc_ps: Be less strict on sps conformance by default. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch allows users to control the sps conformance requirement: It allows to revert the fix for ticket #4035, so faulty streams can be ignored. Also fixes a user-provided sample. Please comment, Carl Eugen From d2a4241f52c7e5b4b5226f7aed237e7448815b77 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 30 Aug 2017 11:55:15 +0200 Subject: [PATCH] lavc/hevc_ps: Be less strict on sps conformance by default. --- libavcodec/hevc_ps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 37eae22..6d12d90 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1187,7 +1187,8 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, if (get_bits_left(gb) < 0) { av_log(avctx, AV_LOG_ERROR, "Overread SPS by %d bits\n", -get_bits_left(gb)); - return AVERROR_INVALIDDATA; + if (avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT) + return AVERROR_INVALIDDATA; } return 0; -- 1.7.10.4