From patchwork Sun Feb 11 14:37:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 7553 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp3026037jai; Sun, 11 Feb 2018 06:38:14 -0800 (PST) X-Google-Smtp-Source: AH8x226KZBY9OGfpCDaRCDVaZuU2dbfrgIOnNz2TLsR76su7A3+emGDK07CSuGUIIZfHJif9NJsY X-Received: by 10.223.183.46 with SMTP id l46mr7727800wre.33.1518359893993; Sun, 11 Feb 2018 06:38:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518359893; cv=none; d=google.com; s=arc-20160816; b=K/2uoD0mUVhk4dB3vLyHWhBfKAfSD6nDPQiTu5L1/0EUN9cIu6c1Sz0fHQspctnDtf gg9l59mumFmNY5CPZORKl3duG3JM57HHurZYzq8G7ydHCpvPWDuBE3kADZ28TKB7Z5lV MPS57t4AIwq+e0xB3oqSpy6LMZjRIli/MAwbbmUO+SFRok8Pi3EPSdKE99pY9q7yWQuS ww85PhZMsRPLOwBvgXyDU+Id1X47KqJ9W+rInccsxtmvmQHux01qktmKuiy/+2dlMiZh QKich0iyK4OCTmPqTCMsHCd4YHkWTAimj2R4pnYo+4nl94FV4ikqq88e/V9DEh6ofW3n MEsw== 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: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=Ba7F5T60alDgyZJbs2ppPo6AgR/kIN/cpAupQnqIras=; b=kr7XebOGLAIAx9oNOk2ISWxi3sQzfwycALh5sPQIJiIdqYupeP/Rzd3HnpmvcfOFEe eoGs7JeMj5HNXP9d1nIooeCUNcc6/T0XIx5jYwvlfIcDcInxuFwk64PSAq1z7HJIVa7k i1X2pS1nY4jgrbslzwyjaNbrqseZHA24aZbhB4b3Yhp9c4fTI/gXn75PMC6gO+TKxWf/ P0okChybKMSOakaK+etHhI/wDF248/CfFNn7ks1gFF37586LKf3/zppsrbglgPXLCUj+ yKcLrPEmetzmywKSuOsaoWSoRNJP0XbuFW7zbod8UD75a7DnpOBIRjt20tePh31g+YY/ DRnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Dog2aC9L; 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 69si2356904wmn.46.2018.02.11.06.38.13; Sun, 11 Feb 2018 06:38:13 -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=20161025 header.b=Dog2aC9L; 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 D3047689A36; Sun, 11 Feb 2018 16:37:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73C26689A2D for ; Sun, 11 Feb 2018 16:37:47 +0200 (EET) Received: by mail-lf0-f65.google.com with SMTP id x196so17154040lfd.12 for ; Sun, 11 Feb 2018 06:37:57 -0800 (PST) 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=4ooqhD1gZ9bciIh4XNKMnvy+9kFpdC+i79yZaya3nQo=; b=Dog2aC9LLu7zqlyNOo90uBI1t7kHSLyWEikyipA/fuhJ0w9mZu3RpF7sg2A7zMgXb2 vH83gAmm0Y3wRGOkcfMoMl6dbcu6R5jwhO0ySYwWKcRwUqM825m6l/wLhsqbV8dvnIeK kt4NV8Gf7PauVDbt1zhaM1u8JQ+zank73KVtWqjS5Y7oThXT4ieLlktr+L+1jqTzxhI8 jRctP9cW5SJhbHpDoan9sxRbX86A0eGarST78WK/bcASAM3JPc7ENRn+kAbd4aWAUkl9 YMLnCwDNox/lmk8Nzu/lQ+5aZtFepLmmlreZDX+OX6NUYHK3u9jfjKedV55XAcM0S+vi TFJw== 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=4ooqhD1gZ9bciIh4XNKMnvy+9kFpdC+i79yZaya3nQo=; b=UhG3wDQlymeph5Lt/DY/9Ia16cLs7tuNaHZHaJwunLflvGI5Ad16WSCQxwi9VSsqGt HtgfLjdsTkM1fk5OaN9sPG5xQ7sbATl70+bk5jX4VoZXpI2xYuZ3if5H3ngJB2NcfQFa dknwUujTvXdKiY1zXxGBcbeE+6jj2qDpKR7mFj9eFocaNPdU606lSTVm7dZvte+nn0iN CCT/hdD6Qa97USduCXl2biuzxDJOZyywV9QjR02ax065UVY4asebjD4vvnW3ZYxrm8Sj js0F5n5bGZpXX/qnw84L6TUa3rgcaXrNE2JlRV64187qFudOReiJWv1jnwwcqYnEa442 x5NQ== X-Gm-Message-State: APf1xPAcAF0ZVOHpO9qzwv0+YzKVlGA10sZryjta7CDRB9mz81lqsi9R /fKj4BzxgpoJuDuRFNFwf3/MSGRu X-Received: by 10.46.20.8 with SMTP id u8mr6078006ljd.12.1518359877079; Sun, 11 Feb 2018 06:37:57 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id f3sm1213107ljc.19.2018.02.11.06.37.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Feb 2018 06:37:55 -0800 (PST) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Feb 2018 16:37:50 +0200 Message-Id: <20180211143752.7851-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180211143752.7851-1-jeebjp@gmail.com> References: <20180211143752.7851-1-jeebjp@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/3] mpegvideo_parser: implement parsing of the picture structure field 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" From: Masaki Tanaka Lets one receive the proper field order from pictures coded in field picture mode, until now forcibly set to BFF. --- libavcodec/mpegvideo_parser.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index be240b6890..3406346a8b 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -41,7 +41,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, uint32_t start_code; int frame_rate_index, ext_type, bytes_left; int frame_rate_ext_n, frame_rate_ext_d; - int top_field_first, repeat_first_field, progressive_frame; + int picture_structure, top_field_first, repeat_first_field, progressive_frame; int horiz_size_ext, vert_size_ext, bit_rate_ext; int did_set_size=0; int set_dim_ret = 0; @@ -51,6 +51,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, enum AVPixelFormat pix_fmt = AV_PIX_FMT_NONE; //FIXME replace the crap with get_bits() s->repeat_pict = 0; + s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN; while (buf < buf_end) { start_code= -1; @@ -114,6 +115,7 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, break; case 0x8: /* picture coding extension */ if (bytes_left >= 5) { + picture_structure = buf[2] & 0x03; top_field_first = buf[3] & (1 << 7); repeat_first_field = buf[3] & (1 << 1); progressive_frame = buf[4] & (1 << 7); @@ -138,6 +140,18 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, s->field_order = AV_FIELD_BB; } else s->field_order = AV_FIELD_PROGRESSIVE; + + switch (picture_structure) { + case PICT_TOP_FIELD: + s->picture_structure = AV_PICTURE_STRUCTURE_TOP_FIELD; + break; + case PICT_BOTTOM_FIELD: + s->picture_structure = AV_PICTURE_STRUCTURE_BOTTOM_FIELD; + break; + case PICT_FRAME: + s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + break; + } } break; }