History

avcodec: add ARBC decoder

Thanks Kostya for great help in reversing binary.

Paul B Mahol committed 7 years ago

Commit 795af111 parent d8ebfd18 files · +217 −1Browse files

Unified · Split

8 files
  1. Changelog +1 −0
  2. libavcodec/Makefile +1 −0
  3. libavcodec/allcodecs.c +1 −0
  4. libavcodec/arbc.c +204 −0
  5. libavcodec/avcodec.h +1 −0
  6. libavcodec/codec_desc.c +7 −0
  7. libavcodec/version.h +1 −1
  8. libavformat/riff.c +1 −0
Changelog+1−0
@@ -16,6 +16,7 @@ version <next>: · 15 unmodified lines
1616 - anlmdn filter
1717 - maskfun filter
1818 - hcom demuxer and decoder
19+- ARBC decoder
1920
2021
2122 version 4.1:
libavcodec/Makefile+1−0
@@ -198,6 +198,7 @@ OBJS-$(CONFIG_APTX_HD_DECODER) += aptx.o · 197 unmodified lines
198198 OBJS-$(CONFIG_APTX_HD_ENCODER) += aptx.o
199199 OBJS-$(CONFIG_APNG_DECODER) += png.o pngdec.o pngdsp.o
200200 OBJS-$(CONFIG_APNG_ENCODER) += png.o pngenc.o
201+OBJS-$(CONFIG_ARBC_DECODER) += arbc.o
201202 OBJS-$(CONFIG_SSA_DECODER) += assdec.o ass.o
202203 OBJS-$(CONFIG_SSA_ENCODER) += assenc.o ass.o
203204 OBJS-$(CONFIG_ASS_DECODER) += assdec.o ass.o
libavcodec/allcodecs.c+1−0
@@ -41,6 +41,7 @@ extern AVCodec ff_anm_decoder; · 40 unmodified lines
4141 extern AVCodec ff_ansi_decoder;
4242 extern AVCodec ff_apng_encoder;
4343 extern AVCodec ff_apng_decoder;
44+extern AVCodec ff_arbc_decoder;
4445 extern AVCodec ff_asv1_encoder;
4546 extern AVCodec ff_asv1_decoder;
4647 extern AVCodec ff_asv2_encoder;
libavcodec/arbc.c+204−0
@@ -0,0 +1,204 @@
1+/*
2+ * Gryphon's Anim Compressor decoder
3+ * Copyright (c) 2019 Paul B Mahol
4+ *
5+ * This file is part of FFmpeg.
6+ *
7+ * FFmpeg is free software; you can redistribute it and/or
8+ * modify it under the terms of the GNU Lesser General Public
9+ * License as published by the Free Software Foundation; either
10+ * version 2.1 of the License, or (at your option) any later version.
11+ *
12+ * FFmpeg is distributed in the hope that it will be useful,
13+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
14+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+ * Lesser General Public License for more details.
16+ *
17+ * You should have received a copy of the GNU Lesser General Public
18+ * License along with FFmpeg; if not, write to the Free Software
19+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+ */
21+
22+#include <stdio.h>
23+#include <stdlib.h>
24+#include <string.h>
25+
26+#include "libavutil/imgutils.h"
27+#include "libavutil/internal.h"
28+#include "libavutil/intreadwrite.h"
29+#include "libavutil/mem.h"
30+
31+#include "avcodec.h"
32+#include "bytestream.h"
33+#include "internal.h"
34+
35+typedef struct ARBCContext {
36+ GetByteContext gb;
37+
38+ AVFrame *prev_frame;
39+} ARBCContext;
40+
41+static void fill_tile4(AVCodecContext *avctx, uint8_t *color, AVFrame *frame)
42+{
43+ ARBCContext *s = avctx->priv_data;
44+ GetByteContext *gb = &s->gb;
45+ int nb_tiles = bytestream2_get_le16(gb);
46+ int h = avctx->height - 1;
47+
48+ for (int i = 0; i < nb_tiles; i++) {
49+ int y = bytestream2_get_byte(gb);
50+ int x = bytestream2_get_byte(gb);
51+ uint16_t mask = bytestream2_get_le16(gb);
52+ int start_y = y * 4, start_x = x * 4;
53+ int end_y = start_y + 4, end_x = start_x + 4;
54+
55+ for (int j = start_y; j < end_y; j++) {
56+ for (int k = start_x; k < end_x; k++) {
57+ if (mask & 0x8000) {
58+ if (j >= avctx->height || k >= avctx->width) {
59+ mask = mask << 1;
60+ continue;
61+ }
62+ frame->data[0][frame->linesize[0] * (h - j) + 3 * k + 0] = color[0];
63+ frame->data[0][frame->linesize[0] * (h - j) + 3 * k + 1] = color[1];
64+ frame->data[0][frame->linesize[0] * (h - j) + 3 * k + 2] = color[2];
65+ }
66+ mask = mask << 1;
67+ }
68+ }
69+ }
70+}
71+
72+static void fill_tileX(AVCodecContext *avctx, int tile_width, int tile_height,
73+ uint8_t *color, AVFrame *frame)
74+{
75+ ARBCContext *s = avctx->priv_data;
76+ GetByteContext *gb = &s->gb;
77+ const int step_h = tile_height / 4;
78+ const int step_w = tile_width / 4;
79+ int nb_tiles = bytestream2_get_le16(gb);
80+ int h = avctx->height - 1;
81+
82+ for (int i = 0; i < nb_tiles; i++) {
83+ int y = bytestream2_get_byte(gb);
84+ int x = bytestream2_get_byte(gb);
85+ uint16_t mask = bytestream2_get_le16(gb);
86+ int start_y = y * tile_height, start_x = x * tile_width;
87+ int end_y = start_y + tile_height, end_x = start_x + tile_width;
88+
89+ for (int j = start_y; j < end_y; j += step_h) {
90+ for (int k = start_x; k < end_x; k += step_w) {
91+ if (mask & 0x8000U) {
92+ for (int m = 0; m < step_h; m++) {
93+ for (int n = 0; n < step_w; n++) {
94+ if (j + m >= avctx->height || k + n >= avctx->width)
95+ continue;
96+ frame->data[0][frame->linesize[0] * (h - (j + m)) + 3 * (k + n) + 0] = color[0];
97+ frame->data[0][frame->linesize[0] * (h - (j + m)) + 3 * (k + n) + 1] = color[1];
98+ frame->data[0][frame->linesize[0] * (h - (j + m)) + 3 * (k + n) + 2] = color[2];
99+ }
100+ }
101+ }
102+ mask = mask << 1;
103+ }
104+ }
105+ }
106+}
107+
108+static int decode_frame(AVCodecContext *avctx, void *data,
109+ int *got_frame, AVPacket *avpkt)
110+{
111+ ARBCContext *s = avctx->priv_data;
112+ AVFrame *frame = data;
113+ int ret, nb_segments, keyframe = 1;
114+
115+ if (avpkt->size < 10)
116+ return AVERROR_INVALIDDATA;
117+
118+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0)
119+ return ret;
120+
121+ if (s->prev_frame->data[0]) {
122+ ret = av_frame_copy(frame, s->prev_frame);
123+ if (ret < 0)
124+ return ret;
125+ }
126+
127+ bytestream2_init(&s->gb, avpkt->data, avpkt->size);
128+ bytestream2_skip(&s->gb, 8);
129+ nb_segments = bytestream2_get_le16(&s->gb);
130+ if (nb_segments == 0)
131+ keyframe = 0;
132+
133+ for (int i = 0; i < nb_segments; i++) {
134+ int resolution_flag;
135+ uint8_t fill[3];
136+
137+ if (bytestream2_get_bytes_left(&s->gb) <= 0)
138+ return AVERROR_INVALIDDATA;
139+
140+ fill[0] = bytestream2_get_byte(&s->gb);
141+ bytestream2_skip(&s->gb, 1);
142+ fill[1] = bytestream2_get_byte(&s->gb);
143+ bytestream2_skip(&s->gb, 1);
144+ fill[2] = bytestream2_get_byte(&s->gb);
145+ bytestream2_skip(&s->gb, 1);
146+ resolution_flag = bytestream2_get_byte(&s->gb);
147+
148+ if (resolution_flag & 0x10)
149+ fill_tileX(avctx, 1024, 1024, fill, frame);
150+ if (resolution_flag & 0x08)
151+ fill_tileX(avctx, 256, 256, fill, frame);
152+ if (resolution_flag & 0x04)
153+ fill_tileX(avctx, 64, 64, fill, frame);
154+ if (resolution_flag & 0x02)
155+ fill_tileX(avctx, 16, 16, fill, frame);
156+ if (resolution_flag & 0x01)
157+ fill_tile4(avctx, fill, frame);
158+ }
159+
160+ av_frame_unref(s->prev_frame);
161+ if ((ret = av_frame_ref(s->prev_frame, frame)) < 0)
162+ return ret;
163+
164+ frame->pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
165+ frame->key_frame = keyframe;
166+ *got_frame = 1;
167+
168+ return avpkt->size;
169+}
170+
171+static av_cold int decode_init(AVCodecContext *avctx)
172+{
173+ ARBCContext *s = avctx->priv_data;
174+
175+ avctx->pix_fmt = AV_PIX_FMT_RGB24;
176+
177+ s->prev_frame = av_frame_alloc();
178+ if (!s->prev_frame)
179+ return AVERROR(ENOMEM);
180+
181+ return 0;
182+}
183+
184+static av_cold int decode_close(AVCodecContext *avctx)
185+{
186+ ARBCContext *s = avctx->priv_data;
187+
188+ av_frame_free(&s->prev_frame);
189+
190+ return 0;
191+}
192+
193+AVCodec ff_arbc_decoder = {
194+ .name = "arbc",
195+ .long_name = NULL_IF_CONFIG_SMALL("Gryphon's Anim Compressor"),
196+ .type = AVMEDIA_TYPE_VIDEO,
197+ .id = AV_CODEC_ID_ARBC,
198+ .priv_data_size = sizeof(ARBCContext),
199+ .init = decode_init,
200+ .decode = decode_frame,
201+ .close = decode_close,
202+ .capabilities = AV_CODEC_CAP_DR1,
203+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
204+};
libavcodec/avcodec.h+1−0
@@ -453,6 +453,7 @@ enum AVCodecID { · 452 unmodified lines
453453 AV_CODEC_ID_WCMV,
454454 AV_CODEC_ID_RASC,
455455 AV_CODEC_ID_HYMT,
456+ AV_CODEC_ID_ARBC,
456457
457458 /* various PCM "codecs" */
458459 AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
libavcodec/codec_desc.c+7−0
@@ -1698,6 +1698,13 @@ static const AVCodecDescriptor codec_descriptors[] = { · 1697 unmodified lines
16981698 .long_name = NULL_IF_CONFIG_SMALL("HuffYUV MT"),
16991699 .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
17001700 },
1701+ {
1702+ .id = AV_CODEC_ID_ARBC,
1703+ .type = AVMEDIA_TYPE_VIDEO,
1704+ .name = "arbc",
1705+ .long_name = NULL_IF_CONFIG_SMALL("Gryphon's Anim Compressor"),
1706+ .props = AV_CODEC_PROP_LOSSY,
1707+ },
17011708
17021709 /* various PCM "codecs" */
17031710 {
libavcodec/version.h+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include "libavutil/version.h"
2929
3030 #define LIBAVCODEC_VERSION_MAJOR 58
31−#define LIBAVCODEC_VERSION_MINOR 44
31+#define LIBAVCODEC_VERSION_MINOR 45
3232 #define LIBAVCODEC_VERSION_MICRO 100
3333
3434 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
libavformat/riff.c+1−0
@@ -476,6 +476,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { · 475 unmodified lines
476476 { AV_CODEC_ID_WCMV, MKTAG('W', 'C', 'M', 'V') },
477477 { AV_CODEC_ID_RASC, MKTAG('R', 'A', 'S', 'C') },
478478 { AV_CODEC_ID_HYMT, MKTAG('H', 'Y', 'M', 'T') },
479+ { AV_CODEC_ID_ARBC, MKTAG('A', 'R', 'B', 'C') },
479480 { AV_CODEC_ID_NONE, 0 }
480481 };
481482

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t