From patchwork Sat Jul 27 17:58:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 14097 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 21EB94493BF for ; Sat, 27 Jul 2019 21:04:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F11D0680BED; Sat, 27 Jul 2019 21:04:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA92F6808AE for ; Sat, 27 Jul 2019 21:04:17 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id a15so55794328qtn.7 for ; Sat, 27 Jul 2019 11:04:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7Vw32ueZSOAOlPGu0SpaxWD0ASkKi9A6/xJ/GV7Ckps=; b=s74lua6JevY7So+f62231V82L35IWxQpT3cCORXWRMKDuGMRI+JVel74d2dBhRGUst zL2HDZaKOQB9/uAYeP2ngE1ywB+n0Lj1B0z2EaP0FiU/RV+q7sbim+UfV0A0+IS8ArAe r3sYoBubnFvXjDtytcZezLD5IYkHLaplpXmWz2TLqJD3N1AS+dKWpRH26iT0jQEIdBGl k5ZYcalemrQsjaPNpXW+Xpbrr4/jNg/OKWa2KQd/geumjtQEjJ9HATTnpg4NCdJ8Y1Cm gSyraGMLmlMrSg7J9qG/waY6ys+OagxVUV+AoAqfWkzh9NQM5WLt9wetyMViI1pTXg7+ /hvA== 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:mime-version :content-transfer-encoding; bh=7Vw32ueZSOAOlPGu0SpaxWD0ASkKi9A6/xJ/GV7Ckps=; b=P7wRQEzUI2kAA9uHRV9E0d1UEyV1ugxy7OY9srjdHlY6zSgcrW9frslUaXTGNcT22J r6zT6vgF0UabPRFvDguQ8ynJFvKPR4RXYMrpT67xc/8td0uO1pGEyyyTAwYe0yFj0WFb ZOlrCjuhVu4GnQdHqfzKNAxcuvMTLoekT6HbM21pqlq5sovC0LX0WjuMpeAlP2EawLCC mBxIpJYvj1BnDNTDr05p6WLKiccxj30hb7+7ccSCTLgFNXBcpLtjSxy3p4gQskXyGUWN QW8+M3ohykXk1HIZhVWeMPhsyDM+EMedlaMHtbo29YFQJJjvpvnRNPx6DtKdruCvAHVB BqVw== X-Gm-Message-State: APjAAAWvKtISr61TSmUe9kF7b/EWTfYOX6LTLx+oSHlKe74OgTwCHYje BGNK2DNlfY6uRKv1O9NBugscX1EvlQY= X-Google-Smtp-Source: APXvYqxk6kR6OeS7/4MHogUh8zQ9v5+WMc86Q4Z5d9GERPhaZTYn9pWEviKfHLxH4Wx0Me7ZfufbJQ== X-Received: by 2002:ac8:2734:: with SMTP id g49mr72382461qtg.228.1564250308133; Sat, 27 Jul 2019 10:58:28 -0700 (PDT) Received: from localhost.localdomain ([191.84.238.227]) by smtp.gmail.com with ESMTPSA id g25sm20688870qto.45.2019.07.27.10.58.27 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 27 Jul 2019 10:58:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 27 Jul 2019 14:58:15 -0300 Message-Id: <20190727175815.670-1-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/movenc: don't ignore errors when writing codec specific boxes in a VisualSampleEntry 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Prevents muxing ultimately broken and spec non-compliant files. Signed-off-by: James Almer --- libavformat/movenc.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a96139077b..6ffaff6910 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1180,46 +1180,50 @@ static int mov_write_d263_tag(AVIOContext *pb) static int mov_write_av1c_tag(AVIOContext *pb, MOVTrack *track) { int64_t pos = avio_tell(pb); + int ret; avio_wb32(pb, 0); ffio_wfourcc(pb, "av1C"); - ff_isom_write_av1c(pb, track->vos_data, track->vos_len); - return update_size(pb, pos); + ret = ff_isom_write_av1c(pb, track->vos_data, track->vos_len); + return ret < 0 ? ret : update_size(pb, pos); } static int mov_write_avcc_tag(AVIOContext *pb, MOVTrack *track) { int64_t pos = avio_tell(pb); + int ret; avio_wb32(pb, 0); ffio_wfourcc(pb, "avcC"); - ff_isom_write_avcc(pb, track->vos_data, track->vos_len); - return update_size(pb, pos); + ret = ff_isom_write_avcc(pb, track->vos_data, track->vos_len); + return ret < 0 ? ret : update_size(pb, pos); } static int mov_write_vpcc_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { int64_t pos = avio_tell(pb); + int ret; avio_wb32(pb, 0); ffio_wfourcc(pb, "vpcC"); avio_w8(pb, 1); /* version */ avio_wb24(pb, 0); /* flags */ - ff_isom_write_vpcc(s, pb, track->par); - return update_size(pb, pos); + ret = ff_isom_write_vpcc(s, pb, track->par); + return ret < 0 ? ret : update_size(pb, pos); } static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) { int64_t pos = avio_tell(pb); + int ret; avio_wb32(pb, 0); ffio_wfourcc(pb, "hvcC"); if (track->tag == MKTAG('h','v','c','1')) - ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 1); + ret = ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 1); else - ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 0); - return update_size(pb, pos); + ret = ff_isom_write_hvcc(pb, track->vos_data, track->vos_len, 0); + return ret < 0 ? ret : update_size(pb, pos); } /* also used by all avid codecs (dv, imx, meridien) and their variants */ @@ -1943,7 +1947,7 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex { int64_t pos = avio_tell(pb); char compressor_name[32] = { 0 }; - int avid = 0; + int ret = 0, avid = 0; int uncompressed_ycbcr = ((track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVY422) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_YUYV422) @@ -2035,17 +2039,17 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex mov_write_avid_tag(pb, track); avid = 1; } else if (track->par->codec_id == AV_CODEC_ID_HEVC) - mov_write_hvcc_tag(pb, track); + ret = mov_write_hvcc_tag(pb, track); else if (track->par->codec_id == AV_CODEC_ID_H264 && !TAG_IS_AVCI(track->tag)) { - mov_write_avcc_tag(pb, track); + ret = mov_write_avcc_tag(pb, track); if (track->mode == MODE_IPOD) mov_write_uuid_tag_ipod(pb); } else if (track->par->codec_id == AV_CODEC_ID_VP9) { - mov_write_vpcc_tag(mov->fc, pb, track); + ret = mov_write_vpcc_tag(mov->fc, pb, track); } else if (track->par->codec_id == AV_CODEC_ID_AV1) { - mov_write_av1c_tag(pb, track); + ret = mov_write_av1c_tag(pb, track); } else if (track->par->codec_id == AV_CODEC_ID_VC1 && track->vos_len > 0) - mov_write_dvc1_tag(pb, track); + ret = mov_write_dvc1_tag(pb, track); else if (track->par->codec_id == AV_CODEC_ID_VP6F || track->par->codec_id == AV_CODEC_ID_VP6A) { /* Don't write any potential extradata here - the cropping @@ -2056,6 +2060,9 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex } else if (track->vos_len > 0) mov_write_glbl_tag(pb, track); + if (ret < 0) + return ret; + if (track->par->codec_id != AV_CODEC_ID_H264 && track->par->codec_id != AV_CODEC_ID_MPEG4 && track->par->codec_id != AV_CODEC_ID_DNXHD) {