virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc/mjpegenc: Add an option to force outputting chroma matrix.

Browse Source 
RFC 2435 suggests that mjpeg over rtp uses both two tables.
This commit is contained in:
Carl Eugen Hoyos 2015-10-09 20:58:07 +02:00
parent 1e81fd3710
commit d6cfbcd621
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/mjpegenc_common.c
View File

@ -64,11 +64,14 @@ static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p,
{ {
int i, j, size; int i, j, size;
uint8_t *ptr; uint8_t *ptr;
MpegEncContext *s = avctx->priv_data;
if (avctx->codec_id != AV_CODEC_ID_LJPEG) { if (avctx->codec_id != AV_CODEC_ID_LJPEG) {
int matrix_count = 1 + !!memcmp(luma_intra_matrix, int matrix_count = 1 + !!memcmp(luma_intra_matrix,
chroma_intra_matrix, chroma_intra_matrix,
sizeof(luma_intra_matrix[0]) * 64); sizeof(luma_intra_matrix[0]) * 64);
if (s->force_duplicated_matrix)
matrix_count = 2;
/* quant matrixes */ /* quant matrixes */
put_marker(p, DQT); put_marker(p, DQT);
put_bits(p, 16, 2 + matrix_count * (1 + 64)); put_bits(p, 16, 2 + matrix_count * (1 + 64));

2
libavcodec/mpegvideo.h
View File

@ -299,6 +299,7 @@ typedef struct MpegEncContext {
uint16_t chroma_intra_matrix[64]; uint16_t chroma_intra_matrix[64];
uint16_t inter_matrix[64]; uint16_t inter_matrix[64];
uint16_t chroma_inter_matrix[64]; uint16_t chroma_inter_matrix[64];
int force_duplicated_matrix; ///< Force duplication of mjpeg matrices, useful for rtp streaming
int intra_quant_bias; ///< bias for the quantizer int intra_quant_bias; ///< bias for the quantizer
int inter_quant_bias; ///< bias for the quantizer int inter_quant_bias; ///< bias for the quantizer
@ -596,6 +597,7 @@ typedef struct MpegEncContext {
{ "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "force_duplicated_matrix", "Always write luma and chroma matrix for mjpeg, useful for rtp streaming.", FF_MPV_OFFSET(force_duplicated_matrix), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS }, \
extern const AVOption ff_mpv_generic_options[]; extern const AVOption ff_mpv_generic_options[];

2
libavcodec/version.h
View File

@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 4 #define LIBAVCODEC_VERSION_MINOR 4
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \