From patchwork Thu Nov 17 05:41:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1452 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp581086vsb; Wed, 16 Nov 2016 21:42:38 -0800 (PST) X-Received: by 10.28.149.135 with SMTP id x129mr15040441wmd.71.1479361357993; Wed, 16 Nov 2016 21:42:37 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o6si10029794wmi.105.2016.11.16.21.42.36; Wed, 16 Nov 2016 21:42:37 -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; 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 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 6591A689EE9; Thu, 17 Nov 2016 07:42:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC4F268071F for ; Thu, 17 Nov 2016 07:42:06 +0200 (EET) Received: by mail-qk0-f194.google.com with SMTP id h201so24588242qke.3 for ; Wed, 16 Nov 2016 21:42:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=/F5UARzwuNFTasp/gr0EbXPeoOIh0xMyv2CJU8HCIeU=; b=iJNCOFRJNySzeu2NS33amsiJcz0a0jRWFKMbb4a6XVbB1skZJZLOXrEZ/DNOR3VQVa wyEZ68gVtrnjoN25Ncm3b7lpiJ2rvt3Q5Wan21cAIgQ2rJbjH2fYuZt/NN0NRdcMUrbp zPuei6AvzPGP3ZpCH/8I2LKnNpCnsuhHVAljAeDdS4mteaxXJxfEAbT6zQw13v2IThNE 7kVcabQqfdxaoyB7k+WcwNawP8ubLk7NTyzaIIf3FqI8ZpWgCgsg+TrcUVvbXvTlg/Oj plG+aPOiRIkMdWLKmRkwBV23DAq/MvGx+XSOePrpifsLMGhvPKl3mIwmVbWXZEx1tp7b WcEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/F5UARzwuNFTasp/gr0EbXPeoOIh0xMyv2CJU8HCIeU=; b=V99vCjDO5Umn0RWr2/4+qFVlOLn+W1JcjPH0qJzkjyArCEfrrYm9k4igZs2Xs9nIJa CBiyI/3ZmQdZhT7dftaFfjSJXP7WYz/aTgZONipkwBTJylIgZ0kAtjvVvl5tMnA9OP6h zNLKMhKGIKzz9Pgmu7j7zYoFV/XPs4XATzXFR5PFyOTZ5t2RavGkvs+ZhnG7i7VElTCC kwOpI9phNhjHegyr6Soiji7ijSjsuIXPiuUcoekq7//abf9Id0UboWkscbGuDho2pXBc uYClM6hLcoBmtas8qjJTYJD21YyvrdmUCZMM9/kSESXvPAO/tqNpFFCZkR61gP9NlgdF +S5Q== X-Gm-Message-State: AKaTC01UEy/8nt1wCOVwvNCwHbGAKYKK2J5YJvDzNP7VYH/93PFN3fGE7tUJCQougqLdiw== X-Received: by 10.55.103.80 with SMTP id b77mr1345812qkc.142.1479361326701; Wed, 16 Nov 2016 21:42:06 -0800 (PST) Received: from localhost.localdomain ([181.22.0.199]) by smtp.gmail.com with ESMTPSA id f66sm730904qke.12.2016.11.16.21.42.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Nov 2016 21:42:06 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Nov 2016 02:41:15 -0300 Message-Id: <20161117054115.3732-3-jamrial@gmail.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161117054115.3732-1-jamrial@gmail.com> References: <20161117054115.3732-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] avformat/matroska: use av_stream_add_side_data() for stereo3d side 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" Signed-off-by: James Almer --- libavformat/matroska.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index c592fb0..7a3d233 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -150,26 +150,13 @@ const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_CO int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode) { - AVPacketSideData *sd, *tmp; AVStereo3D *stereo; + int ret; stereo = av_stereo3d_alloc(); if (!stereo) return AVERROR(ENOMEM); - tmp = av_realloc_array(st->side_data, st->nb_side_data + 1, sizeof(*tmp)); - if (!tmp) { - av_freep(&stereo); - return AVERROR(ENOMEM); - } - st->side_data = tmp; - st->nb_side_data++; - - sd = &st->side_data[st->nb_side_data - 1]; - sd->type = AV_PKT_DATA_STEREO3D; - sd->data = (uint8_t *)stereo; - sd->size = sizeof(*stereo); - // note: the missing breaks are intentional switch (stereo_mode) { case MATROSKA_VIDEO_STEREOMODE_TYPE_MONO: @@ -207,5 +194,12 @@ int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode) break; } + ret = av_stream_add_side_data(st, AV_PKT_DATA_STEREO3D, (uint8_t *)stereo, + sizeof(*stereo)); + if (ret < 0) { + av_freep(&stereo); + return AVERROR(ENOMEM); + } + return 0; }