* MJPEG encoder.
*/
-//#define DEBUG
-#include <assert.h>
-
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
}
#endif
+ if(s->avctx->active_thread_type & FF_THREAD_SLICE){
+ put_marker(p, DRI);
+ put_bits(p, 16, 4);
+ put_bits(p, 16, s->mb_width);
+ }
+
/* huffman table */
put_marker(p, DHT);
flush_put_bits(p);
void ff_mjpeg_encode_picture_header(MpegEncContext *s)
{
- const int lossless= s->avctx->codec_id != CODEC_ID_MJPEG;
+ const int lossless= s->avctx->codec_id != AV_CODEC_ID_MJPEG;
+ int i;
put_marker(&s->pb, SOI);
// hack for AMV mjpeg format
- if(s->avctx->codec_id == CODEC_ID_AMV) return;
+ if(s->avctx->codec_id == AV_CODEC_ID_AMV) goto end;
jpeg_put_comments(s);
jpeg_table_header(s);
switch(s->avctx->codec_id){
- case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break;
- case CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break;
- default: assert(0);
+ case AV_CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break;
+ case AV_CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break;
+ default: av_assert0(0);
}
put_bits(&s->pb, 16, 17);
put_bits(&s->pb, 8, lossless ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */
switch(s->avctx->codec_id){
- case CODEC_ID_MJPEG: put_bits(&s->pb, 8, 63); break; /* Se (not used) */
- case CODEC_ID_LJPEG: put_bits(&s->pb, 8, 0); break; /* not used */
- default: assert(0);
+ 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 */
+ default: av_assert0(0);
}
put_bits(&s->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;
}
static void escape_FF(MpegEncContext *s, int start)
uint8_t *buf= s->pb.buf + start;
int align= (-(size_t)(buf))&3;
- assert((size&7) == 0);
+ av_assert1((size&7) == 0);
size >>= 3;
ff_count=0;
}
}
-void ff_mjpeg_encode_stuffing(PutBitContext * pbc)
+void ff_mjpeg_encode_stuffing(MpegEncContext *s)
{
- int length;
+ int length, 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);
+
+ if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height)
+ put_marker(pbc, RST0 + (mb_y&7));
+ s->esc_pos = put_bits_count(pbc) >> 3;
+
+ for(i=0; i<3; i++)
+ s->last_dc[i] = 128 << s->intra_dc_precision;
}
void ff_mjpeg_encode_picture_trailer(MpegEncContext *s)
{
- ff_mjpeg_encode_stuffing(&s->pb);
- flush_put_bits(&s->pb);
- assert((s->header_bits&7)==0);
+ av_assert1((s->header_bits&7)==0);
- escape_FF(s, s->header_bits>>3);
put_marker(&s->pb, EOI);
}
return ff_MPV_encode_picture(avctx, pkt, &pic, got_packet);
}
+#if CONFIG_MJPEG_ENCODER
AVCodec ff_mjpeg_encoder = {
.name = "mjpeg",
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_MJPEG,
+ .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,
+ .capabilities = CODEC_CAP_SLICE_THREADS | CODEC_CAP_FRAME_THREADS | CODEC_CAP_INTRA_ONLY,
.pix_fmts = (const enum PixelFormat[]){
PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE
},
.long_name = NULL_IF_CONFIG_SMALL("MJPEG (Motion JPEG)"),
};
-
+#endif
+#if CONFIG_AMV_ENCODER
AVCodec ff_amv_encoder = {
.name = "amv",
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_AMV,
+ .id = AV_CODEC_ID_AMV,
.priv_data_size = sizeof(MpegEncContext),
.init = ff_MPV_encode_init,
.encode2 = amv_encode_picture,
.close = ff_MPV_encode_end,
- .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE},
+ .pix_fmts = (const enum PixelFormat[]){
+ PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE
+ },
.long_name = NULL_IF_CONFIG_SMALL("AMV Video"),
};
+#endif