This obviates a dependency of the LJPEG encoder on mpegvideo.
---
Renamed everything to ljpeg, as suggested by Kostya.
configure | 2 +-
libavcodec/Makefile | 4 +-
libavcodec/{mjpegenc.c => ljpeg.c} | 161 ++------------------
libavcodec/ljpeg.h | 38 +++++
libavcodec/ljpegenc.c | 27 +++-
libavcodec/mjpegenc.c | 292 +------------------------------------
libavcodec/mjpegenc.h | 7 -
libavcodec/mpegvideo_enc.c | 8 +-
8 files changed, 83 insertions(+), 456 deletions(-)
copy libavcodec/{mjpegenc.c => ljpeg.c} (65%)
create mode 100644 libavcodec/ljpeg.h
diff --git a/configure b/configure
index baec975..7ea15aa 100755
--- a/configure
+++ b/configure
@@ -1790,7 +1790,7 @@ jpegls_decoder_select="golomb mjpeg_decoder"
jpegls_encoder_select="golomb"
jv_decoder_select="blockdsp"
lagarith_decoder_select="huffyuvdsp"
-ljpeg_encoder_select="aandcttables mpegvideoenc"
+ljpeg_encoder_select="aandcttables dsputil"
loco_decoder_select="golomb"
mdec_decoder_select="blockdsp dsputil mpegvideo"
metasound_decoder_select="lsp mdct sinewin"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1881b0b..bf15d9d 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -233,7 +233,7 @@ OBJS-$(CONFIG_JV_DECODER) += jvdec.o
OBJS-$(CONFIG_KGV1_DECODER) += kgv1dec.o
OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o
OBJS-$(CONFIG_LAGARITH_DECODER) += lagarith.o lagarithrac.o
-OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc.o mjpeg.o
+OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o ljpeg.o mjpeg.o
OBJS-$(CONFIG_LOCO_DECODER) += loco.o
OBJS-$(CONFIG_MACE3_DECODER) += mace.o
OBJS-$(CONFIG_MACE6_DECODER) += mace.o
@@ -242,7 +242,7 @@ OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o
metasound_data.o \
twinvq.o
OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o
OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o
+OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o ljpeg.o
OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o
OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
diff --git a/libavcodec/mjpegenc.c b/libavcodec/ljpeg.c
similarity index 65%
copy from libavcodec/mjpegenc.c
copy to libavcodec/ljpeg.c
index 30433c3..f2a9b5d 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/ljpeg.c
@@ -1,12 +1,5 @@
/*
- * MJPEG encoder
- * Copyright (c) 2000, 2001 Fabrice Bellard
- * Copyright (c) 2003 Alex Beregszaszi
- * Copyright (c) 2003-2004 Michael Niedermayer
- *
- * Support for external huffman table, various fixes (AVID workaround),
- * aspecting, new decode_frame mechanism and apple mjpeg-b support
- * by Alex Beregszaszi
+ * lossless JPEG shared bits
*
* This file is part of Libav.
*
@@ -25,57 +18,18 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/**
- * @file
- * MJPEG encoder.
- */
-
-#include <assert.h>
+#include <stdint.h>
+#include <string.h>
+#include "libavutil/common.h"
#include "libavutil/pixdesc.h"
+#include "libavutil/pixfmt.h"
#include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
+#include "put_bits.h"
+#include "ljpeg.h"
#include "mjpeg.h"
-#include "mjpegenc.h"
-
-av_cold int ff_mjpeg_encode_init(MpegEncContext *s)
-{
- MJpegContext *m;
-
- m = av_malloc(sizeof(MJpegContext));
- if (!m)
- return -1;
-
- s->min_qcoeff=-1023;
- s->max_qcoeff= 1023;
-
- /* build all the huffman tables */
- ff_mjpeg_build_huffman_codes(m->huff_size_dc_luminance,
- m->huff_code_dc_luminance,
- avpriv_mjpeg_bits_dc_luminance,
- avpriv_mjpeg_val_dc);
- ff_mjpeg_build_huffman_codes(m->huff_size_dc_chrominance,
- m->huff_code_dc_chrominance,
- avpriv_mjpeg_bits_dc_chrominance,
- avpriv_mjpeg_val_dc);
- ff_mjpeg_build_huffman_codes(m->huff_size_ac_luminance,
- m->huff_code_ac_luminance,
- avpriv_mjpeg_bits_ac_luminance,
- avpriv_mjpeg_val_ac_luminance);
- ff_mjpeg_build_huffman_codes(m->huff_size_ac_chrominance,
- m->huff_code_ac_chrominance,
- avpriv_mjpeg_bits_ac_chrominance,
- avpriv_mjpeg_val_ac_chrominance);
-
- s->mjpeg_ctx = m;
- return 0;
-}
-
-void ff_mjpeg_encode_close(MpegEncContext *s)
-{
- av_free(s->mjpeg_ctx);
-}
/* table_class: 0 = DC coef, 1 = AC coefs */
static int put_huffman_table(PutBitContext *p, int table_class, int table_id,
@@ -174,7 +128,7 @@ static void jpeg_put_comments(AVCodecContext *avctx,
PutBitContext *p)
}
}
-void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
+void ff_ljpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
ScanTable *intra_scantable,
uint16_t intra_matrix[64])
{
@@ -321,16 +275,16 @@ static void escape_FF(PutBitContext *pb, int start)
}
}
-void ff_mjpeg_encode_stuffing(PutBitContext * pbc)
+void ff_ljpeg_encode_stuffing(PutBitContext * pbc)
{
int length;
length= (-put_bits_count(pbc))&7;
if(length) put_bits(pbc, length, (1<<length)-1);
}
-void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits)
+void ff_ljpeg_encode_picture_trailer(PutBitContext *pb, int header_bits)
{
- ff_mjpeg_encode_stuffing(pb);
+ ff_ljpeg_encode_stuffing(pb);
flush_put_bits(pb);
assert((header_bits & 7) == 0);
@@ -340,7 +294,7 @@ void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int
header_bits)
put_marker(pb, EOI);
}
-void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
+void ff_ljpeg_encode_dc(PutBitContext *pb, int val,
uint8_t *huff_size, uint16_t *huff_code)
{
int mant, nbits;
@@ -361,92 +315,3 @@ void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
put_sbits(pb, nbits, mant);
}
}
-
-static void encode_block(MpegEncContext *s, int16_t *block, int n)
-{
- int mant, nbits, code, i, j;
- int component, dc, run, last_index, val;
- MJpegContext *m = s->mjpeg_ctx;
- uint8_t *huff_size_ac;
- uint16_t *huff_code_ac;
-
- /* DC coef */
- component = (n <= 3 ? 0 : (n&1) + 1);
- dc = block[0]; /* overflow is impossible */
- val = dc - s->last_dc[component];
- if (n < 4) {
- ff_mjpeg_encode_dc(&s->pb, val, m->huff_size_dc_luminance,
m->huff_code_dc_luminance);
- huff_size_ac = m->huff_size_ac_luminance;
- huff_code_ac = m->huff_code_ac_luminance;
- } else {
- ff_mjpeg_encode_dc(&s->pb, val, m->huff_size_dc_chrominance,
m->huff_code_dc_chrominance);
- huff_size_ac = m->huff_size_ac_chrominance;
- huff_code_ac = m->huff_code_ac_chrominance;
- }
- s->last_dc[component] = dc;
-
- /* AC coefs */
-
- run = 0;
- last_index = s->block_last_index[n];
- for(i=1;i<=last_index;i++) {
- j = s->intra_scantable.permutated[i];
- val = block[j];
- if (val == 0) {
- run++;
- } else {
- while (run >= 16) {
- put_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]);
- run -= 16;
- }
- mant = val;
- if (val < 0) {
- val = -val;
- mant--;
- }
-
- nbits= av_log2(val) + 1;
- code = (run << 4) | nbits;
-
- put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]);
-
- put_sbits(&s->pb, nbits, mant);
- run = 0;
- }
- }
-
- /* output EOB only if not already 64 values */
- if (last_index < 63 || run != 0)
- put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]);
-}
-
-void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[6][64])
-{
- int i;
- for(i=0;i<5;i++) {
- encode_block(s, block[i], i);
- }
- if (s->chroma_format == CHROMA_420) {
- encode_block(s, block[5], 5);
- } else {
- encode_block(s, block[6], 6);
- encode_block(s, block[5], 5);
- encode_block(s, block[7], 7);
- }
-
- s->i_tex_bits += get_bits_diff(s);
-}
-
-AVCodec ff_mjpeg_encoder = {
- .name = "mjpeg",
- .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_MJPEG,
- .priv_data_size = sizeof(MpegEncContext),
- .init = ff_MPV_encode_init,
- .encode2 = ff_MPV_encode_picture,
- .close = ff_MPV_encode_end,
- .pix_fmts = (const enum AVPixelFormat[]){
- AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_NONE
- },
-};
diff --git a/libavcodec/ljpeg.h b/libavcodec/ljpeg.h
new file mode 100644
index 0000000..988241c
--- /dev/null
+++ b/libavcodec/ljpeg.h
@@ -0,0 +1,38 @@
+/*
+ * lossless JPEG shared bits
+ *
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_LJPEG_H
+#define AVCODEC_LJPEG_H
+
+#include <stdint.h>
+
+#include "avcodec.h"
+#include "dsputil.h"
+#include "put_bits.h"
+
+void ff_ljpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
+ ScanTable *intra_scantable,
+ uint16_t intra_matrix[64]);
+void ff_ljpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
+void ff_ljpeg_encode_stuffing(PutBitContext *pbc);
+void ff_ljpeg_encode_dc(PutBitContext *pb, int val,
+ uint8_t *huff_size, uint16_t *huff_code);
+
+#endif /* AVCODEC_LJPEG_H */
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c
index e111c8c..5120223 100644
--- a/libavcodec/ljpegenc.c
+++ b/libavcodec/ljpegenc.c
@@ -37,6 +37,7 @@
#include "avcodec.h"
#include "dsputil.h"
#include "internal.h"
+#include "ljpeg.h"
#include "mpegvideo.h"
#include "mjpeg.h"
#include "mjpegenc.h"
@@ -102,9 +103,11 @@ static int ljpeg_encode_bgr(AVCodecContext *avctx,
PutBitContext *pb,
diff = ((left[i] - pred + 0x100) & 0x1FF) - 0x100;
if (i == 0)
- ff_mjpeg_encode_dc(pb, diff, s->huff_size_dc_luminance,
s->huff_code_dc_luminance); //FIXME ugly
+ ff_ljpeg_encode_dc(pb, diff, s->huff_size_dc_luminance,
+ s->huff_code_dc_luminance);
else
- ff_mjpeg_encode_dc(pb, diff, s->huff_size_dc_chrominance,
s->huff_code_dc_chrominance);
+ ff_ljpeg_encode_dc(pb, diff, s->huff_size_dc_chrominance,
+ s->huff_code_dc_chrominance);
}
}
}
@@ -146,9 +149,13 @@ static inline void ljpeg_encode_yuv_mb(LJpegEncContext *s,
PutBitContext *pb,
}
if (i == 0)
- ff_mjpeg_encode_dc(pb, *ptr - pred,
s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly
+ ff_ljpeg_encode_dc(pb, *ptr - pred,
+ s->huff_size_dc_luminance,
+ s->huff_code_dc_luminance);
else
- ff_mjpeg_encode_dc(pb, *ptr - pred,
s->huff_size_dc_chrominance, s->huff_code_dc_chrominance);
+ ff_ljpeg_encode_dc(pb, *ptr - pred,
+ s->huff_size_dc_chrominance,
+ s->huff_code_dc_chrominance);
}
}
}
@@ -168,9 +175,13 @@ static inline void ljpeg_encode_yuv_mb(LJpegEncContext *s,
PutBitContext *pb,
PREDICT(pred, ptr[-linesize - 1], ptr[-linesize], ptr[-1],
predictor);
if (i == 0)
- ff_mjpeg_encode_dc(pb, *ptr - pred,
s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly
+ ff_ljpeg_encode_dc(pb, *ptr - pred,
+ s->huff_size_dc_luminance,
+ s->huff_code_dc_luminance);
else
- ff_mjpeg_encode_dc(pb, *ptr - pred,
s->huff_size_dc_chrominance, s->huff_code_dc_chrominance);
+ ff_ljpeg_encode_dc(pb, *ptr - pred,
+ s->huff_size_dc_chrominance,
+ s->huff_code_dc_chrominance);
}
}
}
@@ -225,7 +236,7 @@ static int ljpeg_encode_frame(AVCodecContext *avctx,
AVPacket *pkt,
init_put_bits(&pb, pkt->data, pkt->size);
- ff_mjpeg_encode_picture_header(avctx, &pb, &s->scantable,
+ ff_ljpeg_encode_picture_header(avctx, &pb, &s->scantable,
s->matrix);
header_bits = put_bits_count(&pb);
@@ -239,7 +250,7 @@ static int ljpeg_encode_frame(AVCodecContext *avctx,
AVPacket *pkt,
emms_c();
- ff_mjpeg_encode_picture_trailer(&pb, header_bits);
+ ff_ljpeg_encode_picture_trailer(&pb, header_bits);
flush_put_bits(&pb);
pkt->size = put_bits_ptr(&pb) - pb.buf;
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index 30433c3..ff4fbb4 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -35,6 +35,7 @@
#include "libavutil/pixdesc.h"
#include "avcodec.h"
+#include "ljpeg.h"
#include "mpegvideo.h"
#include "mjpeg.h"
#include "mjpegenc.h"
@@ -77,291 +78,6 @@ void ff_mjpeg_encode_close(MpegEncContext *s)
av_free(s->mjpeg_ctx);
}
-/* table_class: 0 = DC coef, 1 = AC coefs */
-static int put_huffman_table(PutBitContext *p, int table_class, int table_id,
- const uint8_t *bits_table, const uint8_t
*value_table)
-{
- int n, i;
-
- put_bits(p, 4, table_class);
- put_bits(p, 4, table_id);
-
- n = 0;
- for(i=1;i<=16;i++) {
- n += bits_table[i];
- put_bits(p, 8, bits_table[i]);
- }
-
- for(i=0;i<n;i++)
- put_bits(p, 8, value_table[i]);
-
- return n + 17;
-}
-
-static void jpeg_table_header(PutBitContext *p, ScanTable *intra_scantable,
- uint16_t intra_matrix[64])
-{
- int i, j, size;
- uint8_t *ptr;
-
- /* quant matrixes */
- put_marker(p, DQT);
- put_bits(p, 16, 2 + 1 * (1 + 64));
- put_bits(p, 4, 0); /* 8 bit precision */
- put_bits(p, 4, 0); /* table 0 */
- for(i=0;i<64;i++) {
- j = intra_scantable->permutated[i];
- put_bits(p, 8, intra_matrix[j]);
- }
-
- /* huffman table */
- put_marker(p, DHT);
- flush_put_bits(p);
- ptr = put_bits_ptr(p);
- put_bits(p, 16, 0); /* patched later */
- size = 2;
- size += put_huffman_table(p, 0, 0, avpriv_mjpeg_bits_dc_luminance,
- avpriv_mjpeg_val_dc);
- size += put_huffman_table(p, 0, 1, avpriv_mjpeg_bits_dc_chrominance,
- avpriv_mjpeg_val_dc);
-
- size += put_huffman_table(p, 1, 0, avpriv_mjpeg_bits_ac_luminance,
- avpriv_mjpeg_val_ac_luminance);
- size += put_huffman_table(p, 1, 1, avpriv_mjpeg_bits_ac_chrominance,
- avpriv_mjpeg_val_ac_chrominance);
- AV_WB16(ptr, size);
-}
-
-static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p)
-{
- int size;
- uint8_t *ptr;
-
- if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den >
0) {
- /* JFIF header */
- put_marker(p, APP0);
- put_bits(p, 16, 16);
- avpriv_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte
too */
- put_bits(p, 16, 0x0201); /* v 1.02 */
- put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
- put_bits(p, 16, avctx->sample_aspect_ratio.num);
- put_bits(p, 16, avctx->sample_aspect_ratio.den);
- put_bits(p, 8, 0); /* thumbnail width */
- put_bits(p, 8, 0); /* thumbnail height */
- }
-
- /* comment */
- if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
- put_marker(p, COM);
- flush_put_bits(p);
- ptr = put_bits_ptr(p);
- put_bits(p, 16, 0); /* patched later */
- avpriv_put_string(p, LIBAVCODEC_IDENT, 1);
- size = strlen(LIBAVCODEC_IDENT)+3;
- AV_WB16(ptr, size);
- }
-
- if (avctx->pix_fmt == AV_PIX_FMT_YUV420P ||
- avctx->pix_fmt == AV_PIX_FMT_YUV422P ||
- avctx->pix_fmt == AV_PIX_FMT_YUV444P) {
- put_marker(p, COM);
- flush_put_bits(p);
- ptr = put_bits_ptr(p);
- put_bits(p, 16, 0); /* patched later */
- avpriv_put_string(p, "CS=ITU601", 1);
- size = strlen("CS=ITU601")+3;
- AV_WB16(ptr, size);
- }
-}
-
-void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
- ScanTable *intra_scantable,
- uint16_t intra_matrix[64])
-{
- int chroma_h_shift, chroma_v_shift;
- const int lossless = avctx->codec_id != AV_CODEC_ID_MJPEG;
- int hsample[3], vsample[3];
-
- av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift,
- &chroma_v_shift);
-
- if (avctx->codec->id == AV_CODEC_ID_LJPEG &&
- avctx->pix_fmt == AV_PIX_FMT_BGR24) {
- vsample[0] = hsample[0] =
- vsample[1] = hsample[1] =
- vsample[2] = hsample[2] = 1;
- } else {
- vsample[0] = 2;
- vsample[1] = 2 >> chroma_v_shift;
- vsample[2] = 2 >> chroma_v_shift;
- hsample[0] = 2;
- hsample[1] = 2 >> chroma_h_shift;
- hsample[2] = 2 >> chroma_h_shift;
- }
-
- put_marker(pb, SOI);
-
- jpeg_put_comments(avctx, pb);
-
- jpeg_table_header(pb, intra_scantable, intra_matrix);
-
- switch (avctx->codec_id) {
- case AV_CODEC_ID_MJPEG: put_marker(pb, SOF0 ); break;
- case AV_CODEC_ID_LJPEG: put_marker(pb, SOF3 ); break;
- default: assert(0);
- }
-
- put_bits(pb, 16, 17);
- if (lossless && avctx->pix_fmt == AV_PIX_FMT_BGR24)
- put_bits(pb, 8, 9); /* 9 bits/component RCT */
- else
- put_bits(pb, 8, 8); /* 8 bits/component */
- put_bits(pb, 16, avctx->height);
- put_bits(pb, 16, avctx->width);
- put_bits(pb, 8, 3); /* 3 components */
-
- /* Y component */
- put_bits(pb, 8, 1); /* component number */
- put_bits(pb, 4, hsample[0]); /* H factor */
- put_bits(pb, 4, vsample[0]); /* V factor */
- put_bits(pb, 8, 0); /* select matrix */
-
- /* Cb component */
- put_bits(pb, 8, 2); /* component number */
- put_bits(pb, 4, hsample[1]); /* H factor */
- put_bits(pb, 4, vsample[1]); /* V factor */
- put_bits(pb, 8, 0); /* select matrix */
-
- /* Cr component */
- put_bits(pb, 8, 3); /* component number */
- put_bits(pb, 4, hsample[2]); /* H factor */
- put_bits(pb, 4, vsample[2]); /* V factor */
- put_bits(pb, 8, 0); /* select matrix */
-
- /* scan header */
- put_marker(pb, SOS);
- put_bits(pb, 16, 12); /* length */
- put_bits(pb, 8, 3); /* 3 components */
-
- /* Y component */
- put_bits(pb, 8, 1); /* index */
- put_bits(pb, 4, 0); /* DC huffman table index */
- put_bits(pb, 4, 0); /* AC huffman table index */
-
- /* Cb component */
- put_bits(pb, 8, 2); /* index */
- put_bits(pb, 4, 1); /* DC huffman table index */
- put_bits(pb, 4, lossless ? 0 : 1); /* AC huffman table index */
-
- /* Cr component */
- put_bits(pb, 8, 3); /* index */
- put_bits(pb, 4, 1); /* DC huffman table index */
- put_bits(pb, 4, lossless ? 0 : 1); /* AC huffman table index */
-
- put_bits(pb, 8, lossless ? avctx->prediction_method + 1 : 0); /* Ss (not
used) */
-
- switch (avctx->codec_id) {
- case AV_CODEC_ID_MJPEG: put_bits(pb, 8, 63); break; /* Se (not used) */
- case AV_CODEC_ID_LJPEG: put_bits(pb, 8, 0); break; /* not used */
- default: assert(0);
- }
-
- put_bits(pb, 8, 0); /* Ah/Al (not used) */
-}
-
-static void escape_FF(PutBitContext *pb, int start)
-{
- int size = put_bits_count(pb) - start * 8;
- int i, ff_count;
- uint8_t *buf = pb->buf + start;
- int align= (-(size_t)(buf))&3;
-
- assert((size&7) == 0);
- size >>= 3;
-
- ff_count=0;
- for(i=0; i<size && i<align; i++){
- if(buf[i]==0xFF) ff_count++;
- }
- for(; i<size-15; i+=16){
- int acc, v;
-
- v= *(uint32_t*)(&buf[i]);
- acc= (((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
- v= *(uint32_t*)(&buf[i+4]);
- acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
- v= *(uint32_t*)(&buf[i+8]);
- acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
- v= *(uint32_t*)(&buf[i+12]);
- acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
-
- acc>>=4;
- acc+= (acc>>16);
- acc+= (acc>>8);
- ff_count+= acc&0xFF;
- }
- for(; i<size; i++){
- if(buf[i]==0xFF) ff_count++;
- }
-
- if(ff_count==0) return;
-
- flush_put_bits(pb);
- skip_put_bytes(pb, ff_count);
-
- for(i=size-1; ff_count; i--){
- int v= buf[i];
-
- if(v==0xFF){
- buf[i+ff_count]= 0;
- ff_count--;
- }
-
- buf[i+ff_count]= v;
- }
-}
-
-void ff_mjpeg_encode_stuffing(PutBitContext * pbc)
-{
- int length;
- length= (-put_bits_count(pbc))&7;
- if(length) put_bits(pbc, length, (1<<length)-1);
-}
-
-void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits)
-{
- ff_mjpeg_encode_stuffing(pb);
- flush_put_bits(pb);
-
- assert((header_bits & 7) == 0);
-
- escape_FF(pb, header_bits >> 3);
-
- put_marker(pb, EOI);
-}
-
-void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
- uint8_t *huff_size, uint16_t *huff_code)
-{
- int mant, nbits;
-
- if (val == 0) {
- put_bits(pb, huff_size[0], huff_code[0]);
- } else {
- mant = val;
- if (val < 0) {
- val = -val;
- mant--;
- }
-
- nbits= av_log2_16bit(val) + 1;
-
- put_bits(pb, huff_size[nbits], huff_code[nbits]);
-
- put_sbits(pb, nbits, mant);
- }
-}
-
static void encode_block(MpegEncContext *s, int16_t *block, int n)
{
int mant, nbits, code, i, j;
@@ -375,11 +91,13 @@ static void encode_block(MpegEncContext *s, int16_t
*block, int n)
dc = block[0]; /* overflow is impossible */
val = dc - s->last_dc[component];
if (n < 4) {
- ff_mjpeg_encode_dc(&s->pb, val, m->huff_size_dc_luminance,
m->huff_code_dc_luminance);
+ ff_ljpeg_encode_dc(&s->pb, val, m->huff_size_dc_luminance,
+ m->huff_code_dc_luminance);
huff_size_ac = m->huff_size_ac_luminance;
huff_code_ac = m->huff_code_ac_luminance;
} else {
- ff_mjpeg_encode_dc(&s->pb, val, m->huff_size_dc_chrominance,
m->huff_code_dc_chrominance);
+ ff_ljpeg_encode_dc(&s->pb, val, m->huff_size_dc_chrominance,
+ m->huff_code_dc_chrominance);
huff_size_ac = m->huff_size_ac_chrominance;
huff_code_ac = m->huff_code_ac_chrominance;
}
diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h
index 2ad55f2..6054db1 100644
--- a/libavcodec/mjpegenc.h
+++ b/libavcodec/mjpegenc.h
@@ -51,13 +51,6 @@ typedef struct MJpegContext {
int ff_mjpeg_encode_init(MpegEncContext *s);
void ff_mjpeg_encode_close(MpegEncContext *s);
-void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
- ScanTable *intra_scantable,
- uint16_t intra_matrix[64]);
-void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
-void ff_mjpeg_encode_stuffing(PutBitContext *pbc);
-void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
- uint8_t *huff_size, uint16_t *huff_code);
void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[6][64]);
#endif /* AVCODEC_MJPEGENC_H */
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 8985030..9272466 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -42,6 +42,7 @@
#include "mpegvideo.h"
#include "h261.h"
#include "h263.h"
+#include "ljpeg.h"
#include "mathops.h"
#include "mpegutils.h"
#include "mjpegenc.h"
@@ -1568,7 +1569,7 @@ vbv_retry:
frame_end(s);
if (CONFIG_MJPEG_ENCODER && s->out_format == FMT_MJPEG)
- ff_mjpeg_encode_picture_trailer(&s->pb, s->header_bits);
+ ff_ljpeg_encode_picture_trailer(&s->pb, s->header_bits);
if (avctx->rc_buffer_size) {
RateControlContext *rcc = &s->rc_context;
@@ -2437,7 +2438,7 @@ static void write_slice_end(MpegEncContext *s){
ff_mpeg4_stuffing(&s->pb);
}else if(CONFIG_MJPEG_ENCODER && s->out_format == FMT_MJPEG){
- ff_mjpeg_encode_stuffing(&s->pb);
+ ff_ljpeg_encode_stuffing(&s->pb);
}
avpriv_align_put_bits(&s->pb);
@@ -3384,7 +3385,8 @@ static int encode_picture(MpegEncContext *s, int
picture_number)
switch(s->out_format) {
case FMT_MJPEG:
if (CONFIG_MJPEG_ENCODER)
- ff_mjpeg_encode_picture_header(s->avctx, &s->pb,
&s->intra_scantable,
+ ff_ljpeg_encode_picture_header(s->avctx, &s->pb,
+ &s->intra_scantable,
s->intra_matrix);
break;
case FMT_H261:
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
