summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2012-10-17 12:17:55 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-10-17 12:17:55 (GMT)
commitd6e87190fd0725f3517493f67dca6f8f264bb370 (patch)
tree05a0a27c98a183c9210a0233860702a90701d977
parent1ade37ae9c2b1e4e68948af2474698ad45d504f4 (diff)
parenta25d912dca9cd553440167e0476c47581359c0fc (diff)
downloadffmpeg-d6e87190fd0725f3517493f67dca6f8f264bb370.zip
ffmpeg-d6e87190fd0725f3517493f67dca6f8f264bb370.tar.gz
ffmpeg-d6e87190fd0725f3517493f67dca6f8f264bb370.tar.bz2
Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'
* commit 'a25d912dca9cd553440167e0476c47581359c0fc': avcodec_encode_audio(): fix invalid free pcm-mpeg: correct bitrate calculation ffv1: K&R formatting cosmetics fate: Add rangecoder test network: #include stdint.h in network.h nut: export codec_tag provided by rawvideo avserver: move avserver-specific code from ffmdec.c to avserver.c Conflicts: ffserver.c libavcodec/ffv1.c libavformat/ffmdec.c libavformat/nutenc.c tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--ffserver.c32
-rw-r--r--libavcodec/ffv1.c2094
-rw-r--r--libavcodec/pcm-mpeg.c4
-rw-r--r--libavcodec/utils.c2
-rw-r--r--libavformat/ffm.h4
-rw-r--r--libavformat/ffmdec.c33
-rw-r--r--libavformat/network.h1
-rw-r--r--tests/fate/libavcodec.mak6
8 files changed, 1131 insertions, 1045 deletions
diff --git a/ffserver.c b/ffserver.c
index 4dd0ae2..f98ee82 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -44,6 +44,7 @@
#include "libavutil/avstring.h"
#include "libavutil/lfg.h"
#include "libavutil/dict.h"
+#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
#include "libavutil/random_seed.h"
#include "libavutil/parseutils.h"
@@ -328,6 +329,37 @@ static AVLFG random_state;
static FILE *logfile = NULL;
+static int64_t ffm_read_write_index(int fd)
+{
+ uint8_t buf[8];
+
+ lseek(fd, 8, SEEK_SET);
+ if (read(fd, buf, 8) != 8)
+ return AVERROR(EIO);
+ return AV_RB64(buf);
+}
+
+static int ffm_write_write_index(int fd, int64_t pos)
+{
+ uint8_t buf[8];
+ int i;
+
+ for(i=0;i<8;i++)
+ buf[i] = (pos >> (56 - i * 8)) & 0xff;
+ lseek(fd, 8, SEEK_SET);
+ if (write(fd, buf, 8) != 8)
+ return AVERROR(EIO);
+ return 8;
+}
+
+static void ffm_set_write_index(AVFormatContext *s, int64_t pos,
+ int64_t file_size)
+{
+ FFMContext *ffm = s->priv_data;
+ ffm->write_index = pos;
+ ffm->file_size = file_size;
+}
+
/* FIXME: make ffserver work with IPv6 */
/* resolve host with also IP address parsing */
static int resolve_host(struct in_addr *sin_addr, const char *hostname)
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 6341114..0894f5f 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -25,6 +25,12 @@
* FF Video Codec 1 (a lossless codec)
*/
+#include "libavutil/avassert.h"
+#include "libavutil/crc.h"
+#include "libavutil/opt.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/timer.h"
#include "avcodec.h"
#include "internal.h"
#include "get_bits.h"
@@ -33,12 +39,6 @@
#include "rangecoder.h"
#include "golomb.h"
#include "mathops.h"
-#include "libavutil/pixdesc.h"
-#include "libavutil/avassert.h"
-#include "libavutil/crc.h"
-#include "libavutil/opt.h"
-#include "libavutil/imgutils.h"
-#include "libavutil/timer.h"
#ifdef __INTEL_COMPILER
#undef av_flatten
@@ -53,109 +53,109 @@
extern const uint8_t ff_log2_run[41];
-static const int8_t quant5_10bit[256]={
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,
--1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
--1,-1,-1,-1,-1,-1,-0,-0,-0,-0,-0,-0,-0,-0,-0,-0,
+static const int8_t quant5_10bit[256] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -0, -0, -0, -0, -0, -0, -0, -0, -0, -0,
};
-static const int8_t quant5[256]={
- 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-1,-1,-1,
+static const int8_t quant5[256] = {
+ 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -1, -1,
};
-static const int8_t quant9_10bit[256]={
- 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
--4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
--4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
--4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
--4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
--4,-4,-4,-4,-4,-4,-4,-4,-4,-3,-3,-3,-3,-3,-3,-3,
--3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,-3,
--3,-3,-3,-3,-3,-3,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
--2,-2,-2,-2,-1,-1,-1,-1,-1,-1,-1,-1,-0,-0,-0,-0,
+static const int8_t quant9_10bit[256] = {
+ 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
+ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
+ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
+ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
+ -4, -4, -4, -4, -4, -4, -4, -4, -4, -3, -3, -3, -3, -3, -3, -3,
+ -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3,
+ -3, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2,
+ -2, -2, -2, -2, -1, -1, -1, -1, -1, -1, -1, -1, -0, -0, -0, -0,
};
-static const int8_t quant11[256]={
- 0, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
--5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
--5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
--5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
--5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
--5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,
--5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-5,-4,-4,
--4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,-4,
--4,-4,-4,-4,-4,-3,-3,-3,-3,-3,-3,-3,-2,-2,-2,-1,
+static const int8_t quant11[256] = {
+ 0, 1, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+ -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
+ -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
+ -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
+ -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
+ -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5,
+ -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -4, -4,
+ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
+ -4, -4, -4, -4, -4, -3, -3, -3, -3, -3, -3, -3, -2, -2, -2, -1,
};
-static const uint8_t ver2_state[256]= {
- 0, 10, 10, 10, 10, 16, 16, 16, 28, 16, 16, 29, 42, 49, 20, 49,
- 59, 25, 26, 26, 27, 31, 33, 33, 33, 34, 34, 37, 67, 38, 39, 39,
- 40, 40, 41, 79, 43, 44, 45, 45, 48, 48, 64, 50, 51, 52, 88, 52,
- 53, 74, 55, 57, 58, 58, 74, 60, 101, 61, 62, 84, 66, 66, 68, 69,
- 87, 82, 71, 97, 73, 73, 82, 75, 111, 77, 94, 78, 87, 81, 83, 97,
- 85, 83, 94, 86, 99, 89, 90, 99, 111, 92, 93, 134, 95, 98, 105, 98,
- 105, 110, 102, 108, 102, 118, 103, 106, 106, 113, 109, 112, 114, 112, 116, 125,
- 115, 116, 117, 117, 126, 119, 125, 121, 121, 123, 145, 124, 126, 131, 127, 129,
- 165, 130, 132, 138, 133, 135, 145, 136, 137, 139, 146, 141, 143, 142, 144, 148,
- 147, 155, 151, 149, 151, 150, 152, 157, 153, 154, 156, 168, 158, 162, 161, 160,
- 172, 163, 169, 164, 166, 184, 167, 170, 177, 174, 171, 173, 182, 176, 180, 178,
- 175, 189, 179, 181, 186, 183, 192, 185, 200, 187, 191, 188, 190, 197, 193, 196,
- 197, 194, 195, 196, 198, 202, 199, 201, 210, 203, 207, 204, 205, 206, 208, 214,
- 209, 211, 221, 212, 213, 215, 224, 216, 217, 218, 219, 220, 222, 228, 223, 225,
- 226, 224, 227, 229, 240, 230, 231, 232, 233, 234, 235, 236, 238, 239, 237, 242,
- 241, 243, 242, 244, 245, 246, 247, 248, 249, 250, 251, 252, 252, 253, 254, 255,
+static const uint8_t ver2_state[256] = {
+ 0, 10, 10, 10, 10, 16, 16, 16, 28, 16, 16, 29, 42, 49, 20, 49,
+ 59, 25, 26, 26, 27, 31, 33, 33, 33, 34, 34, 37, 67, 38, 39, 39,
+ 40, 40, 41, 79, 43, 44, 45, 45, 48, 48, 64, 50, 51, 52, 88, 52,
+ 53, 74, 55, 57, 58, 58, 74, 60, 101, 61, 62, 84, 66, 66, 68, 69,
+ 87, 82, 71, 97, 73, 73, 82, 75, 111, 77, 94, 78, 87, 81, 83, 97,
+ 85, 83, 94, 86, 99, 89, 90, 99, 111, 92, 93, 134, 95, 98, 105, 98,
+ 105, 110, 102, 108, 102, 118, 103, 106, 106, 113, 109, 112, 114, 112, 116, 125,
+ 115, 116, 117, 117, 126, 119, 125, 121, 121, 123, 145, 124, 126, 131, 127, 129,
+ 165, 130, 132, 138, 133, 135, 145, 136, 137, 139, 146, 141, 143, 142, 144, 148,
+ 147, 155, 151, 149, 151, 150, 152, 157, 153, 154, 156, 168, 158, 162, 161, 160,
+ 172, 163, 169, 164, 166, 184, 167, 170, 177, 174, 171, 173, 182, 176, 180, 178,
+ 175, 189, 179, 181, 186, 183, 192, 185, 200, 187, 191, 188, 190, 197, 193, 196,
+ 197, 194, 195, 196, 198, 202, 199, 201, 210, 203, 207, 204, 205, 206, 208, 214,
+ 209, 211, 221, 212, 213, 215, 224, 216, 217, 218, 219, 220, 222, 228, 223, 225,
+ 226, 224, 227, 229, 240, 230, 231, 232, 233, 234, 235, 236, 238, 239, 237, 242,
+ 241, 243, 242, 244, 245, 246, 247, 248, 249, 250, 251, 252, 252, 253, 254, 255,
};
-typedef struct VlcState{
+typedef struct VlcState {
int16_t drift;
uint16_t error_sum;
int8_t bias;
uint8_t count;
} VlcState;
-typedef struct PlaneContext{
+typedef struct PlaneContext {
int16_t quant_table[MAX_CONTEXT_INPUTS][256];
int quant_table_index;
int context_count;
@@ -166,7 +166,7 @@ typedef struct PlaneContext{
#define MAX_SLICES 256
-typedef struct FFV1Context{
+typedef struct FFV1Context {
AVClass *class;
AVCodecContext *avctx;
RangeCoder c;
@@ -215,15 +215,16 @@ typedef struct FFV1Context{
int slice_x;
int slice_y;
int bits_per_raw_sample;
-}FFV1Context;
+} FFV1Context;
-static av_always_inline int fold(int diff, int bits){
- if(bits==8)
- diff= (int8_t)diff;
- else{
- diff+= 1<<(bits-1);
- diff&=(1<<bits)-1;
- diff-= 1<<(bits-1);
+static av_always_inline int fold(int diff, int bits)
+{
+ if (bits == 8)
+ diff = (int8_t)diff;
+ else {
+ diff += 1 << (bits - 1);
+ diff &= (1 << bits) - 1;
+ diff -= 1 << (bits - 1);
}
return diff;
@@ -231,9 +232,9 @@ static av_always_inline int fold(int diff, int bits){
static inline int predict(int16_t *src, int16_t *last)
{
- const int LT= last[-1];
- const int T= last[ 0];
- const int L = src[-1];
+ const int LT = last[-1];
+ const int T = last[0];
+ const int L = src[-1];
return mid_pred(L, L + T - LT, T);
}
@@ -241,175 +242,189 @@ static inline int predict(int16_t *src, int16_t *last)
static inline int get_context(PlaneContext *p, int16_t *src,
int16_t *last, int16_t *last2)
{
- const int LT= last[-1];
- const int T= last[ 0];
- const int RT= last[ 1];
- const int L = src[-1];
-
- if(p->quant_table[3][127]){
- const int TT= last2[0];
- const int LL= src[-2];
- return p->quant_table[0][(L-LT) & 0xFF] + p->quant_table[1][(LT-T) & 0xFF] + p->quant_table[2][(T-RT) & 0xFF]
- +p->quant_table[3][(LL-L) & 0xFF] + p->quant_table[4][(TT-T) & 0xFF];
- }else
- return p->quant_table[0][(L-LT) & 0xFF] + p->quant_table[1][(LT-T) & 0xFF] + p->quant_table[2][(T-RT) & 0xFF];
+ const int LT = last[-1];
+ const int T = last[0];
+ const int RT = last[1];
+ const int L = src[-1];
+
+ if (p->quant_table[3][127]) {
+ const int TT = last2[0];
+ const int LL = src[-2];
+ return p->quant_table[0][(L - LT) & 0xFF] +
+ p->quant_table[1][(LT - T) & 0xFF] +
+ p->quant_table[2][(T - RT) & 0xFF] +
+ p->quant_table[3][(LL - L) & 0xFF] +
+ p->quant_table[4][(TT - T) & 0xFF];
+ } else
+ return p->quant_table[0][(L - LT) & 0xFF] +
+ p->quant_table[1][(LT - T) & 0xFF] +
+ p->quant_table[2][(T - RT) & 0xFF];
}
-static void find_best_state(uint8_t best_state[256][256], const uint8_t one_state[256]){
- int i,j,k,m;
+static void find_best_state(uint8_t best_state[256][256],
+ const uint8_t one_state[256])
+{
+ int i, j, k, m;
double l2tab[256];
- for(i=1; i<256; i++)
- l2tab[i]= log2(i/256.0);
+ for (i = 1; i < 256; i++)
+ l2tab[i] = log2(i / 256.0);
- for(i=0; i<256; i++){
+ for (i = 0; i < 256; i++) {
double best_len[256];
- double p= i/256.0;
-
- for(j=0; j<256; j++)
- best_len[j]= 1<<30;
-
- for(j=FFMAX(i-10,1); j<FFMIN(i+11,256); j++){
- double occ[256]={0};
- double len=0;
- occ[j]=1.0;
- for(k=0; k<256; k++){
- double newocc[256]={0};
- for(m=1; m<256; m++){
- if(occ[m]){
+ double p = i / 256.0;
+
+ for (j = 0; j < 256; j++)
+ best_len[j] = 1 << 30;
+
+ for (j = FFMAX(i - 10, 1); j < FFMIN(i + 11, 256); j++) {
+ double occ[256] = { 0 };
+ double len = 0;
+ occ[j] = 1.0;
+ for (k = 0; k < 256; k++) {
+ double newocc[256] = { 0 };
+ for (m = 1; m < 256; m++)
+ if (occ[m]) {
len -=occ[m]*( p *l2tab[ m]
+ (1-p)*l2tab[256-m]);
}
+ if (len < best_len[k]) {
+ best_len[k] = len;
+ best_state[i][k] = j;
}
- if(len < best_len[k]){
- best_len[k]= len;
- best_state[i][k]= j;
- }
- for(m=0; m<256; m++){
- if(occ[m]){
- newocc[ one_state[ m]] += occ[m]* p ;
- newocc[256-one_state[256-m]] += occ[m]*(1-p);
+ for (m = 0; m < 256; m++)
+ if (occ[m]) {
+ newocc[ one_state[ m]] += occ[m] * p;
+ newocc[256 - one_state[256 - m]] += occ[m] * (1 - p);
}
- }
memcpy(occ, newocc, sizeof(occ));
}
}
}
}
-static av_always_inline av_flatten void put_symbol_inline(RangeCoder *c, uint8_t *state, int v, int is_signed, uint64_t rc_stat[256][2], uint64_t rc_stat2[32][2]){
+static av_always_inline av_flatten void put_symbol_inline(RangeCoder *c,
+ uint8_t *state, int v,
+ int is_signed,
+ uint64_t rc_stat[256][2],
+ uint64_t rc_stat2[32][2])
+{
int i;
-#define put_rac(C,S,B) \
-do{\
- if(rc_stat){\
- rc_stat[*(S)][B]++;\
- rc_stat2[(S)-state][B]++;\
- }\
- put_rac(C,S,B);\
-}while(0)
-
- if(v){
- const int a= FFABS(v);
- const int e= av_log2(a);
- put_rac(c, state+0, 0);
- if(e<=9){
- for(i=0; i<e; i++){
- put_rac(c, state+1+i, 1); //1..10
- }
- put_rac(c, state+1+i, 0);
-
- for(i=e-1; i>=0; i--){
- put_rac(c, state+22+i, (a>>i)&1); //22..31
- }
-
- if(is_signed)
- put_rac(c, state+11 + e, v < 0); //11..21
- }else{
- for(i=0; i<e; i++){
- put_rac(c, state+1+FFMIN(i,9), 1); //1..10
- }
- put_rac(c, state+1+9, 0);
-
- for(i=e-1; i>=0; i--){
- put_rac(c, state+22+FFMIN(i,9), (a>>i)&1); //22..31
- }
-
- if(is_signed)
- put_rac(c, state+11 + 10, v < 0); //11..21
- }
- }else{
- put_rac(c, state+0, 1);
+#define put_rac(C, S, B) \
+ do { \
+ if (rc_stat) { \
+ rc_stat[*(S)][B]++; \
+ rc_stat2[(S) - state][B]++; \
+ } \
+ put_rac(C, S, B); \
+ } while (0)
+
+ if (v) {
+ const int a = FFABS(v);
+ const int e = av_log2(a);
+ put_rac(c, state + 0, 0);
+ if (e <= 9) {
+ for (i = 0; i < e; i++)
+ put_rac(c, state + 1 + i, 1); // 1..10
+ put_rac(c, state + 1 + i, 0);
+
+ for (i = e - 1; i >= 0; i--)
+ put_rac(c, state + 22 + i, (a >> i) & 1); // 22..31
+
+ if (is_signed)
+ put_rac(c, state + 11 + e, v < 0); // 11..21
+ } else {
+ for (i = 0; i < e; i++)
+ put_rac(c, state + 1 + FFMIN(i, 9), 1); // 1..10
+ put_rac(c, state + 1 + 9, 0);
+
+ for (i = e - 1; i >= 0; i--)
+ put_rac(c, state + 22 + FFMIN(i, 9), (a >> i) & 1); // 22..31
+
+ if (is_signed)
+ put_rac(c, state + 11 + 10, v < 0); // 11..21
+ }
+ } else {
+ put_rac(c, state + 0, 1);
}
#undef put_rac
}
-static av_noinline void put_symbol(RangeCoder *c, uint8_t *state, int v, int is_signed){
+static av_noinline void put_symbol(RangeCoder *c, uint8_t *state,
+ int v, int is_signed)
+{
put_symbol_inline(c, state, v, is_signed, NULL, NULL);
}
-static inline av_flatten int get_symbol_inline(RangeCoder *c, uint8_t *state, int is_signed){
- if(get_rac(c, state+0))
+static inline av_flatten int get_symbol_inline(RangeCoder *c, uint8_t *state,
+ int is_signed)
+{
+ if (get_rac(c, state + 0))
return 0;
- else{
+ else {
int i, e, a;
- e= 0;
- while(get_rac(c, state+1 + FFMIN(e,9))){ //1..10
+ e = 0;
+ while (get_rac(c, state + 1 + FFMIN(e, 9))) // 1..10
e++;
- }
- a= 1;
- for(i=e-1; i>=0; i--){
- a += a + get_rac(c, state+22 + FFMIN(i,9)); //22..31
- }
+ a = 1;
+ for (i = e - 1; i >= 0; i--)
+ a += a + get_rac(c, state + 22 + FFMIN(i, 9)); // 22..31
- e= -(is_signed && get_rac(c, state+11 + FFMIN(e, 10))); //11..21
- return (a^e)-e;
+ e = -(is_signed && get_rac(c, state + 11 + FFMIN(e, 10))); // 11..21
+ return (a ^ e) - e;
}
}
-static av_noinline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed){
+static av_noinline int get_symbol(RangeCoder *c, uint8_t *state, int is_signed)
+{
return get_symbol_inline(c, state, is_signed);
}
-static inline void update_vlc_state(VlcState * const state, const int v){
- int drift= state->drift;
- int count= state->count;
+static inline void update_vlc_state(VlcState *const state, const int v)
+{
+ int drift = state->drift;
+ int count = state->count;
state->error_sum += FFABS(v);
- drift += v;
+ drift += v;
- if(count == 128){ //FIXME variable
- count >>= 1;
- drift >>= 1;
+ if (count == 128) { // FIXME: variable
+ count >>= 1;
+ drift >>= 1;
state->error_sum >>= 1;
}
count++;
- if(drift <= -count){
- if(state->bias > -128) state->bias--;
+ if (drift <= -count) {
+ if (state->bias > -128)
+ state->bias--;
drift += count;
- if(drift <= -count)
- drift= -count + 1;
- }else if(drift > 0){
- if(state->bias < 127) state->bias++;
+ if (drift <= -count)
+ drift = -count + 1;
+ } else if (drift > 0) {
+ if (state->bias < 127)
+ state->bias++;
drift -= count;
- if(drift > 0)
- drift= 0;
+ if (drift > 0)
+ drift = 0;
}
- state->drift= drift;
- state->count= count;
+ state->drift = drift;
+ state->count = count;
}
-static inline void put_vlc_symbol(PutBitContext *pb, VlcState * const state, int v, int bits){
+static inline void put_vlc_symbol(PutBitContext *pb, VlcState *const state,
+ int v, int bits)
+{
int i, k, code;
v = fold(v - state->bias, bits);
- i= state->count;
- k=0;
- while(i < state->error_sum){ //FIXME optimize
+ i = state->count;
+ k = 0;
+ while (i < state->error_sum) { // FIXME: optimize
k++;
i += i;
}
@@ -417,42 +432,47 @@ static inline void put_vlc_symbol(PutBitContext *pb, VlcState * const state, int
av_assert2(k<=13);
#if 0 // JPEG LS
- if(k==0 && 2*state->drift <= - state->count) code= v ^ (-1);
- else code= v;
+ if (k == 0 && 2 * state->drift <= -state->count)
+ code = v ^ (-1);
+ else
+ code = v;
#else
- code= v ^ ((2*state->drift + state->count)>>31);
+ code = v ^ ((2 * state->drift + state->count) >> 31);
#endif
- av_dlog(NULL, "v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code,
- state->bias, state->error_sum, state->drift, state->count, k);
+ av_dlog(NULL, "v:%d/%d bias:%d error:%d drift:%d count:%d k:%d\n", v, code,
+ state->bias, state->error_sum, state->drift, state->count, k);
set_sr_golomb(pb, code, k, 12, bits);
update_vlc_state(state, v);
}
-static inline int get_vlc_symbol(GetBitContext *gb, VlcState * const state, int bits){
+static inline int get_vlc_symbol(GetBitContext *gb, VlcState *const state,
+ int bits)
+{
int k, i, v, ret;
- i= state->count;
- k=0;
- while(i < state->error_sum){ //FIXME optimize
+ i = state->count;
+ k = 0;
+ while (i < state->error_sum) { // FIXME: optimize
k++;
i += i;
}
- assert(k<=8);
+ assert(k <= 8);
- v= get_sr_golomb(gb, k, 12, bits);
+ v = get_sr_golomb(gb, k, 12, bits);
av_dlog(NULL, "v:%d bias:%d error:%d drift:%d count:%d k:%d",
v, state->bias, state->error_sum, state->drift, state->count, k);
#if 0 // JPEG LS
- if(k==0 && 2*state->drift <= - state->count) v ^= (-1);
+ if (k == 0 && 2 * state->drift <= -state->count)
+ v ^= (-1);
#else
- v ^= ((2*state->drift + state->count)>>31);
+ v ^= ((2 * state->drift + state->count) >> 31);
#endif
- ret= fold(v + state->bias, bits);
+ ret = fold(v + state->bias, bits);
update_vlc_state(state, v);
@@ -464,62 +484,65 @@ static av_always_inline int encode_line(FFV1Context *s, int w,
int16_t *sample[3],
int plane_index, int bits)
{
- PlaneContext * const p= &s->plane[plane_index];
- RangeCoder * const c= &s->c;
+ PlaneContext *const p = &s->plane[plane_index];
+ RangeCoder *const c = &s->c;
int x;
- int run_index= s->run_index;
- int run_count=0;
- int run_mode=0;
+ int run_index = s->run_index;
+ int run_count = 0;
+ int run_mode = 0;
- if(s->ac){
- if(c->bytestream_end - c->bytestream < w*20){
+ if (s->ac) {
+ if (c->bytestream_end - c->bytestream < w * 20) {
av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
return -1;
}
- }else{
- if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < w*4){
+ } else {
+ if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >> 3) < w * 4) {
av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
return -1;
}
}
- for(x=0; x<w; x++){
+ for (x = 0; x < w; x++) {
int diff, context;
- context= get_context(p, sample[0]+x, sample[1]+x, sample[2]+x);
- diff= sample[0][x] - predict(sample[0]+x, sample[1]+x);
+ context = get_context(p, sample[0] + x, sample[1] + x, sample[2] + x);
+ diff = sample[0][x] - predict(sample[0] + x, sample[1] + x);
- if(context < 0){
+ if (context < 0) {
context = -context;
- diff= -diff;
+ diff = -diff;
}
- diff= fold(diff, bits);
+ diff = fold(diff, bits);
- if(s->ac){
- if(s->flags & CODEC_FLAG_PASS1){
- put_symbol_inline(c, p->state[context], diff, 1, s->rc_stat, s->rc_stat2[p->quant_table_index][context]);
- }else{
+ if (s->ac) {
+ if (s->flags & CODEC_FLAG_PASS1) {
+ put_symbol_inline(c, p->state[context], diff, 1, s->rc_stat,
+ s->rc_stat2[p->quant_table_index][context]);
+ } else {
put_symbol_inline(c, p->state[context], diff, 1, NULL, NULL);
}
- }else{
- if(context == 0) run_mode=1;
-
- if(run_mode){
-
- if(diff){
- while(run_count >= 1<<ff_log2_run[run_index]){
- run_count -= 1<<ff_log2_run[run_index];
+ } else {
+ if (context == 0)
+ run_mode = 1;
+
+ if (run_mode) {
+ if (diff) {
+ while (run_count >= 1 << ff_log2_run[run_index]) {
+ run_count -= 1 << ff_log2_run[run_index];
run_index++;
put_bits(&s->pb, 1, 1);
}
put_bits(&s->pb, 1 + ff_log2_run[run_index], run_count);
- if(run_index) run_index--;
- run_count=0;
- run_mode=0;
- if(diff>0) diff--;
- }else{
+ if (run_index)
+ run_index--;
+ run_count = 0;
+ run_mode = 0;
+ if (diff > 0)
+ diff--;
+ } else {
run_count++;
}
}
@@ -528,105 +551,107 @@ static av_always_inline int encode_line(FFV1Context *s, int w,
run_count, run_index, run_mode, x,
(int)put_bits_count(&s->pb));
- if(run_mode == 0)
+ if (run_mode == 0)
put_vlc_symbol(&s->pb, &p->vlc_state[context], diff, bits);
}
}
- if(run_mode){
- while(run_count >= 1<<ff_log2_run[run_index]){
- run_count -= 1<<ff_log2_run[run_index];
+ if (run_mode) {
+ while (run_count >= 1 << ff_log2_run[run_index]) {
+ run_count -= 1 << ff_log2_run[run_index];
run_index++;
put_bits(&s->pb, 1, 1);
}
- if(run_count)
+ if (run_count)
put_bits(&s->pb, 1, 1);
}
- s->run_index= run_index;
+ s->run_index = run_index;
return 0;
}
-static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
- int x,y,i;
- const int ring_size= s->avctx->context_model ? 3 : 2;
+static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h,
+ int stride, int plane_index)
+{
+ int x, y, i;
+ const int ring_size = s->avctx->context_model ? 3 : 2;
int16_t *sample[3];
- s->run_index=0;
+ s->run_index = 0;
- memset(s->sample_buffer, 0, ring_size*(w+6)*sizeof(*s->sample_buffer));
+ memset(s->sample_buffer, 0, ring_size * (w + 6) * sizeof(*s->sample_buffer));
- for(y=0; y<h; y++){
- for(i=0; i<ring_size; i++)
- sample[i]= s->sample_buffer + (w+6)*((h+i-y)%ring_size) + 3;
+ for (y = 0; y < h; y++) {
+ for (i = 0; i < ring_size; i++)
+ sample[i] = s->sample_buffer + (w + 6) * ((h + i - y) % ring_size) + 3;
sample[0][-1]= sample[1][0 ];
sample[1][ w]= sample[1][w-1];
-//{START_TIMER
- if(s->bits_per_raw_sample<=8){
- for(x=0; x<w; x++){
- sample[0][x]= src[x + stride*y];
- }
+// { START_TIMER
+ if (s->bits_per_raw_sample <= 8) {
+ for (x = 0; x < w; x++)
+ sample[0][x] = src[x + stride * y];
encode_line(s, w, sample, plane_index, 8);
- }else{
- if(s->packed_at_lsb){
- for(x=0; x<w; x++){
- sample[0][x]= ((uint16_t*)(src + stride*y))[x];
+ } else {
+ if (s->packed_at_lsb) {
+ for (x = 0; x < w; x++) {
+ sample[0][x] = ((uint16_t*)(src + stride*y))[x];
}
- }else{
- for(x=0; x<w; x++){
- sample[0][x]= ((uint16_t*)(src + stride*y))[x] >> (16 - s->bits_per_raw_sample);
+ } else {
+ for (x = 0; x < w; x++) {
+ sample[0][x] = ((uint16_t*)(src + stride*y))[x] >> (16 - s->bits_per_raw_sample);
}
}
encode_line(s, w, sample, plane_index, s->bits_per_raw_sample);
}
-//STOP_TIMER("encode line")}
+// STOP_TIMER("encode line") }
}
}
-static void encode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int stride[3]){
+static void encode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int stride[3])
+{
int x, y, p, i;
- const int ring_size= s->avctx->context_model ? 3 : 2;
+ const int ring_size = s->avctx->context_model ? 3 : 2;
int16_t *sample[4][3];
- int lbd= s->avctx->bits_per_raw_sample <= 8;
- int bits= s->avctx->bits_per_raw_sample > 0 ? s->avctx->bits_per_raw_sample : 8;
- int offset= 1 << bits;
- s->run_index=0;
+ int lbd = s->avctx->bits_per_raw_sample <= 8;
+ int bits = s->avctx->bits_per_raw_sample > 0 ? s->avctx->bits_per_raw_sample : 8;
+ int offset = 1 << bits;
+ s->run_index = 0;
- memset(s->sample_buffer, 0, ring_size*4*(w+6)*sizeof(*s->sample_buffer));
+ memset(s->sample_buffer, 0, ring_size * 4 * (w + 6) * sizeof(*s->sample_buffer));
- for(y=0; y<h; y++){
- for(i=0; i<ring_size; i++)
- for(p=0; p<4; p++)
+ for (y = 0; y < h; y++) {
+ for (i = 0; i < ring_size; i++)
+ for (p = 0; p < 4; p++)
sample[p][i]= s->sample_buffer + p*ring_size*(w+6) + ((h+i-y)%ring_size)*(w+6) + 3;
- for(x=0; x<w; x++){
- int b,g,r,av_uninit(a);
- if(lbd){
- unsigned v= *((uint32_t*)(src[0] + x*4 + stride[0]*y));
- b= v&0xFF;
- g= (v>>8)&0xFF;
- r= (v>>16)&0xFF;
- a= v>>24;
- }else{
- b= *((uint16_t*)(src[0] + x*2 + stride[0]*y));
- g= *((uint16_t*)(src[1] + x*2 + stride[1]*y));
- r= *((uint16_t*)(src[2] + x*2 + stride[2]*y));
+ for (x = 0; x < w; x++) {
+ int b, g, r, av_uninit(a);
+ if (lbd) {
+ unsigned v = *((uint32_t*)(src[0] + x*4 + stride[0]*y));
+ b = v & 0xFF;
+ g = (v >> 8) & 0xFF;
+ r = (v >> 16) & 0xFF;
+ a = v >> 24;
+ } else {
+ b = *((uint16_t*)(src[0] + x*2 + stride[0]*y));
+ g = *((uint16_t*)(src[1] + x*2 + stride[1]*y));
+ r = *((uint16_t*)(src[2] + x*2 + stride[2]*y));
}
b -= g;
r -= g;
- g += (b + r)>>2;
+ g += (b + r) >> 2;
b += offset;
r += offset;
- sample[0][0][x]= g;
- sample[1][0][x]= b;
- sample[2][0][x]= r;
- sample[3][0][x]= a;
+ sample[0][0][x] = g;
+ sample[1][0][x] = b;
+ sample[2][0][x] = r;
+ sample[3][0][x] = a;
}
- for(p=0; p<3 + s->transparency; p++){
- sample[p][0][-1]= sample[p][1][0 ];
- sample[p][1][ w]= sample[p][1][w-1];
+ for (p = 0; p < 3 + s->transparency; p++) {
+ sample[p][0][-1] = sample[p][1][0 ];
+ sample[p][1][ w] = sample[p][1][w-1];
if (lbd)
encode_line(s, w, sample[p], (p+1)/2, 9);
else
@@ -635,44 +660,47 @@ static void encode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int
}
}
-static void write_quant_table(RangeCoder *c, int16_t *quant_table){
- int last=0;
+static void write_quant_table(RangeCoder *c, int16_t *quant_table)
+{
+ int last = 0;
int i;
uint8_t state[CONTEXT_SIZE];
memset(state, 128, sizeof(state));
- for(i=1; i<128 ; i++){
- if(quant_table[i] != quant_table[i-1]){
- put_symbol(c, state, i-last-1, 0);
- last= i;
+ for (i = 1; i < 128; i++)
+ if (quant_table[i] != quant_table[i - 1]) {
+ put_symbol(c, state, i - last - 1, 0);
+ last = i;
}
- }
- put_symbol(c, state, i-last-1, 0);
+ put_symbol(c, state, i - last - 1, 0);
}
-static void write_quant_tables(RangeCoder *c, int16_t quant_table[MAX_CONTEXT_INPUTS][256]){
+static void write_quant_tables(RangeCoder *c,
+ int16_t quant_table[MAX_CONTEXT_INPUTS][256])
+{
int i;
- for(i=0; i<5; i++)
+ for (i = 0; i < 5; i++)
write_quant_table(c, quant_table[i]);
}
-static void write_header(FFV1Context *f){
+static void write_header(FFV1Context *f)
+{
uint8_t state[CONTEXT_SIZE];
int i, j;
- RangeCoder * const c= &f->slice_context[0]->c;
+ RangeCoder *const c = &f->slice_context[0]->c;
memset(state, 128, sizeof(state));
- if(f->version < 2){
+ if (f->version < 2) {
put_symbol(c, state, f->version, 0);
put_symbol(c, state, f->ac, 0);
- if(f->ac>1){
- for(i=1; i<256; i++){
- put_symbol(c, state, f->state_transition[i] - c->one_state[i], 1);
- }
+ if (f->ac > 1) {
+ for (i = 1; i < 256; i++)
+ put_symbol(c, state,
+ f->state_transition[i] - c->one_state[i], 1);
}
put_symbol(c, state, f->colorspace, 0); //YUV cs type
- if(f->version>0)
+ if (f->version > 0)
put_symbol(c, state, f->bits_per_raw_sample, 0);
put_rac(c, state, f->chroma_planes);
put_symbol(c, state, f->chroma_h_shift, 0);
@@ -680,108 +708,120 @@ static void write_header(FFV1Context *f){
put_rac(c, state, f->transparency);
write_quant_tables(c, f->quant_table);
- }else if(f->version < 3){
+ } else if (f->version < 3) {
put_symbol(c, state, f->slice_count, 0);
- for(i=0; i<f->slice_count; i++){
- FFV1Context *fs= f->slice_context[i];
- put_symbol(c, state, (fs->slice_x +1)*f->num_h_slices / f->width , 0);
- put_symbol(c, state, (fs->slice_y +1)*f->num_v_slices / f->height , 0);
- put_symbol(c, state, (fs->slice_width +1)*f->num_h_slices / f->width -1, 0);
- put_symbol(c, state, (fs->slice_height+1)*f->num_v_slices / f->height-1, 0);
- for(j=0; j<f->plane_count; j++){
+ for (i = 0; i < f->slice_count; i++) {
+ FFV1Context *fs = f->slice_context[i];
+ put_symbol(c, state,
+ (fs->slice_x + 1) * f->num_h_slices / f->width, 0);
+ put_symbol(c, state,
+ (fs->slice_y + 1) * f->num_v_slices / f->height, 0);
+ put_symbol(c, state,
+ (fs->slice_width + 1) * f->num_h_slices / f->width - 1,
+ 0);
+ put_symbol(c, state,
+ (fs->slice_height + 1) * f->num_v_slices / f->height - 1,
+ 0);
+ for (j = 0; j < f->plane_count; j++) {
put_symbol(c, state, f->plane[j].quant_table_index, 0);
av_assert0(f->plane[j].quant_table_index == f->avctx->context_model);
}
}
}
}
+
#endif /* CONFIG_FFV1_ENCODER */
-static av_cold int common_init(AVCodecContext *avctx){
+static av_cold int common_init(AVCodecContext *avctx)
+{
FFV1Context *s = avctx->priv_data;
- if(!avctx->width || !avctx->height)
+ if (!avctx->width || !avctx->height)
return AVERROR_INVALIDDATA;
- s->avctx= avctx;
- s->flags= avctx->flags;
+ s->avctx = avctx;
+ s->flags = avctx->flags;
avcodec_get_frame_defaults(&s->picture);
ff_dsputil_init(&s->dsp, avctx);
- s->width = avctx->width;
- s->height= avctx->height;
-
- //defaults
- s->num_h_slices=1;
- s->num_v_slices=1;
+ s->width = avctx->width;
+ s->height = avctx->height;
+ // defaults
+ s->num_h_slices = 1;
+ s->num_v_slices = 1;
return 0;
}
-static int init_slice_state(FFV1Context *f, FFV1Context *fs){
+static int init_slice_state(FFV1Context *f, FFV1Context *fs)
+{
int j;
- fs->plane_count= f->plane_count;
- fs->transparency= f->transparency;
- for(j=0; j<f->plane_count; j++){
- PlaneContext * const p= &fs->plane[j];
+ fs->plane_count = f->plane_count;
+ fs->transparency = f->transparency;
+ for (j = 0; j < f->plane_count; j++) {
+ PlaneContext *const p = &fs->plane[j];
- if(fs->ac){
- if(!p-> state) p-> state= av_malloc(CONTEXT_SIZE*p->context_count*sizeof(uint8_t));
- if(!p-> state)
+ if (fs->ac) {
+ if (!p->state)
+ p->state = av_malloc(CONTEXT_SIZE * p->context_count *
+ sizeof(uint8_t));
+ if (!p->state)
return AVERROR(ENOMEM);
- }else{
- if(!p->vlc_state) p->vlc_state= av_malloc(p->context_count*sizeof(VlcState));
- if(!p->vlc_state)
+ } else {
+ if (!p->vlc_state)
+ p->vlc_state = av_malloc(p->context_count * sizeof(VlcState));
+ if (!p->vlc_state)
return AVERROR(ENOMEM);
}
}
- if (fs->ac>1){
- //FIXME only redo if state_transition changed
- for(j=1; j<256; j++){
- fs->c.one_state [ j]= f->state_transition[j];
- fs->c.zero_state[256-j]= 256-fs->c.one_state [j];
+ if (fs->ac > 1) {
+ // FIXME: only redo if state_transition changed
+ for (j = 1; j < 256; j++) {
+ fs->c. one_state[ j] = f->state_transition[j];
+ fs->c.zero_state[256 - j] = 256 - fs->c.one_state[j];
}
}
return 0;
}
-static int init_slices_state(FFV1Context *f){
+static int init_slices_state(FFV1Context *f) {
int i;
- for(i=0; i<f->slice_count; i++){
- FFV1Context *fs= f->slice_context[i];
- if(init_slice_state(f, fs) < 0)
+ for (i = 0; i < f->slice_count; i++) {
+ FFV1Context *fs = f->slice_context[i];
+ if (init_slice_state(f, fs) < 0)
return -1;
}
return 0;
}
-static av_cold int init_slice_contexts(FFV1Context *f){
+static av_cold int init_slice_contexts(FFV1Context *f)
+{
int i;
- f->slice_count= f->num_h_slices * f->num_v_slices;
-
- for(i=0; i<f->slice_count; i++){
- FFV1Context *fs= av_mallocz(sizeof(*fs));
- int sx= i % f->num_h_slices;
- int sy= i / f->num_h_slices;
- int sxs= f->avctx->width * sx / f->num_h_slices;
- int sxe= f->avctx->width *(sx+1) / f->num_h_slices;
- int sys= f->avctx->height* sy / f->num_v_slices;
- int sye= f->avctx->height*(sy+1) / f->num_v_slices;
- f->slice_context[i]= fs;
+ f->slice_count = f->num_h_slices * f->num_v_slices;
+
+ for (i = 0; i < f->slice_count; i++) {
+ FFV1Context *fs = av_mallocz(sizeof(*fs));
+ int sx = i % f->num_h_slices;
+ int sy = i / f->num_h_slices;
+ int sxs = f->avctx->width * sx / f->num_h_slices;
+ int sxe = f->avctx->width * (sx + 1) / f->num_h_slices;
+ int sys = f->avctx->height * sy / f->num_v_slices;
+ int sye = f->avctx->height * (sy + 1) / f->num_v_slices;
+ f->slice_context[i] = fs;
memcpy(fs, f, sizeof(*fs));
memset(fs->rc_stat2, 0, sizeof(fs->rc_stat2));
- fs->slice_width = sxe - sxs;
- fs->slice_height= sye - sys;
- fs->slice_x = sxs;
- fs->slice_y = sys;
+ fs->slice_width = sxe - sxs;
+ fs->slice_height = sye - sys;
+ fs->slice_x = sxs;
+ fs->slice_y = sys;
fs->sample_buffer = av_malloc(3*4 * (fs->width+6) * sizeof(*fs->sample_buffer));
if (!fs->sample_buffer)
@@ -790,21 +830,25 @@ static av_cold int init_slice_contexts(FFV1Context *f){
return 0;
}
-static int allocate_initial_states(FFV1Context *f){
+static int allocate_initial_states(FFV1Context *f)
+{
int i;
- for(i=0; i<f->quant_table_count; i++){
- f->initial_states[i]= av_malloc(f->context_count[i]*sizeof(*f->initial_states[i]));
- if(!f->initial_states[i])
+ for (i = 0; i < f->quant_table_count; i++) {
+ f->initial_states[i] = av_malloc(f->context_count[i] *
+ sizeof(*f->initial_states[i]));
+ if (!f->initial_states[i])
return AVERROR(ENOMEM);
- memset(f->initial_states[i], 128, f->context_count[i]*sizeof(*f->initial_states[i]));
+ memset(f->initial_states[i], 128,
+ f->context_count[i] * sizeof(*f->initial_states[i]));
}
return 0;
}
#if CONFIG_FFV1_ENCODER
-static int write_extra_header(FFV1Context *f){
- RangeCoder * const c= &f->c;
+static int write_extra_header(FFV1Context *f)
+{
+ RangeCoder *const c = &f->c;
uint8_t state[CONTEXT_SIZE];
int i, j, k;
uint8_t state2[32][CONTEXT_SIZE];
@@ -813,57 +857,56 @@ static int write_extra_header(FFV1Context *f){
memset(state2, 128, sizeof(state2));
memset(state, 128, sizeof(state));
- f->avctx->extradata= av_malloc(f->avctx->extradata_size= 10000 + (11*11*5*5*5+11*11*11)*32);
+ f->avctx->extradata = av_malloc(f->avctx->extradata_size = 10000 +
+ (11 * 11 * 5 * 5 * 5 + 11 * 11 * 11) * 32);
ff_init_range_encoder(c, f->avctx->extradata, f->avctx->extradata_size);
- ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
+ ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8);
put_symbol(c, state, f->version, 0);
- if(f->version > 2) {
- if(f->version == 3)
+ if (f->version > 2) {
+ if (f->version == 3)
f->minor_version = 2;
put_symbol(c, state, f->minor_version, 0);
}
put_symbol(c, state, f->ac, 0);
- if(f->ac>1){
- for(i=1; i<256; i++){
+ if (f->ac > 1)
+ for (i = 1; i < 256; i++)
put_symbol(c, state, f->state_transition[i] - c->one_state[i], 1);
- }
- }
- put_symbol(c, state, f->colorspace, 0); //YUV cs type
+ put_symbol(c, state, f->colorspace, 0); // YUV cs type
put_symbol(c, state, f->bits_per_raw_sample, 0);
put_rac(c, state, f->chroma_planes);
put_symbol(c, state, f->chroma_h_shift, 0);
put_symbol(c, state, f->chroma_v_shift, 0);
put_rac(c, state, f->transparency);
- put_symbol(c, state, f->num_h_slices-1, 0);
- put_symbol(c, state, f->num_v_slices-1, 0);
+ put_symbol(c, state, f->num_h_slices - 1, 0);
+ put_symbol(c, state, f->num_v_slices - 1, 0);
put_symbol(c, state, f->quant_table_count, 0);
- for(i=0; i<f->quant_table_count; i++)
+ for (i = 0; i < f->quant_table_count; i++)
write_quant_tables(c, f->quant_tables[i]);
- for(i=0; i<f->quant_table_count; i++){
- for(j=0; j<f->context_count[i]*CONTEXT_SIZE; j++)
- if(f->initial_states[i] && f->initial_states[i][0][j] != 128)
+ for (i = 0; i < f->quant_table_count; i++) {
+ for (j = 0; j < f->context_count[i] * CONTEXT_SIZE; j++)
+ if (f->initial_states[i] && f->initial_states[i][0][j] != 128)
break;
- if(j<f->context_count[i]*CONTEXT_SIZE){
+ if (j < f->context_count[i] * CONTEXT_SIZE) {
put_rac(c, state, 1);
- for(j=0; j<f->context_count[i]; j++){
- for(k=0; k<CONTEXT_SIZE; k++){
- int pred= j ? f->initial_states[i][j-1][k] : 128;
- put_symbol(c, state2[k], (int8_t)(f->initial_states[i][j][k]-pred), 1);
+ for (j = 0; j < f->context_count[i]; j++)
+ for (k = 0; k < CONTEXT_SIZE; k++) {
+ int pred = j ? f->initial_states[i][j - 1][k] : 128;
+ put_symbol(c, state2[k],
+ (int8_t)(f->initial_states[i][j][k] - pred), 1);
}
- }
- }else{
+ } else {
put_rac(c, state, 0);
}
}
- if(f->version > 2){
+ if (f->version > 2) {
put_symbol(c, state, f->ec, 0);
}
- f->avctx->extradata_size= ff_rac_terminate(c);
+ f->avctx->extradata_size = ff_rac_terminate(c);
v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, f->avctx->extradata, f->avctx->extradata_size);
AV_WL32(f->avctx->extradata + f->avctx->extradata_size, v);
f->avctx->extradata_size += 4;
@@ -871,46 +914,51 @@ static int write_extra_header(FFV1Context *f){
return 0;
}
-static int sort_stt(FFV1Context *s, uint8_t stt[256]){
- int i,i2,changed,print=0;
+static int sort_stt(FFV1Context *s, uint8_t stt[256])
+{
+ int i, i2, changed, print = 0;
+
+ do {
+ changed = 0;
+ for (i = 12; i < 244; i++) {
+ for (i2 = i + 1; i2 < 245 && i2 < i + 4; i2++) {
- do{
- changed=0;
- for(i=12; i<244; i++){
- for(i2=i+1; i2<245 && i2<i+4; i2++){
-#define COST(old, new) \
- s->rc_stat[old][0]*-log2((256-(new))/256.0)\
- +s->rc_stat[old][1]*-log2( (new) /256.0)
+#define COST(old, new) \
+ s->rc_stat[old][0] * -log2((256 - (new)) / 256.0) + \
+ s->rc_stat[old][1] * -log2((new) / 256.0)
-#define COST2(old, new) \
- COST(old, new)\
- +COST(256-(old), 256-(new))
+#define COST2(old, new) \
+ COST(old, new) + COST(256 - (old), 256 - (new))
- double size0= COST2(i, i ) + COST2(i2, i2);
- double sizeX= COST2(i, i2) + COST2(i2, i );
- if(sizeX < size0 && i!=128 && i2!=128){
+ double size0 = COST2(i, i) + COST2(i2, i2);
+ double sizeX = COST2(i, i2) + COST2(i2, i);
+ if (sizeX < size0 && i != 128 && i2 != 128) {
int j;
- FFSWAP(int, stt[ i], stt[ i2]);
- FFSWAP(int, s->rc_stat[i ][0],s->rc_stat[ i2][0]);
- FFSWAP(int, s->rc_stat[i ][1],s->rc_stat[ i2][1]);
- if(i != 256-i2){
- FFSWAP(int, stt[256-i], stt[256-i2]);
- FFSWAP(int, s->rc_stat[256-i][0],s->rc_stat[256-i2][0]);
- FFSWAP(int, s->rc_stat[256-i][1],s->rc_stat[256-i2][1]);
+ FFSWAP(int, stt[i], stt[i2]);
+ FFSWAP(int, s->rc_stat[i][0], s->rc_stat[i2][0]);
+ FFSWAP(int, s->rc_stat[i][1], s->rc_stat[i2][1]);
+ if (i != 256 - i2) {
+ FFSWAP(int, stt[256 - i], stt[256 - i2]);
+ FFSWAP(int, s->rc_stat[256 - i][0], s->rc_stat[256 - i2][0]);
+ FFSWAP(int, s->rc_stat[256 - i][1], s->rc_stat[256 - i2][1]);
}
- for(j=1; j<256; j++){
- if (stt[j] == i ) stt[j] = i2;
- else if(stt[j] == i2) stt[j] = i ;
- if(i != 256-i2){
- if (stt[256-j] == 256-i ) stt[256-j] = 256-i2;
- else if(stt[256-j] == 256-i2) stt[256-j] = 256-i ;
+ for (j = 1; j < 256; j++) {
+ if (stt[j] == i)
+ stt[j] = i2;
+ else if (stt[j] == i2)
+ stt[j] = i;
+ if (i != 256 - i2) {
+ if (stt[256 - j] == 256 - i)
+ stt[256 - j] = 256 - i2;
+ else if (stt[256 - j] == 256 - i2)
+ stt[256 - j] = 256 - i;
}
}
- print=changed=1;
+ print = changed = 1;
}
}
}
- }while(changed);
+ } while (changed);
return print;
}
@@ -922,28 +970,28 @@ static av_cold int encode_init(AVCodecContext *avctx)
common_init(avctx);
- s->version=0;
+ s->version = 0;
- if((avctx->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)) || avctx->slices>1)
+ if ((avctx->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)) || avctx->slices>1)
s->version = FFMAX(s->version, 2);
- if(avctx->level == 3){
+ if (avctx->level == 3) {
s->version = 3;
}
- if(s->ec < 0){
+ if (s->ec < 0) {
s->ec = (s->version >= 3);
}
- if(s->version >= 2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
+ if (s->version >= 2 && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(avctx, AV_LOG_ERROR, "Version 2 needed for requested features but version 2 is experimental and not enabled\n");
return AVERROR_INVALIDDATA;
}
- s->ac= avctx->coder_type > 0 ? 2 : 0;
+ s->ac = avctx->coder_type > 0 ? 2 : 0;
- s->plane_count=3;
- switch(avctx->pix_fmt){
+ s->plane_count = 3;
+ switch(avctx->pix_fmt) {
case AV_PIX_FMT_YUV444P9:
case AV_PIX_FMT_YUV422P9:
case AV_PIX_FMT_YUV420P9:
@@ -961,22 +1009,22 @@ static av_cold int encode_init(AVCodecContext *avctx)
case AV_PIX_FMT_YUV420P16:
if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample) {
s->bits_per_raw_sample = 16;
- } else if (!s->bits_per_raw_sample){
+ } else if (!s->bits_per_raw_sample) {
s->bits_per_raw_sample = avctx->bits_per_raw_sample;
}
- if(s->bits_per_raw_sample <=8){
+ if (s->bits_per_raw_sample <= 8) {
av_log(avctx, AV_LOG_ERROR, "bits_per_raw_sample invalid\n");
return AVERROR_INVALIDDATA;
}
- if(!s->ac && avctx->coder_type == -1) {
+ if (!s->ac && avctx->coder_type == -1) {
av_log(avctx, AV_LOG_INFO, "bits_per_raw_sample > 8, forcing coder 1\n");
s->ac = 2;
}
- if(!s->ac){
+ if (!s->ac) {
av_log(avctx, AV_LOG_ERROR, "bits_per_raw_sample of more than 8 needs -coder 1 currently\n");
return AVERROR_INVALIDDATA;
}
- s->version= FFMAX(s->version, 1);
+ s->version = FFMAX(s->version, 1);
case AV_PIX_FMT_GRAY8:
case AV_PIX_FMT_YUV444P:
case AV_PIX_FMT_YUV440P:
@@ -984,22 +1032,22 @@ static av_cold int encode_init(AVCodecContext *avctx)
case AV_PIX_FMT_YUV420P:
case AV_PIX_FMT_YUV411P:
case AV_PIX_FMT_YUV410P:
- s->chroma_planes= desc->nb_components < 3 ? 0 : 1;
- s->colorspace= 0;
+ s->chroma_planes = desc->nb_components < 3 ? 0 : 1;
+ s->colorspace = 0;
break;
case AV_PIX_FMT_YUVA444P:
case AV_PIX_FMT_YUVA422P:
case AV_PIX_FMT_YUVA420P:
- s->chroma_planes= 1;
- s->colorspace= 0;
- s->transparency= 1;
+ s->chroma_planes = 1;
+ s->colorspace = 0;
+ s->transparency = 1;
break;
case AV_PIX_FMT_RGB32:
- s->colorspace= 1;
- s->transparency= 1;
+ s->colorspace = 1;
+ s->transparency = 1;
break;
case AV_PIX_FMT_0RGB32:
- s->colorspace= 1;
+ s->colorspace = 1;
break;
case AV_PIX_FMT_GBRP9:
if (!avctx->bits_per_raw_sample)
@@ -1015,9 +1063,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->bits_per_raw_sample = 14;
else if (!s->bits_per_raw_sample)
s->bits_per_raw_sample = avctx->bits_per_raw_sample;
- s->colorspace= 1;
- s->chroma_planes= 1;
- s->version= FFMAX(s->version, 1);
+ s->colorspace = 1;
+ s->chroma_planes = 1;
+ s->version = FFMAX(s->version, 1);
break;
default:
av_log(avctx, AV_LOG_ERROR, "format not supported\n");
@@ -1031,13 +1079,13 @@ static av_cold int encode_init(AVCodecContext *avctx)
return AVERROR(EINVAL);
}
- if(s->ac>1)
- for(i=1; i<256; i++)
- s->state_transition[i]=ver2_state[i];
+ if (s->ac > 1)
+ for (i = 1; i < 256; i++)
+ s->state_transition[i] = ver2_state[i];
- for(i=0; i<256; i++){
- s->quant_table_count=2;
- if(s->bits_per_raw_sample <=8){
+ for (i = 0; i < 256; i++) {
+ s->quant_table_count = 2;
+ if (s->bits_per_raw_sample <= 8) {
s->quant_tables[0][0][i]= quant11[i];
s->quant_tables[0][1][i]= 11*quant11[i];
s->quant_tables[0][2][i]= 11*11*quant11[i];
@@ -1046,7 +1094,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->quant_tables[1][2][i]= 11*11*quant5 [i];
s->quant_tables[1][3][i]= 5*11*11*quant5 [i];
s->quant_tables[1][4][i]= 5*5*11*11*quant5 [i];
- }else{
+ } else {
s->quant_tables[0][0][i]= quant9_10bit[i];
s->quant_tables[0][1][i]= 11*quant9_10bit[i];
s->quant_tables[0][2][i]= 11*11*quant9_10bit[i];
@@ -1057,98 +1105,104 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->quant_tables[1][4][i]= 5*5*11*11*quant5_10bit[i];
}
}
- s->context_count[0]= (11*11*11+1)/2;
- s->context_count[1]= (11*11*5*5*5+1)/2;
- memcpy(s->quant_table, s->quant_tables[avctx->context_model], sizeof(s->quant_table));
+ s->context_count[0] = (11 * 11 * 11 + 1) / 2;
+ s->context_count[1] = (11 * 11 * 5 * 5 * 5 + 1) / 2;
+ memcpy(s->quant_table, s->quant_tables[avctx->context_model],
+ sizeof(s->quant_table));
- for(i=0; i<s->plane_count; i++){
- PlaneContext * const p= &s->plane[i];
+ for (i = 0; i < s->plane_count; i++) {
+ PlaneContext *const p = &s->plane[i];
memcpy(p->quant_table, s->quant_table, sizeof(p->quant_table));
- p->quant_table_index= avctx->context_model;
- p->context_count= s->context_count[p->quant_table_index];
+ p->quant_table_index = avctx->context_model;
+ p->context_count = s->context_count[p->quant_table_index];
}
- if(allocate_initial_states(s) < 0)
+ if (allocate_initial_states(s) < 0)
return AVERROR(ENOMEM);
- avctx->coded_frame= &s->picture;
- if(!s->transparency)
- s->plane_count= 2;
+ avctx->coded_frame = &s->picture;
+ if (!s->transparency)
+ s->plane_count = 2;
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_h_shift, &s->chroma_v_shift);
+ s->picture_number = 0;
- s->picture_number=0;
-
- if(avctx->flags & (CODEC_FLAG_PASS1|CODEC_FLAG_PASS2)){
- for(i=0; i<s->quant_table_count; i++){
- s->rc_stat2[i]= av_mallocz(s->context_count[i]*sizeof(*s->rc_stat2[i]));
- if(!s->rc_stat2[i])
+ if (avctx->flags & (CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2)) {
+ for (i = 0; i < s->quant_table_count; i++) {
+ s->rc_stat2[i] = av_mallocz(s->context_count[i] *
+ sizeof(*s->rc_stat2[i]));
+ if (!s->rc_stat2[i])
return AVERROR(ENOMEM);
}
}
- if(avctx->stats_in){
- char *p= avctx->stats_in;
+ if (avctx->stats_in) {
+ char *p = avctx->stats_in;
uint8_t best_state[256][256];
- int gob_count=0;
+ int gob_count = 0;
char *next;
- av_assert0(s->version>=2);
+ av_assert0(s->version >= 2);
- for(;;){
- for(j=0; j<256; j++){
- for(i=0; i<2; i++){
- s->rc_stat[j][i]= strtol(p, &next, 0);
- if(next==p){
- av_log(avctx, AV_LOG_ERROR, "2Pass file invalid at %d %d [%s]\n", j,i,p);
+ for (;;) {
+ for (j = 0; j < 256; j++)
+ for (i = 0; i < 2; i++) {
+ s->rc_stat[j][i] = strtol(p, &next, 0);
+ if (next == p) {
+ av_log(avctx, AV_LOG_ERROR,
+ "2Pass file invalid at %d %d [%s]\n", j, i, p);
return -1;
}
- p=next;
+ p = next;
}
- }
- for(i=0; i<s->quant_table_count; i++){
- for(j=0; j<s->context_count[i]; j++){
- for(k=0; k<32; k++){
- for(m=0; m<2; m++){
- s->rc_stat2[i][j][k][m]= strtol(p, &next, 0);
- if(next==p){
- av_log(avctx, AV_LOG_ERROR, "2Pass file invalid at %d %d %d %d [%s]\n", i,j,k,m,p);
+ for (i = 0; i < s->quant_table_count; i++)
+ for (j = 0; j < s->context_count[i]; j++) {
+ for (k = 0; k < 32; k++)
+ for (m = 0; m < 2; m++) {
+ s->rc_stat2[i][j][k][m] = strtol(p, &next, 0);
+ if (next == p) {
+ av_log(avctx, AV_LOG_ERROR,
+ "2Pass file invalid at %d %d %d %d [%s]\n",
+ i, j, k, m, p);
return AVERROR_INVALIDDATA;
}
- p=next;
+ p = next;
}
- }
}
- }
- gob_count= strtol(p, &next, 0);
- if(next==p || gob_count <=0){
+ gob_count = strtol(p, &next, 0);
+ if (next == p || gob_count <= 0) {
av_log(avctx, AV_LOG_ERROR, "2Pass file invalid\n");
return AVERROR_INVALIDDATA;
}
- p=next;
- while(*p=='\n' || *p==' ') p++;
- if(p[0]==0) break;
+ p = next;
+ while (*p == '\n' || *p == ' ')
+ p++;
+ if (p[0] == 0)
+ break;
}
sort_stt(s, s->state_transition);
find_best_state(best_state, s->state_transition);
- for(i=0; i<s->quant_table_count; i++){
- for(j=0; j<s->context_count[i]; j++){
- for(k=0; k<32; k++){
- double p= 128;
- if(s->rc_stat2[i][j][k][0]+s->rc_stat2[i][j][k][1]){
- p=256.0*s->rc_stat2[i][j][k][1] / (s->rc_stat2[i][j][k][0]+s->rc_stat2[i][j][k][1]);
+ for (i = 0; i < s->quant_table_count; i++) {
+ for (j = 0; j < s->context_count[i]; j++)
+ for (k = 0; k < 32; k++) {
+ double p = 128;
+ if (s->rc_stat2[i][j][k][0] + s->rc_stat2[i][j][k][1]) {
+ p = 256.0 * s->rc_stat2[i][j][k][1] /
+ (s->rc_stat2[i][j][k][0] + s->rc_stat2[i][j][k][1]);
}
- s->initial_states[i][j][k]= best_state[av_clip(round(p), 1, 255)][av_clip((s->rc_stat2[i][j][k][0]+s->rc_stat2[i][j][k][1])/gob_count, 0, 255)];
+ s->initial_states[i][j][k] =
+ best_state[av_clip(round(p), 1, 255)][av_clip((s->rc_stat2[i][j][k][0] +
+ s->rc_stat2[i][j][k][1]) /
+ gob_count, 0, 255)];
}
- }
}
}
- if(s->version>1){
- for(s->num_v_slices=2; s->num_v_slices<9; s->num_v_slices++){
- for(s->num_h_slices=s->num_v_slices; s->num_h_slices<2*s->num_v_slices; s->num_h_slices++){
- if(avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= 64 || !avctx->slices)
+ if (s->version > 1) {
+ for (s->num_v_slices = 2; s->num_v_slices < 9; s->num_v_slices++) {
+ for (s->num_h_slices = s->num_v_slices; s->num_h_slices < 2*s->num_v_slices; s->num_h_slices++) {
+ if (avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= 64 || !avctx->slices)
goto slices_ok;
}
}
@@ -1158,50 +1212,53 @@ static av_cold int encode_init(AVCodecContext *avctx)
write_extra_header(s);
}
- if(init_slice_contexts(s) < 0)
+ if (init_slice_contexts(s) < 0)
return -1;
- if(init_slices_state(s) < 0)
+ if (init_slices_state(s) < 0)
return -1;
-#define STATS_OUT_SIZE 1024*1024*6
- if(avctx->flags & CODEC_FLAG_PASS1){
- avctx->stats_out= av_mallocz(STATS_OUT_SIZE);
- for(i=0; i<s->quant_table_count; i++){
- for(j=0; j<s->slice_count; j++){
- FFV1Context *sf= s->slice_context[j];
+#define STATS_OUT_SIZE 1024 * 1024 * 6
+ if (avctx->flags & CODEC_FLAG_PASS1) {
+ avctx->stats_out = av_mallocz(STATS_OUT_SIZE);
+ for (i = 0; i < s->quant_table_count; i++)
+ for (j = 0; j < s->slice_count; j++) {
+ FFV1Context *sf = s->slice_context[j];
av_assert0(!sf->rc_stat2[i]);
- sf->rc_stat2[i]= av_mallocz(s->context_count[i]*sizeof(*sf->rc_stat2[i]));
- if(!sf->rc_stat2[i])
+ sf->rc_stat2[i] = av_mallocz(s->context_count[i] *
+ sizeof(*sf->rc_stat2[i]));
+ if (!sf->rc_stat2[i])
return AVERROR(ENOMEM);
}
- }
}
return 0;
}
+
#endif /* CONFIG_FFV1_ENCODER */
-static void clear_slice_state(FFV1Context *f, FFV1Context *fs){
+static void clear_slice_state(FFV1Context *f, FFV1Context *fs)
+{
int i, j;
- for(i=0; i<f->plane_count; i++){
- PlaneContext *p= &fs->plane[i];
-
- p->interlace_bit_state[0]= 128;
- p->interlace_bit_state[1]= 128;
-
- if(fs->ac){
- if(f->initial_states[p->quant_table_index]){
- memcpy(p->state, f->initial_states[p->quant_table_index], CONTEXT_SIZE*p->context_count);
- }else
- memset(p->state, 128, CONTEXT_SIZE*p->context_count);
- }else{
- for(j=0; j<p->context_count; j++){
- p->vlc_state[j].drift= 0;
- p->vlc_state[j].error_sum= 4; //FFMAX((RANGE + 32)/64, 2);
- p->vlc_state[j].bias= 0;
- p->vlc_state[j].count= 1;
+ for (i = 0; i < f->plane_count; i++) {
+ PlaneContext *p = &fs->plane[i];
+
+ p->interlace_bit_state[0] = 128;
+ p->interlace_bit_state[1] = 128;
+
+ if (fs->ac) {
+ if (f->initial_states[p->quant_table_index]) {
+ memcpy(p->state, f->initial_states[p->quant_table_index],
+ CONTEXT_SIZE * p->context_count);
+ } else
+ memset(p->state, 128, CONTEXT_SIZE * p->context_count);
+ } else {
+ for (j = 0; j < p->context_count; j++) {
+ p->vlc_state[j].drift = 0;
+ p->vlc_state[j].error_sum = 4; // FFMAX((RANGE + 32)/64, 2);
+ p->vlc_state[j].bias = 0;
+ p->vlc_state[j].count = 1;
}
}
}
@@ -1209,7 +1266,8 @@ static void clear_slice_state(FFV1Context *f, FFV1Context *fs){
#if CONFIG_FFV1_ENCODER
-static void encode_slice_header(FFV1Context *f, FFV1Context *fs){
+static void encode_slice_header(FFV1Context *f, FFV1Context *fs)
+{
RangeCoder *c = &fs->c;
uint8_t state[CONTEXT_SIZE];
int j;
@@ -1219,57 +1277,58 @@ static void encode_slice_header(FFV1Context *f, FFV1Context *fs){
put_symbol(c, state, (fs->slice_y +1)*f->num_v_slices / f->height , 0);
put_symbol(c, state, (fs->slice_width +1)*f->num_h_slices / f->width -1, 0);
put_symbol(c, state, (fs->slice_height+1)*f->num_v_slices / f->height-1, 0);
- for(j=0; j<f->plane_count; j++){
+ for (j=0; j<f->plane_count; j++) {
put_symbol(c, state, f->plane[j].quant_table_index, 0);
av_assert0(f->plane[j].quant_table_index == f->avctx->context_model);
}
- if(!f->picture.interlaced_frame) put_symbol(c, state, 3, 0);
+ if (!f->picture.interlaced_frame) put_symbol(c, state, 3, 0);
else put_symbol(c, state, 1 + !f->picture.top_field_first, 0);
put_symbol(c, state, f->picture.sample_aspect_ratio.num, 0);
put_symbol(c, state, f->picture.sample_aspect_ratio.den, 0);
}
-static int encode_slice(AVCodecContext *c, void *arg){
- FFV1Context *fs= *(void**)arg;
- FFV1Context *f= fs->avctx->priv_data;
- int width = fs->slice_width;
- int height= fs->slice_height;
- int x= fs->slice_x;
- int y= fs->slice_y;
- AVFrame * const p= &f->picture;
- const int ps= (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
- ?
- (f->bits_per_raw_sample>8)+1
- :
- 4;
-
- if(p->key_frame)
+static int encode_slice(AVCodecContext *c, void *arg)
+{
+ FFV1Context *fs = *(void **)arg;
+ FFV1Context *f = fs->avctx->priv_data;
+ int width = fs->slice_width;
+ int height = fs->slice_height;
+ int x = fs->slice_x;
+ int y = fs->slice_y;
+ AVFrame *const p = &f->picture;
+ const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
+ ?
+ (f->bits_per_raw_sample>8)+1
+ :
+ 4;
+
+ if (p->key_frame)
clear_slice_state(f, fs);
- if(f->version > 2){
+ if (f->version > 2) {
encode_slice_header(f, fs);
}
- if(!fs->ac){
- if(f->version > 2)
- put_rac(&fs->c, (uint8_t[]){129}, 0);
+ if (!fs->ac) {
+ if (f->version > 2)
+ put_rac(&fs->c, (uint8_t[]) {129}, 0);
fs->ac_byte_count = f->version > 2 || (!x&&!y) ? ff_rac_terminate(&fs->c) : 0;
init_put_bits(&fs->pb, fs->c.bytestream_start + fs->ac_byte_count, fs->c.bytestream_end - fs->c.bytestream_start - fs->ac_byte_count);
}
- if(f->colorspace==0){
- const int chroma_width = -((-width )>>f->chroma_h_shift);
- const int chroma_height= -((-height)>>f->chroma_v_shift);
- const int cx= x>>f->chroma_h_shift;
- const int cy= y>>f->chroma_v_shift;
+ if (f->colorspace == 0) {
+ const int chroma_width = -((-width) >> f->chroma_h_shift);
+ const int chroma_height = -((-height) >> f->chroma_v_shift);
+ const int cx = x >> f->chroma_h_shift;
+ const int cy = y >> f->chroma_v_shift;
encode_plane(fs, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0);
- if (f->chroma_planes){
+ if (f->chroma_planes) {
encode_plane(fs, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1);
encode_plane(fs, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1);
}
if (fs->transparency)
encode_plane(fs, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], 2);
- }else{
+ } else {
uint8_t *planes[3] = {p->data[0] + ps*x + y*p->linesize[0],
p->data[1] + ps*x + y*p->linesize[1],
p->data[2] + ps*x + y*p->linesize[2]};
@@ -1283,71 +1342,72 @@ static int encode_slice(AVCodecContext *c, void *arg){
static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet)
{
- FFV1Context *f = avctx->priv_data;
- RangeCoder * const c= &f->slice_context[0]->c;
- AVFrame * const p= &f->picture;
- int used_count= 0;
- uint8_t keystate=128;
+ FFV1Context *f = avctx->priv_data;
+ RangeCoder *const c = &f->slice_context[0]->c;
+ AVFrame *const p = &f->picture;
+ int used_count = 0;
+ uint8_t keystate = 128;
uint8_t *buf_p;
int i, ret;
if ((ret = ff_alloc_packet2(avctx, pkt, avctx->width*avctx->height*((8*2+1+1)*4)/8
- + FF_MIN_BUFFER_SIZE)) < 0)
+ + FF_MIN_BUFFER_SIZE)) < 0)
return ret;
ff_init_range_encoder(c, pkt->data, pkt->size);
- ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
+ ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8);
- *p = *pict;
- p->pict_type= AV_PICTURE_TYPE_I;
+ *p = *pict;
+ p->pict_type = AV_PICTURE_TYPE_I;
- if(avctx->gop_size==0 || f->picture_number % avctx->gop_size == 0){
+ if (avctx->gop_size == 0 || f->picture_number % avctx->gop_size == 0) {
put_rac(c, &keystate, 1);
- p->key_frame= 1;
+ p->key_frame = 1;
f->gob_count++;
write_header(f);
- }else{
+ } else {
put_rac(c, &keystate, 0);
- p->key_frame= 0;
+ p->key_frame = 0;
}
- if (f->ac>1){
+ if (f->ac > 1) {
int i;
- for(i=1; i<256; i++){
- c->one_state[i]= f->state_transition[i];
- c->zero_state[256-i]= 256-c->one_state[i];
+ for (i = 1; i < 256; i++) {
+ c->one_state[i] = f->state_transition[i];
+ c->zero_state[256 - i] = 256 - c->one_state[i];
}
}
- for(i=1; i<f->slice_count; i++){
- FFV1Context *fs= f->slice_context[i];
- uint8_t *start = pkt->data + (pkt->size-used_count)*(int64_t)i/f->slice_count;
- int len = pkt->size/f->slice_count;
+ for (i = 1; i < f->slice_count; i++) {
+ FFV1Context *fs = f->slice_context[i];
+ uint8_t *start = pkt->data + (pkt->size - used_count) * (int64_t)i / f->slice_count;
+ int len = pkt->size / f->slice_count;
ff_init_range_encoder(&fs->c, start, len);
}
- avctx->execute(avctx, encode_slice, &f->slice_context[0], NULL, f->slice_count, sizeof(void*));
+ avctx->execute(avctx, encode_slice, &f->slice_context[0], NULL,
+ f->slice_count, sizeof(void *));
buf_p = pkt->data;
- for(i=0; i<f->slice_count; i++){
- FFV1Context *fs= f->slice_context[i];
+ for (i = 0; i < f->slice_count; i++) {
+ FFV1Context *fs = f->slice_context[i];
int bytes;
- if(fs->ac){
+ if (fs->ac) {
uint8_t state=129;
put_rac(&fs->c, &state, 0);
- bytes= ff_rac_terminate(&fs->c);
- }else{
- flush_put_bits(&fs->pb); //nicer padding FIXME
- bytes= fs->ac_byte_count + (put_bits_count(&fs->pb)+7)/8;
+ bytes = ff_rac_terminate(&fs->c);
+ } else {
+ flush_put_bits(&fs->pb); // FIXME: nicer padding
+ bytes = fs->ac_byte_count + (put_bits_count(&fs->pb) + 7)/8;
}
- if(i>0 || f->version>2){
- av_assert0(bytes < pkt->size/f->slice_count);
+ if (i > 0 || f->version > 2) {
+ av_assert0(bytes < pkt->size / f->slice_count);
memmove(buf_p, fs->c.bytestream_start, bytes);
- av_assert0(bytes < (1<<24));
- AV_WB24(buf_p+bytes, bytes);
- bytes+=3;
+ av_assert0(bytes < (1 << 24));
+ AV_WB24(buf_p + bytes, bytes);
+ bytes += 3;
}
- if(f->ec){
+ if (f->ec) {
unsigned v;
buf_p[bytes++] = 0;
v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, bytes);
@@ -1356,59 +1416,61 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
buf_p += bytes;
}
- if((avctx->flags&CODEC_FLAG_PASS1) && (f->picture_number&31)==0){
+ if ((avctx->flags & CODEC_FLAG_PASS1) && (f->picture_number & 31) == 0) {
int j, k, m;
- char *p= avctx->stats_out;
- char *end= p + STATS_OUT_SIZE;
+ char *p = avctx->stats_out;
+ char *end = p + STATS_OUT_SIZE;
memset(f->rc_stat, 0, sizeof(f->rc_stat));
- for(i=0; i<f->quant_table_count; i++)
- memset(f->rc_stat2[i], 0, f->context_count[i]*sizeof(*f->rc_stat2[i]));
+ for (i = 0; i < f->quant_table_count; i++)
+ memset(f->rc_stat2[i], 0, f->context_count[i] * sizeof(*f->rc_stat2[i]));
- for(j=0; j<f->slice_count; j++){
- FFV1Context *fs= f->slice_context[j];
- for(i=0; i<256; i++){
+ for (j = 0; j < f->slice_count; j++) {
+ FFV1Context *fs = f->slice_context[j];
+ for (i = 0; i < 256; i++) {
f->rc_stat[i][0] += fs->rc_stat[i][0];
f->rc_stat[i][1] += fs->rc_stat[i][1];
}
- for(i=0; i<f->quant_table_count; i++){
- for(k=0; k<f->context_count[i]; k++){
- for(m=0; m<32; m++){
+ for (i = 0; i < f->quant_table_count; i++) {
+ for (k = 0; k < f->context_count[i]; k++)
+ for (m = 0; m < 32; m++) {
f->rc_stat2[i][k][m][0] += fs->rc_stat2[i][k][m][0];
f->rc_stat2[i][k][m][1] += fs->rc_stat2[i][k][m][1];
}
- }
}
}
- for(j=0; j<256; j++){
- snprintf(p, end-p, "%"PRIu64" %"PRIu64" ", f->rc_stat[j][0], f->rc_stat[j][1]);
- p+= strlen(p);
+ for (j = 0; j < 256; j++) {
+ snprintf(p, end - p, "%" PRIu64 " %" PRIu64 " ",
+ f->rc_stat[j][0], f->rc_stat[j][1]);
+ p += strlen(p);
}
- snprintf(p, end-p, "\n");
+ snprintf(p, end - p, "\n");
- for(i=0; i<f->quant_table_count; i++){
- for(j=0; j<f->context_count[i]; j++){
- for(m=0; m<32; m++){
- snprintf(p, end-p, "%"PRIu64" %"PRIu64" ", f->rc_stat2[i][j][m][0], f->rc_stat2[i][j][m][1]);
- p+= strlen(p);
+ for (i = 0; i < f->quant_table_count; i++) {
+ for (j = 0; j < f->context_count[i]; j++)
+ for (m = 0; m < 32; m++) {
+ snprintf(p, end - p, "%" PRIu64 " %" PRIu64 " ",
+ f->rc_stat2[i][j][m][0], f->rc_stat2[i][j][m][1]);
+ p += strlen(p);
}
- }
}
- snprintf(p, end-p, "%d\n", f->gob_count);
- } else if(avctx->flags&CODEC_FLAG_PASS1)
+ snprintf(p, end - p, "%d\n", f->gob_count);
+ } else if (avctx->flags & CODEC_FLAG_PASS1)
avctx->stats_out[0] = '\0';
f->picture_number++;
pkt->size = buf_p - pkt->data;
- pkt->flags |= AV_PKT_FLAG_KEY*p->key_frame;
+ pkt->flags |= AV_PKT_FLAG_KEY * p->key_frame;
*got_packet = 1;
return 0;
}
+
#endif /* CONFIG_FFV1_ENCODER */
-static av_cold int common_end(AVCodecContext *avctx){
+static av_cold int common_end(AVCodecContext *avctx)
+{
FFV1Context *s = avctx->priv_data;
int i, j;
@@ -1417,10 +1479,10 @@ static av_cold int common_end(AVCodecContext *avctx){
if (avctx->codec->decode && s->last_picture.data[0])
avctx->release_buffer(avctx, &s->last_picture);
- for(j=0; j<s->slice_count; j++){
- FFV1Context *fs= s->slice_context[j];
- for(i=0; i<s->plane_count; i++){
- PlaneContext *p= &fs->plane[i];
+ for (j = 0; j < s->slice_count; j++) {
+ FFV1Context *fs = s->slice_context[j];
+ for (i = 0; i < s->plane_count; i++) {
+ PlaneContext *p = &fs->plane[i];
av_freep(&p->state);
av_freep(&p->vlc_state);
@@ -1429,18 +1491,17 @@ static av_cold int common_end(AVCodecContext *avctx){
}
av_freep(&avctx->stats_out);
- for(j=0; j<s->quant_table_count; j++){
+ for (j = 0; j < s->quant_table_count; j++) {
av_freep(&s->initial_states[j]);
- for(i=0; i<s->slice_count; i++){
- FFV1Context *sf= s->slice_context[i];
+ for (i = 0; i < s->slice_count; i++) {
+ FFV1Context *sf = s->slice_context[i];
av_freep(&sf->rc_stat2[j]);
}
av_freep(&s->rc_stat2[j]);
}
- for(i=0; i<s->slice_count; i++){
+ for (i = 0; i < s->slice_count; i++)
av_freep(&s->slice_context[i]);
- }
return 0;
}
@@ -1449,126 +1510,137 @@ static av_always_inline void decode_line(FFV1Context *s, int w,
int16_t *sample[2],
int plane_index, int bits)
{
- PlaneContext * const p= &s->plane[plane_index];
- RangeCoder * const c= &s->c;
+ PlaneContext *const p = &s->plane[plane_index];
+ RangeCoder *const c = &s->c;
int x;
- int run_count=0;
- int run_mode=0;
- int run_index= s->run_index;
+ int run_count = 0;
+ int run_mode = 0;
+ int run_index = s->run_index;
- for(x=0; x<w; x++){
+ for (x = 0; x < w; x++) {
int diff, context, sign;
- context= get_context(p, sample[1] + x, sample[0] + x, sample[1] + x);
- if(context < 0){
- context= -context;
- sign=1;
- }else
- sign=0;
+ context = get_context(p, sample[1] + x, sample[0] + x, sample[1] + x);
+ if (context < 0) {
+ context = -context;
+ sign = 1;
+ } else
+ sign = 0;
av_assert2(context < p->context_count);
- if(s->ac){
- diff= get_symbol_inline(c, p->state[context], 1);
- }else{
- if(context == 0 && run_mode==0) run_mode=1;
-
- if(run_mode){
- if(run_count==0 && run_mode==1){
- if(get_bits1(&s->gb)){
- run_count = 1<<ff_log2_run[run_index];
- if(x + run_count <= w) run_index++;
- }else{
- if(ff_log2_run[run_index]) run_count = get_bits(&s->gb, ff_log2_run[run_index]);
- else run_count=0;
- if(run_index) run_index--;
- run_mode=2;
+ if (s->ac) {
+ diff = get_symbol_inline(c, p->state[context], 1);
+ } else {
+ if (context == 0 && run_mode == 0)
+ run_mode = 1;
+
+ if (run_mode) {
+ if (run_count == 0 && run_mode == 1) {
+ if (get_bits1(&s->gb)) {
+ run_count = 1 << ff_log2_run[run_index];
+ if (x + run_count <= w)
+ run_index++;
+ } else {
+ if (ff_log2_run[run_index])
+ run_count = get_bits(&s->gb, ff_log2_run[run_index]);
+ else
+ run_count = 0;
+ if (run_index)
+ run_index--;
+ run_mode = 2;
}
}
run_count--;
- if(run_count < 0){
- run_mode=0;
- run_count=0;
- diff= get_vlc_symbol(&s->gb, &p->vlc_state[context], bits);
- if(diff>=0) diff++;
- }else
- diff=0;
- }else
- diff= get_vlc_symbol(&s->gb, &p->vlc_state[context], bits);
+ if (run_count < 0) {
+ run_mode = 0;
+ run_count = 0;
+ diff = get_vlc_symbol(&s->gb, &p->vlc_state[context],
+ bits);
+ if (diff >= 0)
+ diff++;
+ } else
+ diff = 0;
+ } else
+ diff = get_vlc_symbol(&s->gb, &p->vlc_state[context], bits);
av_dlog(s->avctx, "count:%d index:%d, mode:%d, x:%d pos:%d\n",
run_count, run_index, run_mode, x, get_bits_count(&s->gb));
}
- if(sign) diff= -diff;
+ if (sign)
+ diff = -diff;
- sample[1][x]= (predict(sample[1] + x, sample[0] + x) + diff) & ((1<<bits)-1);
+ sample[1][x] = (predict(sample[1] + x, sample[0] + x) + diff) &
+ ((1 << bits) - 1);
}
- s->run_index= run_index;
+ s->run_index = run_index;
}
-static void decode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index){
+static void decode_plane(FFV1Context *s, uint8_t *src,
+ int w, int h, int stride, int plane_index)
+{
int x, y;
int16_t *sample[2];
- sample[0]=s->sample_buffer +3;
- sample[1]=s->sample_buffer+w+6+3;
+ sample[0] = s->sample_buffer + 3;
+ sample[1] = s->sample_buffer + w + 6 + 3;
- s->run_index=0;
+ s->run_index = 0;
- memset(s->sample_buffer, 0, 2*(w+6)*sizeof(*s->sample_buffer));
+ memset(s->sample_buffer, 0, 2 * (w + 6) * sizeof(*s->sample_buffer));
- for(y=0; y<h; y++){
- int16_t *temp = sample[0]; //FIXME try a normal buffer
+ for (y = 0; y < h; y++) {
+ int16_t *temp = sample[0]; // FIXME: try a normal buffer
- sample[0]= sample[1];
- sample[1]= temp;
+ sample[0] = sample[1];
+ sample[1] = temp;
- sample[1][-1]= sample[0][0 ];
- sample[0][ w]= sample[0][w-1];
+ sample[1][-1] = sample[0][0];
+ sample[0][w] = sample[0][w - 1];
-//{START_TIMER
- if(s->avctx->bits_per_raw_sample <= 8){
+// { START_TIMER
+ if (s->avctx->bits_per_raw_sample <= 8) {
decode_line(s, w, sample, plane_index, 8);
- for(x=0; x<w; x++){
- src[x + stride*y]= sample[1][x];
- }
- }else{
+ for (x = 0; x < w; x++)
+ src[x + stride * y] = sample[1][x];
+ } else {
decode_line(s, w, sample, plane_index, s->avctx->bits_per_raw_sample);
- if(s->packed_at_lsb){
- for(x=0; x<w; x++){
- ((uint16_t*)(src + stride*y))[x]= sample[1][x];
+ if (s->packed_at_lsb) {
+ for (x = 0; x < w; x++) {
+ ((uint16_t*)(src + stride*y))[x] = sample[1][x];
}
- }else{
- for(x=0; x<w; x++){
- ((uint16_t*)(src + stride*y))[x]= sample[1][x] << (16 - s->avctx->bits_per_raw_sample);
+ } else {
+ for (x = 0; x < w; x++) {
+ ((uint16_t*)(src + stride*y))[x] = sample[1][x] << (16 - s->avctx->bits_per_raw_sample);
}
}
}
-//STOP_TIMER("decode-line")}
+// STOP_TIMER("decode-line") }
}
}
-static void decode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int stride[3]){
+static void decode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int stride[3])
+{
int x, y, p;
int16_t *sample[4][2];
- int lbd= s->avctx->bits_per_raw_sample <= 8;
- int bits= s->avctx->bits_per_raw_sample > 0 ? s->avctx->bits_per_raw_sample : 8;
- int offset= 1 << bits;
- for(x=0; x<4; x++){
- sample[x][0] = s->sample_buffer + x*2 *(w+6) + 3;
- sample[x][1] = s->sample_buffer + (x*2+1)*(w+6) + 3;
+ int lbd = s->avctx->bits_per_raw_sample <= 8;
+ int bits = s->avctx->bits_per_raw_sample > 0 ? s->avctx->bits_per_raw_sample : 8;
+ int offset = 1 << bits;
+ for (x = 0; x < 4; x++) {
+ sample[x][0] = s->sample_buffer + x * 2 * (w + 6) + 3;
+ sample[x][1] = s->sample_buffer + (x * 2 + 1) * (w + 6) + 3;
}
- s->run_index=0;
+ s->run_index = 0;
memset(s->sample_buffer, 0, 8*(w+6)*sizeof(*s->sample_buffer));
- for(y=0; y<h; y++){
- for(p=0; p<3 + s->transparency; p++){
- int16_t *temp = sample[p][0]; //FIXME try a normal buffer
+ for (y = 0; y < h; y++) {
+ for (p = 0; p < 3 + s->transparency; p++) {
+ int16_t *temp = sample[p][0]; // FIXME: try a normal buffer
- sample[p][0]= sample[p][1];
- sample[p][1]= temp;
+ sample[p][0] = sample[p][1];
+ sample[p][1] = temp;
sample[p][1][-1]= sample[p][0][0 ];
sample[p][0][ w]= sample[p][0][w-1];
@@ -1577,21 +1649,21 @@ static void decode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int
else
decode_line(s, w, sample[p], (p+1)/2, bits+1);
}
- for(x=0; x<w; x++){
- int g= sample[0][1][x];
- int b= sample[1][1][x];
- int r= sample[2][1][x];
- int a= sample[3][1][x];
+ for (x = 0; x < w; x++) {
+ int g = sample[0][1][x];
+ int b = sample[1][1][x];
+ int r = sample[2][1][x];
+ int a = sample[3][1][x];
b -= offset;
r -= offset;
- g -= (b + r)>>2;
+ g -= (b + r) >> 2;
b += g;
r += g;
- if(lbd)
- *((uint32_t*)(src[0] + x*4 + stride[0]*y))= b + (g<<8) + (r<<16) + (a<<24);
- else{
+ if (lbd)
+ *((uint32_t*)(src[0] + x*4 + stride[0]*y)) = b + (g<<8) + (r<<16) + (a<<24);
+ else {
*((uint16_t*)(src[0] + x*2 + stride[0]*y)) = b;
*((uint16_t*)(src[1] + x*2 + stride[1]*y)) = g;
*((uint16_t*)(src[2] + x*2 + stride[2]*y)) = r;
@@ -1600,7 +1672,8 @@ static void decode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, int
}
}
-static int decode_slice_header(FFV1Context *f, FFV1Context *fs){
+static int decode_slice_header(FFV1Context *f, FFV1Context *fs)
+{
RangeCoder *c = &fs->c;
uint8_t state[CONTEXT_SIZE];
unsigned ps, i, context_count;
@@ -1608,47 +1681,47 @@ static int decode_slice_header(FFV1Context *f, FFV1Context *fs){
av_assert0(f->version > 2);
- fs->slice_x = get_symbol(c, state, 0) *f->width ;
- fs->slice_y = get_symbol(c, state, 0) *f->height;
- fs->slice_width =(get_symbol(c, state, 0)+1)*f->width + fs->slice_x;
- fs->slice_height=(get_symbol(c, state, 0)+1)*f->height + fs->slice_y;
+ fs->slice_x = get_symbol(c, state, 0) * f->width ;
+ fs->slice_y = get_symbol(c, state, 0) * f->height;
+ fs->slice_width = (get_symbol(c, state, 0) + 1) * f->width + fs->slice_x;
+ fs->slice_height = (get_symbol(c, state, 0) + 1) * f->height + fs->slice_y;
fs->slice_x /= f->num_h_slices;
fs->slice_y /= f->num_v_slices;
fs->slice_width = fs->slice_width /f->num_h_slices - fs->slice_x;
fs->slice_height = fs->slice_height/f->num_v_slices - fs->slice_y;
- if((unsigned)fs->slice_width > f->width || (unsigned)fs->slice_height > f->height)
+ if ((unsigned)fs->slice_width > f->width || (unsigned)fs->slice_height > f->height)
return -1;
- if( (unsigned)fs->slice_x + (uint64_t)fs->slice_width > f->width
- || (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height)
+ if ( (unsigned)fs->slice_x + (uint64_t)fs->slice_width > f->width
+ || (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height)
return -1;
- for(i=0; i<f->plane_count; i++){
- PlaneContext * const p= &fs->plane[i];
- int idx=get_symbol(c, state, 0);
- if(idx > (unsigned)f->quant_table_count){
+ for (i = 0; i < f->plane_count; i++) {
+ PlaneContext * const p = &fs->plane[i];
+ int idx = get_symbol(c, state, 0);
+ if (idx > (unsigned)f->quant_table_count) {
av_log(f->avctx, AV_LOG_ERROR, "quant_table_index out of range\n");
return -1;
}
- p->quant_table_index= idx;
+ p->quant_table_index = idx;
memcpy(p->quant_table, f->quant_tables[idx], sizeof(p->quant_table));
- context_count= f->context_count[idx];
+ context_count = f->context_count[idx];
- if(p->context_count < context_count){
+ if (p->context_count < context_count) {
av_freep(&p->state);
av_freep(&p->vlc_state);
}
- p->context_count= context_count;
+ p->context_count = context_count;
}
ps = get_symbol(c, state, 0);
- if(ps==1){
+ if (ps == 1) {
f->picture.interlaced_frame = 1;
f->picture.top_field_first = 1;
- } else if(ps==2){
+ } else if (ps == 2) {
f->picture.interlaced_frame = 1;
f->picture.top_field_first = 0;
- } else if(ps==3){
+ } else if (ps == 3) {
f->picture.interlaced_frame = 0;
}
f->picture.sample_aspect_ratio.num = get_symbol(c, state, 0);
@@ -1657,37 +1730,38 @@ static int decode_slice_header(FFV1Context *f, FFV1Context *fs){
return 0;
}
-static int decode_slice(AVCodecContext *c, void *arg){
- FFV1Context *fs= *(void**)arg;
- FFV1Context *f= fs->avctx->priv_data;
+static int decode_slice(AVCodecContext *c, void *arg)
+{
+ FFV1Context *fs = *(void **)arg;
+ FFV1Context *f = fs->avctx->priv_data;
int width, height, x, y;
- const int ps= (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
+ const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
?
- (c->bits_per_raw_sample>8)+1
+ (c->bits_per_raw_sample>8)+1
:
4;
- AVFrame * const p= &f->picture;
+ AVFrame * const p = &f->picture;
- if(f->version > 2){
- if(init_slice_state(f, fs) < 0)
+ if (f->version > 2) {
+ if (init_slice_state(f, fs) < 0)
return AVERROR(ENOMEM);
- if(decode_slice_header(f, fs) < 0) {
+ if (decode_slice_header(f, fs) < 0) {
fs->slice_damaged = 1;
return AVERROR_INVALIDDATA;
}
}
- if(init_slice_state(f, fs) < 0)
+ if (init_slice_state(f, fs) < 0)
return AVERROR(ENOMEM);
- if(f->picture.key_frame)
+ if (f->picture.key_frame)
clear_slice_state(f, fs);
width = fs->slice_width;
height= fs->slice_height;
x= fs->slice_x;
y= fs->slice_y;
- if(!fs->ac){
+ if (!fs->ac) {
if (f->version == 3 && f->minor_version > 1 || f->version > 3)
- get_rac(&fs->c, (uint8_t[]){129});
+ get_rac(&fs->c, (uint8_t[]) {129});
fs->ac_byte_count = f->version > 2 || (!x&&!y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0;
init_get_bits(&fs->gb,
fs->c.bytestream_start + fs->ac_byte_count,
@@ -1695,30 +1769,30 @@ static int decode_slice(AVCodecContext *c, void *arg){
}
av_assert1(width && height);
- if(f->colorspace==0){
- const int chroma_width = -((-width )>>f->chroma_h_shift);
- const int chroma_height= -((-height)>>f->chroma_v_shift);
- const int cx= x>>f->chroma_h_shift;
- const int cy= y>>f->chroma_v_shift;
+ if (f->colorspace == 0) {
+ const int chroma_width = -((-width) >> f->chroma_h_shift);
+ const int chroma_height = -((-height) >> f->chroma_v_shift);
+ const int cx = x >> f->chroma_h_shift;
+ const int cy = y >> f->chroma_v_shift;
decode_plane(fs, p->data[0] + ps*x + y*p->linesize[0], width, height, p->linesize[0], 0);
- if (f->chroma_planes){
+ if (f->chroma_planes) {
decode_plane(fs, p->data[1] + ps*cx+cy*p->linesize[1], chroma_width, chroma_height, p->linesize[1], 1);
decode_plane(fs, p->data[2] + ps*cx+cy*p->linesize[2], chroma_width, chroma_height, p->linesize[2], 1);
}
if (fs->transparency)
decode_plane(fs, p->data[3] + ps*x + y*p->linesize[3], width, height, p->linesize[3], 2);
- }else{
+ } else {
uint8_t *planes[3] = {p->data[0] + ps*x + y*p->linesize[0],
p->data[1] + ps*x + y*p->linesize[1],
p->data[2] + ps*x + y*p->linesize[2]};
decode_rgb_frame(fs, planes, width, height, p->linesize);
}
- if(fs->ac && f->version > 2) {
+ if (fs->ac && f->version > 2) {
int v;
- get_rac(&fs->c, (uint8_t[]){129});
+ get_rac(&fs->c, (uint8_t[]) {129});
v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec;
- if(v) {
+ if (v) {
av_log(f->avctx, AV_LOG_ERROR, "bytestream end mismatching by %d\n", v);
fs->slice_damaged = 1;
}
@@ -1729,47 +1803,51 @@ static int decode_slice(AVCodecContext *c, void *arg){
return 0;
}
-static int read_quant_table(RangeCoder *c, int16_t *quant_table, int scale){
+static int read_quant_table(RangeCoder *c, int16_t *quant_table, int scale)
+{
int v;
- int i=0;
+ int i = 0;
uint8_t state[CONTEXT_SIZE];
memset(state, 128, sizeof(state));
- for(v=0; i<128 ; v++){
- unsigned len= get_symbol(c, state, 0) + 1;
+ for (v = 0; i < 128; v++) {
+ unsigned len = get_symbol(c, state, 0) + 1;
- if(len > 128 - i) return -1;
+ if (len > 128 - i)
+ return -1;
- while(len--){
- quant_table[i] = scale*v;
+ while (len--) {
+ quant_table[i] = scale * v;
i++;
}
}
- for(i=1; i<128; i++){
- quant_table[256-i]= -quant_table[i];
- }
- quant_table[128]= -quant_table[127];
+ for (i = 1; i < 128; i++)
+ quant_table[256 - i] = -quant_table[i];
+ quant_table[128] = -quant_table[127];
- return 2*v - 1;
+ return 2 * v - 1;
}
-static int read_quant_tables(RangeCoder *c, int16_t quant_table[MAX_CONTEXT_INPUTS][256]){
+static int read_quant_tables(RangeCoder *c,
+ int16_t quant_table[MAX_CONTEXT_INPUTS][256])
+{
int i;
- int context_count=1;
+ int context_count = 1;
- for(i=0; i<5; i++){
- context_count*= read_quant_table(c, quant_table[i], context_count);
- if(context_count > 32768U){
+ for (i = 0; i < 5; i++) {
+ context_count *= read_quant_table(c, quant_table[i], context_count);
+ if (context_count > 32768U) {
return -1;
}
}
- return (context_count+1)/2;
+ return (context_count + 1) / 2;
}
-static int read_extra_header(FFV1Context *f){
- RangeCoder * const c= &f->c;
+static int read_extra_header(FFV1Context *f)
+{
+ RangeCoder *const c = &f->c;
uint8_t state[CONTEXT_SIZE];
int i, j, k;
uint8_t state2[32][CONTEXT_SIZE];
@@ -1778,65 +1856,67 @@ static int read_extra_header(FFV1Context *f){
memset(state, 128, sizeof(state));
ff_init_range_decoder(c, f->avctx->extradata, f->avctx->extradata_size);
- ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
+ ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8);
- f->version= get_symbol(c, state, 0);
- if(f->version > 2) {
+ f->version = get_symbol(c, state, 0);
+ if (f->version > 2) {
c->bytestream_end -= 4;
- f->minor_version= get_symbol(c, state, 0);
- }
- f->ac= f->avctx->coder_type= get_symbol(c, state, 0);
- if(f->ac>1){
- for(i=1; i<256; i++){
- f->state_transition[i]= get_symbol(c, state, 1) + c->one_state[i];
- }
- }
- f->colorspace= get_symbol(c, state, 0); //YUV cs type
- f->avctx->bits_per_raw_sample= get_symbol(c, state, 0);
- f->chroma_planes= get_rac(c, state);
- f->chroma_h_shift= get_symbol(c, state, 0);
- f->chroma_v_shift= get_symbol(c, state, 0);
- f->transparency= get_rac(c, state);
- f->plane_count= 2 + f->transparency;
- f->num_h_slices= 1 + get_symbol(c, state, 0);
- f->num_v_slices= 1 + get_symbol(c, state, 0);
- if(f->num_h_slices > (unsigned)f->width || f->num_v_slices > (unsigned)f->height){
+ f->minor_version = get_symbol(c, state, 0);
+ }
+ f->ac = f->avctx->coder_type = get_symbol(c, state, 0);
+ if (f->ac > 1)
+ for (i = 1; i < 256; i++)
+ f->state_transition[i] = get_symbol(c, state, 1) + c->one_state[i];
+
+ f->colorspace = get_symbol(c, state, 0); // YUV cs type
+ f->avctx->bits_per_raw_sample = get_symbol(c, state, 0);
+ f->chroma_planes = get_rac(c, state);
+ f->chroma_h_shift = get_symbol(c, state, 0);
+ f->chroma_v_shift = get_symbol(c, state, 0);
+ f->transparency = get_rac(c, state);
+ f->plane_count = 2 + f->transparency;
+ f->num_h_slices = 1 + get_symbol(c, state, 0);
+ f->num_v_slices = 1 + get_symbol(c, state, 0);
+
+ if (f->num_h_slices > (unsigned)f->width ||
+ f->num_v_slices > (unsigned)f->height) {
av_log(f->avctx, AV_LOG_ERROR, "too many slices\n");
return -1;
}
- f->quant_table_count= get_symbol(c, state, 0);
- if(f->quant_table_count > (unsigned)MAX_QUANT_TABLES)
+ f->quant_table_count = get_symbol(c, state, 0);
+
+ if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES)
return -1;
- for(i=0; i<f->quant_table_count; i++){
- if((f->context_count[i]= read_quant_tables(c, f->quant_tables[i])) < 0){
+
+ for (i = 0; i < f->quant_table_count; i++) {
+ f->context_count[i] = read_quant_tables(c, f->quant_tables[i]);
+ if (f->context_count[i] < 0) {
av_log(f->avctx, AV_LOG_ERROR, "read_quant_table error\n");
return -1;
}
}
- if(allocate_initial_states(f) < 0)
+ if (allocate_initial_states(f) < 0)
return AVERROR(ENOMEM);
- for(i=0; i<f->quant_table_count; i++){
- if(get_rac(c, state)){
- for(j=0; j<f->context_count[i]; j++){
- for(k=0; k<CONTEXT_SIZE; k++){
- int pred= j ? f->initial_states[i][j-1][k] : 128;
- f->initial_states[i][j][k]= (pred+get_symbol(c, state2[k], 1))&0xFF;
+ for (i = 0; i < f->quant_table_count; i++)
+ if (get_rac(c, state))
+ for (j = 0; j < f->context_count[i]; j++)
+ for (k = 0; k < CONTEXT_SIZE; k++) {
+ int pred = j ? f->initial_states[i][j - 1][k] : 128;
+ f->initial_states[i][j][k] =
+ (pred + get_symbol(c, state2[k], 1)) & 0xFF;
}
- }
- }
- }
- if(f->version > 2){
+ if (f->version > 2) {
f->ec = get_symbol(c, state, 0);
}
- if(f->version > 2){
+ if (f->version > 2) {
unsigned v;
v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, f->avctx->extradata, f->avctx->extradata_size);
- if(v){
+ if (v) {
av_log(f->avctx, AV_LOG_ERROR, "CRC mismatch %X!\n", v);
return AVERROR_INVALIDDATA;
}
@@ -1845,186 +1925,190 @@ static int read_extra_header(FFV1Context *f){
return 0;
}
-static int read_header(FFV1Context *f){
+static int read_header(FFV1Context *f)
+{
uint8_t state[CONTEXT_SIZE];
int i, j, context_count = -1; //-1 to avoid warning
- RangeCoder * const c= &f->slice_context[0]->c;
+ RangeCoder *const c = &f->slice_context[0]->c;
memset(state, 128, sizeof(state));
- if(f->version < 2){
+ if (f->version < 2) {
unsigned v= get_symbol(c, state, 0);
- if(v >= 2){
+ if (v >= 2) {
av_log(f->avctx, AV_LOG_ERROR, "invalid version %d in ver01 header\n", v);
return AVERROR_INVALIDDATA;
}
f->version = v;
- f->ac= f->avctx->coder_type= get_symbol(c, state, 0);
- if(f->ac>1){
- for(i=1; i<256; i++){
- f->state_transition[i]= get_symbol(c, state, 1) + c->one_state[i];
- }
- }
- f->colorspace= get_symbol(c, state, 0); //YUV cs type
- if(f->version>0)
- f->avctx->bits_per_raw_sample= get_symbol(c, state, 0);
- f->chroma_planes= get_rac(c, state);
- f->chroma_h_shift= get_symbol(c, state, 0);
- f->chroma_v_shift= get_symbol(c, state, 0);
- f->transparency= get_rac(c, state);
- f->plane_count= 2 + f->transparency;
- }
-
- if(f->colorspace==0){
- if(!f->transparency && !f->chroma_planes){
- if (f->avctx->bits_per_raw_sample<=8)
- f->avctx->pix_fmt= AV_PIX_FMT_GRAY8;
+ f->ac = f->avctx->coder_type = get_symbol(c, state, 0);
+ if (f->ac > 1)
+ for (i = 1; i < 256; i++)
+ f->state_transition[i] = get_symbol(c, state, 1) + c->one_state[i];
+ f->colorspace = get_symbol(c, state, 0); // YUV cs type
+ if (f->version > 0)
+ f->avctx->bits_per_raw_sample = get_symbol(c, state, 0);
+ f->chroma_planes = get_rac(c, state);
+ f->chroma_h_shift = get_symbol(c, state, 0);
+ f->chroma_v_shift = get_symbol(c, state, 0);
+ f->transparency = get_rac(c, state);
+ f->plane_count = 2 + f->transparency;
+ }
+
+ if (f->colorspace == 0) {
+ if (!f->transparency && !f->chroma_planes) {
+ if (f->avctx->bits_per_raw_sample <= 8)
+ f->avctx->pix_fmt = AV_PIX_FMT_GRAY8;
else
- f->avctx->pix_fmt= AV_PIX_FMT_GRAY16;
- }else if(f->avctx->bits_per_raw_sample<=8 && !f->transparency){
- switch(16*f->chroma_h_shift + f->chroma_v_shift){
- case 0x00: f->avctx->pix_fmt= AV_PIX_FMT_YUV444P; break;
- case 0x01: f->avctx->pix_fmt= AV_PIX_FMT_YUV440P; break;
- case 0x10: f->avctx->pix_fmt= AV_PIX_FMT_YUV422P; break;
- case 0x11: f->avctx->pix_fmt= AV_PIX_FMT_YUV420P; break;
- case 0x20: f->avctx->pix_fmt= AV_PIX_FMT_YUV411P; break;
- case 0x22: f->avctx->pix_fmt= AV_PIX_FMT_YUV410P; break;
+ f->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
+ } else if (f->avctx->bits_per_raw_sample<=8 && !f->transparency) {
+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P; break;
+ case 0x01: f->avctx->pix_fmt = AV_PIX_FMT_YUV440P; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P; break;
+ case 0x20: f->avctx->pix_fmt = AV_PIX_FMT_YUV411P; break;
+ case 0x22: f->avctx->pix_fmt = AV_PIX_FMT_YUV410P; break;
default:
av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
return -1;
}
- }else if(f->avctx->bits_per_raw_sample<=8 && f->transparency){
- switch(16*f->chroma_h_shift + f->chroma_v_shift){
- case 0x00: f->avctx->pix_fmt= AV_PIX_FMT_YUVA444P; break;
- case 0x10: f->avctx->pix_fmt= AV_PIX_FMT_YUVA422P; break;
- case 0x11: f->avctx->pix_fmt= AV_PIX_FMT_YUVA420P; break;
+ } else if (f->avctx->bits_per_raw_sample <= 8 && f->transparency) {
+ switch(16*f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUVA444P; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUVA422P; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUVA420P; break;
default:
av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
return -1;
}
- }else if(f->avctx->bits_per_raw_sample==9) {
- f->packed_at_lsb=1;
- switch(16*f->chroma_h_shift + f->chroma_v_shift){
- case 0x00: f->avctx->pix_fmt= AV_PIX_FMT_YUV444P9; break;
- case 0x10: f->avctx->pix_fmt= AV_PIX_FMT_YUV422P9; break;
- case 0x11: f->avctx->pix_fmt= AV_PIX_FMT_YUV420P9; break;
+ } else if (f->avctx->bits_per_raw_sample == 9) {
+ f->packed_at_lsb = 1;
+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P9; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P9; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P9; break;
default:
av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
return -1;
}
- }else if(f->avctx->bits_per_raw_sample==10) {
- f->packed_at_lsb=1;
- switch(16*f->chroma_h_shift + f->chroma_v_shift){
- case 0x00: f->avctx->pix_fmt= AV_PIX_FMT_YUV444P10; break;
- case 0x10: f->avctx->pix_fmt= AV_PIX_FMT_YUV422P10; break;
- case 0x11: f->avctx->pix_fmt= AV_PIX_FMT_YUV420P10; break;
+ } else if (f->avctx->bits_per_raw_sample == 10) {
+ f->packed_at_lsb = 1;
+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P10; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P10; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P10; break;
default:
av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
return -1;
}
- }else {
- switch(16*f->chroma_h_shift + f->chroma_v_shift){
- case 0x00: f->avctx->pix_fmt= AV_PIX_FMT_YUV444P16; break;
- case 0x10: f->avctx->pix_fmt= AV_PIX_FMT_YUV422P16; break;
- case 0x11: f->avctx->pix_fmt= AV_PIX_FMT_YUV420P16; break;
+ } else {
+ switch(16 * f->chroma_h_shift + f->chroma_v_shift) {
+ case 0x00: f->avctx->pix_fmt = AV_PIX_FMT_YUV444P16; break;
+ case 0x10: f->avctx->pix_fmt = AV_PIX_FMT_YUV422P16; break;
+ case 0x11: f->avctx->pix_fmt = AV_PIX_FMT_YUV420P16; break;
default:
av_log(f->avctx, AV_LOG_ERROR, "format not supported\n");
return -1;
}
}
- }else if(f->colorspace==1){
- if(f->chroma_h_shift || f->chroma_v_shift){
- av_log(f->avctx, AV_LOG_ERROR, "chroma subsampling not supported in this colorspace\n");
+ } else if (f->colorspace == 1) {
+ if (f->chroma_h_shift || f->chroma_v_shift) {
+ av_log(f->avctx, AV_LOG_ERROR,
+ "chroma subsampling not supported in this colorspace\n");
return -1;
}
- if(f->avctx->bits_per_raw_sample==9)
- f->avctx->pix_fmt= AV_PIX_FMT_GBRP9;
- else if(f->avctx->bits_per_raw_sample==10)
- f->avctx->pix_fmt= AV_PIX_FMT_GBRP10;
- else if(f->avctx->bits_per_raw_sample==12)
- f->avctx->pix_fmt= AV_PIX_FMT_GBRP12;
- else if(f->avctx->bits_per_raw_sample==14)
- f->avctx->pix_fmt= AV_PIX_FMT_GBRP14;
+ if ( f->avctx->bits_per_raw_sample == 9)
+ f->avctx->pix_fmt = AV_PIX_FMT_GBRP9;
+ else if (f->avctx->bits_per_raw_sample == 10)
+ f->avctx->pix_fmt = AV_PIX_FMT_GBRP10;
+ else if (f->avctx->bits_per_raw_sample == 12)
+ f->avctx->pix_fmt = AV_PIX_FMT_GBRP12;
+ else if (f->avctx->bits_per_raw_sample == 14)
+ f->avctx->pix_fmt = AV_PIX_FMT_GBRP14;
else
- if(f->transparency) f->avctx->pix_fmt= AV_PIX_FMT_RGB32;
- else f->avctx->pix_fmt= AV_PIX_FMT_0RGB32;
- }else{
+ if (f->transparency) f->avctx->pix_fmt = AV_PIX_FMT_RGB32;
+ else f->avctx->pix_fmt = AV_PIX_FMT_0RGB32;
+ } else {
av_log(f->avctx, AV_LOG_ERROR, "colorspace not supported\n");
return -1;
}
av_dlog(f->avctx, "%d %d %d\n",
f->chroma_h_shift, f->chroma_v_shift, f->avctx->pix_fmt);
- if(f->version < 2){
- context_count= read_quant_tables(c, f->quant_table);
- if(context_count < 0){
- av_log(f->avctx, AV_LOG_ERROR, "read_quant_table error\n");
- return -1;
+
+ if (f->version < 2) {
+ context_count = read_quant_tables(c, f->quant_table);
+ if (context_count < 0) {
+ av_log(f->avctx, AV_LOG_ERROR, "read_quant_table error\n");
+ return -1;
}
- }else if(f->version < 3){
- f->slice_count= get_symbol(c, state, 0);
- }else{
- const uint8_t *p= c->bytestream_end;
- for(f->slice_count = 0; f->slice_count < MAX_SLICES && 3 < p - c->bytestream_start; f->slice_count++){
+ } else if (f->version < 3) {
+ f->slice_count = get_symbol(c, state, 0);
+ } else {
+ const uint8_t *p = c->bytestream_end;
+ for (f->slice_count = 0; f->slice_count < MAX_SLICES && 3 < p - c->bytestream_start; f->slice_count++) {
int trailer = 3 + 5*!!f->ec;
int size = AV_RB24(p-trailer);
- if(size + trailer > p - c->bytestream_start)
+ if (size + trailer > p - c->bytestream_start)
break;
p -= size + trailer;
}
}
- if(f->slice_count > (unsigned)MAX_SLICES || f->slice_count <= 0){
+ if (f->slice_count > (unsigned)MAX_SLICES || f->slice_count <= 0) {
av_log(f->avctx, AV_LOG_ERROR, "slice count %d is invalid\n", f->slice_count);
return -1;
}
- for(j=0; j<f->slice_count; j++){
- FFV1Context *fs= f->slice_context[j];
- fs->ac= f->ac;
- fs->packed_at_lsb= f->packed_at_lsb;
+ for (j = 0; j < f->slice_count; j++) {
+ FFV1Context *fs = f->slice_context[j];
+ fs->ac = f->ac;
+ fs->packed_at_lsb = f->packed_at_lsb;
fs->slice_damaged = 0;
- if(f->version == 2){
- fs->slice_x = get_symbol(c, state, 0) *f->width ;
- fs->slice_y = get_symbol(c, state, 0) *f->height;
- fs->slice_width =(get_symbol(c, state, 0)+1)*f->width + fs->slice_x;
- fs->slice_height=(get_symbol(c, state, 0)+1)*f->height + fs->slice_y;
-
- fs->slice_x /= f->num_h_slices;
- fs->slice_y /= f->num_v_slices;
- fs->slice_width = fs->slice_width /f->num_h_slices - fs->slice_x;
- fs->slice_height = fs->slice_height/f->num_v_slices - fs->slice_y;
- if((unsigned)fs->slice_width > f->width || (unsigned)fs->slice_height > f->height)
+ if (f->version == 2) {
+ fs->slice_x = get_symbol(c, state, 0) * f->width ;
+ fs->slice_y = get_symbol(c, state, 0) * f->height;
+ fs->slice_width = (get_symbol(c, state, 0) + 1) * f->width + fs->slice_x;
+ fs->slice_height = (get_symbol(c, state, 0) + 1) * f->height + fs->slice_y;
+
+ fs->slice_x /= f->num_h_slices;
+ fs->slice_y /= f->num_v_slices;
+ fs->slice_width = fs->slice_width / f->num_h_slices - fs->slice_x;
+ fs->slice_height = fs->slice_height / f->num_v_slices - fs->slice_y;
+ if ((unsigned)fs->slice_width > f->width ||
+ (unsigned)fs->slice_height > f->height)
return -1;
- if( (unsigned)fs->slice_x + (uint64_t)fs->slice_width > f->width
- || (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height)
+ if ((unsigned)fs->slice_x + (uint64_t)fs->slice_width > f->width ||
+ (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height)
return -1;
}
- for(i=0; i<f->plane_count; i++){
- PlaneContext * const p= &fs->plane[i];
+ for (i = 0; i < f->plane_count; i++) {
+ PlaneContext *const p = &fs->plane[i];
- if(f->version == 2){
- int idx=get_symbol(c, state, 0);
- if(idx > (unsigned)f->quant_table_count){
- av_log(f->avctx, AV_LOG_ERROR, "quant_table_index out of range\n");
+ if (f->version == 2) {
+ int idx = get_symbol(c, state, 0);
+ if (idx > (unsigned)f->quant_table_count) {
+ av_log(f->avctx, AV_LOG_ERROR,
+ "quant_table_index out of range\n");
return -1;
}
- p->quant_table_index= idx;
- memcpy(p->quant_table, f->quant_tables[idx], sizeof(p->quant_table));
- context_count= f->context_count[idx];
- }else{
+ p->quant_table_index = idx;
+ memcpy(p->quant_table, f->quant_tables[idx],
+ sizeof(p->quant_table));
+ context_count = f->context_count[idx];
+ } else {
memcpy(p->quant_table, f->quant_table, sizeof(p->quant_table));
}
- if(f->version <= 2){
- av_assert0(context_count>=0);
- if(p->context_count < context_count){
+ if (f->version <= 2) {
+ av_assert0(context_count >= 0);
+ if (p->context_count < context_count) {
av_freep(&p->state);
av_freep(&p->vlc_state);
}
- p->context_count= context_count;
+ p->context_count = context_count;
}
}
}
@@ -2037,23 +2121,24 @@ static av_cold int decode_init(AVCodecContext *avctx)
common_init(avctx);
- if(avctx->extradata && read_extra_header(f) < 0)
+ if (avctx->extradata && read_extra_header(f) < 0)
return -1;
- if(init_slice_contexts(f) < 0)
+ if (init_slice_contexts(f) < 0)
return -1;
return 0;
}
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt){
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- FFV1Context *f = avctx->priv_data;
- RangeCoder * const c= &f->slice_context[0]->c;
- AVFrame * const p= &f->picture;
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)
+{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ FFV1Context *f = avctx->priv_data;
+ RangeCoder *const c = &f->slice_context[0]->c;
+ AVFrame *const p = &f->picture;
int i;
- uint8_t keystate= 128;
+ uint8_t keystate = 128;
const uint8_t *buf_p;
AVFrame *picture = data;
@@ -2063,17 +2148,16 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
avctx->release_buffer(avctx, p);
ff_init_range_decoder(c, buf, buf_size);
- ff_build_rac_states(c, 0.05*(1LL<<32), 256-8);
-
+ ff_build_rac_states(c, 0.05 * (1LL << 32), 256 - 8);
- p->pict_type= AV_PICTURE_TYPE_I; //FIXME I vs. P
- if(get_rac(c, &keystate)){
- p->key_frame= 1;
+ p->pict_type = AV_PICTURE_TYPE_I; // FIXME: I vs. P
+ if (get_rac(c, &keystate)) {
+ p->key_frame = 1;
f->key_frame_ok = 0;
- if(read_header(f) < 0)
+ if (read_header(f) < 0)
return -1;
f->key_frame_ok = 1;
- }else{
+ } else {
if (!f->key_frame_ok) {
av_log(avctx, AV_LOG_ERROR, "Cant decode non keyframe without valid keyframe\n");
return AVERROR_INVALIDDATA;
@@ -2081,38 +2165,38 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
p->key_frame= 0;
}
- p->reference= 3; //for error concealment
- if(avctx->get_buffer(avctx, p) < 0){
+ p->reference = 3; //for error concealment
+ if (avctx->get_buffer(avctx, p) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- if(avctx->debug&FF_DEBUG_PICT_INFO)
+ if (avctx->debug&FF_DEBUG_PICT_INFO)
av_log(avctx, AV_LOG_DEBUG, "ver:%d keyframe:%d coder:%d ec:%d slices:%d bps:%d\n",
f->version, p->key_frame, f->ac, f->ec, f->slice_count, f->avctx->bits_per_raw_sample);
- buf_p= buf + buf_size;
- for(i=f->slice_count-1; i>=0; i--){
- FFV1Context *fs= f->slice_context[i];
+ buf_p = buf + buf_size;
+ for (i = f->slice_count - 1; i >= 0; i--) {
+ FFV1Context *fs = f->slice_context[i];
int trailer = 3 + 5*!!f->ec;
int v;
- if(i || f->version>2) v = AV_RB24(buf_p-trailer)+trailer;
- else v = buf_p - c->bytestream_start;
- if(buf_p - c->bytestream_start < v){
+ if (i || f->version>2) v = AV_RB24(buf_p-trailer)+trailer;
+ else v = buf_p - c->bytestream_start;
+ if (buf_p - c->bytestream_start < v) {
av_log(avctx, AV_LOG_ERROR, "Slice pointer chain broken\n");
return -1;
}
buf_p -= v;
- if(f->ec){
+ if (f->ec) {
unsigned crc = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, v);
- if(crc){
+ if (crc) {
int64_t ts = avpkt->pts != AV_NOPTS_VALUE ? avpkt->pts : avpkt->dts;
av_log(f->avctx, AV_LOG_ERROR, "CRC mismatch %X!", crc);
- if(ts != AV_NOPTS_VALUE && avctx->pkt_timebase.num) {
- av_log(f->avctx, AV_LOG_ERROR, "at %f seconds\n",ts*av_q2d(avctx->pkt_timebase));
- } else if(ts != AV_NOPTS_VALUE) {
+ if (ts != AV_NOPTS_VALUE && avctx->pkt_timebase.num) {
+ av_log(f->avctx, AV_LOG_ERROR, "at %f seconds\n", ts*av_q2d(avctx->pkt_timebase));
+ } else if (ts != AV_NOPTS_VALUE) {
av_log(f->avctx, AV_LOG_ERROR, "at %"PRId64"\n", ts);
} else {
av_log(f->avctx, AV_LOG_ERROR, "\n");
@@ -2121,20 +2205,20 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
}
- if(i){
+ if (i) {
ff_init_range_decoder(&fs->c, buf_p, v);
- }else
+ } else
fs->c.bytestream_end = (uint8_t *)(buf_p + v);
}
avctx->execute(avctx, decode_slice, &f->slice_context[0], NULL, f->slice_count, sizeof(void*));
- for(i=f->slice_count-1; i>=0; i--){
+ for (i=f->slice_count-1; i>=0; i--) {
FFV1Context *fs= f->slice_context[i];
int j;
- if(fs->slice_damaged && f->last_picture.data[0]){
+ if (fs->slice_damaged && f->last_picture.data[0]) {
uint8_t *dst[4], *src[4];
- for(j=0; j<4; j++){
+ for (j=0; j<4; j++) {
int sh = (j==1 || j==2) ? f->chroma_h_shift : 0;
int sv = (j==1 || j==2) ? f->chroma_v_shift : 0;
dst[j] = f->picture .data[j] + f->picture .linesize[j]*
@@ -2149,7 +2233,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
f->picture_number++;
- *picture= *p;
+ *picture = *p;
*data_size = sizeof(AVFrame);
FFSWAP(AVFrame, f->picture, f->last_picture);
@@ -2201,7 +2285,7 @@ AVCodec ff_ffv1_encoder = {
.close = common_end,
.capabilities = CODEC_CAP_SLICE_THREADS,
.defaults = ffv1_defaults,
- .pix_fmts = (const enum AVPixelFormat[]){
+ .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV411P,
AV_PIX_FMT_YUV410P, AV_PIX_FMT_0RGB32, AV_PIX_FMT_RGB32, AV_PIX_FMT_YUV420P16,
diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c
index 032bdae..207f121 100644
--- a/libavcodec/pcm-mpeg.c
+++ b/libavcodec/pcm-mpeg.c
@@ -110,12 +110,12 @@ static int pcm_bluray_parse_header(AVCodecContext *avctx,
return -1;
}
- avctx->bit_rate = avctx->channels * avctx->sample_rate *
+ avctx->bit_rate = FFALIGN(avctx->channels, 2) * avctx->sample_rate *
avctx->bits_per_coded_sample;
if (avctx->debug & FF_DEBUG_PICT_INFO)
av_dlog(avctx,
- "pcm_bluray_parse_header: %d channels, %d bits per sample, %d kHz, %d kbit\n",
+ "pcm_bluray_parse_header: %d channels, %d bits per sample, %d Hz, %d bit/s\n",
avctx->channels, avctx->bits_per_coded_sample,
avctx->sample_rate, avctx->bit_rate);
return 0;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d64de0e..a238e62 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1284,7 +1284,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
const short *samples)
{
AVPacket pkt;
- AVFrame frame0;
+ AVFrame frame0 = { 0 };
AVFrame *frame;
int ret, samples_size, got_packet;
diff --git a/libavformat/ffm.h b/libavformat/ffm.h
index 4940235..b392b8d 100644
--- a/libavformat/ffm.h
+++ b/libavformat/ffm.h
@@ -57,8 +57,4 @@ typedef struct FFMContext {
int64_t start_time;
} FFMContext;
-int64_t ffm_read_write_index(int fd);
-int ffm_write_write_index(int fd, int64_t pos);
-void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size);
-
#endif /* AVFORMAT_FFM_H */
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index f151f9c1..7cbcf2b 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -25,39 +25,6 @@
#include "internal.h"
#include "ffm.h"
#include "avio_internal.h"
-#if CONFIG_FFSERVER
-#include <unistd.h>
-
-int64_t ffm_read_write_index(int fd)
-{
- uint8_t buf[8];
-
- lseek(fd, 8, SEEK_SET);
- if (read(fd, buf, 8) != 8)
- return AVERROR(EIO);
- return AV_RB64(buf);
-}
-
-int ffm_write_write_index(int fd, int64_t pos)
-{
- uint8_t buf[8];
- int i;
-
- for(i=0;i<8;i++)
- buf[i] = (pos >> (56 - i * 8)) & 0xff;
- lseek(fd, 8, SEEK_SET);
- if (write(fd, buf, 8) != 8)
- return AVERROR(EIO);
- return 8;
-}
-
-void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size)
-{
- FFMContext *ffm = s->priv_data;
- ffm->write_index = pos;
- ffm->file_size = file_size;
-}
-#endif // CONFIG_FFSERVER
static int ffm_is_avail_data(AVFormatContext *s, int size)
{
diff --git a/libavformat/network.h b/libavformat/network.h
index 51d855d..a766d03 100644
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -22,6 +22,7 @@
#define AVFORMAT_NETWORK_H
#include <errno.h>
+#include <stdint.h>
#include "config.h"
#include "libavutil/error.h"
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index 2aa9596..765a1b8 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -7,4 +7,10 @@ FATE_LIBAVCODEC += fate-iirfilter
fate-iirfilter: libavcodec/iirfilter-test$(EXESUF)
fate-iirfilter: CMD = run libavcodec/iirfilter-test
+FATE_LIBAVCODEC += fate-rangecoder
+fate-rangecoder: libavcodec/rangecoder-test$(EXESUF)
+fate-rangecoder: CMD = run libavcodec/rangecoder-test
+fate-rangecoder: CMP = null
+fate-rangecoder: REF = /dev/null
+
fate-libavcodec: $(FATE_LIBAVCODEC)
generated by cgit at 2024-05-18 04:42:36 (GMT)