Skip to content

F
FFmpeg

云duo / FFmpeg
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
F
FFmpeg

体验新版 GitCode，发现更多精彩内容 >>

提交 44301eaa 编写于 作者: A Aurelien Jacobs
浏览文件
操作

add a proper prefix to all mjpeg encoder exported functions 

Originally committed as revision 9058 to svn://svn.ffmpeg.org/ffmpeg/trunk
上级 d9c9259f
隐藏空白更改
内联 并排
Showing with 34 addition and 34 deletion
libavcodec/ljpegenc.c
浏览文件 @ 44301eaa
...@@ -52,7 +52,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in ...@@ -52,7 +52,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
p->pict_type= FF_I_TYPE; p->pict_type= FF_I_TYPE;
p->key_frame= 1; p->key_frame= 1;
mjpeg_picture_header(s); ff_mjpeg_encode_picture_header(s);
s->header_bits= put_bits_count(&s->pb); s->header_bits= put_bits_count(&s->pb);
...@@ -96,9 +96,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in ...@@ -96,9 +96,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100; diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100;
if(i==0) if(i==0)
mjpeg_encode_dc(s, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly ff_mjpeg_encode_dc(s, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
else else
mjpeg_encode_dc(s, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); ff_mjpeg_encode_dc(s, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
} }
} }
} }
...@@ -141,9 +141,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in ...@@ -141,9 +141,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
} }
if(i==0) if(i==0)
mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly ff_mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
else else
mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); ff_mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
} }
} }
} }
...@@ -164,9 +164,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in ...@@ -164,9 +164,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor); PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
if(i==0) if(i==0)
mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly ff_mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
else else
mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); ff_mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
} }
} }
} }
...@@ -177,7 +177,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in ...@@ -177,7 +177,7 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in
emms_c(); emms_c();
mjpeg_picture_trailer(s); ff_mjpeg_encode_picture_trailer(s);
s->picture_number++; s->picture_number++;
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
......
libavcodec/mjpegenc.c
浏览文件 @ 44301eaa
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#undef TWOMATRIXES #undef TWOMATRIXES
int mjpeg_init(MpegEncContext *s) int ff_mjpeg_encode_init(MpegEncContext *s)
{ {
MJpegContext *m; MJpegContext *m;
...@@ -77,7 +77,7 @@ int mjpeg_init(MpegEncContext *s) ...@@ -77,7 +77,7 @@ int mjpeg_init(MpegEncContext *s)
return 0; return 0;
} }
void mjpeg_close(MpegEncContext *s) void ff_mjpeg_encode_close(MpegEncContext *s)
{ {
av_free(s->mjpeg_ctx); av_free(s->mjpeg_ctx);
} }
...@@ -197,7 +197,7 @@ static void jpeg_put_comments(MpegEncContext *s) ...@@ -197,7 +197,7 @@ static void jpeg_put_comments(MpegEncContext *s)
} }
} }
void mjpeg_picture_header(MpegEncContext *s) 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 != CODEC_ID_MJPEG;
...@@ -335,16 +335,16 @@ static void escape_FF(MpegEncContext *s, int start) ...@@ -335,16 +335,16 @@ static void escape_FF(MpegEncContext *s, int start)
} }
} }
void ff_mjpeg_stuffing(PutBitContext * pbc) void ff_mjpeg_encode_stuffing(PutBitContext * pbc)
{ {
int length; int length;
length= (-put_bits_count(pbc))&7; length= (-put_bits_count(pbc))&7;
if(length) put_bits(pbc, length, (1<<length)-1); if(length) put_bits(pbc, length, (1<<length)-1);
} }
void mjpeg_picture_trailer(MpegEncContext *s) void ff_mjpeg_encode_picture_trailer(MpegEncContext *s)
{ {
ff_mjpeg_stuffing(&s->pb); ff_mjpeg_encode_stuffing(&s->pb);
flush_put_bits(&s->pb); flush_put_bits(&s->pb);
assert((s->header_bits&7)==0); assert((s->header_bits&7)==0);
...@@ -354,8 +354,8 @@ void mjpeg_picture_trailer(MpegEncContext *s) ...@@ -354,8 +354,8 @@ void mjpeg_picture_trailer(MpegEncContext *s)
put_marker(&s->pb, EOI); put_marker(&s->pb, EOI);
} }
void 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)
{ {
int mant, nbits; int mant, nbits;
...@@ -389,11 +389,11 @@ static void encode_block(MpegEncContext *s, DCTELEM *block, int n) ...@@ -389,11 +389,11 @@ static void encode_block(MpegEncContext *s, DCTELEM *block, int n)
dc = block[0]; /* overflow is impossible */ dc = block[0]; /* overflow is impossible */
val = dc - s->last_dc[component]; val = dc - s->last_dc[component];
if (n < 4) { if (n < 4) {
mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance); ff_mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
huff_size_ac = m->huff_size_ac_luminance; huff_size_ac = m->huff_size_ac_luminance;
huff_code_ac = m->huff_code_ac_luminance; huff_code_ac = m->huff_code_ac_luminance;
} else { } else {
mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); ff_mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
huff_size_ac = m->huff_size_ac_chrominance; huff_size_ac = m->huff_size_ac_chrominance;
huff_code_ac = m->huff_code_ac_chrominance; huff_code_ac = m->huff_code_ac_chrominance;
} }
...@@ -434,8 +434,7 @@ static void encode_block(MpegEncContext *s, DCTELEM *block, int n) ...@@ -434,8 +434,7 @@ static void encode_block(MpegEncContext *s, DCTELEM *block, int n)
put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]); put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]);
} }
void mjpeg_encode_mb(MpegEncContext *s, void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64])
DCTELEM block[6][64])
{ {
int i; int i;
for(i=0;i<5;i++) { for(i=0;i<5;i++) {
......
libavcodec/mjpegenc.h
浏览文件 @ 44301eaa
...@@ -48,13 +48,13 @@ typedef struct MJpegContext { ...@@ -48,13 +48,13 @@ typedef struct MJpegContext {
uint16_t huff_code_ac_chrominance[256]; uint16_t huff_code_ac_chrominance[256];
} MJpegContext; } MJpegContext;
int mjpeg_init(MpegEncContext *s); int ff_mjpeg_encode_init(MpegEncContext *s);
void mjpeg_close(MpegEncContext *s); void ff_mjpeg_encode_close(MpegEncContext *s);
void mjpeg_picture_header(MpegEncContext *s); void ff_mjpeg_encode_picture_header(MpegEncContext *s);
void mjpeg_picture_trailer(MpegEncContext *s); void ff_mjpeg_encode_picture_trailer(MpegEncContext *s);
void ff_mjpeg_stuffing(PutBitContext *pbc); void ff_mjpeg_encode_stuffing(PutBitContext *pbc);
void 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);
void mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]); void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]);
#endif /* MJPEGENC_H */ #endif /* MJPEGENC_H */
libavcodec/mpegvideo.c
浏览文件 @ 44301eaa
...@@ -1204,7 +1204,8 @@ int MPV_encode_init(AVCodecContext *avctx) ...@@ -1204,7 +1204,8 @@ int MPV_encode_init(AVCodecContext *avctx)
s->mjpeg_hsample[0] = 2; s->mjpeg_hsample[0] = 2;
s->mjpeg_hsample[1] = 2>>chroma_h_shift; s->mjpeg_hsample[1] = 2>>chroma_h_shift;
s->mjpeg_hsample[2] = 2>>chroma_h_shift; s->mjpeg_hsample[2] = 2>>chroma_h_shift;
if (!(ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) || mjpeg_init(s) < 0) if (!(ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER)
|| ff_mjpeg_encode_init(s) < 0)
return -1; return -1;
avctx->delay=0; avctx->delay=0;
s->low_delay=1; s->low_delay=1;
...@@ -1398,7 +1399,7 @@ int MPV_encode_end(AVCodecContext *avctx) ...@@ -1398,7 +1399,7 @@ int MPV_encode_end(AVCodecContext *avctx)
MPV_common_end(s); MPV_common_end(s);
if ((ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) && s->out_format == FMT_MJPEG) if ((ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) && s->out_format == FMT_MJPEG)
mjpeg_close(s); ff_mjpeg_encode_close(s);
av_freep(&avctx->extradata); av_freep(&avctx->extradata);
...@@ -2544,7 +2545,7 @@ vbv_retry: ...@@ -2544,7 +2545,7 @@ vbv_retry:
MPV_frame_end(s); MPV_frame_end(s);
if (ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG) if (ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG)
mjpeg_picture_trailer(s); ff_mjpeg_encode_picture_trailer(s);
if(avctx->rc_buffer_size){ if(avctx->rc_buffer_size){
RateControlContext *rcc= &s->rc_context; RateControlContext *rcc= &s->rc_context;
...@@ -4594,7 +4595,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x, ...@@ -4594,7 +4595,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x,
h263_encode_mb(s, s->block, motion_x, motion_y); break; h263_encode_mb(s, s->block, motion_x, motion_y); break;
case CODEC_ID_MJPEG: case CODEC_ID_MJPEG:
if (ENABLE_MJPEG_ENCODER) if (ENABLE_MJPEG_ENCODER)
mjpeg_encode_mb(s, s->block); ff_mjpeg_encode_mb(s, s->block);
break; break;
default: default:
assert(0); assert(0);
...@@ -4896,7 +4897,7 @@ static void write_slice_end(MpegEncContext *s){ ...@@ -4896,7 +4897,7 @@ static void write_slice_end(MpegEncContext *s){
ff_mpeg4_stuffing(&s->pb); ff_mpeg4_stuffing(&s->pb);
}else if(ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG){ }else if(ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG){
ff_mjpeg_stuffing(&s->pb); ff_mjpeg_encode_stuffing(&s->pb);
} }
align_put_bits(&s->pb); align_put_bits(&s->pb);
...@@ -5763,7 +5764,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) ...@@ -5763,7 +5764,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
switch(s->out_format) { switch(s->out_format) {
case FMT_MJPEG: case FMT_MJPEG:
if (ENABLE_MJPEG_ENCODER) if (ENABLE_MJPEG_ENCODER)
mjpeg_picture_header(s); ff_mjpeg_encode_picture_header(s);
break; break;
case FMT_H261: case FMT_H261:
if (ENABLE_H261_ENCODER) if (ENABLE_H261_ENCODER)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或