From patchwork Fri Nov 10 21:40:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5983 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3884437jah; Fri, 10 Nov 2017 13:42:19 -0800 (PST) X-Google-Smtp-Source: AGs4zMYEvqiNF87lG7xRxbooXmOpQ5oX/33q5e9BTvocvStCTcwp5jAXK622VggzFw5H2ZqS6l67 X-Received: by 10.223.159.83 with SMTP id f19mr1364860wrg.20.1510350139462; Fri, 10 Nov 2017 13:42:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510350139; cv=none; d=google.com; s=arc-20160816; b=EKFKNHqZlU4Zh6VvR1CzfRCEwOxLUkAUxmMPjF3UDuUNLEn9/Tngjye+ocV2viFD9f HnRMIm3xvVadDwpUyF+8OzogcZvB5cw/g0wNyA0jRu+PXdUak1UM8KIpffgLDywBtY3F Xo7O+SjDOlkYR4WgM3rPD6QUwkDg5qUeTAl8XB4aPRMXfPRY3ZMAaykvu27Fk/3941Yk HtzZA0ueiJMHkBZ45xW0j005NurZhxqH2kQo1aQSymlWCjr0o+V5ePJz5YMBhcl7H5LK dnOuX4hMc1lpluLnQf7xIUxd7upRD0NDDoLUApr9tAwl1irelaUTBybzJNLFNg+BzPSs WC3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=O7sn3WU3SvugYlEy0YWODy4S7kqLK8e1Gi8GiKlHuRk=; b=0XJzersA4aeD4s2sEuUJccrqIAVYq0aEBBZPXZvOtOynV9khZXeFJenIh6hb31qoqM tj/Ezi2Ad3UO5oX8TCiSNvXssgelOuyRxhKoL1YHoqk5XyDvzPlkRSJS9VLoqjBn9J45 YbSHr0bH74/OlglYOct3oFvu4/a5yWN7IMIHdgQaEU7IDJvb2scpdFmemVit92S745LU cAOtFOpin9PWMPuIbU8GIAuqgHH/su3lrPNYJyZfdfrjViZo+zndI24y4OC7hjjqdqql SOULz0OOG06Dw0fPHLwgh9iz3u6fCuBeQphlwmW0ruOifzzYAVVEwDaQ0SKMCyGC6NoS MFvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=ELbePsjc; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 93si8320414wrf.298.2017.11.10.13.42.19; Fri, 10 Nov 2017 13:42:19 -0800 (PST) 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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=ELbePsjc; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F04B689F55; Fri, 10 Nov 2017 23:41:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f54.google.com (mail-pg0-f54.google.com [74.125.83.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9341A689EFA for ; Fri, 10 Nov 2017 23:41:02 +0200 (EET) Received: by mail-pg0-f54.google.com with SMTP id j16so2799102pgn.9 for ; Fri, 10 Nov 2017 13:41:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Cs0mxymTv+AqudpLcEUNOiO05M+FCGCz8ktqFZEEWYU=; b=ELbePsjcmas4KI1nTDfEzZgmfQIkE/jQ5HowFjuyYPklG99Eh82XjP9xxwix+Akpjc l+pM53vCDa/ePXbH9r/ImLfrwsTB3LglDt8SsvB+hkHYZIiPaZL9ToK4/uxc7aB80I/s yoNtLYk06Uh0ZXp3iryPxq+6r/UUUVn3JEvazseh4PLokfUb4WvNc02I7Q5XhG+be3iu Omz0J9IzA+NKEvg0MdMFQThG7zcgue0+Fn8pquCj/JTWTtXQ76+ivwTv0p9GJDFX894d l9u+/SOsPBs89VWhZTa2K7nQvB0rl11RgvldkgVzw6L6f+WA4ZMhwu7LxFwyXqjobkhn yWDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Cs0mxymTv+AqudpLcEUNOiO05M+FCGCz8ktqFZEEWYU=; b=s/lHCQXTauYamx+Hl2uJ1bB2Ja9DeA80xTpV24E0zPZo5SpmzjvGsdgBNScuTFIMW9 LuUrNgJm8XDEfrSwByrQSsc9c+QYx5rtYmTQmurcgiiTE8CknNc9s+Uc/GKlzPqPH+5i Om9Wi5amDuLM7I9FEn9+4Xk3tMDJUA0V6tPIWl+KyNENxJaq/il8K8fluXV/iql+2cwA 8o7JUBV05p6t2cs77uDfmmLsZDrYVdA4NWSeC7ZDjH8HCtaZLDgVfGsYBOAsTaX7gp+j XhEXadvzRFz5dsJdSnMoezDu2kBVWyd3ujhcxgu7UYnPTMd/ZJoyYbrTFAe+ndYDsI5b 6a/w== X-Gm-Message-State: AJaThX7yvxtP7M8BYZ43VDKrzygH6Bp73/QAAtvOSuhNxOLXc4MQhypM cf/0YhpktJr2Ja0gh29LuXRJVoVu X-Received: by 10.101.93.9 with SMTP id e9mr1597785pgr.302.1510350074547; Fri, 10 Nov 2017 13:41:14 -0800 (PST) Received: from tmm1-imac.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id 81sm20734554pfh.145.2017.11.10.13.41.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Nov 2017 13:41:14 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Nov 2017 13:40:57 -0800 Message-Id: <20171110214059.84891-12-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171110214059.84891-1-ffmpeg@tmm1.net> References: <20171110214059.84891-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH v4 12/14] avcodec/videotoolbox: pass through hevc param changes to the decoder 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 Cc: nfxjfg@googlemail.com, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta This includes the SEI_PREFIX/SEI_SUFFIX NALUs, which can contain updates like HEVC_SEI_TYPE_ACTIVE_PARAMETER_SETS. Previously, hevc samples with this SEI present would not playback correctly. See for example https://github.com/lhc70000/iina/issues/1123 --- libavcodec/videotoolbox.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index fc33dce608..9eb06e619f 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -654,6 +654,14 @@ static int videotoolbox_h264_end_frame(AVCodecContext *avctx) return ret; } +static int videotoolbox_hevc_decode_params(AVCodecContext *avctx, + int type, + const uint8_t *buffer, + uint32_t size) +{ + return ff_videotoolbox_h264_decode_slice(avctx, buffer, size); +} + static int videotoolbox_hevc_end_frame(AVCodecContext *avctx) { HEVCContext *h = avctx->priv_data; @@ -1026,6 +1034,7 @@ AVHWAccel ff_hevc_videotoolbox_hwaccel = { .alloc_frame = ff_videotoolbox_alloc_frame, .start_frame = ff_videotoolbox_h264_start_frame, .decode_slice = ff_videotoolbox_h264_decode_slice, + .decode_params = videotoolbox_hevc_decode_params, .end_frame = videotoolbox_hevc_end_frame, .init = videotoolbox_common_init, .uninit = ff_videotoolbox_uninit,