openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-27 05:00:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()

Browse Source 
This will allow deMpegEncContextizing the LJPEG encoder.
This commit is contained in:
Anton Khirnov 2013-12-01 22:05:18 +01:00
parent 058d5f2feb
commit 3360ad9955
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ljpegenc.c
View File

@ -193,7 +193,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt,
emms_c(); emms_c();
ff_mjpeg_encode_picture_trailer(s); ff_mjpeg_encode_picture_trailer(&s->pb, s->header_bits);
s->picture_number++; s->picture_number++;
flush_put_bits(&s->pb); flush_put_bits(&s->pb);

22
libavcodec/mjpegenc.c
View File

@ -269,11 +269,11 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
put_bits(pb, 8, 0); /* Ah/Al (not used) */ put_bits(pb, 8, 0); /* Ah/Al (not used) */
} }
static void escape_FF(MpegEncContext *s, int start) static void escape_FF(PutBitContext *pb, int start)
{ {
int size= put_bits_count(&s->pb) - start*8; int size = put_bits_count(pb) - start * 8;
int i, ff_count; int i, ff_count;
uint8_t *buf= s->pb.buf + start; uint8_t *buf = pb->buf + start;
int align= (-(size_t)(buf))&3; int align= (-(size_t)(buf))&3;
assert((size&7) == 0); assert((size&7) == 0);
@ -306,8 +306,8 @@ static void escape_FF(MpegEncContext *s, int start)
if(ff_count==0) return; if(ff_count==0) return;
flush_put_bits(&s->pb); flush_put_bits(pb);
skip_put_bytes(&s->pb, ff_count); skip_put_bytes(pb, ff_count);
for(i=size-1; ff_count; i--){ for(i=size-1; ff_count; i--){
int v= buf[i]; int v= buf[i];
@ -328,16 +328,16 @@ void ff_mjpeg_encode_stuffing(PutBitContext * pbc)
if(length) put_bits(pbc, length, (1<<length)-1); if(length) put_bits(pbc, length, (1<<length)-1);
} }
void ff_mjpeg_encode_picture_trailer(MpegEncContext *s) void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits)
{ {
ff_mjpeg_encode_stuffing(&s->pb); ff_mjpeg_encode_stuffing(pb);
flush_put_bits(&s->pb); flush_put_bits(pb);
assert((s->header_bits&7)==0); assert((header_bits & 7) == 0);
escape_FF(s, s->header_bits>>3); escape_FF(pb, header_bits >> 3);
put_marker(&s->pb, EOI); put_marker(pb, EOI);
} }
void ff_mjpeg_encode_dc(MpegEncContext *s, int val, void ff_mjpeg_encode_dc(MpegEncContext *s, int val,

2
libavcodec/mjpegenc.h
View File

@ -54,7 +54,7 @@ void ff_mjpeg_encode_close(MpegEncContext *s);
void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
ScanTable *intra_scantable, ScanTable *intra_scantable,
uint16_t intra_matrix[64]); uint16_t intra_matrix[64]);
void ff_mjpeg_encode_picture_trailer(MpegEncContext *s); void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
void ff_mjpeg_encode_stuffing(PutBitContext *pbc); void ff_mjpeg_encode_stuffing(PutBitContext *pbc);
void ff_mjpeg_encode_dc(MpegEncContext *s, int val, void ff_mjpeg_encode_dc(MpegEncContext *s, int val,
uint8_t *huff_size, uint16_t *huff_code); uint8_t *huff_size, uint16_t *huff_code);

2
libavcodec/mpegvideo_enc.c
View File

@ -1474,7 +1474,7 @@ vbv_retry:
frame_end(s); frame_end(s);
if (CONFIG_MJPEG_ENCODER && s->out_format == FMT_MJPEG) if (CONFIG_MJPEG_ENCODER && s->out_format == FMT_MJPEG)
ff_mjpeg_encode_picture_trailer(s); ff_mjpeg_encode_picture_trailer(&s->pb, s->header_bits);
if (avctx->rc_buffer_size) { if (avctx->rc_buffer_size) {
RateControlContext *rcc = &s->rc_context; RateControlContext *rcc = &s->rc_context;