virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mjpegenc_common: Constify ff_mjpeg_encode_{dc,picture_header}()

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-04 17:18:30 +01:00
parent 5689d9c0f4
commit 60cae5019a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/mjpegenc_common.c
View File

@@ -56,10 +56,10 @@ static int put_huffman_table(PutBitContext *p, int table_class, int table_id,
} }
static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p, static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p,
MJpegContext *m, const MJpegContext *m,
const uint8_t intra_matrix_permutation[64], const uint8_t intra_matrix_permutation[64],
uint16_t luma_intra_matrix[64], const uint16_t luma_intra_matrix[64],
uint16_t chroma_intra_matrix[64], const uint16_t chroma_intra_matrix[64],
int hsample[3], int use_slices, int matrices_differ) int hsample[3], int use_slices, int matrices_differ)
{ {
int size; int size;
@@ -246,7 +246,7 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p,
} }
} }
void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int vsample[4]) void ff_mjpeg_init_hvsample(const AVCodecContext *avctx, int hsample[4], int vsample[4])
{ {
if (avctx->codec_id == AV_CODEC_ID_LJPEG && if (avctx->codec_id == AV_CODEC_ID_LJPEG &&
( avctx->pix_fmt == AV_PIX_FMT_BGR0 ( avctx->pix_fmt == AV_PIX_FMT_BGR0
@@ -273,10 +273,10 @@ void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int vsample[4
} }
void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
const AVFrame *frame, struct MJpegContext *m, const AVFrame *frame, const struct MJpegContext *m,
const uint8_t intra_matrix_permutation[64], int pred, const uint8_t intra_matrix_permutation[64], int pred,
uint16_t luma_intra_matrix[64], const uint16_t luma_intra_matrix[64],
uint16_t chroma_intra_matrix[64], const uint16_t chroma_intra_matrix[64],
int use_slices) int use_slices)
{ {
const int lossless = !m; const int lossless = !m;
@@ -465,7 +465,7 @@ void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits)
} }
void ff_mjpeg_encode_dc(PutBitContext *pb, int val, void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
uint8_t *huff_size, uint16_t *huff_code) const uint8_t huff_size[], const uint16_t huff_code[])
{ {
int mant, nbits; int mant, nbits;

10
libavcodec/mjpegenc_common.h
View File

@@ -31,21 +31,21 @@ struct MJpegContext;
int ff_mjpeg_add_icc_profile_size(AVCodecContext *avctx, const AVFrame *frame, int ff_mjpeg_add_icc_profile_size(AVCodecContext *avctx, const AVFrame *frame,
size_t *max_pkt_size); size_t *max_pkt_size);
void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
const AVFrame *frame, struct MJpegContext *m, const AVFrame *frame, const struct MJpegContext *m,
const uint8_t intra_matrix_permutation[64], const uint8_t intra_matrix_permutation[64],
int pred, int pred,
uint16_t luma_intra_matrix[64], const uint16_t luma_intra_matrix[64],
uint16_t chroma_intra_matrix[64], const uint16_t chroma_intra_matrix[64],
int use_slices); int use_slices);
void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits); void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
void ff_mjpeg_escape_FF(PutBitContext *pb, int start); void ff_mjpeg_escape_FF(PutBitContext *pb, int start);
void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
const uint8_t *bits_table, const uint8_t *bits_table,
const uint8_t *val_table); const uint8_t *val_table);
void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int vsample[4]); void ff_mjpeg_init_hvsample(const AVCodecContext *avctx, int hsample[4], int vsample[4]);
void ff_mjpeg_encode_dc(PutBitContext *pb, int val, void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
uint8_t *huff_size, uint16_t *huff_code); const uint8_t huff_size[], const uint16_t huff_code[]);
int ff_mjpeg_encode_check_pix_fmt(AVCodecContext *avctx); int ff_mjpeg_encode_check_pix_fmt(AVCodecContext *avctx);