History

prores: move data shared between decoder and encoder to common file

Kostya Shishkov committed 14 years ago

Commit 8835c2c1 parent 3ec623c4 files · +120 −62Browse files

Unified · Split

4 files
  1. libavcodec/Makefile +1 −1
  2. libavcodec/proresdata.c +72 −0
  3. libavcodec/proresdata.h +39 −0
  4. libavcodec/proresdec.c +8 −61
libavcodec/Makefile+1−1
@@ -301,7 +301,7 @@ OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o pngdsp.o · 300 unmodified lines
301301 OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
302302 OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o
303303 OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o
304−OBJS-$(CONFIG_PRORES_DECODER) += proresdec.o proresdsp.o
304+OBJS-$(CONFIG_PRORES_DECODER) += proresdec.o proresdata.o proresdsp.o
305305 OBJS-$(CONFIG_PTX_DECODER) += ptx.o
306306 OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \
307307 celp_filters.o acelp_vectors.o \
libavcodec/proresdata.c+72−0
@@ -0,0 +1,72 @@
1+/*
2+ * Apple ProRes compatible decoder
3+ *
4+ * Copyright (c) 2010-2011 Maxim Poliakovski
5+ *
6+ * This file is part of Libav.
7+ *
8+ * Libav is free software; you can redistribute it and/or
9+ * modify it under the terms of the GNU Lesser General Public
10+ * License as published by the Free Software Foundation; either
11+ * version 2.1 of the License, or (at your option) any later version.
12+ *
13+ * Libav is distributed in the hope that it will be useful,
14+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+ * Lesser General Public License for more details.
17+ *
18+ * You should have received a copy of the GNU Lesser General Public
19+ * License along with Libav; if not, write to the Free Software
20+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21+ */
22+
23+#include "proresdata.h"
24+
25+const uint8_t ff_prores_progressive_scan[64] = {
26+ 0, 1, 8, 9, 2, 3, 10, 11,
27+ 16, 17, 24, 25, 18, 19, 26, 27,
28+ 4, 5, 12, 20, 13, 6, 7, 14,
29+ 21, 28, 29, 22, 15, 23, 30, 31,
30+ 32, 33, 40, 48, 41, 34, 35, 42,
31+ 49, 56, 57, 50, 43, 36, 37, 44,
32+ 51, 58, 59, 52, 45, 38, 39, 46,
33+ 53, 60, 61, 54, 47, 55, 62, 63
34+};
35+
36+const uint8_t ff_prores_interlaced_scan[64] = {
37+ 0, 8, 1, 9, 16, 24, 17, 25,
38+ 2, 10, 3, 11, 18, 26, 19, 27,
39+ 32, 40, 33, 34, 41, 48, 56, 49,
40+ 42, 35, 43, 50, 57, 58, 51, 59,
41+ 4, 12, 5, 6, 13, 20, 28, 21,
42+ 14, 7, 15, 22, 29, 36, 44, 37,
43+ 30, 23, 31, 38, 45, 52, 60, 53,
44+ 46, 39, 47, 54, 61, 62, 55, 63
45+};
46+
47+
48+const uint8_t ff_prores_dc_codebook[4] = {
49+ 0x04, // rice_order = 0, exp_golomb_order = 1, switch_bits = 0
50+ 0x28, // rice_order = 1, exp_golomb_order = 2, switch_bits = 0
51+ 0x4D, // rice_order = 2, exp_golomb_order = 3, switch_bits = 1
52+ 0x70 // rice_order = 3, exp_golomb_order = 4, switch_bits = 0
53+};
54+
55+const uint8_t ff_prores_ac_codebook[7] = {
56+ 0x04, // rice_order = 0, exp_golomb_order = 1, switch_bits = 0
57+ 0x28, // rice_order = 1, exp_golomb_order = 2, switch_bits = 0
58+ 0x4C, // rice_order = 2, exp_golomb_order = 3, switch_bits = 0
59+ 0x05, // rice_order = 0, exp_golomb_order = 1, switch_bits = 1
60+ 0x29, // rice_order = 1, exp_golomb_order = 2, switch_bits = 1
61+ 0x06, // rice_order = 0, exp_golomb_order = 1, switch_bits = 2
62+ 0x0A, // rice_order = 0, exp_golomb_order = 2, switch_bits = 2
63+};
64+
65+/**
66+ * Lookup tables for adaptive switching between codebooks
67+ * according with previous run/level value.
68+ */
69+const uint8_t ff_prores_run_to_cb_index[16] =
70+ { 5, 5, 3, 3, 0, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 2 };
71+
72+const uint8_t ff_prores_lev_to_cb_index[10] = { 0, 6, 3, 5, 0, 1, 1, 1, 1, 2 };
libavcodec/proresdata.h+39−0
@@ -0,0 +1,39 @@
1+/*
2+ * Apple ProRes compatible decoder
3+ *
4+ * Copyright (c) 2010-2011 Maxim Poliakovski
5+ *
6+ * This file is part of Libav.
7+ *
8+ * Libav is free software; you can redistribute it and/or
9+ * modify it under the terms of the GNU Lesser General Public
10+ * License as published by the Free Software Foundation; either
11+ * version 2.1 of the License, or (at your option) any later version.
12+ *
13+ * Libav is distributed in the hope that it will be useful,
14+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+ * Lesser General Public License for more details.
17+ *
18+ * You should have received a copy of the GNU Lesser General Public
19+ * License along with Libav; if not, write to the Free Software
20+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21+ */
22+
23+#ifndef AVCODEC_PRORESDATA_H
24+#define AVCODEC_PRORESDATA_H
25+
26+#include <stdint.h>
27+
28+#define FRAME_ID MKBETAG('i', 'c', 'p', 'f')
29+
30+extern const uint8_t ff_prores_progressive_scan[64];
31+extern const uint8_t ff_prores_interlaced_scan[64];
32+
33+#define FIRST_DC_CB 0xB8 // rice_order = 5, exp_golomb_order = 6, switch_bits = 0
34+extern const uint8_t ff_prores_dc_codebook[4];
35+extern const uint8_t ff_prores_ac_codebook[7];
36+extern const uint8_t ff_prores_run_to_cb_index[16];
37+extern const uint8_t ff_prores_lev_to_cb_index[10];
38+
39+#endif /* AVCODEC_PRORESDATA_H */
libavcodec/proresdec.c+8−61
@@ -34,6 +34,7 @@ · 33 unmodified lines
3434
3535 #include "libavutil/intmath.h"
3636 #include "avcodec.h"
37+#include "proresdata.h"
3738 #include "proresdsp.h"
3839 #include "get_bits.h"
3940
@@ -75,29 +76,6 @@ typedef struct { · 35 unmodified lines
7576 } ProresContext;
7677
7778
78−static const uint8_t progressive_scan[64] = {
79− 0, 1, 8, 9, 2, 3, 10, 11,
80− 16, 17, 24, 25, 18, 19, 26, 27,
81− 4, 5, 12, 20, 13, 6, 7, 14,
82− 21, 28, 29, 22, 15, 23, 30, 31,
83− 32, 33, 40, 48, 41, 34, 35, 42,
84− 49, 56, 57, 50, 43, 36, 37, 44,
85− 51, 58, 59, 52, 45, 38, 39, 46,
86− 53, 60, 61, 54, 47, 55, 62, 63
87−};
88−
89−static const uint8_t interlaced_scan[64] = {
90− 0, 8, 1, 9, 16, 24, 17, 25,
91− 2, 10, 3, 11, 18, 26, 19, 27,
92− 32, 40, 33, 34, 41, 48, 56, 49,
93− 42, 35, 43, 50, 57, 58, 51, 59,
94− 4, 12, 5, 6, 13, 20, 28, 21,
95− 14, 7, 15, 22, 29, 36, 44, 37,
96− 30, 23, 31, 38, 45, 52, 60, 53,
97− 46, 39, 47, 54, 61, 62, 55, 63
98−};
99−
100−
10179 static av_cold int decode_init(AVCodecContext *avctx)
10280 {
10381 ProresContext *ctx = avctx->priv_data;
@@ -175,10 +153,10 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, · 71 unmodified lines
175153 if (ctx->scantable_type != ctx->frame_type) {
176154 if (!ctx->frame_type)
177155 ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable,
178− progressive_scan);
156+ ff_prores_progressive_scan);
179157 else
180158 ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable,
181− interlaced_scan);
159+ ff_prores_interlaced_scan);
182160 ctx->scantable_type = ctx->frame_type;
183161 }
184162
@@ -352,16 +330,6 @@ static inline int decode_vlc_codeword(GetBitContext *gb, uint8_t codebook) · 167 unmodified lines
352330 #define LSB2SIGN(x) (-((x) & 1))
353331 #define TOSIGNED(x) (((x) >> 1) ^ LSB2SIGN(x))
354332
355−#define FIRST_DC_CB 0xB8 // rice_order = 5, exp_golomb_order = 6, switch_bits = 0
356−
357−static uint8_t dc_codebook[4] = {
358− 0x04, // rice_order = 0, exp_golomb_order = 1, switch_bits = 0
359− 0x28, // rice_order = 1, exp_golomb_order = 2, switch_bits = 0
360− 0x4D, // rice_order = 2, exp_golomb_order = 3, switch_bits = 1
361− 0x70 // rice_order = 3, exp_golomb_order = 4, switch_bits = 0
362−};
363−
364−
365333 /**
366334 * Decode DC coefficients for all blocks in a slice.
367335 */
@@ -380,7 +348,7 @@ static inline void decode_dc_coeffs(GetBitContext *gb, DCTELEM *out, · 12 unmodified lines
380348 delta = 3;
381349
382350 for (i = 1; i < nblocks; i++, out += 64) {
383− code = decode_vlc_codeword(gb, dc_codebook[FFMIN(FFABS(delta), 3)]);
351+ code = decode_vlc_codeword(gb, ff_prores_dc_codebook[FFMIN(FFABS(delta), 3)]);
384352
385353 sign = -(((delta >> 15) & 1) ^ (code & 1));
386354 delta = (((code + 1) >> 1) ^ sign) - sign;
@@ -390,26 +358,6 @@ static inline void decode_dc_coeffs(GetBitContext *gb, DCTELEM *out, · 3 unmodified lines
390358 }
391359
392360
393−static uint8_t ac_codebook[7] = {
394− 0x04, // rice_order = 0, exp_golomb_order = 1, switch_bits = 0
395− 0x28, // rice_order = 1, exp_golomb_order = 2, switch_bits = 0
396− 0x4C, // rice_order = 2, exp_golomb_order = 3, switch_bits = 0
397− 0x05, // rice_order = 0, exp_golomb_order = 1, switch_bits = 1
398− 0x29, // rice_order = 1, exp_golomb_order = 2, switch_bits = 1
399− 0x06, // rice_order = 0, exp_golomb_order = 1, switch_bits = 2
400− 0x0A, // rice_order = 0, exp_golomb_order = 2, switch_bits = 2
401−};
402−
403−/**
404− * Lookup tables for adaptive switching between codebooks
405− * according with previous run/level value.
406− */
407−static uint8_t run_to_cb_index[16] =
408− { 5, 5, 3, 3, 0, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 2 };
409−
410−static uint8_t lev_to_cb_index[10] = { 0, 6, 3, 5, 0, 1, 1, 1, 1, 2 };
411−
412−
413361 /**
414362 * Decode AC coefficients for all blocks in a slice.
415363 */
@@ -429,20 +377,20 @@ static inline void decode_ac_coeffs(GetBitContext *gb, DCTELEM *out, · 13 unmodified lines
429377 block_mask = blocks_per_slice - 1;
430378
431379 for (pos = blocks_per_slice - 1; pos < max_coeffs;) {
432− run_cb_index = run_to_cb_index[FFMIN(run, 15)];
433− lev_cb_index = lev_to_cb_index[FFMIN(level, 9)];
380+ run_cb_index = ff_prores_run_to_cb_index[FFMIN(run, 15)];
381+ lev_cb_index = ff_prores_lev_to_cb_index[FFMIN(level, 9)];
434382
435383 bits_left = get_bits_left(gb);
436384 if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left)))
437385 return;
438386
439− run = decode_vlc_codeword(gb, ac_codebook[run_cb_index]);
387+ run = decode_vlc_codeword(gb, ff_prores_ac_codebook[run_cb_index]);
440388
441389 bits_left = get_bits_left(gb);
442390 if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left)))
443391 return;
444392
445− level = decode_vlc_codeword(gb, ac_codebook[lev_cb_index]) + 1;
393+ level = decode_vlc_codeword(gb, ff_prores_ac_codebook[lev_cb_index]) + 1;
446394
447395 pos += run + 1;
448396 if (pos >= max_coeffs)
@@ -629,7 +577,6 @@ static int decode_picture(ProresContext *ctx, int pic_num, · 180 unmodified lines
629577 }
630578
631579
632−#define FRAME_ID MKBETAG('i', 'c', 'p', 'f')
633580 #define MOVE_DATA_PTR(nbytes) buf += (nbytes); buf_size -= (nbytes)
634581
635582 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,

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