From patchwork Wed Sep 19 13:58:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 10406 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp738151jap; Wed, 19 Sep 2018 06:59:00 -0700 (PDT) X-Google-Smtp-Source: ANB0VdacpBEnVtA4UaB0Bdc1TCfVIA6Fh75thw12Iowq9h7IJtV1LSY1cxyYvmcoOn0AjrgvI44W X-Received: by 2002:adf:8445:: with SMTP id 63-v6mr29251839wrf.41.1537365539888; Wed, 19 Sep 2018 06:58:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537365539; cv=none; d=google.com; s=arc-20160816; b=tZXNZuiJVlUj1dcvFWYo9UfMCsoe5R7Jz8YWahxx7BOw1eTC7r+QSd0xT6NOrX5wwp ZuVxVjvrYMQ1iFcICsFHVM94bgwp9VIO/tEFfsCedU4cUX5mv4yTTX78+GBnxrH9vCAC AQ1AVYLzOQwCNYQhxm9NrcDsueGb/bOQ2EX8UsjAng8SmKfFKneFAymN5EslokTjIAS4 ahkviT5QLHlFDIGEHawUS9YwdFTfzqxcm5rQ6km0MKITKLoPFky7br78jJ/vmH/M0oCh GGOLEZkar7pXKOrfZKYhznsEKAV1AX6KEkPKDJujBGxVQTRfOHnu09Lq8NvuMTpaVkkq tMhA== 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:references :in-reply-to:message-id:date:to:from:delivered-to; bh=Oy/qkebGnuYPtLHW+9TcW2vNGIcAm1z3hj7EyIJsSeA=; b=DUvqg+dvteGJqVv7jQzh9b9qT/bAyI+xrTk7vO3OhwpSshWjZyPdZQS3XAtbNr9bGT s4LohqsgIRT5it+0UQ0ipR0ub4P7TOHiMBHJxTDyZ/06Z9KgNdZRtGH0pxIpAapZ9VxE HmcanCd6jGmqeq/yH3AVz9Z3EuztPanASGwJDE/Z9c/kv6Fkg4osGuC+FejEe+ged+aD JKGq5NduujqBR27hAjWO/ZjAwV+e/vCMSuKoq4mfVDowdME72XyVG/JAWzD5CCr5hval oGvGaric0Pcm3oKSNtsCFrV9qbFPQYZbO6QCZ9qWin50yK/NcAyo0z6+ELUFqHzbYaJb JgHA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b141-v6si13687231wme.113.2018.09.19.06.58.59; Wed, 19 Sep 2018 06:58:59 -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; 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 BB49568A5BE; Wed, 19 Sep 2018 16:58:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23C6268A468 for ; Wed, 19 Sep 2018 16:58:32 +0300 (EEST) Received: from paradise.fritz.box ([79.223.50.137]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M5tzh-1frxwC0SE5-00xuPf; Wed, 19 Sep 2018 15:58:45 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Wed, 19 Sep 2018 15:58:30 +0200 Message-Id: <34079525021f9afa22dfbae674203b85968be872.1537349317.git.barsnick@gmx.net> X-Mailer: git-send-email 2.14.4 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V03:K1:rSPw1nOlIrKIl5OMVDXnwkus5ZiUN+q8seQuc2GJGhfiIv/DbYu LwMRqR7cVC79OnL2OyVl9cOA4I0TrkzPnEojj7xiJ40rJTqzBiy2KSZcGSV84YMcLSM7qrv 8hqBWg1BkYBzA7BYkWHRlQXdw8kg5FZdSTGVWrKb2osfD71tTNSpzDSggLGhUBOSgQivPXw AJ4QXGIWGfC6GRPHGVCOg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Cug6SB2wFpQ=:HwB4uo2wH9psmGJ/ygiyEa TKJEvwfp10vKGH/sWLbCT7YvwIgxAmLKa2nZf5kpMDG2pNGrTxWjxl4S/AJZyt9SmTzNFmz2D ynBHVlmMf22qc0b3VsTt/Vk7vHgZjZjgTJWPDwwIehMRMpELzS1sZYcbDGhVrDy5hHuy8xvaY 2sTD2JUm9buimWCtvfokhOsPvS6z54FhRjr/8B0wgFO1ikvM1xDtq0EoY3kV0vFgOJ3CmhPkl emxdBNNSO6GIbCIDcWRQ9veGTDJEpXUb9LIJPPfm9JPNhnALZlaneXCXdqwy4zz828tTsFksQ 7xBIt4Fzy/1gKYN1WOnYWXyZoMioP/SjWKt+xUlpTbINaFJLfh2Zy0Nh+esGpuD0vAtKCA6Rl SuUPsQ83PHhL0DVucvoYAEyfkqr+kzk62x0FRsXQzPe/Uxo+C4Hzse4Njqx78G/WpB1kR1jkF KwU/kDRhidpontz+0KT6Nt1Dsy2CyTiXPYH4oQGIcD9tbw507h2xz/7lIktCxDvmgkqOgUBDx BqeYMbcBhaJ1gyTJj1O/ISJOf/aMkv/Hqurwjt4AX3+QYg9ELXa1d/SJhOBVZHYVg6jqUJNEt xRXbtaOE3OMicji/izOdDPPaBj8YiTt4uf5ZYLs0NBBc7U4N8rQwXtyrBM3aUXC3i0jpeaAfK hJQTTO/5JlICxeYpyFbJJMXAT+FBL+ZX4c2iRwX347zp0orIexnOngSH9U1ocDI6RUu61xQcv OwJ+sZnTfkM0YF8A0QKlmyVT+sA+HQZ4MLTdxKF20wa0y7FGGmJlGPqOVMg8Ax9mCux3SkF73 JrXOAzLd2zmogFUJAwVSSw1oPnPyg== Subject: [FFmpeg-devel] [PATCH 1/3] avformat/movenc: allow padding to two bytes in mov_write_int8_metadata() 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: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Padding to four bytes was already possible. This is in preparation for being able to also write 16-bit integer atoms (and other currently unneeded scenarios). Signed-off-by: Moritz Barsnick --- libavformat/movenc.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6b9c012bc6..7c326faa49 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3461,7 +3461,7 @@ static int mov_write_int8_metadata(AVFormatContext *s, AVIOContext *pb, uint8_t num; int size = 24 + len; - if (len != 1 && len != 4) + if (len != 1 && len != 2 && len != 4) return -1; if (!(t = av_dict_get(s->metadata, tag, NULL, 0))) @@ -3470,12 +3470,14 @@ static int mov_write_int8_metadata(AVFormatContext *s, AVIOContext *pb, avio_wb32(pb, size); ffio_wfourcc(pb, name); - avio_wb32(pb, size - 8); + avio_wb32(pb, size - 8); // size ffio_wfourcc(pb, "data"); - avio_wb32(pb, 0x15); + avio_wb32(pb, 0x15); // type specifier avio_wb32(pb, 0); - if (len==4) avio_wb32(pb, num); - else avio_w8 (pb, num); + // data: + if (len == 4) avio_wb32(pb, num); + else if (len == 2) avio_wb16(pb, num); + else avio_w8 (pb, num); return size; }