You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
avcodec/mpegvideo_enc: Reindent after the previous commit
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
@@ -3832,14 +3832,14 @@ static int encode_picture(MpegEncContext *s, const AVPacket *pkt)
|
|||||||
s->qscale= 3; //reduce clipping problems
|
s->qscale= 3; //reduce clipping problems
|
||||||
|
|
||||||
if (s->out_format == FMT_MJPEG) {
|
if (s->out_format == FMT_MJPEG) {
|
||||||
const uint16_t * luma_matrix = ff_mpeg1_default_intra_matrix;
|
|
||||||
const uint16_t *chroma_matrix = ff_mpeg1_default_intra_matrix;
|
|
||||||
|
|
||||||
ret = ff_check_codec_matrices(s->avctx, FF_MATRIX_TYPE_INTRA | FF_MATRIX_TYPE_CHROMA_INTRA, (7 + s->qscale) / s->qscale, 65535);
|
ret = ff_check_codec_matrices(s->avctx, FF_MATRIX_TYPE_INTRA | FF_MATRIX_TYPE_CHROMA_INTRA, (7 + s->qscale) / s->qscale, 65535);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (s->codec_id != AV_CODEC_ID_AMV) {
|
if (s->codec_id != AV_CODEC_ID_AMV) {
|
||||||
|
const uint16_t * luma_matrix = ff_mpeg1_default_intra_matrix;
|
||||||
|
const uint16_t *chroma_matrix = ff_mpeg1_default_intra_matrix;
|
||||||
|
|
||||||
if (s->avctx->intra_matrix) {
|
if (s->avctx->intra_matrix) {
|
||||||
chroma_matrix =
|
chroma_matrix =
|
||||||
luma_matrix = s->avctx->intra_matrix;
|
luma_matrix = s->avctx->intra_matrix;
|
||||||
@@ -3848,13 +3848,13 @@ static int encode_picture(MpegEncContext *s, const AVPacket *pkt)
|
|||||||
chroma_matrix = s->avctx->chroma_intra_matrix;
|
chroma_matrix = s->avctx->chroma_intra_matrix;
|
||||||
|
|
||||||
/* for mjpeg, we do include qscale in the matrix */
|
/* for mjpeg, we do include qscale in the matrix */
|
||||||
for(i=1;i<64;i++){
|
for (int i = 1; i < 64; i++) {
|
||||||
int j = s->idsp.idct_permutation[i];
|
int j = s->idsp.idct_permutation[i];
|
||||||
|
|
||||||
s->chroma_intra_matrix[j] = av_clip_uint8((chroma_matrix[i] * s->qscale) >> 3);
|
s->chroma_intra_matrix[j] = av_clip_uint8((chroma_matrix[i] * s->qscale) >> 3);
|
||||||
s-> intra_matrix[j] = av_clip_uint8(( luma_matrix[i] * s->qscale) >> 3);
|
s-> intra_matrix[j] = av_clip_uint8(( luma_matrix[i] * s->qscale) >> 3);
|
||||||
}
|
}
|
||||||
s->y_dc_scale_table=
|
s->y_dc_scale_table =
|
||||||
s->c_dc_scale_table = ff_mpeg12_dc_scale_table[s->intra_dc_precision];
|
s->c_dc_scale_table = ff_mpeg12_dc_scale_table[s->intra_dc_precision];
|
||||||
s->chroma_intra_matrix[0] =
|
s->chroma_intra_matrix[0] =
|
||||||
s->intra_matrix[0] = ff_mpeg12_dc_scale_table[s->intra_dc_precision][8];
|
s->intra_matrix[0] = ff_mpeg12_dc_scale_table[s->intra_dc_precision][8];
|
||||||
|
Reference in New Issue
Block a user