mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-12 19:18:44 +02:00
9b3279b201
In the aforementioned case mpegvideo_enc.c calls ff_mjpeg_encode_stuffing() at the end of every line which pads the output to byte-alignment and escapes it; yet it does not write the restart-markers (and also not the DRI marker when writing the header) and so the output files are broken. Fix this by writing these markers depending upon the number of slices and not the number of threads in use; this also makes the output of the encoder reproducible given a slice count and is therefore important if encoder tests that actually use -threads auto are added in the future. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
51 lines
2.0 KiB
C
51 lines
2.0 KiB
C
/*
|
|
* lossless JPEG shared bits
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_MJPEGENC_COMMON_H
|
|
#define AVCODEC_MJPEGENC_COMMON_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "avcodec.h"
|
|
#include "idctdsp.h"
|
|
#include "put_bits.h"
|
|
|
|
struct MJpegContext;
|
|
|
|
void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
|
|
struct MJpegContext *m,
|
|
ScanTable *intra_scantable, int pred,
|
|
uint16_t luma_intra_matrix[64],
|
|
uint16_t chroma_intra_matrix[64],
|
|
int use_slices);
|
|
void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits);
|
|
void ff_mjpeg_escape_FF(PutBitContext *pb, int start);
|
|
void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
|
|
const uint8_t *bits_table,
|
|
const uint8_t *val_table);
|
|
void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[4], int vsample[4]);
|
|
|
|
void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
|
|
uint8_t *huff_size, uint16_t *huff_code);
|
|
|
|
int ff_mjpeg_encode_check_pix_fmt(AVCodecContext *avctx);
|
|
|
|
#endif /* AVCODEC_MJPEGENC_COMMON_H */
|