* commit '759001c534287a96dc96d1e274665feb7059145d':
lavc decoders: work with refcounted frames.
Anton Khirnov (1):
lavc decoders: work with refcounted frames.
Clément Bœsch (47):
lavc/ansi: reset file
lavc/ansi: re-do refcounted frame changes from Anton
fraps: reset file
lavc/fraps: switch to refcounted frames
gifdec: reset file
lavc/gifdec: switch to refcounted frames
dsicinav: resolve conflicts
smc: resolve conflicts
zmbv: resolve conflicts
rpza: resolve conflicts
vble: resolve conflicts
xxan: resolve conflicts
targa: resolve conflicts
vmnc: resolve conflicts
utvideodec: resolve conflicts
tscc: resolve conflicts
ulti: resolve conflicts
ffv1dec: resolve conflicts
dnxhddec: resolve conflicts
v210dec: resolve conflicts
vp3: resolve conflicts
vcr1: resolve conflicts
v210x: resolve conflicts
wavpack: resolve conflicts
pngdec: fix compilation
roqvideodec: resolve conflicts
pictordec: resolve conflicts
mdec: resolve conflicts
tiertexseqv: resolve conflicts
smacker: resolve conflicts
vb: resolve conflicts
vqavideo: resolve conflicts
xl: resolve conflicts
tmv: resolve conflicts
vmdav: resolve conflicts
truemotion1: resolve conflicts
truemotion2: resolve conflicts
lcldec: fix compilation
libcelt_dec: fix compilation
qdrw: fix compilation
r210dec: fix compilation
rl2: fix compilation
wnv1: fix compilation
yop: fix compilation
tiff: resolve conflicts
interplayvideo: fix compilation
qpeg: resolve conflicts (FIXME/TESTME).
Hendrik Leppkes (33):
012v: convert to refcounted frames
8bps: fix compilation
8svx: resolve conflicts
4xm: resolve conflicts
aasc: resolve conflicts
bfi: fix compilation
aura: fix compilation
alsdec: resolve conflicts
avrndec: convert to refcounted frames
avuidec: convert to refcounted frames
bintext: convert to refcounted frames
cavsdec: resolve conflicts
brender_pix: convert to refcounted frames
cinepak: resolve conflicts
cinepak: avoid using AVFrame struct directly in private context
cljr: fix compilation
cpia: convert to refcounted frames
cscd: resolve conflicts
iff: resolve conflicts and do proper conversion to refcounted frames
4xm: fix reference frame handling
cyuv: fix compilation
dxa: fix compilation
eacmv: fix compilation
eamad: fix compilation
eatgv: fix compilation
escape124: remove unused variable.
escape130: convert to refcounted frames
evrcdec: convert to refcounted frames
exr: convert to refcounted frames
mvcdec: convert to refcounted frames
paf: properly free the frame data on decode close
sgirle: convert to refcounted frames
lavfi/moviesrc: use refcounted frames
Michael Niedermayer (56):
Merge commit '759001c534287a96dc96d1e274665feb7059145d'
resolve conflicts in headers
motion_est: resolve conflict
mpeg4videodec: fix conflicts
dpcm conflict fix
dpx: fix conflicts
indeo3: resolve confilcts
kmvc: resolve conflicts
kmvc: resolve conflicts
h264: resolve conflicts
utils: resolve conflicts
rawdec: resolve conflcits
mpegvideo: resolve conflicts
svq1enc: resolve conflicts
mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
pthreads: resolve conflicts
frame_thread_encoder: simple compilefix not yet tested
snow: update to buffer refs
crytsalhd: fix compile
dirac: switch to new API
sonic: update to new API
svq1: resolve conflict, update to new API
ffwavesynth: update to new buffer API
g729: update to new API
indeo5: fix compile
j2kdec: update to new buffer API
linopencore-amr: fix compile
libvorbisdec: update to new API
loco: fix compile
paf: update to new API
proresdec: update to new API
vp56: update to new api / resolve conflicts
xface: convert to refcounted frames
xan: fix compile&fate
v408: update to ref counted buffers
v308: update to ref counted buffers
yuv4dec: update to ref counted buffers
y41p: update to ref counted frames
xbm: update to refcounted frames
targa_y216: update to refcounted buffers
qpeg: fix fate/crash
cdxl: fix fate
tscc: fix reget buffer useage
targa_y216dec: fix style
msmpeg4: fix fate
h264: ref_picture() copy fields that have been lost too
update_frame_pool: use channel field
h264: Put code that prevents deadlocks back
mpegvideo: dont allow last == current
wmalossless: fix buffer ref messup
ff_alloc_picture: free tables in case of dimension mismatches
h264: fix null pointer dereference and assertion failure
frame_thread_encoder: update to bufrefs
ec: fix used arrays
snowdec: fix off by 1 error in dimensions check
h264: disallow single unpaired fields as references of frames
Paul B Mahol (2):
lavc/vima: convert to refcounted frames
sanm: convert to refcounted frames
Conflicts:
libavcodec/4xm.c
libavcodec/8bps.c
libavcodec/8svx.c
libavcodec/aasc.c
libavcodec/alsdec.c
libavcodec/anm.c
libavcodec/ansi.c
libavcodec/avs.c
libavcodec/bethsoftvideo.c
libavcodec/bfi.c
libavcodec/c93.c
libavcodec/cavsdec.c
libavcodec/cdgraphics.c
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/dsicinav.c
libavcodec/dvdec.c
libavcodec/dxa.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c
libavcodec/error_resilience.c
libavcodec/escape124.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/huffyuvdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/jvdec.c
libavcodec/kgv1dec.c
libavcodec/kmvc.c
libavcodec/lagarith.c
libavcodec/libopenjpegdec.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mmvideo.c
libavcodec/motion_est.c
libavcodec/motionpixels.c
libavcodec/mpc7.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/nuv.c
libavcodec/options_table.h
libavcodec/pcx.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/pthread.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/r210dec.c
libavcodec/rawdec.c
libavcodec/roqvideodec.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavcodec/targa.c
libavcodec/tiertexseqv.c
libavcodec/tiff.c
libavcodec/tmv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
libavcodec/tscc.c
libavcodec/ulti.c
libavcodec/utils.c
libavcodec/utvideodec.c
libavcodec/v210dec.c
libavcodec/v210x.c
libavcodec/vb.c
libavcodec/vble.c
libavcodec/vcr1.c
libavcodec/vmdav.c
libavcodec/vmnc.c
libavcodec/vp3.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
237 lines
8.9 KiB
C
237 lines
8.9 KiB
C
/*
|
|
* lossless JPEG encoder
|
|
* Copyright (c) 2000, 2001 Fabrice Bellard
|
|
* Copyright (c) 2003 Alex Beregszaszi
|
|
* Copyright (c) 2003-2004 Michael Niedermayer
|
|
*
|
|
* Support for external huffman table, various fixes (AVID workaround),
|
|
* aspecting, new decode_frame mechanism and apple mjpeg-b support
|
|
* by Alex Beregszaszi
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* lossless JPEG encoder.
|
|
*/
|
|
|
|
#include "avcodec.h"
|
|
#include "internal.h"
|
|
#include "mpegvideo.h"
|
|
#include "mjpeg.h"
|
|
#include "mjpegenc.h"
|
|
|
|
|
|
static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt,
|
|
const AVFrame *pict, int *got_packet)
|
|
{
|
|
MpegEncContext * const s = avctx->priv_data;
|
|
MJpegContext * const m = s->mjpeg_ctx;
|
|
const int width= s->width;
|
|
const int height= s->height;
|
|
AVFrame * const p = &s->current_picture.f;
|
|
const int predictor= avctx->prediction_method+1;
|
|
const int mb_width = (width + s->mjpeg_hsample[0] - 1) / s->mjpeg_hsample[0];
|
|
const int mb_height = (height + s->mjpeg_vsample[0] - 1) / s->mjpeg_vsample[0];
|
|
int ret, max_pkt_size = FF_MIN_BUFFER_SIZE;
|
|
|
|
if (avctx->pix_fmt == AV_PIX_FMT_BGRA)
|
|
max_pkt_size += width * height * 3 * 4;
|
|
else {
|
|
max_pkt_size += mb_width * mb_height * 3 * 4
|
|
* s->mjpeg_hsample[0] * s->mjpeg_vsample[0];
|
|
}
|
|
|
|
if (!s->edge_emu_buffer &&
|
|
(ret = ff_mpv_frame_size_alloc(s, pict->linesize[0])) < 0) {
|
|
av_log(avctx, AV_LOG_ERROR, "failed to allocate context scratch buffers.\n");
|
|
return ret;
|
|
}
|
|
|
|
if ((ret = ff_alloc_packet2(avctx, pkt, max_pkt_size)) < 0)
|
|
return ret;
|
|
|
|
init_put_bits(&s->pb, pkt->data, pkt->size);
|
|
|
|
av_frame_unref(p);
|
|
ret = av_frame_ref(p, pict);
|
|
if (ret < 0)
|
|
return ret;
|
|
p->pict_type= AV_PICTURE_TYPE_I;
|
|
p->key_frame= 1;
|
|
|
|
ff_mjpeg_encode_picture_header(s);
|
|
|
|
s->header_bits= put_bits_count(&s->pb);
|
|
|
|
if(avctx->pix_fmt == AV_PIX_FMT_BGR0
|
|
|| avctx->pix_fmt == AV_PIX_FMT_BGRA
|
|
|| avctx->pix_fmt == AV_PIX_FMT_BGR24){
|
|
int x, y, i;
|
|
const int linesize= p->linesize[0];
|
|
uint16_t (*buffer)[4]= (void *) s->rd_scratchpad;
|
|
int left[3], top[3], topleft[3];
|
|
|
|
for(i=0; i<3; i++){
|
|
buffer[0][i]= 1 << (9 - 1);
|
|
}
|
|
|
|
for(y = 0; y < height; y++) {
|
|
const int modified_predictor= y ? predictor : 1;
|
|
uint8_t *ptr = p->data[0] + (linesize * y);
|
|
|
|
if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < width*3*4){
|
|
av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
|
|
return -1;
|
|
}
|
|
|
|
for(i=0; i<3; i++){
|
|
top[i]= left[i]= topleft[i]= buffer[0][i];
|
|
}
|
|
for(x = 0; x < width; x++) {
|
|
if(avctx->pix_fmt == AV_PIX_FMT_BGR24){
|
|
buffer[x][1] = ptr[3*x+0] - ptr[3*x+1] + 0x100;
|
|
buffer[x][2] = ptr[3*x+2] - ptr[3*x+1] + 0x100;
|
|
buffer[x][0] = (ptr[3*x+0] + 2*ptr[3*x+1] + ptr[3*x+2])>>2;
|
|
}else{
|
|
buffer[x][1] = ptr[4*x+0] - ptr[4*x+1] + 0x100;
|
|
buffer[x][2] = ptr[4*x+2] - ptr[4*x+1] + 0x100;
|
|
buffer[x][0] = (ptr[4*x+0] + 2*ptr[4*x+1] + ptr[4*x+2])>>2;
|
|
}
|
|
|
|
for(i=0;i<3;i++) {
|
|
int pred, diff;
|
|
|
|
PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
|
|
|
|
topleft[i]= top[i];
|
|
top[i]= buffer[x+1][i];
|
|
|
|
left[i]= buffer[x][i];
|
|
|
|
diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100;
|
|
|
|
if(i==0)
|
|
ff_mjpeg_encode_dc(s, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
|
|
else
|
|
ff_mjpeg_encode_dc(s, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
|
|
}
|
|
}
|
|
}
|
|
}else{
|
|
int mb_x, mb_y, i;
|
|
|
|
for(mb_y = 0; mb_y < mb_height; mb_y++) {
|
|
if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < mb_width * 4 * 3 * s->mjpeg_hsample[0] * s->mjpeg_vsample[0]){
|
|
av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
|
|
return -1;
|
|
}
|
|
for(mb_x = 0; mb_x < mb_width; mb_x++) {
|
|
if(mb_x==0 || mb_y==0){
|
|
for(i=0;i<3;i++) {
|
|
uint8_t *ptr;
|
|
int x, y, h, v, linesize;
|
|
h = s->mjpeg_hsample[i];
|
|
v = s->mjpeg_vsample[i];
|
|
linesize= p->linesize[i];
|
|
|
|
for(y=0; y<v; y++){
|
|
for(x=0; x<h; x++){
|
|
int pred;
|
|
|
|
ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
|
|
if(y==0 && mb_y==0){
|
|
if(x==0 && mb_x==0){
|
|
pred= 128;
|
|
}else{
|
|
pred= ptr[-1];
|
|
}
|
|
}else{
|
|
if(x==0 && mb_x==0){
|
|
pred= ptr[-linesize];
|
|
}else{
|
|
PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
|
|
}
|
|
}
|
|
|
|
if(i==0)
|
|
ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
|
|
else
|
|
ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
|
|
}
|
|
}
|
|
}
|
|
}else{
|
|
for(i=0;i<3;i++) {
|
|
uint8_t *ptr;
|
|
int x, y, h, v, linesize;
|
|
h = s->mjpeg_hsample[i];
|
|
v = s->mjpeg_vsample[i];
|
|
linesize= p->linesize[i];
|
|
|
|
for(y=0; y<v; y++){
|
|
for(x=0; x<h; x++){
|
|
int pred;
|
|
|
|
ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
|
|
PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
|
|
|
|
if(i==0)
|
|
ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
|
|
else
|
|
ff_mjpeg_encode_dc(s, *ptr - pred, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
emms_c();
|
|
av_assert0(s->esc_pos == s->header_bits >> 3);
|
|
ff_mjpeg_encode_stuffing(s);
|
|
ff_mjpeg_encode_picture_trailer(s);
|
|
s->picture_number++;
|
|
|
|
flush_put_bits(&s->pb);
|
|
pkt->size = put_bits_ptr(&s->pb) - s->pb.buf;
|
|
pkt->flags |= AV_PKT_FLAG_KEY;
|
|
*got_packet = 1;
|
|
|
|
return 0;
|
|
// return (put_bits_count(&f->pb)+7)/8;
|
|
}
|
|
|
|
|
|
AVCodec ff_ljpeg_encoder = { //FIXME avoid MPV_* lossless JPEG should not need them
|
|
.name = "ljpeg",
|
|
.type = AVMEDIA_TYPE_VIDEO,
|
|
.id = AV_CODEC_ID_LJPEG,
|
|
.priv_data_size = sizeof(MpegEncContext),
|
|
.init = ff_MPV_encode_init,
|
|
.encode2 = encode_picture_lossless,
|
|
.close = ff_MPV_encode_end,
|
|
.pix_fmts = (const enum AVPixelFormat[]){
|
|
AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_BGR0,
|
|
AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P,
|
|
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P,
|
|
AV_PIX_FMT_NONE},
|
|
.long_name = NULL_IF_CONFIG_SMALL("Lossless JPEG"),
|
|
};
|