From patchwork Wed Sep 11 13:34:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 15021 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 74F3B44A48C for ; Wed, 11 Sep 2019 16:34:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57190688042; Wed, 11 Sep 2019 16:34:55 +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.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9B4C687FCC for ; Wed, 11 Sep 2019 16:34:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1568208888; bh=OKdV0fUDQ6KRzb/DWTU/Gs2f05RVp56XafNc94452pc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=UZjbyyKSG5HcvTKWJn+8NZ9uWFZrlWpJxRVEn0iqZJ0Hzr/WTuJX+2VfTlNeLdRU/ f0Y4IbD/8a1HUEVw14S2jBIn8Rtm47arMW3aJjkq7Z885vR+Ykpcc8NYvbVs2sMxbF 6ccOU5vF29YaW8ico3DdOZSfqPM28SJtsuEpr9fQ= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from paradise.fritz.box ([89.182.224.149]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LbyUS-1iZMhI0Qc8-00jH4W; Wed, 11 Sep 2019 15:34:48 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Wed, 11 Sep 2019 15:34:31 +0200 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: <456c8458535f26fc2f46045693724294b26cb6ed.1568205721.git.barsnick@gmx.net> References: <456c8458535f26fc2f46045693724294b26cb6ed.1568205721.git.barsnick@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:Z8+OFO5hvCNKtW3KICol++Ru59Vl6Jl1Nx89eZsiBA7heV3ZrbM KGkXxrbIQ6ON+Y1q9GQw2mZ3+2LJwF/UdX+jiU/X1MsGilQvbEO+lxSd0urjXjIg3lsF148 H3tg5Xt8+NPVyLUEZo+Ii5nSXirENlHY5nlRrMogmWYuUVxdIn+AbEEQ0cnSaT2KOdBoW0r ZIBgWGZm8xV8S6+fR1Qfw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:MsHrKsWjQ9k=:pcC+CKwbITsWA9z0sbErL6 LHaqreFq3MHUizzyMYSxKy8/+m0XCzcl35ZCMPz6otuBS6WIRrL8gYy/NTHqUFdmdgnUsqk+j z9TgBKTPeWNBp8Jgy866BGKY0pAUqstUyJEftX743hpaCAS0BnU7XAdaz8UXI29aKk6Ed4Sz6 tjbFqWTLX/bcmh0NamSaQT5qldSgnuYQFSyX9pdv51rGJiIbzyLdu6Bv/xORApAD3lFmSNoWw n3ORkueV1t1UdogcGlkK4JfnvNZCrHWy4kogTpSjxELtQgP+qsmffJHxgey6vcLtSYusNrwOX 8J9UCLD0IwoMpAuLyg8oUf8UlE2rn9i6ZxGH+pJpAkx/RzKCM1/UQyRJH9QzzW++4EpNP7sxE wGo13tiBIFFHXxt7zwwnb8k64AFFKs0STnT8jeo/3ExR/OJT/ByZoyLkspQbcJD2A7TM1g+zp wL1xo5ON3+Z060y66Jur5pHaw+NAbo7sLf3VvtBXFFnMi9Ygi08q4sU/jveCruUsVM2jpww/t KM4r8AED7hRdGe1duRuQdlew3NPBJ/LwzsJpvLP6eYyI5BbtxJ5aSoCySHNyD/E0aA9OVv/0P Kh14pW1Tank0DaHw0BfdvFIlTzZ49zCXhc0tMe1rcs9MEpQ7IGd7syeT69s3TEBEIy0+xmeFj OU7t1RVBdQmgWzzvM0QqcfrOaz1dhhTCyfWCIyehwkdvHKXntpVW5VN8POammSw+gj/+Q22sm Dm7jaksIjPtFeEpD4wvdFAtHY99b9TJ2D/9t/miob+tly3fMp+xPNtg6zLeSdrQz/7+u+DtDg gnBPUH7XGtRi3dmlGgEoHNq3B0oBLyqZgh3HQWIIrS4wKnzWEvCit/7sxBmk3ZzbGIQ5DGuYo cQ89k13YMBK7NbqeOASX8KgG7r6k8EvjMySyGl/GlyL4TzueH+0kbVfaJnIf7U4qBl4olK3Sv UsGdVR2goo0VkqVpTi6Z9LZsbGvdEg8+hC4C9N+aiW7pCzIfd52mGDMb0noVPsnPD8Yf8ILKc ekiAhXig4KcLg/5SxCmugK1aj2sCw5wBVHX/NFXcVlOFyBXWrG3R3N8WEku7hsuFSthq/dlP2 ueNubAKUiRAOjIrMV5lRxcAHfOOEKeKXL7mLLs3oz4nUUCbWgpWHXuioLoQFO+Q12DBc2YCYx Bw7HeHaCoV2Ifvcd+i9P+pKnbqayNjxE2uZ05aT86eo3UA7l+dE49cQ5YdIl2kB0/hS3ySp4q B/GkYT9Bu81zfk8E81OrNj/ZbVc5BlQWjI55i8o7O2/9ACzWIdyM39PZwKRo= Subject: [FFmpeg-devel] [PATCH v2 2/3] avformat/hashenc: use an array of hashes 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Only the first element of the array is used currently, the other elements are in preparation for a new muxer calculating multiple hashes. Also move alloc/init code from the write_header() functions to dedicated init() functions, and the cleanup code from the write_trailer() functions to dedicated deinit() functions. --- libavformat/hashenc.c | 88 ++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 30 deletions(-) -- 2.20.1 diff --git a/libavformat/hashenc.c b/libavformat/hashenc.c index 210bfdea0e..4fd41e41b6 100644 --- a/libavformat/hashenc.c +++ b/libavformat/hashenc.c @@ -29,7 +29,7 @@ struct HashContext { const AVClass *avclass; - struct AVHashContext *hash; + struct AVHashContext **hashes; char *hash_name; int format_version; }; @@ -72,20 +72,26 @@ static const AVOption framemd5_options[] = { #endif #if CONFIG_HASH_MUXER || CONFIG_MD5_MUXER -static int hash_write_header(struct AVFormatContext *s) +static int hash_init(struct AVFormatContext *s) { + int res; struct HashContext *c = s->priv_data; - int res = av_hash_alloc(&c->hash, c->hash_name); - if (res < 0) + c->hashes = av_mallocz_array(1, sizeof(c->hashes)); + if (!c->hashes) + return AVERROR(ENOMEM); + res = av_hash_alloc(&c->hashes[0], c->hash_name); + if (res < 0) { + av_freep(&c->hashes); return res; - av_hash_init(c->hash); + } + av_hash_init(c->hashes[0]); return 0; } static int hash_write_packet(struct AVFormatContext *s, AVPacket *pkt) { struct HashContext *c = s->priv_data; - av_hash_update(c->hash, pkt->data, pkt->size); + av_hash_update(c->hashes[0], pkt->data, pkt->size); return 0; } @@ -93,16 +99,22 @@ static int hash_write_trailer(struct AVFormatContext *s) { struct HashContext *c = s->priv_data; char buf[AV_HASH_MAX_SIZE*2+128]; - snprintf(buf, sizeof(buf) - 200, "%s=", av_hash_get_name(c->hash)); + snprintf(buf, sizeof(buf) - 200, "%s=", av_hash_get_name(c->hashes[0])); - av_hash_final_hex(c->hash, buf + strlen(buf), sizeof(buf) - strlen(buf)); + av_hash_final_hex(c->hashes[0], buf + strlen(buf), sizeof(buf) - strlen(buf)); av_strlcatf(buf, sizeof(buf), "\n"); avio_write(s->pb, buf, strlen(buf)); avio_flush(s->pb); - av_hash_freep(&c->hash); return 0; } + +static void hash_free(struct AVFormatContext *s) +{ + struct HashContext *c = s->priv_data; + av_hash_freep(&c->hashes[0]); + av_freep(&c->hashes); +} #endif #if CONFIG_HASH_MUXER @@ -119,9 +131,10 @@ AVOutputFormat ff_hash_muxer = { .priv_data_size = sizeof(struct HashContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_RAWVIDEO, - .write_header = hash_write_header, + .init = hash_init, .write_packet = hash_write_packet, .write_trailer = hash_write_trailer, + .deinit = hash_free, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_TS_NEGATIVE, .priv_class = &hashenc_class, @@ -142,9 +155,10 @@ AVOutputFormat ff_md5_muxer = { .priv_data_size = sizeof(struct HashContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_RAWVIDEO, - .write_header = hash_write_header, + .init = hash_init, .write_packet = hash_write_packet, .write_trailer = hash_write_trailer, + .deinit = hash_free, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_TS_NEGATIVE, .priv_class = &md5enc_class, @@ -164,24 +178,36 @@ static void framehash_print_extradata(struct AVFormatContext *s) char buf[AV_HASH_MAX_SIZE*2+1]; avio_printf(s->pb, "#extradata %d, %31d, ", i, par->extradata_size); - av_hash_init(c->hash); - av_hash_update(c->hash, par->extradata, par->extradata_size); - av_hash_final_hex(c->hash, buf, sizeof(buf)); + av_hash_init(c->hashes[0]); + av_hash_update(c->hashes[0], par->extradata, par->extradata_size); + av_hash_final_hex(c->hashes[0], buf, sizeof(buf)); avio_write(s->pb, buf, strlen(buf)); avio_printf(s->pb, "\n"); } } } -static int framehash_write_header(struct AVFormatContext *s) +static int framehash_init(struct AVFormatContext *s) { + int res; struct HashContext *c = s->priv_data; - int res = av_hash_alloc(&c->hash, c->hash_name); - if (res < 0) + c->hashes = av_mallocz_array(1, sizeof(c->hashes)); + if (!c->hashes) + return AVERROR(ENOMEM); + res = av_hash_alloc(&c->hashes[0], c->hash_name); + if (res < 0) { + av_freep(&c->hashes); return res; + } + return 0; +} + +static int framehash_write_header(struct AVFormatContext *s) +{ + struct HashContext *c = s->priv_data; avio_printf(s->pb, "#format: frame checksums\n"); avio_printf(s->pb, "#version: %d\n", c->format_version); - avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hash)); + avio_printf(s->pb, "#hash: %s\n", av_hash_get_name(c->hashes[0])); framehash_print_extradata(s); ff_framehash_write_header(s); avio_printf(s->pb, "#stream#, dts, pts, duration, size, hash\n"); @@ -193,30 +219,30 @@ static int framehash_write_packet(struct AVFormatContext *s, AVPacket *pkt) struct HashContext *c = s->priv_data; char buf[AV_HASH_MAX_SIZE*2+128]; int len; - av_hash_init(c->hash); - av_hash_update(c->hash, pkt->data, pkt->size); + av_hash_init(c->hashes[0]); + av_hash_update(c->hashes[0], pkt->data, pkt->size); snprintf(buf, sizeof(buf) - (AV_HASH_MAX_SIZE * 2 + 1), "%d, %10"PRId64", %10"PRId64", %8"PRId64", %8d, ", pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size); len = strlen(buf); - av_hash_final_hex(c->hash, buf + len, sizeof(buf) - len); + av_hash_final_hex(c->hashes[0], buf + len, sizeof(buf) - len); avio_write(s->pb, buf, strlen(buf)); if (c->format_version > 1 && pkt->side_data_elems) { int i, j; avio_printf(s->pb, ", S=%d", pkt->side_data_elems); for (i = 0; i < pkt->side_data_elems; i++) { - av_hash_init(c->hash); + av_hash_init(c->hashes[0]); if (HAVE_BIGENDIAN && pkt->side_data[i].type == AV_PKT_DATA_PALETTE) { for (j = 0; j < pkt->side_data[i].size; j += sizeof(uint32_t)) { uint32_t data = AV_RL32(pkt->side_data[i].data + j); - av_hash_update(c->hash, (uint8_t *)&data, sizeof(uint32_t)); + av_hash_update(c->hashes[0], (uint8_t *)&data, sizeof(uint32_t)); } } else - av_hash_update(c->hash, pkt->side_data[i].data, pkt->side_data[i].size); + av_hash_update(c->hashes[0], pkt->side_data[i].data, pkt->side_data[i].size); snprintf(buf, sizeof(buf) - (AV_HASH_MAX_SIZE * 2 + 1), ", %8d, ", pkt->side_data[i].size); len = strlen(buf); - av_hash_final_hex(c->hash, buf + len, sizeof(buf) - len); + av_hash_final_hex(c->hashes[0], buf + len, sizeof(buf) - len); avio_write(s->pb, buf, strlen(buf)); } } @@ -226,11 +252,11 @@ static int framehash_write_packet(struct AVFormatContext *s, AVPacket *pkt) return 0; } -static int framehash_write_trailer(struct AVFormatContext *s) +static void framehash_free(struct AVFormatContext *s) { struct HashContext *c = s->priv_data; - av_hash_freep(&c->hash); - return 0; + av_hash_freep(&c->hashes[0]); + av_freep(&c->hashes); } #endif @@ -248,9 +274,10 @@ AVOutputFormat ff_framehash_muxer = { .priv_data_size = sizeof(struct HashContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_RAWVIDEO, + .init = framehash_init, .write_header = framehash_write_header, .write_packet = framehash_write_packet, - .write_trailer = framehash_write_trailer, + .deinit = framehash_free, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_TS_NEGATIVE, .priv_class = &framehash_class, @@ -271,9 +298,10 @@ AVOutputFormat ff_framemd5_muxer = { .priv_data_size = sizeof(struct HashContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_RAWVIDEO, + .init = framehash_init, .write_header = framehash_write_header, .write_packet = framehash_write_packet, - .write_trailer = framehash_write_trailer, + .deinit = framehash_free, .flags = AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT | AVFMT_TS_NEGATIVE, .priv_class = &framemd5_class,