From patchwork Tue Sep 21 18:40:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 30427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2703488iob; Tue, 21 Sep 2021 11:41:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQpGPK171+LEDYUtvQof6RNu/3EcGGGwE+OG5TBWC6Ht4FfoJZfa7Q377/NsaWgRB05ast X-Received: by 2002:aa7:c806:: with SMTP id a6mr36758297edt.354.1632249692019; Tue, 21 Sep 2021 11:41:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632249692; cv=none; d=google.com; s=arc-20160816; b=X9N4UBbD3wFagnU6W2MqlvA5DAeua9XB6+jdkj2RtOtxievWxylz/S+AIgh6bKat/p M9TNCGONZTz9dHLIoqA3y3KQRvsvTskcJZjW3eJ4w+GVB0bxUkcIhlH4FRml71P7u4fR nFi5R1af/qI7lsnVOaNQ1ZO06DrpsoYIUcTetJ+NR41YDkiTa5fIYk4l8Mt3y7ADTKjY JtxwBCae+WeB5xuS42ykvYa3UFRZz+onJxE16SMLrCmz5wXSLh3VJ0q1eA8jIjhNhChu 9yB3Xfi2WYHfLAahvjtpvx5x7kfy6T21VMmV5D6Vsj5RbaYZER+twzQL1MNJa3xFHi14 hrrA== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=Eto9gB9FqBqW5nlz0JJ1665eefYp23cQgyKJNKN0Dkk=; b=gLoOVZATae3XU+1uYQvwUnnRXCVZpv0t3cLcONR6N9Jma7Z7eHn3AwPxSs6tFUdxu6 HVq/YNU7TDbJ5m9BbYKbhPUS8K/1UiTMo7Q1jM0qYcvY81+OJfhbf5Pr+syeAXFtzsLn etG2+Ffm9yho5vldp3uTVFCw92tUrACbykEcBX+4/wDwBivjpo0EEeMCn0d5gEo3U6ny pL5vFHnbzklgk/TdIm0SDEJ1SMJYjWgx/uSx3XIabLwGJ48sUfde0elShak13iowYUqh hO/SnqYJ8obuH2mUackgQpEXVHtpILm59YjqeoTsuMwXWnll0fo0JQc1HEdOklpLWylr tC9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kJtqxUli; 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 u13si17959837eju.576.2021.09.21.11.41.31; Tue, 21 Sep 2021 11:41:32 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=kJtqxUli; 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 CC30F68AF5C; Tue, 21 Sep 2021 21:41:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C9B968A96A for ; Tue, 21 Sep 2021 21:41:22 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id q23so350239pfs.9 for ; Tue, 21 Sep 2021 11:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id; bh=mTqGeTHrwV32ZQQwh2nu++aRZliDfvf3gV9vGhnb0t4=; b=kJtqxUlih3QL88m/HvFCy+RU5iSkRlL3VRb01x6t5KREqfOK1dS6LoAaD1QEXPqTD6 CLIKeP2vlsezzKxxZKOenWz7h4O73V8h9RgLqwP3Eo78k15LSGDiYzVyghpfAOcopzoC jwWj9ifXFiZ2Gur6vMG28xQoVw2CmkDcVQ//Wp61v6rVn13rRl7dJ1vcHE/0QwbYqDKT q2SPdH5Pm6C5LPjKv/4zlRp/CuIhYxeSLIgZmz9WCt15xEyKI0OYcapi6b8ap/T0Lo8R Bq5UohEZtWGNDkETeeNopzI/70wVyGjZATEn9eJxl+Y2RFcpppFCvRviaS63PbLQcfpW 58Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id; bh=mTqGeTHrwV32ZQQwh2nu++aRZliDfvf3gV9vGhnb0t4=; b=XLSutUubxzNR/jBg5ilgfLTq96KnymzR0s0yMdptwrAYTrlvoOHMTCFMmq5ykUAcXh usGcwg4dNcaWRyXfJMPTwT9P2bS2C1JdLlRZpEczMvBj1CvlFEm3wHiCsnLyjap3UnFN K2QcQrx1Z3CLJzfmd4kbqasnAZ8O7y2jUPuE2oDRruK76z8VUor7Xr6XvosZbtmLcXJX +eC/h9P2PixvwfbjdGVipFwZEyypRsR+HZi3g/ZK0OKqRlgT32UML1F2hLXjSNaEBgJx aVRcpB1u0zXIi9EFiu1hfaUrTJZifbHb1rKSQVprOSNYv2VuEYU4faoMcI/omgOS+oKq 6T+g== X-Gm-Message-State: AOAM530Uk3/RRD/lNAsOdYB/6qxCZjcukv7S6QvRwtmKZFynYE4GdbBs hGnlVBf5QN1b4NYYDVj5CYW0HgycSiQ= X-Received: by 2002:a63:f963:: with SMTP id q35mr29411396pgk.132.1632249678715; Tue, 21 Sep 2021 11:41:18 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:5023:907:6d04:a3b6:841a:1d61]) by smtp.gmail.com with ESMTPSA id fh3sm3347244pjb.8.2021.09.21.11.41.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:41:18 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Sep 2021 00:10:58 +0530 Message-Id: <20210921184058.3156-1-nachiket.programmer@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] libavcodec/adts_header: add frame_length field and avpriv function to parse AAC ADTS header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: bJjZF5OHPltq These will be used by HLS demuxer in case of sample decryption. Signed-off-by: Nachiket Tarate --- libavcodec/adts_header.c | 1 + libavcodec/adts_header.h | 15 +++++++++++++++ libavcodec/adts_parser.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/libavcodec/adts_header.c b/libavcodec/adts_header.c index 0889820f8a..e4454529c4 100644 --- a/libavcodec/adts_header.c +++ b/libavcodec/adts_header.c @@ -66,6 +66,7 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) hdr->sample_rate = avpriv_mpeg4audio_sample_rates[sr]; hdr->samples = (rdb + 1) * 1024; hdr->bit_rate = size * 8 * hdr->sample_rate / hdr->samples; + hdr->frame_length = size; return size; } diff --git a/libavcodec/adts_header.h b/libavcodec/adts_header.h index f615f6a9f9..354d07e1f8 100644 --- a/libavcodec/adts_header.h +++ b/libavcodec/adts_header.h @@ -34,6 +34,7 @@ typedef struct AACADTSHeaderInfo { uint8_t sampling_index; uint8_t chan_config; uint8_t num_aac_frames; + uint32_t frame_length; } AACADTSHeaderInfo; /** @@ -47,4 +48,18 @@ typedef struct AACADTSHeaderInfo { */ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr); +/** + * Parse the ADTS frame header contained in the buffer, which is + * the first 54 bits. + * @param[in] buf Pointer to buffer containing the first 54 bits of the frame. + * @param[in] size Size of buffer containing the first 54 bits of the frame. + * @param[out] phdr Pointer to pointer to struct AACADTSHeaderInfo for which + * memory is allocated and header info is written into it. After using the header + * information, the allocated memory must be freed by using av_free. + * @return Returns 0 on success, -1 if there is a sync word mismatch, + * -2 if the version element is invalid, -3 if the sample rate + * element is invalid, or -4 if the bit rate element is invalid. + */ +int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_t size); + #endif /* AVCODEC_ADTS_HEADER_H */ diff --git a/libavcodec/adts_parser.c b/libavcodec/adts_parser.c index 5c9f8ff6f2..4a1a8fd5f4 100644 --- a/libavcodec/adts_parser.c +++ b/libavcodec/adts_parser.c @@ -42,3 +42,34 @@ int av_adts_header_parse(const uint8_t *buf, uint32_t *samples, uint8_t *frames) return AVERROR(ENOSYS); #endif } + +int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_t size) +{ +#if CONFIG_ADTS_HEADER + int ret = 0; + GetBitContext gb; + + if (!phdr || !buf || size < AV_AAC_ADTS_HEADER_SIZE) + return AVERROR_INVALIDDATA; + + *phdr = av_mallocz(sizeof(AACADTSHeaderInfo)); + if (!*phdr) + return AVERROR(ENOMEM); + + ret = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE); + if (ret < 0) { + av_freep(phdr); + return ret; + } + + ret = ff_adts_header_parse(&gb, *phdr); + if (ret < 0) { + av_freep(phdr); + return ret; + } + + return 0; +#else + return AVERROR(ENOSYS); +#endif +} From patchwork Tue Sep 21 18:41:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 30426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2703827iob; Tue, 21 Sep 2021 11:41:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpKQ/spyYsIFdVytZTSKliAwed9V/culE1gP5He7p9e0m0L5Ve9nV9IY6Vj1t63I+sShEj X-Received: by 2002:a17:906:974d:: with SMTP id o13mr35522560ejy.563.1632249718935; Tue, 21 Sep 2021 11:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632249718; cv=none; d=google.com; s=arc-20160816; b=C0SaiLerBWDDjoJH/JHaXj6U0Gv6lBn/SBA0x6QH6QCJbSfBaWpYsrG1n6AheR8kUu FEqC1Ssd/tHHE8r9IKnV1re0VOFMv5ayDXX0XT8ktdY1N+VYnjjXrw9ALjx8YCEdIhwb Dzk8OYssYki7d6e7aTfPYa2AKZsZc1LQsOFAFcOPq8t3nvWzJ4/nP7O+X7a1q96S+d9c KJR3oaEEhcs2+FujnZiDK6iHyJxffMDqG72icziY87FrFNlTkpNBuDhyJ72hoORLUp0h kXQCmPTpsdWjwzXYDJ5RLZM5IyPsoLpeObVihbhtsQVsSVAtl3XXNing4nd50F7smx3c fl8g== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=jaDDjYW3BGorhIkcw0pop6/Q2+n42QIlqU+mvpj+3Ug=; b=0W3oF4c92t5pQZd3CwWdD4WtGQFyfB6YCkXyXOrqbqB8XStyby8UcsavMc+6YLiDBy Qw5R4SlPdDCWP3zjRhpTcm6O2lggt3pFEYH+YyVJkAxbrOV+nfHO4jijakz5OnpdiTjI IFXVYdouGSC0lGxkoaK/epTxwRXHHwc7ECZhmry4LN+seuTDmQJfRvBYRNC0L2SlcAYg bgQU+IOtzYq0adSiu7rS+1AszeHWuldMjLyGXt36DcxmlmxHpGRR3uO02gvU8gBbkiVp slshCaOE6obTw/gtQ5GfzrAgPxT6rHo6hPKBp+EefTvd/LcglLuJWuQGoMq8Hl6qYFRh kDzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=miZs4dOE; 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 l17si21885807edv.315.2021.09.21.11.41.58; Tue, 21 Sep 2021 11:41:58 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=miZs4dOE; 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 DE25468B030; Tue, 21 Sep 2021 21:41:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B40668AFE1 for ; Tue, 21 Sep 2021 21:41:49 +0300 (EEST) Received: by mail-pg1-f175.google.com with SMTP id e7so12366pgk.2 for ; Tue, 21 Sep 2021 11:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id; bh=7SLmGxI/ILWGhFBimRLNZNMv1tekVDXw7ZYKFnxXT90=; b=miZs4dOEcL6XrB4AbkOZ2FcYH1wZMJN4saOQuZ6ClIQAquZAWA8bHhTd9PFT38NMRG F/OJ5ih8G31h31i77rEb41TjcDMNI7NjPsdj5v3r3lwG4wL/J9D+tL11wXvdCDCA8bTk 8k6NZU13ZarVd+p24P9CyAMbnydMrnMYYieIJ7WL44kyfi8GVwe8dfds4xy42QWTXhJg O4L5FgGB8+ltWgom1hglYh+tR/LtZ8LBiB8Av91ern6hnVr8C6q/VzYzoZOXqm+qtMi1 3oGit0iCzoybd3gEZPnidDxPZ6ULKZHnAza4qgkk7aLK0Y2W7t6pPDRfSvoG73S8Q8bq ZR6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id; bh=7SLmGxI/ILWGhFBimRLNZNMv1tekVDXw7ZYKFnxXT90=; b=DpoJ4XSn4gibjVkG0FUKFxrPivb3WZnmZbs0IyWyy1BdUNPIvvLYXCbj64FffVBB4h f1pwPm7Y/L6O9b59/SEGHCN6Py6JJkFsuZeGQBB1kn8TexGuMoKBB/Xe9GI5SXMFz8PK pRJQduPcdBk627aD+cz7XU1NV7a/IIcbDwVAvY8xTMVjixO8FOr9Uu13NWS2Mrs81VOI /4vSrhC+HWTH0Tc3HJ4RaYze3bbDBgWeykmtqoKPCd16rZQe/xb6L87NnTVGt+XocZuu ZEm/L2QVs3jIR1MqDnDSgxaPj1sPMkn9au2MDLHeDDN2UhScQGSMr4f9V6k+9tYO08Yu ZwtA== X-Gm-Message-State: AOAM533t+S7wmANevD0GdJWoMM7dij1JBpJNH76e5PZyGcLfPOKJ//HY 94DM2xJ0OTAsgouG2B7Utz/cEO8xSZE= X-Received: by 2002:a62:8cd7:0:b0:438:26bb:965d with SMTP id m206-20020a628cd7000000b0043826bb965dmr31726589pfd.64.1632249706400; Tue, 21 Sep 2021 11:41:46 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:5023:907:6d04:a3b6:841a:1d61]) by smtp.gmail.com with ESMTPSA id w22sm14649860pgc.56.2021.09.21.11.41.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:41:45 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Sep 2021 00:11:31 +0530 Message-Id: <20210921184131.3212-1-nachiket.programmer@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 2/4] libavformat/mov: add support for 'cens', 'cbc1' and 'cbcs' encryption schemes specified in Common Encryption (CENC) standard X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: IaQODpxbPKSf correct implementation of 'cenc' encryption scheme to support decryption of partial cipher blocks at the end of subsamples https://www.iso.org/standard/68042.html Signed-off-by: Nachiket Tarate --- libavformat/isom.h | 2 + libavformat/mov.c | 245 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 241 insertions(+), 6 deletions(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index 34a58c79b7..b484250034 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -237,6 +237,8 @@ typedef struct MOVStreamContext { int has_sidx; // If there is an sidx entry for this stream. struct { struct AVAESCTR* aes_ctr; + struct AVAES *aes_ctx; + unsigned int frag_index_entry_base; unsigned int per_sample_iv_size; // Either 0, 8, or 16. AVEncryptionInfo *default_encrypted_sample; MOVEncryptionIndex *encryption_index; diff --git a/libavformat/mov.c b/libavformat/mov.c index 4bc42d6b20..81312f1371 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6584,15 +6584,149 @@ static int mov_read_dfla(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } -static int cenc_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *sample, uint8_t *input, int size) +static int cenc_scheme_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *sample, uint8_t *input, int size) { int i, ret; + int bytes_of_protected_data; + int partially_encrypted_block_size; + uint8_t *partially_encrypted_block; + uint8_t block[16]; - if (sample->scheme != MKBETAG('c','e','n','c') || sample->crypt_byte_block != 0 || sample->skip_byte_block != 0) { - av_log(c->fc, AV_LOG_ERROR, "Only the 'cenc' encryption scheme is supported\n"); - return AVERROR_PATCHWELCOME; + if (!sc->cenc.aes_ctr) { + /* initialize the cipher */ + sc->cenc.aes_ctr = av_aes_ctr_alloc(); + if (!sc->cenc.aes_ctr) { + return AVERROR(ENOMEM); + } + + ret = av_aes_ctr_init(sc->cenc.aes_ctr, c->decryption_key); + if (ret < 0) { + return ret; + } + } + + av_aes_ctr_set_full_iv(sc->cenc.aes_ctr, sample->iv); + + if (!sample->subsample_count) { + /* decrypt the whole packet */ + av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, size); + return 0; + } + + partially_encrypted_block_size = 0; + + for (i = 0; i < sample->subsample_count; i++) { + if (sample->subsamples[i].bytes_of_clear_data + sample->subsamples[i].bytes_of_protected_data > size) { + av_log(c->fc, AV_LOG_ERROR, "subsample size exceeds the packet size left\n"); + return AVERROR_INVALIDDATA; + } + + /* skip the clear bytes */ + input += sample->subsamples[i].bytes_of_clear_data; + size -= sample->subsamples[i].bytes_of_clear_data; + + /* decrypt the encrypted bytes */ + + if (partially_encrypted_block_size) { + memcpy(block, partially_encrypted_block, partially_encrypted_block_size); + memcpy(block+partially_encrypted_block_size, input, 16-partially_encrypted_block_size); + av_aes_ctr_crypt(sc->cenc.aes_ctr, block, block, 16); + memcpy(partially_encrypted_block, block, partially_encrypted_block_size); + memcpy(input, block+partially_encrypted_block_size, 16-partially_encrypted_block_size); + input += 16-partially_encrypted_block_size; + size -= 16-partially_encrypted_block_size; + bytes_of_protected_data = sample->subsamples[i].bytes_of_protected_data - (16-partially_encrypted_block_size); + } else { + bytes_of_protected_data = sample->subsamples[i].bytes_of_protected_data; + } + + if (i < sample->subsample_count-1) { + int num_of_encrypted_blocks = bytes_of_protected_data/16; + partially_encrypted_block_size = bytes_of_protected_data%16; + if (partially_encrypted_block_size) + partially_encrypted_block = input + 16*num_of_encrypted_blocks; + av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, 16*num_of_encrypted_blocks); + } else { + av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, bytes_of_protected_data); + } + + input += bytes_of_protected_data; + size -= bytes_of_protected_data; + } + + if (size > 0) { + av_log(c->fc, AV_LOG_ERROR, "leftover packet bytes after subsample processing\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +static int cbc1_scheme_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *sample, uint8_t *input, int size) +{ + int i, ret; + int num_of_encrypted_blocks; + uint8_t iv[16]; + + if (!sc->cenc.aes_ctx) { + /* initialize the cipher */ + sc->cenc.aes_ctx = av_aes_alloc(); + if (!sc->cenc.aes_ctx) { + return AVERROR(ENOMEM); + } + + ret = av_aes_init(sc->cenc.aes_ctx, c->decryption_key, 16 * 8, 1); + if (ret < 0) { + return ret; + } } + memcpy(iv, sample->iv, 16); + + /* whole-block full sample encryption */ + if (!sample->subsample_count) { + /* decrypt the whole packet */ + av_aes_crypt(sc->cenc.aes_ctx, input, input, size/16, iv, 1); + return 0; + } + + for (i = 0; i < sample->subsample_count; i++) { + if (sample->subsamples[i].bytes_of_clear_data + sample->subsamples[i].bytes_of_protected_data > size) { + av_log(c->fc, AV_LOG_ERROR, "subsample size exceeds the packet size left\n"); + return AVERROR_INVALIDDATA; + } + + if (sample->subsamples[i].bytes_of_protected_data % 16) { + av_log(c->fc, AV_LOG_ERROR, "subsample BytesOfProtectedData is not a multiple of 16\n"); + return AVERROR_INVALIDDATA; + } + + /* skip the clear bytes */ + input += sample->subsamples[i].bytes_of_clear_data; + size -= sample->subsamples[i].bytes_of_clear_data; + + /* decrypt the encrypted bytes */ + num_of_encrypted_blocks = sample->subsamples[i].bytes_of_protected_data/16; + if (num_of_encrypted_blocks > 0) { + av_aes_crypt(sc->cenc.aes_ctx, input, input, num_of_encrypted_blocks, iv, 1); + } + input += sample->subsamples[i].bytes_of_protected_data; + size -= sample->subsamples[i].bytes_of_protected_data; + } + + if (size > 0) { + av_log(c->fc, AV_LOG_ERROR, "leftover packet bytes after subsample processing\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +static int cens_scheme_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *sample, uint8_t *input, int size) +{ + int i, ret, rem_bytes; + uint8_t *data; + if (!sc->cenc.aes_ctr) { /* initialize the cipher */ sc->cenc.aes_ctr = av_aes_ctr_alloc(); @@ -6608,10 +6742,14 @@ static int cenc_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *s av_aes_ctr_set_full_iv(sc->cenc.aes_ctr, sample->iv); + /* whole-block full sample encryption */ if (!sample->subsample_count) { /* decrypt the whole packet */ av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, size); return 0; + } else if (!sample->crypt_byte_block && !sample->skip_byte_block) { + av_log(c->fc, AV_LOG_ERROR, "pattern encryption is not present in 'cens' scheme\n"); + return AVERROR_INVALIDDATA; } for (i = 0; i < sample->subsample_count; i++) { @@ -6625,7 +6763,18 @@ static int cenc_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *s size -= sample->subsamples[i].bytes_of_clear_data; /* decrypt the encrypted bytes */ - av_aes_ctr_crypt(sc->cenc.aes_ctr, input, input, sample->subsamples[i].bytes_of_protected_data); + data = input; + rem_bytes = sample->subsamples[i].bytes_of_protected_data; + while (rem_bytes > 0) { + if (rem_bytes < 16*sample->crypt_byte_block) { + break; + } + av_aes_ctr_crypt(sc->cenc.aes_ctr, data, data, 16*sample->crypt_byte_block); + data += 16*sample->crypt_byte_block; + rem_bytes -= 16*sample->crypt_byte_block; + data += FFMIN(16*sample->skip_byte_block, rem_bytes); + rem_bytes -= FFMIN(16*sample->skip_byte_block, rem_bytes); + } input += sample->subsamples[i].bytes_of_protected_data; size -= sample->subsamples[i].bytes_of_protected_data; } @@ -6638,6 +6787,88 @@ static int cenc_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *s return 0; } +static int cbcs_scheme_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *sample, uint8_t *input, int size) +{ + int i, ret, rem_bytes; + uint8_t iv[16]; + uint8_t *data; + + if (!sc->cenc.aes_ctx) { + /* initialize the cipher */ + sc->cenc.aes_ctx = av_aes_alloc(); + if (!sc->cenc.aes_ctx) { + return AVERROR(ENOMEM); + } + + ret = av_aes_init(sc->cenc.aes_ctx, c->decryption_key, 16 * 8, 1); + if (ret < 0) { + return ret; + } + } + + /* whole-block full sample encryption */ + if (!sample->subsample_count) { + /* decrypt the whole packet */ + memcpy(iv, sample->iv, 16); + av_aes_crypt(sc->cenc.aes_ctx, input, input, size/16, iv, 1); + return 0; + } else if (!sample->crypt_byte_block && !sample->skip_byte_block) { + av_log(c->fc, AV_LOG_ERROR, "pattern encryption is not present in 'cbcs' scheme\n"); + return AVERROR_INVALIDDATA; + } + + for (i = 0; i < sample->subsample_count; i++) { + if (sample->subsamples[i].bytes_of_clear_data + sample->subsamples[i].bytes_of_protected_data > size) { + av_log(c->fc, AV_LOG_ERROR, "subsample size exceeds the packet size left\n"); + return AVERROR_INVALIDDATA; + } + + /* skip the clear bytes */ + input += sample->subsamples[i].bytes_of_clear_data; + size -= sample->subsamples[i].bytes_of_clear_data; + + /* decrypt the encrypted bytes */ + memcpy(iv, sample->iv, 16); + data = input; + rem_bytes = sample->subsamples[i].bytes_of_protected_data; + while (rem_bytes > 0) { + if (rem_bytes < 16*sample->crypt_byte_block) { + break; + } + av_aes_crypt(sc->cenc.aes_ctx, data, data, sample->crypt_byte_block, iv, 1); + data += 16*sample->crypt_byte_block; + rem_bytes -= 16*sample->crypt_byte_block; + data += FFMIN(16*sample->skip_byte_block, rem_bytes); + rem_bytes -= FFMIN(16*sample->skip_byte_block, rem_bytes); + } + input += sample->subsamples[i].bytes_of_protected_data; + size -= sample->subsamples[i].bytes_of_protected_data; + } + + if (size > 0) { + av_log(c->fc, AV_LOG_ERROR, "leftover packet bytes after subsample processing\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +static int cenc_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *sample, uint8_t *input, int size) +{ + if (sample->scheme == MKBETAG('c','e','n','c') && !sample->crypt_byte_block && !sample->skip_byte_block) { + return cenc_scheme_decrypt(c, sc, sample, input, size); + } else if (sample->scheme == MKBETAG('c','b','c','1') && !sample->crypt_byte_block && !sample->skip_byte_block) { + return cbc1_scheme_decrypt(c, sc, sample, input, size); + } else if (sample->scheme == MKBETAG('c','e','n','s')) { + return cens_scheme_decrypt(c, sc, sample, input, size); + } else if (sample->scheme == MKBETAG('c','b','c','s')) { + return cbcs_scheme_decrypt(c, sc, sample, input, size); + } else { + av_log(c->fc, AV_LOG_ERROR, "invalid encryption scheme\n"); + return AVERROR_INVALIDDATA; + } +} + static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPacket *pkt, int current_index) { MOVFragmentStreamInfo *frag_stream_info; @@ -6652,7 +6883,9 @@ static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPa // Note this only supports encryption info in the first sample descriptor. if (mov->fragment.stsd_id == 1) { if (frag_stream_info->encryption_index) { - encrypted_index = current_index - frag_stream_info->index_entry; + if (!current_index && frag_stream_info->index_entry) + sc->cenc.frag_index_entry_base = frag_stream_info->index_entry; + encrypted_index = current_index - (frag_stream_info->index_entry - sc->cenc.frag_index_entry_base); encryption_index = frag_stream_info->encryption_index; } else { encryption_index = sc->cenc.encryption_index; From patchwork Tue Sep 21 18:42:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 30425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2704182iob; Tue, 21 Sep 2021 11:42:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyO+AHdHj0HtsDy72VcMe9Zka3DUkuTiR85LEamiXQmL7yuH1dTjrSYr4bnCUougvwK48K9 X-Received: by 2002:a05:6402:3454:: with SMTP id l20mr37478107edc.83.1632249746948; Tue, 21 Sep 2021 11:42:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632249746; cv=none; d=google.com; s=arc-20160816; b=zjsegPSRHDRXYgb+V7Jp8DOZStwZ9wfS9W+BhAlmg3SKGwCKCQAAHSiomsypQKU5gs vzGhJAMQ9oxvvD1vEGHLYGw9PAPc/IYbJTSLpAfE/F+xBSg1NwsHyq1xErtPWbiPdfZ+ NjJnm/2Lkwxf9aO9qZSqIQJXKYwHx6SHAru0BYZy4GMotCEBGudvTaN5NbAXu3ojP29N uYHgGJn09L9X607VWKcU72b1gDjHfMCM0uVxkX+ax8BeMRBbTGLvKIX7MgtKMLawU8DB 1Zj0evAIZJYeZw94vyIGrCXhQIGSUnrfIZ8EQbD5vyemuSED13LhqufOSk8fEnubbAY4 aAmw== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=2mn7QXVN/GDD8Hlqe3s97Cp+M9sdhqzBQFyq4e3nreE=; b=TiPWEzJbOi7cB/LVvg0Hq4RVOe6CmNBY7SrjV8b5loqUox2Kig2XcJ9N2iKgPXu1Ci HcAhDr7cwm2tOAqYNV2dWomqTlODmB4WzBoM79tXhqN/cjn86s5HAYTFBnafSq7Yvk8Y gESKkK5TL0dckJmHU2Vk1eyNg/s/0WJy7ki9Kf7f7tLTP8Smp2zUsQAUzedPBow5JU3q cXNiqR3meH/bY2A0EXYTDs0+5uOLJi15lnpS4dtDL0/pw21/yhxyIbzcGPJM4ivYUbbq ZC1asYg8+hnstaCGITgrugFvhLJHT8BNk7betWZolEwVV+tJz+eQy3svusZcN7fAdK1D 5xpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="g/sj1+zs"; 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 a1si20000892edx.506.2021.09.21.11.42.26; Tue, 21 Sep 2021 11:42:26 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="g/sj1+zs"; 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 0C5AF68B06C; Tue, 21 Sep 2021 21:42:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE02868A96A for ; Tue, 21 Sep 2021 21:42:17 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id w19so327528pfn.12 for ; Tue, 21 Sep 2021 11:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id; bh=gOlRqzH0pndsLq69wRQy6/WYvqu7SiX7/K7hzIm6FbY=; b=g/sj1+zsw21Mc6EJisg6bG1usqu/HWDIWApep4qcvx9RoPL0wzFRqqP6YOIwuwhyKc Yf/17EwzT0BztFf2rXJsBlmZBiwyvWU00AhxIoyjOFc+YSXXUf8pMKsVW1+1Eo8r+lws TJSTAD8wEsoUbhot0BTLJhJ75SY855PwghOjt9s0qzL/lNguM8lP/iUY+pbRkiUAomKT b5hHBInx/bBRMOnTAQmbyz1WvhiBOPChawwLQmu9sscp7E9LIZIYX+JRjCH7Km3pnZzH HenIKU62S7xP1qUjT+bq+1akOoZ8WoYxnH5Q8mLe2+crlyiOpl4MfXhFY0tbVxeBtpzX DHtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id; bh=gOlRqzH0pndsLq69wRQy6/WYvqu7SiX7/K7hzIm6FbY=; b=fmHFWxnHm+ZFwysjI5W08ml/GCFQNbM7/kjRATpyOvE6oY74e8jyoyRIJlt0JN2CYA 1tTCYr0fiW39jADEjRfsgs7iolC+yerQ3gvZuhb9k8FLxVvJ910WpmuxGnf+ObJ2QS6o vJiZqQixlPUj+GfVol6I2rrw6lUyE7z+mRARiBxmT0n/PD+ZWlWY0mm9bG1BLLHFQTRk A1QTLefMzw2vj7AlWgdzrYWmijQCpwVNpMdnfMuFzRRZGS7ZisWgIVnqqOIRbIbJrKha rihHceiG7Nmbuf+MYICZRNYLHYI+2HFc6gwsXW9rdvXsEK03jlTEG1qardbo7lWJX1Ye T62w== X-Gm-Message-State: AOAM533u3YEkfKPw74akAYy1/ETANQ8WhD7CS2Aggl2tLTYQCTLWW7D8 l69zFZPVQ6dXMIaetFuvLyfmoJrWuMc= X-Received: by 2002:a63:24a:: with SMTP id 71mr4587351pgc.285.1632249735560; Tue, 21 Sep 2021 11:42:15 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:5023:907:6d04:a3b6:841a:1d61]) by smtp.gmail.com with ESMTPSA id y7sm3267911pjt.40.2021.09.21.11.42.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:42:15 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Sep 2021 00:12:00 +0530 Message-Id: <20210921184200.3269-1-nachiket.programmer@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 3/4] libavformat/hls: add support for decryption of HLS media segments encrypted using SAMPLE-AES encryption method X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: YXfCg28VTbOc Apple HTTP Live Streaming Sample Encryption: https://developer.apple.com/library/ios/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption Signed-off-by: Nachiket Tarate --- libavformat/Makefile | 2 +- libavformat/hls.c | 128 +++++++-- libavformat/hls_sample_encryption.c | 389 ++++++++++++++++++++++++++++ libavformat/hls_sample_encryption.h | 65 +++++ libavformat/mpegts.c | 11 + 5 files changed, 576 insertions(+), 19 deletions(-) create mode 100644 libavformat/hls_sample_encryption.c create mode 100644 libavformat/hls_sample_encryption.h diff --git a/libavformat/Makefile b/libavformat/Makefile index f7e47563da..53139663cc 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -238,7 +238,7 @@ OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o -OBJS-$(CONFIG_HLS_DEMUXER) += hls.o +OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o OBJS-$(CONFIG_ICO_DEMUXER) += icodec.o diff --git a/libavformat/hls.c b/libavformat/hls.c index 421a60a476..0feddb06e4 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2,6 +2,7 @@ * Apple HTTP Live Streaming demuxer * Copyright (c) 2010 Martin Storsjo * Copyright (c) 2013 Anssi Hannula + * Copyright (c) 2021 Nachiket Tarate * * This file is part of FFmpeg. * @@ -39,6 +40,8 @@ #include "avio_internal.h" #include "id3v2.h" +#include "hls_sample_encryption.h" + #define INITIAL_BUFFER_SIZE 32768 #define MAX_FIELD_LEN 64 @@ -145,6 +148,8 @@ struct playlist { int id3_changed; /* ID3 tag data has changed at some point */ ID3v2ExtraMeta *id3_deferred_extra; /* stored here until subdemuxer is opened */ + HLSAudioSetupInfo audio_setup_info; + int64_t seek_timestamp; int seek_flags; int seek_stream_index; /* into subdemuxer stream array */ @@ -214,6 +219,7 @@ typedef struct HLSContext { int http_multiple; int http_seekable; AVIOContext *playlist_pb; + HLSCryptoContext crypto_ctx; } HLSContext; static void free_segment_dynarray(struct segment **segments, int n_segments) @@ -1006,7 +1012,10 @@ fail: static struct segment *current_segment(struct playlist *pls) { - return pls->segments[pls->cur_seq_no - pls->start_seq_no]; + int64_t n = pls->cur_seq_no - pls->start_seq_no; + if (n >= pls->n_segments) + return NULL; + return pls->segments[n]; } static struct segment *next_segment(struct playlist *pls) @@ -1035,17 +1044,18 @@ static int read_from_url(struct playlist *pls, struct segment *seg, /* Parse the raw ID3 data and pass contents to caller */ static void parse_id3(AVFormatContext *s, AVIOContext *pb, - AVDictionary **metadata, int64_t *dts, + AVDictionary **metadata, int64_t *dts, HLSAudioSetupInfo *audio_setup_info, ID3v2ExtraMetaAPIC **apic, ID3v2ExtraMeta **extra_meta) { static const char id3_priv_owner_ts[] = "com.apple.streaming.transportStreamTimestamp"; + static const char id3_priv_owner_audio_setup[] = "com.apple.streaming.audioDescription"; ID3v2ExtraMeta *meta; ff_id3v2_read_dict(pb, metadata, ID3v2_DEFAULT_MAGIC, extra_meta); for (meta = *extra_meta; meta; meta = meta->next) { if (!strcmp(meta->tag, "PRIV")) { ID3v2ExtraMetaPRIV *priv = &meta->data.priv; - if (priv->datasize == 8 && !strcmp(priv->owner, id3_priv_owner_ts)) { + if (priv->datasize == 8 && !av_strncasecmp(priv->owner, id3_priv_owner_ts, 44)) { /* 33-bit MPEG timestamp */ int64_t ts = AV_RB64(priv->data); av_log(s, AV_LOG_DEBUG, "HLS ID3 audio timestamp %"PRId64"\n", ts); @@ -1053,6 +1063,8 @@ static void parse_id3(AVFormatContext *s, AVIOContext *pb, *dts = ts; else av_log(s, AV_LOG_ERROR, "Invalid HLS ID3 audio timestamp %"PRId64"\n", ts); + } else if (priv->datasize >= 8 && !av_strncasecmp(priv->owner, id3_priv_owner_audio_setup, 36)) { + ff_hls_senc_read_audio_setup_info(audio_setup_info, priv->data, priv->datasize); } } else if (!strcmp(meta->tag, "APIC") && apic) *apic = &meta->data.apic; @@ -1096,7 +1108,7 @@ static void handle_id3(AVIOContext *pb, struct playlist *pls) ID3v2ExtraMeta *extra_meta = NULL; int64_t timestamp = AV_NOPTS_VALUE; - parse_id3(pls->ctx, pb, &metadata, ×tamp, &apic, &extra_meta); + parse_id3(pls->ctx, pb, &metadata, ×tamp, &pls->audio_setup_info, &apic, &extra_meta); if (timestamp != AV_NOPTS_VALUE) { pls->id3_mpegts_timestamp = timestamp; @@ -1250,10 +1262,7 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg, av_log(pls->parent, AV_LOG_VERBOSE, "HLS request for url '%s', offset %"PRId64", playlist %d\n", seg->url, seg->url_offset, pls->index); - if (seg->key_type == KEY_NONE) { - ret = open_url(pls->parent, in, seg->url, &c->avio_opts, opts, &is_http); - } else if (seg->key_type == KEY_AES_128) { - char iv[33], key[33], url[MAX_URL_SIZE]; + if (seg->key_type == KEY_AES_128 || seg->key_type == KEY_SAMPLE_AES) { if (strcmp(seg->key, pls->key_url)) { AVIOContext *pb = NULL; if (open_url(pls->parent, &pb, seg->key, &c->avio_opts, opts, NULL) == 0) { @@ -1269,6 +1278,10 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg, } av_strlcpy(pls->key_url, seg->key, sizeof(pls->key_url)); } + } + + if (seg->key_type == KEY_AES_128) { + char iv[33], key[33], url[MAX_URL_SIZE]; ff_data_to_hex(iv, seg->iv, sizeof(seg->iv), 0); ff_data_to_hex(key, pls->key, sizeof(pls->key), 0); iv[32] = key[32] = '\0'; @@ -1285,13 +1298,9 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg, goto cleanup; } ret = 0; - } else if (seg->key_type == KEY_SAMPLE_AES) { - av_log(pls->parent, AV_LOG_ERROR, - "SAMPLE-AES encryption is not supported yet\n"); - ret = AVERROR_PATCHWELCOME; + } else { + ret = open_url(pls->parent, in, seg->url, &c->avio_opts, opts, &is_http); } - else - ret = AVERROR(ENOSYS); /* Seek to the requested position. If this was a HTTP request, the offset * should already be where want it to, but this allows e.g. local testing @@ -1854,6 +1863,9 @@ static int hls_close(AVFormatContext *s) free_variant_list(c); free_rendition_list(c); + if (c->crypto_ctx.aes_ctx) + av_free(c->crypto_ctx.aes_ctx); + av_dict_free(&c->avio_opts); ff_format_io_close(c->ctx, &c->playlist_pb); @@ -1959,7 +1971,8 @@ static int hls_read_header(AVFormatContext *s) struct playlist *pls = c->playlists[i]; const AVInputFormat *in_fmt = NULL; char *url; - AVDictionary *seg_format_opts = NULL; + AVDictionary *options = NULL; + struct segment *seg = NULL; if (!(pls->ctx = avformat_alloc_context())) return AVERROR(ENOMEM); @@ -1989,8 +2002,55 @@ static int hls_read_header(AVFormatContext *s) pls->ctx = NULL; return AVERROR(ENOMEM); } + ffio_init_context(&pls->pb, pls->read_buffer, INITIAL_BUFFER_SIZE, 0, pls, read_data, NULL, NULL); + + /* + * If encryption scheme is SAMPLE-AES, try to read ID3 tags of + * external audio track that contains audio setup information + */ + seg = current_segment(pls); + if (seg && seg->key_type == KEY_SAMPLE_AES && pls->n_renditions > 0 && + pls->renditions[0]->type == AVMEDIA_TYPE_AUDIO) { + uint8_t buf[HLS_MAX_ID3_TAGS_DATA_LEN]; + if ((ret = avio_read(&pls->pb.pub, buf, HLS_MAX_ID3_TAGS_DATA_LEN)) < 0) { + /* Fail if error was not end of file */ + if (ret != AVERROR_EOF) { + avformat_free_context(pls->ctx); + pls->ctx = NULL; + return ret; + } + } + ret = 0; + /* Reset reading */ + ff_format_io_close(pls->parent, &pls->input); + pls->input = NULL; + pls->input_read_done = 0; + ff_format_io_close(pls->parent, &pls->input_next); + pls->input_next = NULL; + pls->input_next_requested = 0; + pls->cur_seg_offset = 0; + pls->cur_init_section = NULL; + /* Reset EOF flag */ + pls->pb.pub.eof_reached = 0; + /* Clear any buffered data */ + pls->pb.pub.buf_end = pls->pb.pub.buf_ptr = pls->pb.pub.buffer; + /* Reset the position */ + pls->pb.pub.pos = 0; + } + + /* + * If encryption scheme is SAMPLE-AES and audio setup information is present in external audio track, + * use that information to find the media format, otherwise probe input data + */ + if (seg && seg->key_type == KEY_SAMPLE_AES && pls->is_id3_timestamped && + pls->audio_setup_info.codec_id != AV_CODEC_ID_NONE) { + void *iter = NULL; + while ((in_fmt = (const AVInputFormat *)av_demuxer_iterate(&iter))) + if (in_fmt->raw_codec_id == pls->audio_setup_info.codec_id) + break; + } else { pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; pls->ctx->interrupt_callback = s->interrupt_callback; @@ -2008,6 +2068,24 @@ static int hls_read_header(AVFormatContext *s) return ret; } av_free(url); + } + + if (seg && seg->key_type == KEY_SAMPLE_AES) { + if (strstr(in_fmt->name, "mov")) { + char key[33]; + ff_data_to_hex(key, pls->key, sizeof(pls->key), 0); + key[32] = '\0'; + av_dict_set(&options, "decryption_key", key, AV_OPT_FLAG_DECODING_PARAM); + } else if (!c->crypto_ctx.aes_ctx) { + c->crypto_ctx.aes_ctx = av_aes_alloc(); + if (!c->crypto_ctx.aes_ctx) { + avformat_free_context(pls->ctx); + pls->ctx = NULL; + return AVERROR(ENOMEM); + } + } + } + pls->ctx->pb = &pls->pb.pub; pls->ctx->io_open = nested_io_open; pls->ctx->flags |= s->flags & ~AVFMT_FLAG_CUSTOM_IO; @@ -2015,10 +2093,10 @@ static int hls_read_header(AVFormatContext *s) if ((ret = ff_copy_whiteblacklists(pls->ctx, s)) < 0) return ret; - av_dict_copy(&seg_format_opts, c->seg_format_opts, 0); + av_dict_copy(&options, c->seg_format_opts, 0); - ret = avformat_open_input(&pls->ctx, pls->segments[0]->url, in_fmt, &seg_format_opts); - av_dict_free(&seg_format_opts); + ret = avformat_open_input(&pls->ctx, pls->segments[0]->url, in_fmt, &options); + av_dict_free(&options); if (ret < 0) return ret; @@ -2039,7 +2117,12 @@ static int hls_read_header(AVFormatContext *s) * on us if they want to. */ if (pls->is_id3_timestamped || (pls->n_renditions > 0 && pls->renditions[0]->type == AVMEDIA_TYPE_AUDIO)) { + if (seg && seg->key_type == KEY_SAMPLE_AES && pls->audio_setup_info.setup_data_length > 0 && + pls->ctx->nb_streams == 1) + ret = ff_hls_senc_parse_audio_setup_info(pls->ctx->streams[0], &pls->audio_setup_info); + else ret = avformat_find_stream_info(pls->ctx, NULL); + if (ret < 0) return ret; } @@ -2166,6 +2249,7 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) while (1) { int64_t ts_diff; AVRational tb; + struct segment *seg = NULL; ret = av_read_frame(pls->ctx, pls->pkt); if (ret < 0) { if (!avio_feof(&pls->pb.pub) && ret != AVERROR_EOF) @@ -2184,6 +2268,14 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) get_timebase(pls), AV_TIME_BASE_Q); } + seg = current_segment(pls); + if (seg && seg->key_type == KEY_SAMPLE_AES && !strstr(pls->ctx->iformat->name, "mov")) { + enum AVCodecID codec_id = pls->ctx->streams[pls->pkt->stream_index]->codecpar->codec_id; + memcpy(c->crypto_ctx.iv, seg->iv, sizeof(seg->iv)); + memcpy(c->crypto_ctx.key, pls->key, sizeof(pls->key)); + ff_hls_senc_decrypt_frame(codec_id, &c->crypto_ctx, pls->pkt); + } + if (pls->seek_timestamp == AV_NOPTS_VALUE) break; diff --git a/libavformat/hls_sample_encryption.c b/libavformat/hls_sample_encryption.c new file mode 100644 index 0000000000..396fe97921 --- /dev/null +++ b/libavformat/hls_sample_encryption.c @@ -0,0 +1,389 @@ +/* + * Apple HTTP Live Streaming Sample Encryption/Decryption + * + * Copyright (c) 2021 Nachiket Tarate + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Apple HTTP Live Streaming Sample Encryption + * https://developer.apple.com/library/ios/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption + */ + +#include "hls_sample_encryption.h" + +#include "libavcodec/adts_header.h" +#include "libavcodec/adts_parser.h" +#include "libavcodec/ac3_parser_internal.h" + + +typedef struct NALUnit { + uint8_t *data; + int type; + int length; + int start_code_length; +} NALUnit; + +typedef struct AudioFrame { + uint8_t *data; + int length; + int header_length; +} AudioFrame; + +typedef struct CodecParserContext { + const uint8_t *buf_ptr; + const uint8_t *buf_end; +} CodecParserContext; + +static const int eac3_sample_rate_tab[] = { 48000, 44100, 32000, 0 }; + +void ff_hls_senc_read_audio_setup_info(HLSAudioSetupInfo *info, const uint8_t *buf, size_t size) +{ + if (size < 8) + return; + + info->codec_tag = AV_RL32(buf); + + if (info->codec_tag == MKTAG('z','a','a','c')) + info->codec_id = AV_CODEC_ID_AAC; + else if (info->codec_tag == MKTAG('z','a','c','3')) + info->codec_id = AV_CODEC_ID_AC3; + else if (info->codec_tag == MKTAG('z','e','c','3')) + info->codec_id = AV_CODEC_ID_EAC3; + else + info->codec_id = AV_CODEC_ID_NONE; + + buf += 4; + info->priming = AV_RL16(buf); + buf += 2; + info->version = *buf++; + info->setup_data_length = *buf++; + + if (info->setup_data_length > size - 8) + info->setup_data_length = size - 8; + + if (info->setup_data_length > HLS_MAX_AUDIO_SETUP_DATA_LEN) + return; + + memcpy(info->setup_data, buf, info->setup_data_length); +} + +int ff_hls_senc_parse_audio_setup_info(AVStream *st, HLSAudioSetupInfo *info) +{ + int ret = 0; + + st->codecpar->codec_tag = info->codec_tag; + + if (st->codecpar->codec_id == AV_CODEC_ID_AAC) + return 0; + + if (st->codecpar->codec_id != AV_CODEC_ID_AC3 && st->codecpar->codec_id != AV_CODEC_ID_EAC3) + return AVERROR_INVALIDDATA; + + if (st->codecpar->codec_id == AV_CODEC_ID_AC3) { + AC3HeaderInfo *ac3hdr = NULL; + + ret = avpriv_ac3_parse_header(&ac3hdr, info->setup_data, info->setup_data_length); + if (ret < 0) { + if (ret != AVERROR(ENOMEM)) + av_free(ac3hdr); + return ret; + } + + st->codecpar->sample_rate = ac3hdr->sample_rate; + st->codecpar->channels = ac3hdr->channels; + st->codecpar->channel_layout = ac3hdr->channel_layout; + st->codecpar->bit_rate = ac3hdr->bit_rate; + + av_free(ac3hdr); + } else { /* Parse 'dec3' EC3SpecificBox */ + GetBitContext gb; + int data_rate, fscod, acmod, lfeon; + + ret = init_get_bits8(&gb, info->setup_data, info->setup_data_length); + if (ret < 0) + return AVERROR_INVALIDDATA; + + data_rate = get_bits(&gb, 13); + skip_bits(&gb, 3); + fscod = get_bits(&gb, 2); + skip_bits(&gb, 10); + acmod = get_bits(&gb, 3); + lfeon = get_bits(&gb, 1); + + st->codecpar->sample_rate = eac3_sample_rate_tab[fscod]; + + st->codecpar->channel_layout = avpriv_ac3_channel_layout_tab[acmod]; + if (lfeon) + st->codecpar->channel_layout |= AV_CH_LOW_FREQUENCY; + + st->codecpar->channels = av_get_channel_layout_nb_channels(st->codecpar->channel_layout); + + st->codecpar->bit_rate = data_rate*1000; + } + + return 0; +} + +/* + * Remove start code emulation prevention 0x03 bytes + */ +static void remove_scep_3_bytes(NALUnit *nalu) +{ + int i = 0; + int j = 0; + + uint8_t *data = nalu->data; + + while (i < nalu->length) { + if (nalu->length - i > 3 && AV_RB24(&data[i]) == 0x000003) { + data[j++] = data[i++]; + data[j++] = data[i++]; + i++; + } else { + data[j++] = data[i++]; + } + } + + nalu->length = j; +} + +static int get_next_nal_unit(CodecParserContext *ctx, NALUnit *nalu) +{ + const uint8_t *nalu_start = ctx->buf_ptr; + + if (ctx->buf_end - ctx->buf_ptr >= 4 && AV_RB32(ctx->buf_ptr) == 0x00000001) + nalu->start_code_length = 4; + else if (ctx->buf_end - ctx->buf_ptr >= 3 && AV_RB24(ctx->buf_ptr) == 0x000001) + nalu->start_code_length = 3; + else /* No start code at the beginning of the NAL unit */ + return -1; + + ctx->buf_ptr += nalu->start_code_length; + + while (ctx->buf_ptr < ctx->buf_end) { + if (ctx->buf_end - ctx->buf_ptr >= 4 && AV_RB32(ctx->buf_ptr) == 0x00000001) + break; + else if (ctx->buf_end - ctx->buf_ptr >= 3 && AV_RB24(ctx->buf_ptr) == 0x000001) + break; + ctx->buf_ptr++; + } + + nalu->data = (uint8_t *)nalu_start + nalu->start_code_length; + nalu->length = ctx->buf_ptr - nalu->data; + nalu->type = *nalu->data & 0x1F; + + return 0; +} + +static int decrypt_nal_unit(HLSCryptoContext *crypto_ctx, NALUnit *nalu) +{ + int ret = 0; + int rem_bytes; + uint8_t *data; + uint8_t iv[16]; + + ret = av_aes_init(crypto_ctx->aes_ctx, crypto_ctx->key, 16 * 8, 1); + if (ret < 0) + return ret; + + /* Remove start code emulation prevention 0x03 bytes */ + remove_scep_3_bytes(nalu); + + data = nalu->data + 32; + rem_bytes = nalu->length - 32; + + memcpy(iv, crypto_ctx->iv, 16); + + while (rem_bytes > 0) { + if (rem_bytes > 16) { + av_aes_crypt(crypto_ctx->aes_ctx, data, data, 1, iv, 1); + data += 16; + rem_bytes -= 16; + } + data += FFMIN(144, rem_bytes); + rem_bytes -= FFMIN(144, rem_bytes); + } + + return 0; +} + +static int decrypt_video_frame(HLSCryptoContext *crypto_ctx, AVPacket *pkt) +{ + int ret = 0; + CodecParserContext ctx; + NALUnit nalu; + uint8_t *data_ptr; + int move_nalu = 0; + + memset(&ctx, 0, sizeof(ctx)); + ctx.buf_ptr = pkt->data; + ctx.buf_end = pkt->data + pkt->size; + + data_ptr = pkt->data; + + while (ctx.buf_ptr < ctx.buf_end) { + memset(&nalu, 0, sizeof(nalu)); + ret = get_next_nal_unit(&ctx, &nalu); + if (ret < 0) + return ret; + if ((nalu.type == 0x01 || nalu.type == 0x05) && nalu.length > 48) { + int encrypted_nalu_length = nalu.length; + ret = decrypt_nal_unit(crypto_ctx, &nalu); + if (ret < 0) + return ret; + move_nalu = nalu.length != encrypted_nalu_length; + } + if (move_nalu) + memmove(data_ptr, nalu.data - nalu.start_code_length, nalu.start_code_length + nalu.length); + data_ptr += nalu.start_code_length + nalu.length; + } + + av_shrink_packet(pkt, data_ptr - pkt->data); + + return 0; +} + +static int get_next_adts_frame(CodecParserContext *ctx, AudioFrame *frame) +{ + int ret = 0; + + AACADTSHeaderInfo *adts_hdr = NULL; + + /* Find next sync word 0xFFF */ + while (ctx->buf_ptr < ctx->buf_end - 1) { + if (*ctx->buf_ptr == 0xFF && *(ctx->buf_ptr + 1) & 0xF0 == 0xF0) + break; + ctx->buf_ptr++; + } + + if (ctx->buf_ptr >= ctx->buf_end - 1) + return -1; + + frame->data = (uint8_t*)ctx->buf_ptr; + + ret = avpriv_adts_header_parse (&adts_hdr, frame->data, ctx->buf_end - frame->data); + if (ret < 0) + return ret; + + frame->header_length = adts_hdr->crc_absent ? AV_AAC_ADTS_HEADER_SIZE : AV_AAC_ADTS_HEADER_SIZE + 2; + frame->length = adts_hdr->frame_length; + + av_free(adts_hdr); + + return 0; +} + +static int get_next_ac3_eac3_sync_frame(CodecParserContext *ctx, AudioFrame *frame) +{ + int ret = 0; + + AC3HeaderInfo *hdr = NULL; + + /* Find next sync word 0x0B77 */ + while (ctx->buf_ptr < ctx->buf_end - 1) { + if (*ctx->buf_ptr == 0x0B && *(ctx->buf_ptr + 1) == 0x77) + break; + ctx->buf_ptr++; + } + + if (ctx->buf_ptr >= ctx->buf_end - 1) + return -1; + + frame->data = (uint8_t*)ctx->buf_ptr; + frame->header_length = 0; + + ret = avpriv_ac3_parse_header(&hdr, frame->data, ctx->buf_end - frame->data); + if (ret < 0) { + if (ret != AVERROR(ENOMEM)) + av_free(hdr); + return ret; + } + + frame->length = hdr->frame_size; + + av_free(hdr); + + return 0; +} + +static int get_next_sync_frame(enum AVCodecID codec_id, CodecParserContext *ctx, AudioFrame *frame) +{ + if (codec_id == AV_CODEC_ID_AAC) + return get_next_adts_frame(ctx, frame); + else if (codec_id == AV_CODEC_ID_AC3 || codec_id == AV_CODEC_ID_EAC3) + return get_next_ac3_eac3_sync_frame(ctx, frame); + else + return AVERROR_INVALIDDATA; +} + +static int decrypt_sync_frame(enum AVCodecID codec_id, HLSCryptoContext *crypto_ctx, AudioFrame *frame) +{ + int ret = 0; + uint8_t *data; + int num_of_encrypted_blocks; + + ret = av_aes_init(crypto_ctx->aes_ctx, crypto_ctx->key, 16 * 8, 1); + if (ret < 0) + return ret; + + data = frame->data + frame->header_length + 16; + + num_of_encrypted_blocks = (frame->length - frame->header_length - 16)/16; + + av_aes_crypt(crypto_ctx->aes_ctx, data, data, num_of_encrypted_blocks, crypto_ctx->iv, 1); + + return 0; +} + +static int decrypt_audio_frame(enum AVCodecID codec_id, HLSCryptoContext *crypto_ctx, AVPacket *pkt) +{ + int ret = 0; + CodecParserContext ctx; + AudioFrame frame; + + memset(&ctx, 0, sizeof(ctx)); + ctx.buf_ptr = pkt->data; + ctx.buf_end = pkt->data + pkt->size; + + while (ctx.buf_ptr < ctx.buf_end) { + memset(&frame, 0, sizeof(frame)); + ret = get_next_sync_frame(codec_id, &ctx, &frame); + if (ret < 0) + return ret; + if (frame.length - frame.header_length > 31) { + ret = decrypt_sync_frame(codec_id, crypto_ctx, &frame); + if (ret < 0) + return ret; + } + ctx.buf_ptr += frame.length; + } + + return 0; +} + +int ff_hls_senc_decrypt_frame(enum AVCodecID codec_id, HLSCryptoContext *crypto_ctx, AVPacket *pkt) +{ + if (codec_id == AV_CODEC_ID_H264) + return decrypt_video_frame(crypto_ctx, pkt); + else if (codec_id == AV_CODEC_ID_AAC || codec_id == AV_CODEC_ID_AC3 || codec_id == AV_CODEC_ID_EAC3) + return decrypt_audio_frame(codec_id, crypto_ctx, pkt); + + return AVERROR_INVALIDDATA; +} diff --git a/libavformat/hls_sample_encryption.h b/libavformat/hls_sample_encryption.h new file mode 100644 index 0000000000..ff3f9c22f7 --- /dev/null +++ b/libavformat/hls_sample_encryption.h @@ -0,0 +1,65 @@ +/* + * Apple HTTP Live Streaming Sample Encryption/Decryption + * + * Copyright (c) 2021 Nachiket Tarate + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * Apple HTTP Live Streaming Sample Encryption + * https://developer.apple.com/library/ios/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption + */ + +#ifndef AVFORMAT_HLS_SAMPLE_ENCRYPTION_H +#define AVFORMAT_HLS_SAMPLE_ENCRYPTION_H + +#include + +#include "avformat.h" +#include "libavcodec/avcodec.h" + +#include "libavutil/aes.h" + +#define HLS_MAX_ID3_TAGS_DATA_LEN 138 +#define HLS_MAX_AUDIO_SETUP_DATA_LEN 10 + +typedef struct HLSCryptoContext { + struct AVAES *aes_ctx; + uint8_t key[16]; + uint8_t iv[16]; +} HLSCryptoContext; + +typedef struct HLSAudioSetupInfo { + enum AVCodecID codec_id; + uint32_t codec_tag; + uint16_t priming; + uint8_t version; + uint8_t setup_data_length; + uint8_t setup_data[HLS_MAX_AUDIO_SETUP_DATA_LEN]; +} HLSAudioSetupInfo; + + +void ff_hls_senc_read_audio_setup_info(HLSAudioSetupInfo *info, const uint8_t *buf, size_t size); + +int ff_hls_senc_parse_audio_setup_info(AVStream *st, HLSAudioSetupInfo *info); + +int ff_hls_senc_decrypt_frame(enum AVCodecID codec_id, HLSCryptoContext *crypto_ctx, AVPacket *pkt); + +#endif /* AVFORMAT_HLS_SAMPLE_ENCRYPTION_H */ + diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index fe89d4fb9f..8a2959d190 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -839,6 +839,15 @@ static const StreamType MISC_types[] = { { 0 }, }; +/* HLS Sample Encryption Types */ +static const StreamType HLS_SAMPLE_ENC_types[] = { + { 0xdb, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264}, + { 0xcf, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC }, + { 0xc1, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 }, + { 0xc2, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3}, + { 0 }, +}; + static const StreamType REGD_types[] = { { MKTAG('d', 'r', 'a', 'c'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, { MKTAG('A', 'C', '-', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 }, @@ -948,6 +957,8 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes, } if (st->codecpar->codec_id == AV_CODEC_ID_NONE) mpegts_find_stream_type(st, pes->stream_type, MISC_types); + if (st->codecpar->codec_id == AV_CODEC_ID_NONE) + mpegts_find_stream_type(st, pes->stream_type, HLS_SAMPLE_ENC_types); if (st->codecpar->codec_id == AV_CODEC_ID_NONE) { st->codecpar->codec_id = old_codec_id; st->codecpar->codec_type = old_codec_type; From patchwork Tue Sep 21 18:42:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nachiket Tarate X-Patchwork-Id: 30428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2704464iob; Tue, 21 Sep 2021 11:42:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjfHvDNafEDuEWZ2zTLm3xinWsCAksjeVK0KHGrEiaD61axEglpt84FjBjiLivF4MGYYOf X-Received: by 2002:a17:906:4ad1:: with SMTP id u17mr25165981ejt.407.1632249773732; Tue, 21 Sep 2021 11:42:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632249773; cv=none; d=google.com; s=arc-20160816; b=LxugcgrVFoQV6FVTdh7Z4kw/tcapYQqM6GWKjB6dch1vkdMcTivwvPBtYknEGaLXvX AESy3iQhxKlozNTSPHhcOuD9Lxb6u0YNMLvGaPgh8hesj+5ktYiPUWHV+OtiM5PmelZS dJJeRqYKLKbjPq/fex8zEfbg/heQF3HyOPUu9jTGfgrio3qgLWbDC75cMuYgkGma9e1s vqWoiL6G4DgRDMRHb7cdTHdZML1SQApRnYTjBgDFbo0fCg87qc+76zH07EBVC1r1Xh08 e7vo0wmLY7jw5rn64upk2GL+OuNfgk43n3kbHuXy8fgsnF/eETtPPb1kTzsU0BYpo2lR wWfw== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=BFKRhps4GAhuT3iks4c6DGrifP0jGKL1PX+bRVeqc9I=; b=lzYDVsG8S/91SlwDa9CudFA7RJRzUG3ee6TUJYO5x4jdxur4vbF+GYXBtMbGqmcMFz 1J7nP8xaS9gVZZMRmuMoBFmgQre0JfztdEF+Go6NwAaiM/8Y1TJNCIRUvPCuyneEYGQN 13gEzl9QczsncYcmtk26RYQx78cgkkzlt2QpmGcqtKwpGVpKbND67HYkWgse7dMnu43M Jk0WTnFeJJVlATKrGDxbd9F5s0rGA5srbxm/8Qu36tv79CrFcOS9eV2DPOYTz5e2LsIU FkhHtAnFcSgqFhlq4bpw3Sk82g6vAJebdTimTfVpOYbeIH7bgTa1yzCcv8/RcvQR9zL3 JTEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QcZoUNwl; 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 ay23si3483902edb.134.2021.09.21.11.42.53; Tue, 21 Sep 2021 11:42:53 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QcZoUNwl; 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 1EC6468B08E; Tue, 21 Sep 2021 21:42:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 145E268AF00 for ; Tue, 21 Sep 2021 21:42:45 +0300 (EEST) Received: by mail-pj1-f48.google.com with SMTP id lb1-20020a17090b4a4100b001993f863df2so267546pjb.5 for ; Tue, 21 Sep 2021 11:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id; bh=w37WisqTtz02SKVRUjryWWoDBp/PUHFYZijvDqNqIYY=; b=QcZoUNwlVtnX/R1j8Ivf3Fmcx1YX/4/rFZ8UVbr+Fd9D5HV6MVgfzf5kMTMP6h97xk YGL8NisgiGW/BtFslqlA3m9sAPVKSehXsYfwOm8kSTsoNnmufnx3BxBCUPAhiBowcnM7 5FnI1C/X52a8OPHzuWT1yZ6bpMvpu76FZgoEE2BoWISAvi0uvdUPHqT37oV9BevW1Otg s9s6XKLWuu/JZnf7ZDcx51ibVt37ZBrG7ZTWPJ/AYr52ql2oQyGw3JQh+UK4NbuW7X0q auhQVqkGeYGaYUV8EnUtuWPES+MBgxKvqejBkikYkyMaokxgDOV01SIldBLWhzf1D9wu bbgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id; bh=w37WisqTtz02SKVRUjryWWoDBp/PUHFYZijvDqNqIYY=; b=MdYXnUpXh5qzbIr8xGo10KzTBfxEgs/LijptQoni7dRm4whypeCLkYO7fo6Gcq4oy4 cJwovWtxBKlDTpZe1qIIuWX02UIcsAYRGL106gVD9XskQB3KChmTv/HdyqRLMCMaCDnU u6W5iuOzOaqE7W9/o7Ew2kp/iXZsDvRKPnPUNRxo2lBw9kxLc3A8g1JZ3WMG5Kh3WxJy ssnKxnPW8MlE+zcZrbH1mRBnH4OyWtrD3poS8W4MJ2jz1YzXhyFsbDlNUae0KckUUvH9 qVjsmN7L+/+ffEVKDu1hDOT1zwKd51e+vjs2aVP9G3DdAaNxxiCcKCeN8xDIohC6WaIq sG0g== X-Gm-Message-State: AOAM5330pKe5BNIr6bBEW0BDn8YHqBKp3wL5ggh/rvkyhQUlZIwYOd0P dp1OvaDBiN41it31BbkH9J9IauISeXk= X-Received: by 2002:a17:90a:34b:: with SMTP id 11mr6983972pjf.102.1632249763206; Tue, 21 Sep 2021 11:42:43 -0700 (PDT) Received: from localhost.localdomain ([2401:4900:5023:907:6d04:a3b6:841a:1d61]) by smtp.gmail.com with ESMTPSA id g3sm21009767pgf.1.2021.09.21.11.42.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 11:42:42 -0700 (PDT) From: Nachiket Tarate To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Sep 2021 00:12:28 +0530 Message-Id: <20210921184228.3328-1-nachiket.programmer@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 4/4] libavformat/hls: correct indentation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Nvftqs1Yf98d Signed-off-by: Nachiket Tarate --- libavformat/hls.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 0feddb06e4..3c34d69538 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -2051,23 +2051,23 @@ static int hls_read_header(AVFormatContext *s) if (in_fmt->raw_codec_id == pls->audio_setup_info.codec_id) break; } else { - pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; - pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; - pls->ctx->interrupt_callback = s->interrupt_callback; - url = av_strdup(pls->segments[0]->url); - ret = av_probe_input_buffer(&pls->pb.pub, &in_fmt, url, NULL, 0, 0); - if (ret < 0) { - /* Free the ctx - it isn't initialized properly at this point, - * so avformat_close_input shouldn't be called. If - * avformat_open_input fails below, it frees and zeros the - * context, so it doesn't need any special treatment like this. */ - av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", url); - avformat_free_context(pls->ctx); - pls->ctx = NULL; + pls->ctx->probesize = s->probesize > 0 ? s->probesize : 1024 * 4; + pls->ctx->max_analyze_duration = s->max_analyze_duration > 0 ? s->max_analyze_duration : 4 * AV_TIME_BASE; + pls->ctx->interrupt_callback = s->interrupt_callback; + url = av_strdup(pls->segments[0]->url); + ret = av_probe_input_buffer(&pls->pb.pub, &in_fmt, url, NULL, 0, 0); + if (ret < 0) { + /* Free the ctx - it isn't initialized properly at this point, + * so avformat_close_input shouldn't be called. If + * avformat_open_input fails below, it frees and zeros the + * context, so it doesn't need any special treatment like this. */ + av_log(s, AV_LOG_ERROR, "Error when loading first segment '%s'\n", url); + avformat_free_context(pls->ctx); + pls->ctx = NULL; + av_free(url); + return ret; + } av_free(url); - return ret; - } - av_free(url); } if (seg && seg->key_type == KEY_SAMPLE_AES) { @@ -2121,7 +2121,7 @@ static int hls_read_header(AVFormatContext *s) pls->ctx->nb_streams == 1) ret = ff_hls_senc_parse_audio_setup_info(pls->ctx->streams[0], &pls->audio_setup_info); else - ret = avformat_find_stream_info(pls->ctx, NULL); + ret = avformat_find_stream_info(pls->ctx, NULL); if (ret < 0) return ret;