From patchwork Sun Jan 21 14:18:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Zheng X-Patchwork-Id: 45692 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a402:b0:199:de12:6fa6 with SMTP id z2csp943983pzk; Sun, 21 Jan 2024 06:20:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IGFhqDXYc2bAwSTgXVRvNOjZJ7IjgbC8z0FA2m71y3GMbLEEydelRCJb0mtBuQRTk3ssfZ0 X-Received: by 2002:a05:6402:31f5:b0:553:7065:e7c2 with SMTP id dy21-20020a05640231f500b005537065e7c2mr898426edb.113.1705846808125; Sun, 21 Jan 2024 06:20:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705846808; cv=none; d=google.com; s=arc-20160816; b=xVPyQaggqITO6hpsE6m2WL9KW8haZDUVUBGq8OiozPfbfH0+5UKzpO+wpOJ6okFOUh fnMl4HHNRto6OMVEeTjGquXZwBmrKrRqvJbMEVTp5ctoXdhKDP2l2sAezqS2oef6eEHZ RDQRItqe5I7OzVtxMj8TAM1A1Vz8zOeYH5pmXAuS4fpNoe4EsnlPe7bAq4u/oR8fGih9 ehtbz4CIqsyU5EeYWCnZsRqJ72oX5LzAIqm1y6TTb/KOgCvlQDQ4/qBoZNGwXI80EWdx DJCTq0WUptaHWrA4733+AayIyc/YXxRfFh0nG2yoZ3jHHkzTm8AWIQp3E4O05yzHAuaD uTBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=/HeJf1H8knddRxLGCvueDDaZISd5dg+lz4a8TuE/Zrg=; fh=iiAW4vjlCGdXV3Yszi/eNCPr6t9/oDQbs1mdNL59KvI=; b=tuXEoLAFMMHpVLVbDdBmbxdQJSUAJ+9AeU/LQ0+yq24au7iNpkuPsP0VshR7SfMgkp W/bcjYa642QB/OTZ2q5QW3pmguaTvXlkQfn41z8ImUw/m9NLJtqRAaZ4fbJmgqmIaj7U yEi79+++HwhI4sP1t47sAPtWgXH5gj4uT3avz5my9Dz4wv4inKWWbDb3mAc5iZJf0F8S 4uQ/WxWH54bJRKFkSgGS8/hQ51/cGZ5bHDxeBHabkkwC7qBXMdJvP8hMHHFUKTZ68X0o oXcW5BgODhVR+wn308Ol8wu8DBFvMiJrgvFYlBk2ckrHgI8yzgJ5bdq9bcS37LwPEolp S63g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jfrM52Vk; 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=QUARANTINE 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 fk3-20020a056402398300b0055a9009c58asi1689532edb.17.2024.01.21.06.20.07; Sun, 21 Jan 2024 06:20:08 -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=@gmail.com header.s=20230601 header.b=jfrM52Vk; 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=QUARANTINE 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 C9A9468D0D3; Sun, 21 Jan 2024 16:19:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 831B168D0C8 for ; Sun, 21 Jan 2024 16:19:22 +0200 (EET) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5cfa71498feso2136907a12.1 for ; Sun, 21 Jan 2024 06:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705846760; x=1706451560; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XrvrpFEzt9V2KvAKeN/CcRCalrmpjk1WoFXgG3qgOw8=; b=jfrM52Vk29ZDay/A+lzkiF7AvNI8XJQGXm0AzREj6dPK9uwuiOBfZh9+hrCeWYRer6 LcE582AQWdoumVC0xsYwseajk1FKrxmmOicugHM4Lh4I7MyOZGFu7zmj5X9iIk1tDARC 6BgN1IrNo5SxreLA+jJu+EKy9RG7TLmLT3yt0ZJtkg2AfNXGBfWGYvenmHrCHTvZ6Rl/ BH6awtdms9h75aRJo8fsub3PlgRjWq/IEH1BPKu6kwbP+zFJYDQymDjH6EI6fJDEYU11 TSwajpULlW0BegTmRdm797xaBJJw77ec9Yv/ysKu+qTlpg1Rmvo3Ot2wYAwWgEClIWCB wfPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705846760; x=1706451560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XrvrpFEzt9V2KvAKeN/CcRCalrmpjk1WoFXgG3qgOw8=; b=a1D5/odzexedhcBXmFV7BWZj7PilHbGD9ajhdxMNU4eh9KPPUc/URUyjjEASl98YlL fwCQT0hTD19sg0gg/PE7jFysddHjFB5o3Sh5f9FdGQDdVuOEK22mMF7eKQ4yGMXP2rvz zss4owvbj9sSoNXQmz0+2guItHmxuZWuWsz4qu3/2VvVtAW2G+g3028gRbPA3KHK5awr 7SOuHyRF75SYTssgW+SbuY591NDnZow/rYPt9i3W7Q/pvJOxj45GOsVXBm1anwU4KTTq qAmJ3IKAxrALIdRxbn5wuf3iBbjZqsoyTDHmAMTFfA6IxjPApL/mJ/CnO1WLaWFXKmfl a8LA== X-Gm-Message-State: AOJu0Yx5VYzA36tJS21icS6inBKLW6HkMmV4YKVrYmdGgV8vYnkMD7fQ 3Wawvs076dk2WPw/xwVzuz4PmYSyc8zASoHlq1TmmwJiT3eLrbhK3PphJuc+gWs= X-Received: by 2002:a17:902:82c9:b0:1d7:105a:53da with SMTP id u9-20020a17090282c900b001d7105a53damr3355940plz.27.1705846760471; Sun, 21 Jan 2024 06:19:20 -0800 (PST) Received: from localhost.localdomain ([183.242.63.6]) by smtp.gmail.com with ESMTPSA id bg4-20020a1709028e8400b001d4b73f60e4sm5840726plb.149.2024.01.21.06.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 06:19:20 -0800 (PST) From: "jianfeng.zheng" X-Google-Original-From: "jianfeng.zheng" To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Jan 2024 22:18:45 +0800 Message-Id: <20240121141846.4077778-6-jianfeng.zheng@mthreads.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240121141846.4077778-1-jianfeng.zheng@mthreads.com> References: <20240121141846.4077778-1-jianfeng.zheng@mthreads.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [vaapi-cavs 6/7] cavs: set profile & level for AVCodecContext 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 Cc: "jianfeng.zheng" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ymy+cnZy4pyK Signed-off-by: jianfeng.zheng --- libavcodec/cavsdec.c | 5 ++++- tests/ref/fate/cavs-demux | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 format|filename=bunny.mp4|nb_streams=1|nb_programs=0|format_name=cavsvideo|start_time=N/A|duration=N/A|size=177752|bit_rate=N/A|probe_score=51 diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 8d3ba530a6..5036ef50f7 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -1499,7 +1499,10 @@ static int cavs_decode_frame(AVCodecContext *avctx, AVFrame *rframe, switch (stc) { case CAVS_START_CODE: init_get_bits(&h->gb, buf_ptr, input_size); - decode_seq_header(h); + if ((ret = decode_seq_header(h)) < 0) + return ret; + avctx->profile = h->profile; + avctx->level = h->level; break; case PIC_I_START_CODE: if (!h->got_keyframe) { diff --git a/tests/ref/fate/cavs-demux b/tests/ref/fate/cavs-demux index 000b32ab05..6381f2075b 100644 --- a/tests/ref/fate/cavs-demux +++ b/tests/ref/fate/cavs-demux @@ -58,5 +58,5 @@ packet|codec_type=video|stream_index=0|pts=2280000|pts_time=1.900000|dts=2280000 packet|codec_type=video|stream_index=0|pts=2320000|pts_time=1.933333|dts=2320000|dts_time=1.933333|duration=40000|duration_time=0.033333|size=67|pos=172185|flags=K__|data_hash=CRC32:42484449 packet|codec_type=video|stream_index=0|pts=2360000|pts_time=1.966667|dts=2360000|dts_time=1.966667|duration=40000|duration_time=0.033333|size=83|pos=172252|flags=K__|data_hash=CRC32:a941bdf0 packet|codec_type=video|stream_index=0|pts=2400000|pts_time=2.000000|dts=2400000|dts_time=2.000000|duration=40000|duration_time=0.033333|size=5417|pos=172335|flags=K__|data_hash=CRC32:9d0d503b -stream|index=0|codec_name=cavs|profile=unknown|codec_type=video|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|width=1280|height=720|coded_width=1280|coded_height=720|closed_captions=0|film_grain=0|has_b_frames=0|sample_aspect_ratio=N/A|display_aspect_ratio=N/A|pix_fmt=yuv420p|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|refs=1|id=N/A|r_frame_rate=30/1|avg_frame_rate=25/1|time_base=1/1200000|start_pts=N/A|start_time=N/A|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=60|extradata_size=18|extradata_hash=CRC32:1255d52e|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbna ils=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0 +stream|index=0|codec_name=cavs|profile=32|codec_type=video|codec_tag_string=[0][0][0][0]|codec_tag=0x0000|width=1280|height=720|coded_width=1280|coded_height=720|closed_captions=0|film_grain=0|has_b_frames=0|sample_aspect_ratio=N/A|display_aspect_ratio=N/A|pix_fmt=yuv420p|level=64|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|refs=1|id=N/A|r_frame_rate=30/1|avg_frame_rate=25/1|time_base=1/1200000|start_pts=N/A|start_time=N/A|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=60|extradata_size=18|extradata_hash=CRC32:1255d52e|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|