From patchwork Tue Nov 26 12:57:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 16422 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 D8A85448750 for ; Tue, 26 Nov 2019 15:07:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B528668AF35; Tue, 26 Nov 2019 15:07:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AD0668AB8A for ; Tue, 26 Nov 2019 15:07:39 +0200 (EET) Received: by mail-qk1-f194.google.com with SMTP id b8so1040270qkk.5 for ; Tue, 26 Nov 2019 05:07:39 -0800 (PST) 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=HYkCRWpG4K/nYSm5exUamUARPGK1jDdzA/9Cbbkyqhc=; b=ceRckIjfe64KrLPWWAZA1SUE60i3DlM0S1gHK+b527CsKoHPkOwGUqWedb0QxVrfuN I36daT9ewTMf3lScSTM3I3s0E8lUadmiB1EC4QRq+C/qmgJ5CDvjGUOZuYt0esvLwxGs yCHyW1aBRo509pn/f7L0+8ObQDc6/p6Vr86ovjxA8L0qWLktu32UVxdzWThs58X9ClO4 NINygKCJhlTRMdoZT4XXFxK1C/q1DWcpcBStPzOF2LgggnBF7XVL8ie1IfqRsloRQ+kr 2sz0i0HNsotrAeLFmpOq3IVzEu3wVlp261wKKRtYq1IUCkJnrdH1CNkwPjj91lXjfz4N 1Xqg== 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=HYkCRWpG4K/nYSm5exUamUARPGK1jDdzA/9Cbbkyqhc=; b=q2vwQhYjHC94DDpgWX3APivGi3IM0RRBlzNnAYlMXRObzSGwbWCeWaVqlu8OLjuWNF CnkWKRPtPVbtudysZZmPBwl1IEWwFf4/ONKwBM+uTIzEfWBKDvgZg5ibpk2a4zhqvHG7 9XfhmFIV0MSnckLge7wK3JYaiSxWRGNYhU+NivvanH8nAHigK4pzXY/51PwHKTh/Q+7M rJpggm64ub/vTLPVIB2FoNar+HD16ziYG/zaqjKWW4lqrEribhfp3IdVxBURcZfB4QX3 YrsZbDCSuXs2O/cp/bxUhUx0nJ5txmizEOkWm3jpEZkTaCd5Q3v9z7/LTT4VBJurmOh8 Kn8w== X-Gm-Message-State: APjAAAWBSpwZ0rL6nN1DEj00TshIs8HMdGitN9HBjFATs+n4CrtTISJH fThKyPtNTAGFXKmzuOsPvRpFmlN6nzg= X-Google-Smtp-Source: APXvYqxLoAgcvF/Zcn3let2jZDFmO5VXHnGLrdyjn84OxV0YW83ViujeP81n9N3ZNLXGb54G/3bj0Q== X-Received: by 2002:a37:4ece:: with SMTP id c197mr23587699qkb.326.1574773194253; Tue, 26 Nov 2019 04:59:54 -0800 (PST) Received: from localhost.localdomain ([181.23.79.171]) by smtp.gmail.com with ESMTPSA id d6sm5083902qkb.103.2019.11.26.04.59.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2019 04:59:53 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Nov 2019 09:57:20 -0300 Message-Id: <20191126125721.105-1-jamrial@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/avc: write the missing bits in the AVC Decoder Configuration Box 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" Signed-off-by: James Almer --- libavformat/avc.c | 38 +++++++++++++++++++++++++++++++++----- libavformat/avc.h | 1 + 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index a041e84357..9bd215c07f 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -107,11 +107,11 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) { - AVIOContext *sps_pb = NULL, *pps_pb = NULL; + AVIOContext *sps_pb = NULL, *pps_pb = NULL, *sps_ext_pb = NULL; uint8_t *buf = NULL, *end, *start = NULL; - uint8_t *sps = NULL, *pps = NULL; - uint32_t sps_size = 0, pps_size = 0; - int ret, nb_sps = 0, nb_pps = 0; + uint8_t *sps = NULL, *pps = NULL, *sps_ext = NULL; + uint32_t sps_size = 0, pps_size = 0, sps_ext_size = 0; + int ret, nb_sps = 0, nb_pps = 0, nb_sps_ext = 0; if (len <= 6) return AVERROR_INVALIDDATA; @@ -133,6 +133,9 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) if (ret < 0) goto fail; ret = avio_open_dyn_buf(&pps_pb); + if (ret < 0) + goto fail; + ret = avio_open_dyn_buf(&sps_ext_pb); if (ret < 0) goto fail; @@ -160,12 +163,21 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) } avio_wb16(pps_pb, size); avio_write(pps_pb, buf, size); + } else if (nal_type == 13) { /* SPS_EXT */ + nb_sps_ext++; + if (size > UINT16_MAX || nb_sps_ext >= 256) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + avio_wb16(sps_ext_pb, size); + avio_write(sps_ext_pb, buf, size); } buf += size; } sps_size = avio_close_dyn_buf(sps_pb, &sps); pps_size = avio_close_dyn_buf(pps_pb, &pps); + sps_ext_size = avio_close_dyn_buf(sps_ext_pb, &sps_ext); if (sps_size < 6 || !pps_size) { ret = AVERROR_INVALIDDATA; @@ -183,13 +195,29 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) avio_w8(pb, nb_pps); /* number of pps */ avio_write(pb, pps, pps_size); + if (sps[3] != 66 && sps[3] != 77 && sps[3] != 88) { + H264SequenceParameterSet *seq = ff_avc_decode_sps(sps, sps_size); + if (!seq) + goto fail; + avio_w8(pb, 0xfc | seq->chroma_format_idc); /* 6 bits reserved (111111) + chroma_format_idc */ + avio_w8(pb, 0xf8 | seq->bit_depth_luma - 8); /* 5 bits reserved (11111) + bit_depth_luma_minus8 */ + avio_w8(pb, 0xf8 | seq->bit_depth_chroma - 8); /* 5 bits reserved (11111) + bit_depth_chroma_minus8 */ + avio_w8(pb, nb_sps_ext); /* number of sps ext */ + if (nb_sps_ext) + avio_write(pb, sps_ext, sps_ext_size); + av_free(seq); + } + fail: if (!sps) avio_close_dyn_buf(sps_pb, &sps); if (!pps) avio_close_dyn_buf(pps_pb, &pps); + if (!sps_ext) + avio_close_dyn_buf(sps_ext_pb, &sps_ext); av_free(sps); av_free(pps); + av_free(sps_ext); av_free(start); return ret; @@ -351,7 +379,7 @@ H264SequenceParameterSet *ff_avc_decode_sps(const uint8_t *buf, int buf_size) skip_bits1(&gb); // separate_colour_plane_flag } sps->bit_depth_luma = get_ue_golomb(&gb) + 8; - get_ue_golomb(&gb); // bit_depth_chroma_minus8 + sps->bit_depth_chroma = get_ue_golomb(&gb) + 8; skip_bits1(&gb); // qpprime_y_zero_transform_bypass_flag if (get_bits1(&gb)) { // seq_scaling_matrix_present_flag for (i = 0; i < ((sps->chroma_format_idc != 3) ? 8 : 12); i++) { diff --git a/libavformat/avc.h b/libavformat/avc.h index a79bf9b2db..5286d19d89 100644 --- a/libavformat/avc.h +++ b/libavformat/avc.h @@ -43,6 +43,7 @@ typedef struct { uint8_t constraint_set_flags; uint8_t chroma_format_idc; uint8_t bit_depth_luma; + uint8_t bit_depth_chroma; uint8_t frame_mbs_only_flag; AVRational sar; } H264SequenceParameterSet;