summaryrefslogtreecommitdiff
path: root/ffmpeg/libavcodec/mjpegenc.c
diff options
context:
space:
mode:
Diffstat (limited to 'ffmpeg/libavcodec/mjpegenc.c')
-rw-r--r--ffmpeg/libavcodec/mjpegenc.c271
1 files changed, 160 insertions, 111 deletions
diff --git a/ffmpeg/libavcodec/mjpegenc.c b/ffmpeg/libavcodec/mjpegenc.c
index 80a4022..f23343a 100644
--- a/ffmpeg/libavcodec/mjpegenc.c
+++ b/ffmpeg/libavcodec/mjpegenc.c
@@ -30,6 +30,8 @@
* MJPEG encoder.
*/
+#include "libavutil/pixdesc.h"
+
#include "avcodec.h"
#include "mpegvideo.h"
#include "mjpeg.h"
@@ -84,10 +86,9 @@ void ff_mjpeg_encode_close(MpegEncContext *s)
}
/* table_class: 0 = DC coef, 1 = AC coefs */
-static int put_huffman_table(MpegEncContext *s, int table_class, int table_id,
+static int put_huffman_table(PutBitContext *p, int table_class, int table_id,
const uint8_t *bits_table, const uint8_t *value_table)
{
- PutBitContext *p = &s->pb;
int n, i;
put_bits(p, 4, table_class);
@@ -105,12 +106,15 @@ static int put_huffman_table(MpegEncContext *s, int table_class, int table_id,
return n + 17;
}
-static void jpeg_table_header(MpegEncContext *s)
+static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p,
+ ScanTable *intra_scantable,
+ uint16_t intra_matrix[64],
+ int hsample[3])
{
- PutBitContext *p = &s->pb;
int i, j, size;
uint8_t *ptr;
+ if (avctx->codec_id != AV_CODEC_ID_LJPEG) {
/* quant matrixes */
put_marker(p, DQT);
#ifdef TWOMATRIXES
@@ -121,8 +125,8 @@ static void jpeg_table_header(MpegEncContext *s)
put_bits(p, 4, 0); /* 8 bit precision */
put_bits(p, 4, 0); /* table 0 */
for(i=0;i<64;i++) {
- j = s->intra_scantable.permutated[i];
- put_bits(p, 8, s->intra_matrix[j]);
+ j = intra_scantable->permutated[i];
+ put_bits(p, 8, intra_matrix[j]);
}
#ifdef TWOMATRIXES
put_bits(p, 4, 0); /* 8 bit precision */
@@ -132,11 +136,12 @@ static void jpeg_table_header(MpegEncContext *s)
put_bits(p, 8, s->chroma_intra_matrix[j]);
}
#endif
+ }
- if(s->avctx->active_thread_type & FF_THREAD_SLICE){
+ if(avctx->active_thread_type & FF_THREAD_SLICE){
put_marker(p, DRI);
put_bits(p, 16, 4);
- put_bits(p, 16, (s->width-1)/(8*s->mjpeg_hsample[0]) + 1);
+ put_bits(p, 16, (avctx->width-1)/(8*hsample[0]) + 1);
}
/* huffman table */
@@ -145,40 +150,38 @@ static void jpeg_table_header(MpegEncContext *s)
ptr = put_bits_ptr(p);
put_bits(p, 16, 0); /* patched later */
size = 2;
- size += put_huffman_table(s, 0, 0, avpriv_mjpeg_bits_dc_luminance,
+ size += put_huffman_table(p, 0, 0, avpriv_mjpeg_bits_dc_luminance,
avpriv_mjpeg_val_dc);
- size += put_huffman_table(s, 0, 1, avpriv_mjpeg_bits_dc_chrominance,
+ size += put_huffman_table(p, 0, 1, avpriv_mjpeg_bits_dc_chrominance,
avpriv_mjpeg_val_dc);
- size += put_huffman_table(s, 1, 0, avpriv_mjpeg_bits_ac_luminance,
+ size += put_huffman_table(p, 1, 0, avpriv_mjpeg_bits_ac_luminance,
avpriv_mjpeg_val_ac_luminance);
- size += put_huffman_table(s, 1, 1, avpriv_mjpeg_bits_ac_chrominance,
+ 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(MpegEncContext *s)
+static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p)
{
- PutBitContext *p = &s->pb;
int size;
uint8_t *ptr;
- if (s->avctx->sample_aspect_ratio.num /* && !lossless */)
- {
- /* 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, 0x0102); /* v 1.02 */
- put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
- put_bits(p, 16, s->avctx->sample_aspect_ratio.num);
- put_bits(p, 16, s->avctx->sample_aspect_ratio.den);
- put_bits(p, 8, 0); /* thumbnail width */
- put_bits(p, 8, 0); /* thumbnail height */
+ 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, 0x0102); /* 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(!(s->flags & CODEC_FLAG_BITEXACT)){
+ if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {
put_marker(p, COM);
flush_put_bits(p);
ptr = put_bits_ptr(p);
@@ -188,9 +191,9 @@ static void jpeg_put_comments(MpegEncContext *s)
AV_WB16(ptr, size);
}
- if( s->avctx->pix_fmt == AV_PIX_FMT_YUV420P
- ||s->avctx->pix_fmt == AV_PIX_FMT_YUV422P
- ||s->avctx->pix_fmt == AV_PIX_FMT_YUV444P){
+ 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);
@@ -201,105 +204,148 @@ static void jpeg_put_comments(MpegEncContext *s)
}
}
-void ff_mjpeg_encode_picture_header(MpegEncContext *s)
+void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[3], int vsample[3])
+{
+ int chroma_h_shift, chroma_v_shift;
+
+ 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_BGR0
+ || avctx->pix_fmt == AV_PIX_FMT_BGRA
+ || avctx->pix_fmt == AV_PIX_FMT_BGR24)) {
+ vsample[0] = hsample[0] =
+ vsample[1] = hsample[1] =
+ vsample[2] = hsample[2] = 1;
+ } else if (avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->pix_fmt == AV_PIX_FMT_YUVJ444P) {
+ vsample[0] = vsample[1] = vsample[2] = 2;
+ hsample[0] = hsample[1] = 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;
+ }
+}
+
+void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
+ ScanTable *intra_scantable,
+ uint16_t intra_matrix[64])
{
- const int lossless= s->avctx->codec_id != AV_CODEC_ID_MJPEG;
+ const int lossless = avctx->codec_id != AV_CODEC_ID_MJPEG && avctx->codec_id != AV_CODEC_ID_AMV;
+ int hsample[3], vsample[3];
int i;
- put_marker(&s->pb, SOI);
+ ff_mjpeg_init_hvsample(avctx, hsample, vsample);
+
+ put_marker(pb, SOI);
// hack for AMV mjpeg format
- if(s->avctx->codec_id == AV_CODEC_ID_AMV) goto end;
+ if(avctx->codec_id == AV_CODEC_ID_AMV) goto end;
- jpeg_put_comments(s);
+ jpeg_put_comments(avctx, pb);
- jpeg_table_header(s);
+ jpeg_table_header(avctx, pb, intra_scantable, intra_matrix, hsample);
- switch(s->avctx->codec_id){
- case AV_CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break;
- case AV_CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break;
+ 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: av_assert0(0);
}
- put_bits(&s->pb, 16, 17);
- if(lossless && (s->avctx->pix_fmt == AV_PIX_FMT_BGR0
- || s->avctx->pix_fmt == AV_PIX_FMT_BGRA
- || s->avctx->pix_fmt == AV_PIX_FMT_BGR24))
- put_bits(&s->pb, 8, 9); /* 9 bits/component RCT */
+ put_bits(pb, 16, 17);
+ if (lossless && ( avctx->pix_fmt == AV_PIX_FMT_BGR0
+ || avctx->pix_fmt == AV_PIX_FMT_BGRA
+ || avctx->pix_fmt == AV_PIX_FMT_BGR24))
+ put_bits(pb, 8, 9); /* 9 bits/component RCT */
else
- put_bits(&s->pb, 8, 8); /* 8 bits/component */
- put_bits(&s->pb, 16, s->height);
- put_bits(&s->pb, 16, s->width);
- put_bits(&s->pb, 8, 3); /* 3 components */
+ 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(&s->pb, 8, 1); /* component number */
- put_bits(&s->pb, 4, s->mjpeg_hsample[0]); /* H factor */
- put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */
- put_bits(&s->pb, 8, 0); /* select matrix */
+ 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(&s->pb, 8, 2); /* component number */
- put_bits(&s->pb, 4, s->mjpeg_hsample[1]); /* H factor */
- put_bits(&s->pb, 4, s->mjpeg_vsample[1]); /* V factor */
+ put_bits(pb, 8, 2); /* component number */
+ put_bits(pb, 4, hsample[1]); /* H factor */
+ put_bits(pb, 4, vsample[1]); /* V factor */
#ifdef TWOMATRIXES
- put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
+ put_bits(pb, 8, lossless ? 0 : 1); /* select matrix */
#else
- put_bits(&s->pb, 8, 0); /* select matrix */
+ put_bits(pb, 8, 0); /* select matrix */
#endif
/* Cr component */
- put_bits(&s->pb, 8, 3); /* component number */
- put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */
- put_bits(&s->pb, 4, s->mjpeg_vsample[2]); /* V factor */
+ put_bits(pb, 8, 3); /* component number */
+ put_bits(pb, 4, hsample[2]); /* H factor */
+ put_bits(pb, 4, vsample[2]); /* V factor */
#ifdef TWOMATRIXES
- put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
+ put_bits(pb, 8, lossless ? 0 : 1); /* select matrix */
#else
- put_bits(&s->pb, 8, 0); /* select matrix */
+ put_bits(pb, 8, 0); /* select matrix */
#endif
/* scan header */
- put_marker(&s->pb, SOS);
- put_bits(&s->pb, 16, 12); /* length */
- put_bits(&s->pb, 8, 3); /* 3 components */
+ put_marker(pb, SOS);
+ put_bits(pb, 16, 12); /* length */
+ put_bits(pb, 8, 3); /* 3 components */
/* Y component */
- put_bits(&s->pb, 8, 1); /* index */
- put_bits(&s->pb, 4, 0); /* DC huffman table index */
- put_bits(&s->pb, 4, 0); /* AC huffman table index */
+ 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(&s->pb, 8, 2); /* index */
- put_bits(&s->pb, 4, 1); /* DC huffman table index */
- put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
+ 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(&s->pb, 8, 3); /* index */
- put_bits(&s->pb, 4, 1); /* DC huffman table index */
- put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
+ 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(&s->pb, 8, lossless ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */
+ put_bits(pb, 8, lossless ? avctx->prediction_method + 1 : 0); /* Ss (not used) */
- switch(s->avctx->codec_id){
- case AV_CODEC_ID_MJPEG: put_bits(&s->pb, 8, 63); break; /* Se (not used) */
- case AV_CODEC_ID_LJPEG: put_bits(&s->pb, 8, 0); break; /* 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: av_assert0(0);
}
- put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */
+ put_bits(pb, 8, 0); /* Ah/Al (not used) */
end:
- s->esc_pos = put_bits_count(&s->pb) >> 3;
- for(i=1; i<s->slice_context_count; i++)
- s->thread_context[i]->esc_pos = 0;
+ if (!lossless) {
+ MpegEncContext *s = avctx->priv_data;
+ av_assert0(avctx->codec->priv_data_size == sizeof(MpegEncContext));
+
+ s->esc_pos = put_bits_count(pb) >> 3;
+ for(i=1; i<s->slice_context_count; i++)
+ s->thread_context[i]->esc_pos = 0;
+ }
}
-static void escape_FF(MpegEncContext *s, int start)
+void ff_mjpeg_escape_FF(PutBitContext *pb, int start)
{
- int size= put_bits_count(&s->pb) - start*8;
+ int size;
int i, ff_count;
- uint8_t *buf= s->pb.buf + start;
+ uint8_t *buf = pb->buf + start;
int align= (-(size_t)(buf))&3;
+ int pad = (-put_bits_count(pb))&7;
+
+ if (pad)
+ put_bits(pb, pad, (1<<pad)-1);
+
+ flush_put_bits(pb);
+ size = put_bits_count(pb) - start * 8;
av_assert1((size&7) == 0);
size >>= 3;
@@ -331,8 +377,8 @@ static void escape_FF(MpegEncContext *s, int start)
if(ff_count==0) return;
- flush_put_bits(&s->pb);
- skip_put_bytes(&s->pb, ff_count);
+ flush_put_bits(pb);
+ skip_put_bytes(pb, ff_count);
for(i=size-1; ff_count; i--){
int v= buf[i];
@@ -348,14 +394,11 @@ static void escape_FF(MpegEncContext *s, int start)
void ff_mjpeg_encode_stuffing(MpegEncContext *s)
{
- int length, i;
+ int i;
PutBitContext *pbc = &s->pb;
int mb_y = s->mb_y - !s->mb_x;
- length= (-put_bits_count(pbc))&7;
- if(length) put_bits(pbc, length, (1<<length)-1);
- flush_put_bits(&s->pb);
- escape_FF(s, s->esc_pos);
+ ff_mjpeg_escape_FF(pbc, s->esc_pos);
if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height)
put_marker(pbc, RST0 + (mb_y&7));
@@ -365,22 +408,20 @@ void ff_mjpeg_encode_stuffing(MpegEncContext *s)
s->last_dc[i] = 128 << s->intra_dc_precision;
}
-void ff_mjpeg_encode_picture_trailer(MpegEncContext *s)
+void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits)
{
+ av_assert1((header_bits & 7) == 0);
- av_assert1((s->header_bits&7)==0);
-
-
- put_marker(&s->pb, EOI);
+ put_marker(pb, EOI);
}
-void ff_mjpeg_encode_dc(MpegEncContext *s, int val,
+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(&s->pb, huff_size[0], huff_code[0]);
+ put_bits(pb, huff_size[0], huff_code[0]);
} else {
mant = val;
if (val < 0) {
@@ -390,9 +431,9 @@ void ff_mjpeg_encode_dc(MpegEncContext *s, int val,
nbits= av_log2_16bit(val) + 1;
- put_bits(&s->pb, huff_size[nbits], huff_code[nbits]);
+ put_bits(pb, huff_size[nbits], huff_code[nbits]);
- put_sbits(&s->pb, nbits, mant);
+ put_sbits(pb, nbits, mant);
}
}
@@ -409,11 +450,11 @@ 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, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
+ 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, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
+ 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;
}
@@ -439,7 +480,7 @@ static void encode_block(MpegEncContext *s, int16_t *block, int n)
mant--;
}
- nbits= av_log2(val) + 1;
+ nbits= av_log2_16bit(val) + 1;
code = (run << 4) | nbits;
put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]);
@@ -496,24 +537,33 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
{
MpegEncContext *s = avctx->priv_data;
- AVFrame pic = *pic_arg;
- int i;
+ AVFrame *pic;
+ int i, ret;
+ int chroma_h_shift, chroma_v_shift;
+
+ av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift);
//CODEC_FLAG_EMU_EDGE have to be cleared
if(s->avctx->flags & CODEC_FLAG_EMU_EDGE)
return -1;
+ pic = av_frame_alloc();
+ av_frame_ref(pic, pic_arg);
//picture should be flipped upside-down
for(i=0; i < 3; i++) {
- pic.data[i] += (pic.linesize[i] * (s->mjpeg_vsample[i] * (8 * s->mb_height -((s->height/V_MAX)&7)) - 1 ));
- pic.linesize[i] *= -1;
+ int vsample = i ? 2 >> chroma_v_shift : 2;
+ pic->data[i] += (pic->linesize[i] * (vsample * (8 * s->mb_height -((s->height/V_MAX)&7)) - 1 ));
+ pic->linesize[i] *= -1;
}
- return ff_MPV_encode_picture(avctx, pkt, &pic, got_packet);
+ ret = ff_MPV_encode_picture(avctx, pkt, pic, got_packet);
+ av_frame_free(&pic);
+ return ret;
}
#if CONFIG_MJPEG_ENCODER
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),
@@ -524,12 +574,12 @@ AVCodec ff_mjpeg_encoder = {
.pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE
},
- .long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
};
#endif
#if CONFIG_AMV_ENCODER
AVCodec ff_amv_encoder = {
.name = "amv",
+ .long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_AMV,
.priv_data_size = sizeof(MpegEncContext),
@@ -539,6 +589,5 @@ AVCodec ff_amv_encoder = {
.pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_NONE
},
- .long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
};
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-06 15:54:44 +0000