I have underestimated this a little, and these are just some ...

Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 17 years ago
parent ff794171c9
commit 7993df6527
  1. 4
      libavcodec/bytestream.h
  2. 6
      libavcodec/dnxhdenc.c
  3. 2
      libavcodec/dpcm.c
  4. 6
      libavcodec/dsicinav.c
  5. 2
      libavcodec/dsputil.c
  6. 2
      libavcodec/dv.c
  7. 36
      libavcodec/dvbsubdec.c
  8. 2
      libavcodec/dvdsubdec.c
  9. 6
      libavcodec/gifdec.c
  10. 4
      libavcodec/idcinvideo.c
  11. 2
      libavcodec/imc.c
  12. 2
      libavcodec/indeo2.c
  13. 6
      libavcodec/indeo3.c
  14. 10
      libavcodec/interplayvideo.c
  15. 6
      libavcodec/kmvc.c
  16. 2
      libavcodec/lcldec.c
  17. 4
      libavcodec/loco.c
  18. 6
      libavcodec/lzw.c
  19. 4
      libavcodec/lzw.h
  20. 2
      libavcodec/mmvideo.c
  21. 2
      libavcodec/mpc7.c
  22. 2
      libavcodec/mpc8.c
  23. 8
      libavcodec/mpegaudiodec.c
  24. 4
      libavcodec/msrle.c
  25. 4
      libavcodec/msvideo1.c
  26. 4
      libavcodec/nellymoserdec.c
  27. 2
      libavcodec/nuv.c
  28. 6
      libavcodec/pcm.c
  29. 2
      libavcodec/roqvideodec.c
  30. 16
      libavcodec/sgidec.c
  31. 2
      libavcodec/ulti.c
  32. 6
      libavcodec/vb.c
  33. 6
      libavcodec/xsubdec.c

@ -25,7 +25,7 @@
#include "common.h" #include "common.h"
#define DEF_T(type, name, bytes, read, write) \ #define DEF_T(type, name, bytes, read, write) \
static av_always_inline type bytestream_get_ ## name(uint8_t **b){\ static av_always_inline type bytestream_get_ ## name(const uint8_t **b){\
(*b) += bytes;\ (*b) += bytes;\
return read(*b - bytes);\ return read(*b - bytes);\
}\ }\
@ -53,7 +53,7 @@ DEF (byte, 1, AV_RB8 , AV_WB8 )
#undef DEF64 #undef DEF64
#undef DEF_T #undef DEF_T
static av_always_inline unsigned int bytestream_get_buffer(uint8_t **b, uint8_t *dst, unsigned int size) static av_always_inline unsigned int bytestream_get_buffer(const uint8_t **b, uint8_t *dst, unsigned int size)
{ {
memcpy(dst, *b, size); memcpy(dst, *b, size);
(*b) += size; (*b) += size;

@ -693,7 +693,7 @@ static int dnxhd_find_qscale(DNXHDEncContext *ctx)
static int dnxhd_rc_cmp(const void *a, const void *b) static int dnxhd_rc_cmp(const void *a, const void *b)
{ {
return ((RCCMPEntry *)b)->value - ((RCCMPEntry *)a)->value; return ((const RCCMPEntry *)b)->value - ((const RCCMPEntry *)a)->value;
} }
static int dnxhd_encode_fast(AVCodecContext *avctx, DNXHDEncContext *ctx) static int dnxhd_encode_fast(AVCodecContext *avctx, DNXHDEncContext *ctx)
@ -733,7 +733,7 @@ static int dnxhd_encode_fast(AVCodecContext *avctx, DNXHDEncContext *ctx)
return 0; return 0;
} }
static void dnxhd_load_picture(DNXHDEncContext *ctx, AVFrame *frame) static void dnxhd_load_picture(DNXHDEncContext *ctx, const AVFrame *frame)
{ {
int i; int i;
@ -753,7 +753,7 @@ static void dnxhd_load_picture(DNXHDEncContext *ctx, AVFrame *frame)
ctx->cur_field = frame->interlaced_frame && !frame->top_field_first; ctx->cur_field = frame->interlaced_frame && !frame->top_field_first;
} }
static int dnxhd_encode_picture(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data) static int dnxhd_encode_picture(AVCodecContext *avctx, unsigned char *buf, int buf_size, const void *data)
{ {
DNXHDEncContext *ctx = avctx->priv_data; DNXHDEncContext *ctx = avctx->priv_data;
int first_field = 1; int first_field = 1;

@ -159,7 +159,7 @@ static int dpcm_decode_init(AVCodecContext *avctx)
static int dpcm_decode_frame(AVCodecContext *avctx, static int dpcm_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DPCMContext *s = avctx->priv_data; DPCMContext *s = avctx->priv_data;
int in, out = 0; int in, out = 0;

@ -195,7 +195,7 @@ static void cin_decode_rle(const unsigned char *src, int src_size, unsigned char
static int cinvideo_decode_frame(AVCodecContext *avctx, static int cinvideo_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
CinVideoContext *cin = avctx->priv_data; CinVideoContext *cin = avctx->priv_data;
int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size; int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size;
@ -311,10 +311,10 @@ static int cinaudio_decode_init(AVCodecContext *avctx)
static int cinaudio_decode_frame(AVCodecContext *avctx, static int cinaudio_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
CinAudioContext *cin = avctx->priv_data; CinAudioContext *cin = avctx->priv_data;
uint8_t *src = buf; const uint8_t *src = buf;
int16_t *samples = (int16_t *)data; int16_t *samples = (int16_t *)data;
buf_size = FFMIN(buf_size, *data_size/2); buf_size = FFMIN(buf_size, *data_size/2);

@ -3785,7 +3785,7 @@ void ff_vector_fmul_add_add_c(float *dst, const float *src0, const float *src1,
void ff_float_to_int16_c(int16_t *dst, const float *src, int len){ void ff_float_to_int16_c(int16_t *dst, const float *src, int len){
int i; int i;
for(i=0; i<len; i++) { for(i=0; i<len; i++) {
int_fast32_t tmp = ((int32_t*)src)[i]; int_fast32_t tmp = ((const int32_t*)src)[i];
if(tmp & 0xf0000){ if(tmp & 0xf0000){
tmp = (0x43c0ffff - tmp)>>31; tmp = (0x43c0ffff - tmp)>>31;
// is this faster on some gcc/cpu combinations? // is this faster on some gcc/cpu combinations?

@ -1031,7 +1031,7 @@ static int dv_encode_mt(AVCodecContext *avctx, void* sl)
144000 bytes for PAL - or twice those for 50Mbps) */ 144000 bytes for PAL - or twice those for 50Mbps) */
static int dvvideo_decode_frame(AVCodecContext *avctx, static int dvvideo_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVVideoContext *s = avctx->priv_data; DVVideoContext *s = avctx->priv_data;

@ -429,7 +429,7 @@ static int dvbsub_close_decoder(AVCodecContext *avctx)
} }
static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len,
uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table) int non_mod, uint8_t *map_table)
{ {
GetBitContext gb; GetBitContext gb;
@ -534,7 +534,7 @@ static int dvbsub_read_2bit_string(uint8_t *destbuf, int dbuf_len,
} }
static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len,
uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table) int non_mod, uint8_t *map_table)
{ {
GetBitContext gb; GetBitContext gb;
@ -655,10 +655,10 @@ static int dvbsub_read_4bit_string(uint8_t *destbuf, int dbuf_len,
} }
static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len, static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
uint8_t **srcbuf, int buf_size, const uint8_t **srcbuf, int buf_size,
int non_mod, uint8_t *map_table) int non_mod, uint8_t *map_table)
{ {
uint8_t *sbuf_end = (*srcbuf) + buf_size; const uint8_t *sbuf_end = (*srcbuf) + buf_size;
int bits; int bits;
int run_length; int run_length;
int pixels_read = 0; int pixels_read = 0;
@ -714,12 +714,12 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display, static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display,
uint8_t *buf, int buf_size, int top_bottom, int non_mod) const uint8_t *buf, int buf_size, int top_bottom, int non_mod)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
DVBSubRegion *region = get_region(ctx, display->region_id); DVBSubRegion *region = get_region(ctx, display->region_id);
uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
uint8_t *pbuf; uint8_t *pbuf;
int x_pos, y_pos; int x_pos, y_pos;
int i; int i;
@ -833,12 +833,12 @@ static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDis
} }
static void dvbsub_parse_object_segment(AVCodecContext *avctx, static void dvbsub_parse_object_segment(AVCodecContext *avctx,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
uint8_t *block; const uint8_t *block;
int object_id; int object_id;
DVBSubObject *object; DVBSubObject *object;
DVBSubObjectDisplay *display; DVBSubObjectDisplay *display;
@ -892,11 +892,11 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx,
} }
static void dvbsub_parse_clut_segment(AVCodecContext *avctx, static void dvbsub_parse_clut_segment(AVCodecContext *avctx,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
int clut_id; int clut_id;
DVBSubCLUT *clut; DVBSubCLUT *clut;
int entry_id, depth , full_range; int entry_id, depth , full_range;
@ -982,11 +982,11 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx,
static void dvbsub_parse_region_segment(AVCodecContext *avctx, static void dvbsub_parse_region_segment(AVCodecContext *avctx,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
int region_id, object_id; int region_id, object_id;
DVBSubRegion *region; DVBSubRegion *region;
DVBSubObject *object; DVBSubObject *object;
@ -1098,13 +1098,13 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx,
} }
static void dvbsub_parse_page_segment(AVCodecContext *avctx, static void dvbsub_parse_page_segment(AVCodecContext *avctx,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
DVBSubRegionDisplay *display; DVBSubRegionDisplay *display;
DVBSubRegionDisplay *tmp_display_list, **tmp_ptr; DVBSubRegionDisplay *tmp_display_list, **tmp_ptr;
uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
int region_id; int region_id;
int page_state; int page_state;
@ -1265,7 +1265,7 @@ static void save_display_set(DVBSubContext *ctx)
} }
#endif #endif
static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf, static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
int buf_size, AVSubtitle *sub) int buf_size, AVSubtitle *sub)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
@ -1341,11 +1341,11 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf,
static int dvbsub_decode(AVCodecContext *avctx, static int dvbsub_decode(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data; DVBSubContext *ctx = (DVBSubContext*) avctx->priv_data;
AVSubtitle *sub = (AVSubtitle*) data; AVSubtitle *sub = (AVSubtitle*) data;
uint8_t *p, *p_end; const uint8_t *p, *p_end;
int segment_type; int segment_type;
int page_id; int page_id;
int segment_length; int segment_length;

@ -469,7 +469,7 @@ static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h,
static int dvdsub_decode(AVCodecContext *avctx, static int dvdsub_decode(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
AVSubtitle *sub = (void *)data; AVSubtitle *sub = (void *)data;
int is_menu; int is_menu;

@ -47,8 +47,8 @@ typedef struct GifState {
int gce_delay; int gce_delay;
/* LZW compatible decoder */ /* LZW compatible decoder */
uint8_t *bytestream; const uint8_t *bytestream;
uint8_t *bytestream_end; const uint8_t *bytestream_end;
LZWState *lzw; LZWState *lzw;
/* aux buffers */ /* aux buffers */
@ -285,7 +285,7 @@ static int gif_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) static int gif_decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size)
{ {
GifState *s = avctx->priv_data; GifState *s = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;

@ -69,7 +69,7 @@ typedef struct IdcinContext {
DSPContext dsp; DSPContext dsp;
AVFrame frame; AVFrame frame;
unsigned char *buf; const unsigned char *buf;
int size; int size;
hnode_t huff_nodes[256][HUF_TOKENS*2]; hnode_t huff_nodes[256][HUF_TOKENS*2];
@ -212,7 +212,7 @@ static void idcin_decode_vlcs(IdcinContext *s)
static int idcin_decode_frame(AVCodecContext *avctx, static int idcin_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
IdcinContext *s = avctx->priv_data; IdcinContext *s = avctx->priv_data;
AVPaletteControl *palette_control = avctx->palctrl; AVPaletteControl *palette_control = avctx->palctrl;

@ -625,7 +625,7 @@ static int imc_get_coeffs (IMCContext* q) {
static int imc_decode_frame(AVCodecContext * avctx, static int imc_decode_frame(AVCodecContext * avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t * buf, int buf_size) const uint8_t * buf, int buf_size)
{ {
IMCContext *q = avctx->priv_data; IMCContext *q = avctx->priv_data;

@ -136,7 +136,7 @@ static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_
static int ir2_decode_frame(AVCodecContext *avctx, static int ir2_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
Ir2Context * const s = avctx->priv_data; Ir2Context * const s = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;

@ -176,12 +176,12 @@ static void iv_free_func(Indeo3DecodeContext *s)
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static unsigned long iv_decode_frame(Indeo3DecodeContext *s, static unsigned long iv_decode_frame(Indeo3DecodeContext *s,
unsigned char *buf, int buf_size) const unsigned char *buf, int buf_size)
{ {
unsigned int hdr_width, hdr_height, unsigned int hdr_width, hdr_height,
chroma_width, chroma_height; chroma_width, chroma_height;
unsigned long fflags1, fflags2, fflags3, offs1, offs2, offs3, offs; unsigned long fflags1, fflags2, fflags3, offs1, offs2, offs3, offs;
unsigned char *hdr_pos, *buf_pos; const unsigned char *hdr_pos, *buf_pos;
buf_pos = buf; buf_pos = buf;
buf_pos += 18; buf_pos += 18;
@ -1074,7 +1074,7 @@ static int indeo3_decode_init(AVCodecContext *avctx)
static int indeo3_decode_frame(AVCodecContext *avctx, static int indeo3_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
unsigned char *buf, int buf_size) const unsigned char *buf, int buf_size)
{ {
Indeo3DecodeContext *s=avctx->priv_data; Indeo3DecodeContext *s=avctx->priv_data;
unsigned char *src, *dest; unsigned char *src, *dest;

@ -60,14 +60,14 @@ typedef struct IpvideoContext {
AVFrame second_last_frame; AVFrame second_last_frame;
AVFrame last_frame; AVFrame last_frame;
AVFrame current_frame; AVFrame current_frame;
unsigned char *decoding_map; const unsigned char *decoding_map;
int decoding_map_size; int decoding_map_size;
unsigned char *buf; const unsigned char *buf;
int size; int size;
unsigned char *stream_ptr; const unsigned char *stream_ptr;
unsigned char *stream_end; const unsigned char *stream_end;
unsigned char *pixel_ptr; unsigned char *pixel_ptr;
int line_inc; int line_inc;
int stride; int stride;
@ -879,7 +879,7 @@ static int ipvideo_decode_init(AVCodecContext *avctx)
static int ipvideo_decode_frame(AVCodecContext *avctx, static int ipvideo_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
IpvideoContext *s = avctx->priv_data; IpvideoContext *s = avctx->priv_data;
AVPaletteControl *palette_control = avctx->palctrl; AVPaletteControl *palette_control = avctx->palctrl;

@ -67,7 +67,7 @@ typedef struct BitBuf {
} \ } \
} }
static void kmvc_decode_intra_8x8(KmvcContext * ctx, uint8_t * src, int w, int h) static void kmvc_decode_intra_8x8(KmvcContext * ctx, const uint8_t * src, int w, int h)
{ {
BitBuf bb; BitBuf bb;
int res, val; int res, val;
@ -142,7 +142,7 @@ static void kmvc_decode_intra_8x8(KmvcContext * ctx, uint8_t * src, int w, int h
} }
} }
static void kmvc_decode_inter_8x8(KmvcContext * ctx, uint8_t * src, int w, int h) static void kmvc_decode_inter_8x8(KmvcContext * ctx, const uint8_t * src, int w, int h)
{ {
BitBuf bb; BitBuf bb;
int res, val; int res, val;
@ -224,7 +224,7 @@ static void kmvc_decode_inter_8x8(KmvcContext * ctx, uint8_t * src, int w, int h
} }
} }
static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, uint8_t * buf, static int decode_frame(AVCodecContext * avctx, void *data, int *data_size, const uint8_t * buf,
int buf_size) int buf_size)
{ {
KmvcContext *const ctx = avctx->priv_data; KmvcContext *const ctx = avctx->priv_data;

@ -161,7 +161,7 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
* Decode a frame * Decode a frame
* *
*/ */
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size)
{ {
LclDecContext * const c = avctx->priv_data; LclDecContext * const c = avctx->priv_data;
unsigned char *encoded = (unsigned char *)buf; unsigned char *encoded = (unsigned char *)buf;

@ -116,7 +116,7 @@ static inline int loco_predict(uint8_t* data, int stride, int step)
} }
static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int height, static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int height,
int stride, uint8_t *buf, int buf_size, int step) int stride, const uint8_t *buf, int buf_size, int step)
{ {
RICEContext rc; RICEContext rc;
int val; int val;
@ -157,7 +157,7 @@ static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int heigh
static int decode_frame(AVCodecContext *avctx, static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
LOCOContext * const l = avctx->priv_data; LOCOContext * const l = avctx->priv_data;
AVFrame * const p= (AVFrame*)&l->pic; AVFrame * const p= (AVFrame*)&l->pic;

@ -42,7 +42,7 @@ static const uint16_t mask[17] =
}; };
struct LZWState { struct LZWState {
uint8_t *pbuf, *ebuf; const uint8_t *pbuf, *ebuf;
int bbits; int bbits;
unsigned int bbuf; unsigned int bbuf;
@ -91,7 +91,7 @@ static int lzw_get_code(struct LZWState * s)
return c & s->curmask; return c & s->curmask;
} }
uint8_t* ff_lzw_cur_ptr(LZWState *p) const uint8_t* ff_lzw_cur_ptr(LZWState *p)
{ {
return ((struct LZWState*)p)->pbuf; return ((struct LZWState*)p)->pbuf;
} }
@ -127,7 +127,7 @@ void ff_lzw_decode_close(LZWState **p)
* @param buf_size input data size * @param buf_size input data size
* @param mode decoder working mode - either GIF or TIFF * @param mode decoder working mode - either GIF or TIFF
*/ */
int ff_lzw_decode_init(LZWState *p, int csize, uint8_t *buf, int buf_size, int mode) int ff_lzw_decode_init(LZWState *p, int csize, const uint8_t *buf, int buf_size, int mode)
{ {
struct LZWState *s = (struct LZWState *)p; struct LZWState *s = (struct LZWState *)p;

@ -43,9 +43,9 @@ typedef void LZWState;
/* first two functions de/allocate memory for LZWState */ /* first two functions de/allocate memory for LZWState */
void ff_lzw_decode_open(LZWState **p); void ff_lzw_decode_open(LZWState **p);
void ff_lzw_decode_close(LZWState **p); void ff_lzw_decode_close(LZWState **p);
int ff_lzw_decode_init(LZWState *s, int csize, uint8_t *buf, int buf_size, int mode); int ff_lzw_decode_init(LZWState *s, int csize, const uint8_t *buf, int buf_size, int mode);
int ff_lzw_decode(LZWState *s, uint8_t *buf, int len); int ff_lzw_decode(LZWState *s, uint8_t *buf, int len);
uint8_t* ff_lzw_cur_ptr(LZWState *lzw); const uint8_t* ff_lzw_cur_ptr(LZWState *lzw);
void ff_lzw_decode_tail(LZWState *lzw); void ff_lzw_decode_tail(LZWState *lzw);
/** LZW encode state */ /** LZW encode state */

@ -150,7 +150,7 @@ static void mm_decode_inter(MmContext * s, int half_horiz, int half_vert, const
static int mm_decode_frame(AVCodecContext *avctx, static int mm_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
MmContext *s = avctx->priv_data; MmContext *s = avctx->priv_data;
AVPaletteControl *palette_control = avctx->palctrl; AVPaletteControl *palette_control = avctx->palctrl;

@ -158,7 +158,7 @@ static inline void idx_to_quant(MPCContext *c, GetBitContext *gb, int idx, int *
static int mpc7_decode_frame(AVCodecContext * avctx, static int mpc7_decode_frame(AVCodecContext * avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t * buf, int buf_size) const uint8_t * buf, int buf_size)
{ {
MPCContext *c = avctx->priv_data; MPCContext *c = avctx->priv_data;
GetBitContext gb; GetBitContext gb;

@ -182,7 +182,7 @@ static int mpc8_decode_init(AVCodecContext * avctx)
static int mpc8_decode_frame(AVCodecContext * avctx, static int mpc8_decode_frame(AVCodecContext * avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t * buf, int buf_size) const uint8_t * buf, int buf_size)
{ {
MPCContext *c = avctx->priv_data; MPCContext *c = avctx->priv_data;
GetBitContext gb2, *gb = &gb2; GetBitContext gb2, *gb = &gb2;

@ -2367,7 +2367,7 @@ static int mp_decode_frame(MPADecodeContext *s,
static int decode_frame(AVCodecContext * avctx, static int decode_frame(AVCodecContext * avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t * buf, int buf_size) const uint8_t * buf, int buf_size)
{ {
MPADecodeContext *s = avctx->priv_data; MPADecodeContext *s = avctx->priv_data;
uint32_t header; uint32_t header;
@ -2438,7 +2438,7 @@ static void flush(AVCodecContext *avctx){
#ifdef CONFIG_MP3ADU_DECODER #ifdef CONFIG_MP3ADU_DECODER
static int decode_frame_adu(AVCodecContext * avctx, static int decode_frame_adu(AVCodecContext * avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t * buf, int buf_size) const uint8_t * buf, int buf_size)
{ {
MPADecodeContext *s = avctx->priv_data; MPADecodeContext *s = avctx->priv_data;
uint32_t header; uint32_t header;
@ -2564,7 +2564,7 @@ static int decode_close_mp3on4(AVCodecContext * avctx)
static int decode_frame_mp3on4(AVCodecContext * avctx, static int decode_frame_mp3on4(AVCodecContext * avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t * buf, int buf_size) const uint8_t * buf, int buf_size)
{ {
MP3On4DecodeContext *s = avctx->priv_data; MP3On4DecodeContext *s = avctx->priv_data;
MPADecodeContext *m; MPADecodeContext *m;
@ -2574,7 +2574,7 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS]; OUT_INT decoded_buf[MPA_FRAME_SIZE * MPA_MAX_CHANNELS];
OUT_INT *outptr, *bp; OUT_INT *outptr, *bp;
int fsize; int fsize;
unsigned char *start2 = buf, *start; const unsigned char *start2 = buf, *start;
int fr, i, j, n; int fr, i, j, n;
int off = avctx->channels; int off = avctx->channels;
int *coff = chan_offset[s->chan_cfg]; int *coff = chan_offset[s->chan_cfg];

@ -43,7 +43,7 @@ typedef struct MsrleContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame; AVFrame frame;
unsigned char *buf; const unsigned char *buf;
int size; int size;
} MsrleContext; } MsrleContext;
@ -250,7 +250,7 @@ static int msrle_decode_init(AVCodecContext *avctx)
static int msrle_decode_frame(AVCodecContext *avctx, static int msrle_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
MsrleContext *s = avctx->priv_data; MsrleContext *s = avctx->priv_data;

@ -52,7 +52,7 @@ typedef struct Msvideo1Context {
DSPContext dsp; DSPContext dsp;
AVFrame frame; AVFrame frame;
unsigned char *buf; const unsigned char *buf;
int size; int size;
int mode_8bit; /* if it's not 8-bit, it's 16-bit */ int mode_8bit; /* if it's not 8-bit, it's 16-bit */
@ -297,7 +297,7 @@ static void msvideo1_decode_16bit(Msvideo1Context *s)
static int msvideo1_decode_frame(AVCodecContext *avctx, static int msvideo1_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
Msvideo1Context *s = avctx->priv_data; Msvideo1Context *s = avctx->priv_data;

@ -274,7 +274,7 @@ static void get_sample_bits(const float *buf, int *bits)
} }
} }
void nelly_decode_block(NellyMoserDecodeContext *s, unsigned char block[NELLY_BLOCK_LEN], float audio[NELLY_SAMPLES]) void nelly_decode_block(NellyMoserDecodeContext *s, const unsigned char block[NELLY_BLOCK_LEN], float audio[NELLY_SAMPLES])
{ {
int i,j; int i,j;
float buf[NELLY_FILL_LEN], pows[NELLY_FILL_LEN]; float buf[NELLY_FILL_LEN], pows[NELLY_FILL_LEN];
@ -358,7 +358,7 @@ static int decode_init(AVCodecContext * avctx) {
static int decode_tag(AVCodecContext * avctx, static int decode_tag(AVCodecContext * avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t * buf, int buf_size) { const uint8_t * buf, int buf_size) {
NellyMoserDecodeContext *s = avctx->priv_data; NellyMoserDecodeContext *s = avctx->priv_data;
int blocks, i; int blocks, i;
int16_t* samples; int16_t* samples;

@ -129,7 +129,7 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, int qualit
} }
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
uint8_t *buf, int buf_size) { const uint8_t *buf, int buf_size) {
NuvContext *c = avctx->priv_data; NuvContext *c = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;
int orig_size = buf_size; int orig_size = buf_size;

@ -355,7 +355,7 @@ static int pcm_decode_init(AVCodecContext * avctx)
* \param src_len number of bytes in src * \param src_len number of bytes in src
*/ */
static inline void decode_to16(int bps, int le, int us, static inline void decode_to16(int bps, int le, int us,
uint8_t **src, short **samples, int src_len) const uint8_t **src, short **samples, int src_len)
{ {
int usum = us ? -0x8000 : 0; int usum = us ? -0x8000 : 0;
register int n = src_len / bps; register int n = src_len / bps;
@ -373,12 +373,12 @@ static inline void decode_to16(int bps, int le, int us,
static int pcm_decode_frame(AVCodecContext *avctx, static int pcm_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
PCMDecode *s = avctx->priv_data; PCMDecode *s = avctx->priv_data;
int c, n; int c, n;
short *samples; short *samples;
uint8_t *src, *src2[MAX_CHANNELS]; const uint8_t *src, *src2[MAX_CHANNELS];
samples = data; samples = data;
src = buf; src = buf;

@ -43,7 +43,7 @@ static void roqvideo_decode_frame(RoqContext *ri)
int vqid, bpos, xpos, ypos, xp, yp, x, y, mx, my; int vqid, bpos, xpos, ypos, xp, yp, x, y, mx, my;
int frame_stats[2][4] = {{0},{0}}; int frame_stats[2][4] = {{0},{0}};
roq_qcell *qcell; roq_qcell *qcell;
unsigned char *buf = ri->buf; const unsigned char *buf = ri->buf;
unsigned char *buf_end = ri->buf + ri->size; unsigned char *buf_end = ri->buf + ri->size;
while (buf < buf_end) { while (buf < buf_end) {

@ -40,7 +40,7 @@ typedef struct SgiState {
* @param pixelstride pixel stride of input buffer * @param pixelstride pixel stride of input buffer
* @return size of output in bytes, -1 if buffer overflows * @return size of output in bytes, -1 if buffer overflows
*/ */
static int expand_rle_row(uint8_t *in_buf, uint8_t* in_end, static int expand_rle_row(const uint8_t *in_buf, const uint8_t* in_end,
unsigned char *out_buf, uint8_t* out_end, int pixelstride) unsigned char *out_buf, uint8_t* out_end, int pixelstride)
{ {
unsigned char pixel, count; unsigned char pixel, count;
@ -80,12 +80,12 @@ static int expand_rle_row(uint8_t *in_buf, uint8_t* in_end,
* @param s the current image state * @param s the current image state
* @return 0 if no error, else return error number. * @return 0 if no error, else return error number.
*/ */
static int read_rle_sgi(unsigned char* out_buf, uint8_t *in_buf, static int read_rle_sgi(unsigned char* out_buf, const uint8_t *in_buf,
uint8_t *in_end, SgiState* s) const uint8_t *in_end, SgiState* s)
{ {
uint8_t *dest_row; uint8_t *dest_row;
unsigned int len = s->height * s->depth * 4; unsigned int len = s->height * s->depth * 4;
uint8_t *start_table = in_buf; const uint8_t *start_table = in_buf;
unsigned int y, z; unsigned int y, z;
unsigned int start_offset; unsigned int start_offset;
@ -121,10 +121,10 @@ static int read_rle_sgi(unsigned char* out_buf, uint8_t *in_buf,
* @return 0 if read success, otherwise return -1. * @return 0 if read success, otherwise return -1.
*/ */
static int read_uncompressed_sgi(unsigned char* out_buf, uint8_t* out_end, static int read_uncompressed_sgi(unsigned char* out_buf, uint8_t* out_end,
uint8_t *in_buf, uint8_t *in_end, SgiState* s) const uint8_t *in_buf, const uint8_t *in_end, SgiState* s)
{ {
int x, y, z; int x, y, z;
uint8_t *ptr; const uint8_t *ptr;
unsigned int offset = s->height * s->width; unsigned int offset = s->height * s->width;
/* Test buffer size. */ /* Test buffer size. */
@ -147,12 +147,12 @@ static int read_uncompressed_sgi(unsigned char* out_buf, uint8_t* out_end,
static int decode_frame(AVCodecContext *avctx, static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *in_buf, int buf_size) const uint8_t *in_buf, int buf_size)
{ {
SgiState *s = avctx->priv_data; SgiState *s = avctx->priv_data;
AVFrame *picture = data; AVFrame *picture = data;
AVFrame *p = &s->picture; AVFrame *p = &s->picture;
uint8_t *in_end = in_buf + buf_size; const uint8_t *in_end = in_buf + buf_size;
unsigned int dimension, bytes_per_channel, rle; unsigned int dimension, bytes_per_channel, rle;
int ret = 0; int ret = 0;
uint8_t *out_buf, *out_end; uint8_t *out_buf, *out_end;

@ -200,7 +200,7 @@ static void ulti_grad(AVFrame *frame, int x, int y, uint8_t *Y, int chroma, int
static int ulti_decode_frame(AVCodecContext *avctx, static int ulti_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
UltimotionDecodeContext *s=avctx->priv_data; UltimotionDecodeContext *s=avctx->priv_data;
int modifier = 0; int modifier = 0;

@ -44,7 +44,7 @@ typedef struct VBDecContext {
uint8_t *frame, *prev_frame; uint8_t *frame, *prev_frame;
uint32_t pal[256]; uint32_t pal[256];
uint8_t *stream; const uint8_t *stream;
} VBDecContext; } VBDecContext;
static const uint16_t vb_patterns[64] = { static const uint16_t vb_patterns[64] = {
@ -82,7 +82,7 @@ static inline int check_line(uint8_t *buf, uint8_t *start, uint8_t *end)
return buf >= start && (buf + 4) <= end; return buf >= start && (buf + 4) <= end;
} }
static int vb_decode_framedata(VBDecContext *c, uint8_t *buf, int offset) static int vb_decode_framedata(VBDecContext *c, const uint8_t *buf, int offset)
{ {
uint8_t *prev, *cur; uint8_t *prev, *cur;
int blk, blocks, t, blk2; int blk, blocks, t, blk2;
@ -173,7 +173,7 @@ static int vb_decode_framedata(VBDecContext *c, uint8_t *buf, int offset)
return 0; return 0;
} }
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size)
{ {
VBDecContext * const c = avctx->priv_data; VBDecContext * const c = avctx->priv_data;
uint8_t *outptr, *srcptr; uint8_t *outptr, *srcptr;

@ -30,7 +30,7 @@ static int decode_init(AVCodecContext *avctx) {
static const uint8_t tc_offsets[9] = { 0, 1, 3, 4, 6, 7, 9, 10, 11 }; static const uint8_t tc_offsets[9] = { 0, 1, 3, 4, 6, 7, 9, 10, 11 };
static const uint8_t tc_muls[9] = { 10, 6, 10, 6, 10, 6, 10, 10, 1 }; static const uint8_t tc_muls[9] = { 10, 6, 10, 6, 10, 6, 10, 10, 1 };
static uint64_t parse_timecode(uint8_t *buf) { static uint64_t parse_timecode(const uint8_t *buf) {
int i; int i;
int64_t ms = 0; int64_t ms = 0;
if (buf[2] != ':' || buf[5] != ':' || buf[8] != '.') if (buf[2] != ':' || buf[5] != ':' || buf[8] != '.')
@ -44,9 +44,9 @@ static uint64_t parse_timecode(uint8_t *buf) {
} }
static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
uint8_t *buf, int buf_size) { const uint8_t *buf, int buf_size) {
AVSubtitle *sub = data; AVSubtitle *sub = data;
uint8_t *buf_end = buf + buf_size; const uint8_t *buf_end = buf + buf_size;
uint8_t *bitmap; uint8_t *bitmap;
int w, h, x, y, rlelen, i; int w, h, x, y, rlelen, i;
GetBitContext gb; GetBitContext gb;

Loading…
Cancel
Save